java-spring: https

.github/workflows/artifact-csharp-mvc.yml

@@ -1,33 +0,0 @@
-name: Artifact Csharp MVC
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [master, main]
-    paths: ['web/documentserver-example/csharp-mvc/**']
-  pull_request:
-    branches: [master, main]
-    paths: ['web/documentserver-example/csharp-mvc/**']
-
-jobs:
-  artifact:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-      - name: Build Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/csharp-mvc
-          mkdir -p ./deploy/'DotNet (Csharp MVN) Example'
-          rsync -av --exclude='deploy' ./ ./deploy/'DotNet (Csharp MVC) Example'
-          cd ./deploy/'DotNet (Csharp MVC) Example'/assets
-          rm -rf ./.git/
-          rm .git
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: DotNet.Csharp.MVC.Example
-          path: ${{ github.workspace }}/web/documentserver-example/csharp-mvc/deploy

.github/workflows/artifact-csharp.yml

@@ -1,33 +0,0 @@
-name: Artifact Csharp
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [master, main]
-    paths: ['web/documentserver-example/csharp/**']
-  pull_request:
-    branches: [master, main, develop]
-    paths: ['web/documentserver-example/csharp/**']
-
-jobs:
-  artifact:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-      - name: Build Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/csharp
-          mkdir -p ./deploy/'DotNet (Csharp) Example'
-          rsync -av --exclude='deploy' ./ ./deploy/'DotNet (Csharp) Example'
-          cd ./deploy/'DotNet (Csharp) Example'/assets
-          rm -rf ./.git/
-          rm .git
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: DotNet.Csharp.Example
-          path: ${{ github.workspace }}/web/documentserver-example/csharp/deploy

.github/workflows/artifact-java.yml

@@ -1,33 +0,0 @@
-name: Artifact Java
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [master, main]
-    paths: ['web/documentserver-example/java/**']
-  pull_request:
-    branches: [master, main]
-    paths: ['web/documentserver-example/java/**']
-
-jobs:
-  artifact:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-      - name: Build Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/java
-          mkdir -p ./deploy/'Java Example'
-          rsync -av --exclude='deploy' ./ ./deploy/'Java Example'
-          cd ./deploy/'Java Example'/src/main/resources/assets
-          rm -rf ./.git/
-          rm .git
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: Java.Example
-          path: ${{ github.workspace }}/web/documentserver-example/java/deploy

.github/workflows/artifact-node.yml

@@ -1,33 +0,0 @@
-name: Artifact Nodejs
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [master, main]
-    paths: ['web/documentserver-example/nodejs/**']
-  pull_request:
-    branches: [master, main]
-    paths: ['web/documentserver-example/nodejs/**']
-
-jobs:
-  artifact:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-      - name: Build Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/nodejs
-          mkdir -p ./deploy/'Node.js Example'
-          rsync -av --exclude='deploy' ./ ./deploy/'Node.js Example'
-          cd ./deploy/'Node.js Example'/public/assets
-          rm -rf ./.git/
-          rm .git
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: Node.js.Example
-          path: ${{ github.workspace }}/web/documentserver-example/nodejs/deploy

.github/workflows/artifact-php.yml

@@ -1,33 +0,0 @@
-name: Artifact PHP
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [master, main]
-    paths: ['web/documentserver-example/php/**']
-  pull_request:
-    branches: [master, main]
-    paths: ['web/documentserver-example/php/**']
-
-jobs:
-  artifact:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-      - name: Build Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/php
-          mkdir -p ./deploy/'PHP Example'
-          rsync -av --exclude='deploy' ./ ./deploy/'PHP Example'
-          cd ./deploy/'PHP Example'/assets
-          rm -rf ./.git/
-          rm .git
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: PHP.Example
-          path: ${{ github.workspace }}/web/documentserver-example/php/deploy

.github/workflows/artifact-python.yml

@@ -1,33 +0,0 @@
-name: Artifact Python
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [master, main]
-    paths: ['web/documentserver-example/python/**']
-  pull_request:
-    branches: [master, main]
-    paths: ['web/documentserver-example/python/**']
-
-jobs:
-  artifact:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-      - name: Build Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/python
-          mkdir -p ./deploy/'Python Example'
-          rsync -av --exclude='deploy' ./ ./deploy/'Python Example'
-          cd ./deploy/'Python Example'/assets
-          rm -rf ./.git/
-          rm .git
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: Python.Example
-          path: ${{ github.workspace }}/web/documentserver-example/python/deploy

.github/workflows/artifact-ruby.yml

@@ -1,33 +0,0 @@
-name: Artifact Ruby
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [master, main]
-    paths: ['web/documentserver-example/ruby/**']
-  pull_request:
-    branches: [master, main]
-    paths: ['web/documentserver-example/ruby/**']
-
-jobs:
-  artifact:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-      - name: Build Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/ruby
-          mkdir -p ./deploy/'Ruby Example'
-          rsync -av --exclude='deploy' ./ ./deploy/'Ruby Example'
-          cd ./deploy/'Ruby Example'/public/assets
-          rm -rf ./.git/
-          rm .git
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: Ruby.Example
-          path: ${{ github.workspace }}/web/documentserver-example/ruby/deploy

.github/workflows/artifact-spring.yml

@@ -1,33 +0,0 @@
-name: Artifact Java Spring
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [master, main]
-    paths: ['web/documentserver-example/java-spring/**']
-  pull_request:
-    branches: [master, main]
-    paths: ['web/documentserver-example/java-spring/**']
-
-jobs:
-  artifact:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-      - name: Build Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/java-spring
-          mkdir -p ./deploy/'Java Spring Example'
-          rsync -av --exclude='deploy' ./ ./deploy/'Java Spring Example'
-          cd ./deploy/'Java Spring Example'/src/main/resources/assets
-          rm -rf ./.git/
-          rm .git
-      - name: Upload Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: Java.Spring.Example
-          path: ${{ github.workspace }}/web/documentserver-example/java-spring/deploy

.github/workflows/lint-java.yml

@@ -6,7 +6,7 @@ on:
     branches: [master, main]
     paths: ['web/documentserver-example/java/**']
   pull_request:
-    branches: [master, main, develop]
+    branches: [master, main]
     paths: ['web/documentserver-example/java/**']
 
 jobs:

.github/workflows/lint-nodejs.yml

@@ -6,7 +6,7 @@ on:
     branches: [master, main]
     paths: ['web/documentserver-example/nodejs/**']
   pull_request:
-    branches: [master, main, develop]
+    branches: [master, main]
     paths: ['web/documentserver-example/nodejs/**']
 
 env:

.github/workflows/lint-php.yml

@@ -6,7 +6,7 @@ on:
     branches: [master, main]
     paths: ['web/documentserver-example/php/**']
   pull_request:
-    branches: [master, main, develop]
+    branches: [master, main]
     paths: ['web/documentserver-example/php/**']
 
 jobs:
@@ -25,5 +25,7 @@ jobs:
           php-version: '8.2'
           tools: cs2pr, phpcs
           
-      - name: Lint
-        run: phpcs src index.php
+      - name: Run phpcs
+        run: |
+          phpcs --version
+          phpcs -q --extensions=php,module,inc,install,test,profile,theme,info --ignore=node_modules,bower_components,vendor,css,js,lib --standard=./ruleset.xml ./

.github/workflows/lint-python.yml

@@ -6,7 +6,7 @@ on:
     branches: [master, main]
     paths: ['web/documentserver-example/python/**']
   pull_request:
-    branches: [master, main, develop]
+    branches: [master, main]
     paths: ['web/documentserver-example/python/**']
 
 jobs:

.github/workflows/lint-ruby.yml

@@ -6,7 +6,7 @@ on:
     branches: [master, main]
     paths: ['web/documentserver-example/ruby/**']
   pull_request:
-    branches: [master, main, develop]
+    branches: [master, main]
     paths: ['web/documentserver-example/ruby/**']
 
 jobs:

.github/workflows/lint-spring.yml

@@ -6,7 +6,7 @@ on:
     branches: [master, main]
     paths: ['web/documentserver-example/java-spring/**']
   pull_request:
-    branches: [master, main, develop]
+    branches: [master, main]
     paths: ['web/documentserver-example/java-spring/**']
 
 jobs:

.github/workflows/release.yml

@@ -1,146 +0,0 @@
-name: Release
-
-on:
-  push:
-    branches: [master,main]
-
-permissions:
-  contents: write
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-      - name: Install Zip
-        run: sudo apt-get install zip
-      - name: Get Info
-        run: |
-          echo "version=$(grep -Eo '[0-9]+(\.[0-9]+)+' CHANGELOG.md | head -n 1)" >> $GITHUB_OUTPUT
-        id: info
-      - name: Generate Changelog
-        run: |
-          awk '/## [0-9]/{p++} p; /## [0-9]/{if (p > 1) exit}' CHANGELOG.md | awk 'NR>2 {print last} {last=$0}' > RELEASE.md
-      - name: Build Csharp MVC Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/csharp-mvc
-          mkdir -p ./'DotNet (Csharp MVC) Example'
-          rsync -av --exclude='DotNet (Csharp MVC) Example' ./ ./'DotNet (Csharp MVC) Example'
-          cd ./'DotNet (Csharp MVC) Example'/assets
-          rm -rf ./.git/
-          rm .git
-      - name: Build Csharp Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/csharp
-          mkdir -p ./'DotNet (Csharp) Example'
-          rsync -av --exclude='DotNet (Csharp) Example' ./ ./'DotNet (Csharp) Example'
-          cd ./'DotNet (Csharp) Example'/assets
-          rm -rf ./.git/
-          rm .git
-      - name: Build Java Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/java
-          mkdir -p ./'Java Example'
-          rsync -av --exclude='Java Example' ./ ./'Java Example'
-          cd ./'Java Example'/src/main/resources/assets
-          rm -rf ./.git/
-          rm .git
-      - name: Build Nodejs Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/nodejs
-          mkdir -p ./'Node.js Example'
-          rsync -av --exclude='Node.js Example' ./ ./'Node.js Example'
-          cd ./'Node.js Example'/public/assets
-          rm -rf ./.git/
-          rm .git
-      - name: Build PHP Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/php
-          mkdir -p ./'PHP Example'
-          rsync -av --exclude='PHP Example' ./ ./'PHP Example'
-          cd ./'PHP Example'/assets
-          rm -rf ./.git/
-          rm .git
-      - name: Build Python Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/python
-          mkdir -p ./'Python Example'
-          rsync -av --exclude='Python Example' ./ ./'Python Example'
-          cd ./'Python Example'/assets
-          rm -rf ./.git/
-          rm .git
-      - name: Build Ruby Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/ruby
-          mkdir -p ./'Ruby Example'
-          rsync -av --exclude='Ruby Example' ./ ./'Ruby Example'
-          cd ./'Ruby Example'/public/assets
-          rm -rf ./.git/
-          rm .git
-      - name: Build Spring Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cwd=$(pwd)
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/java-spring
-          mkdir -p ./'Java Spring Example'
-          rsync -av --exclude='Java Spring Example' ./ ./'Java Spring Example'
-          cd ./'Java Spring Example'/src/main/resources/assets
-          rm -rf ./.git/
-          rm .git
-      - name: Pack Artifacts
-        run: |
-          cd ${{ github.workspace }}/web/documentserver-example/csharp-mvc
-          zip -r DotNet.Csharp.MVC.Example.zip ./'DotNet (Csharp MVC) Example'
-          cd ${{ github.workspace }}/web/documentserver-example/csharp
-          zip -r DotNet.Csharp.Example.zip ./'DotNet (Csharp) Example'
-          cd ${{ github.workspace }}/web/documentserver-example/java
-          zip -r Java.Example.zip ./'Java Example'
-          cd ${{ github.workspace }}/web/documentserver-example/nodejs
-          zip -r Node.js.Example.zip ./'Node.js Example'
-          cd ${{ github.workspace }}/web/documentserver-example/php
-          zip -r PHP.Example.zip ./'PHP Example'
-          cd ${{ github.workspace }}/web/documentserver-example/python
-          zip -r Python.Example.zip ./'Python Example'
-          cd ${{ github.workspace }}/web/documentserver-example/ruby
-          zip -r Ruby.Example.zip ./'Ruby Example'
-          cd ${{ github.workspace }}/web/documentserver-example/java-spring
-          zip -r Java.Spring.Example.zip ./'Java Spring Example'
-      - name: Create Release
-        uses: ncipollo/release-action@v1
-        id: create_release
-        with:
-          bodyFile: RELEASE.md
-          artifacts: "
-            ${{ github.workspace }}/web/documentserver-example/csharp-mvc/DotNet.Csharp.MVC.Example.zip,
-            ${{ github.workspace }}/web/documentserver-example/csharp/DotNet.Csharp.Example.zip,
-            ${{ github.workspace }}/web/documentserver-example/java/Java.Example.zip,
-            ${{ github.workspace }}/web/documentserver-example/nodejs/Node.js.Example.zip,
-            ${{ github.workspace }}/web/documentserver-example/php/PHP.Example.zip,
-            ${{ github.workspace }}/web/documentserver-example/python/Python.Example.zip,
-            ${{ github.workspace }}/web/documentserver-example/ruby/Ruby.Example.zip,
-            ${{ github.workspace }}/web/documentserver-example/java-spring/Java.Spring.Example.zip
-          "
-          tag: v${{ steps.info.outputs.version }}

.gitignore

@@ -11,14 +11,6 @@
 **/.vscode/
 **/.vs/
 **/.idea
-.classpath
-.project
-.settings/
-*.iml
-*.iws
-.DS_Store
 /web/documentserver-example/java/target/
-/web/documentserver-example/java-spring/target/
 /web/documentserver-example/csharp/packages
 /web/documentserver-example/csharp-mvc/packages
-/web/documentserver-example/java-spring/documents/

.gitmodules

@@ -1,3 +1,19 @@
+[submodule "web/documentserver-example/nodejs/public/assets"]
+	path = web/documentserver-example/nodejs/public/assets
+	url = https://github.com/ONLYOFFICE/document-templates
+	branch = main/en
+[submodule "web/documentserver-example/java/src/main/resources/assets"]
+	path = web/documentserver-example/java/src/main/resources/assets
+	url = https://github.com/ONLYOFFICE/document-templates
+	branch = main/en
+[submodule "web/documentserver-example/php/assets"]
+	path = web/documentserver-example/php/assets
+	url = https://github.com/ONLYOFFICE/document-templates
+	branch = main/en
+[submodule "web/documentserver-example/python/assets"]
+	path = web/documentserver-example/python/assets
+	url = https://github.com/ONLYOFFICE/document-templates
+	branch = main/en
 [submodule "web/documentserver-example/csharp-mvc/assets"]
 	path = web/documentserver-example/csharp-mvc/assets
 	url = https://github.com/ONLYOFFICE/document-templates
@@ -6,43 +22,11 @@
 	path = web/documentserver-example/csharp/assets
 	url = https://github.com/ONLYOFFICE/document-templates
 	branch = main/en
-[submodule "web/documentserver-example/nodejs/public/assets/document-templates"]
-	path = web/documentserver-example/nodejs/public/assets/document-templates
+[submodule "web/documentserver-example/ruby/public/assets"]
+	path = web/documentserver-example/ruby/public/assets
 	url = https://github.com/ONLYOFFICE/document-templates
 	branch = main/en
-[submodule "web/documentserver-example/nodejs/public/assets/document-formats"]
-	path = web/documentserver-example/nodejs/public/assets/document-formats
-	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
-[submodule "web/documentserver-example/php/assets/document-templates"]
-	path = web/documentserver-example/php/assets/document-templates
+[submodule "web/documentserver-example/java-spring/src/main/resources/assets"]
+	path = web/documentserver-example/java-spring/src/main/resources/assets
 	url = https://github.com/ONLYOFFICE/document-templates
 	branch = main/en
-[submodule "web/documentserver-example/php/assets/document-formats"]
-	path = web/documentserver-example/php/assets/document-formats
-	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
-[submodule "web/documentserver-example/python/assets/document-templates"]
-	path = web/documentserver-example/python/assets/document-templates
-	url = https://github.com/ONLYOFFICE/document-templates
-	branch = main/en
-[submodule "web/documentserver-example/java/src/main/resources/assets/document-templates"]
-	path = web/documentserver-example/java/src/main/resources/assets/document-templates
-	url = https://github.com/ONLYOFFICE/document-templates
-	branch = main/en
-[submodule "web/documentserver-example/ruby/assets/document-templates"]
-	path = web/documentserver-example/ruby/assets/document-templates
-	url = https://github.com/ONLYOFFICE/document-templates
-	branch = main/en
-[submodule "web/documentserver-example/java-spring/src/main/resources/assets/document-templates"]
-	path = web/documentserver-example/java-spring/src/main/resources/assets/document-templates
-	url = https://github.com/ONLYOFFICE/document-templates
-	branch = main/en
-[submodule "web/documentserver-example/python/assets/document-formats"]
-	path = web/documentserver-example/python/assets/document-formats
-	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
-[submodule "web/documentserver-example/ruby/assets/document-formats"]
-	path = web/documentserver-example/ruby/assets/document-formats
-	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master

3rd-Party.license

@@ -3,6 +3,10 @@ Document Server integration example uses code from the following 3rd party proje
 
 web/documentserver-example/csharp
 
+jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
+License:        MIT
+License File:   jQuery.license
+
 jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
 License:        MIT, GPL
 License File:   jQuery.BlockUI.license
@@ -15,26 +19,10 @@ jQuery.iframe-transport - jQuery Iframe Transport Plugin for File Upload (https:
 License:        MIT
 License File:   jQuery.iframe-transport.license
 
-jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
-License:        MIT
-License File:   jQuery.license
-
-jQuery.Migrate - Upgrading libraries such as jQuery can be a lot of work, when breaking changes have been introduced. jQuery Migrate makes this easier, by restoring the APIs that were removed, and additionally shows warnings in the browser console (development version of jQuery Migrate only) when removed and/or deprecated APIs are used. (https://github.com/jquery/jquery-migrate/blob/main/LICENSE.txt)
-License:        OpenJS
-License File:   jQuery.Migrate.license
-
 jQuery.UI     - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
 License:        MIT
 License File:   jQuery.UI.license
 
-JWT           - JWT (JSON Web Token) Implementation for .NET (Public Domain) (https://github.com/jwt-dotnet/jwt/)
-License:        MIT
-License File:   JWT.license
-
-Newtonsoft.Json - Json.NET is a popular high-performance JSON framework for .NET (https://github.com/JamesNK/Newtonsoft.Json)
-License:        MIT
-License File:   Newtonsoft.Json.license
-
 
 web/documentserver-example/csharp-mvc
 
@@ -42,6 +30,10 @@ Entity Framework - Entity Framework is an object-relational mapper that enables
 License:        MICROSOFT SOFTWARE SUPPLEMENTAL TERMS, MICROSOFT SOFTWARE LICENSE TERMS
 License File:   EntityFramework.license
 
+jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
+License:        MIT
+License File:   jQuery.license
+
 jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
 License:        MIT, GPL
 License File:   jQuery.BlockUI.license
@@ -54,27 +46,15 @@ jQuery.iframe-transport - jQuery Iframe Transport Plugin for File Upload (https:
 License:        MIT
 License File:   jQuery.iframe-transport.license
 
-jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
-License:        MIT
-License File:   jQuery.license
-
-jQuery.Migrate - Upgrading libraries such as jQuery can be a lot of work, when breaking changes have been introduced. jQuery Migrate makes this easier, by restoring the APIs that were removed, and additionally shows warnings in the browser console (development version of jQuery Migrate only) when removed and/or deprecated APIs are used. (https://github.com/jquery/jquery-migrate/blob/main/LICENSE.txt)
-License:        OpenJS
-License File:   jQuery.Migrate.license
-
 jQuery.UI     - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
 License:        MIT
 License File:   jQuery.UI.license
 
-JWT           - JWT (JSON Web Token) Implementation for .NET (Public Domain) (https://github.com/jwt-dotnet/jwt/)
-License:        MIT
-License File:   JWT.license
-
 Microsoft.Web.Infrastructure - This package contains the Microsoft.Web.Infrastructure assembly that lets you dynamically register HTTP modules at run time. (https://www.microsoft.com/web/webpi/eula/aspnetmvc3update-eula.htm)
 License:        MS-EULA License
 License File:   Microsoft.Web.Infrastructure.license
 
-Newtonsoft.Json - Json.NET is a popular high-performance JSON framework for .NET (https://github.com/JamesNK/Newtonsoft.Json)
+Newtonsoft.Json - Json.NET is a popular high-performance JSON framework for .NET (https://licenses.nuget.org/MIT)
 License:        MIT
 License File:   Newtonsoft.Json.license
 
@@ -85,6 +65,10 @@ License File:   WebGrease.license
 
 web/documentserver-example/java
 
+jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
+License:        MIT
+License File:   jQuery.license
+
 jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
 License:        MIT, GPL
 License File:   jQuery.BlockUI.license
@@ -97,14 +81,6 @@ jQuery.iframe-transport - jQuery Iframe Transport Plugin for File Upload (https:
 License:        MIT
 License File:   jQuery.iframe-transport.license
 
-jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
-License:        MIT
-License File:   jQuery.license
-
-jQuery.Migrate - Upgrading libraries such as jQuery can be a lot of work, when breaking changes have been introduced. jQuery Migrate makes this easier, by restoring the APIs that were removed, and additionally shows warnings in the browser console (development version of jQuery Migrate only) when removed and/or deprecated APIs are used. (https://github.com/jquery/jquery-migrate/blob/main/LICENSE.txt)
-License:        OpenJS
-License File:   jQuery.Migrate.license
-
 jQuery.UI     - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
 License:        MIT
 License File:   jQuery.UI.license
@@ -116,17 +92,9 @@ License File:   prime-jwt.license
 
 web/documentserver-example/java-spring
 
-Gson          - Gson is a Java library that can be used to convert Java Objects into their JSON representation. (https://github.com/google/gson/blob/master/LICENSE)
-License:        Apache 2.0
-License File:   gson.license
-
-H2 Database Engine - This software contains unmodified binary redistributions for H2 database engine. H2 is a relational DBMS that can be embedded in java applications. (https://h2database.com/html/license.html)
-License:        MPL 2.0 or EPL 1.0
-License File:   h2database.license
-
-Jackson Databind - General-purpose data-binding functionality and tree-model for Jackson Data Processor. (https://github.com/FasterXML/jackson-databind/blob/master/LICENSE)
-License:        Apache 2.0
-License File:   jackson-databind.license
+jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
+License:        MIT
+License File:   jQuery.license
 
 jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
 License:        MIT, GPL
@@ -140,30 +108,10 @@ jQuery.iframe-transport - jQuery Iframe Transport Plugin for File Upload (https:
 License:        MIT
 License File:   jQuery.iframe-transport.license
 
-jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
-License:        MIT
-License File:   jQuery.license
-
-jQuery.Migrate - Upgrading libraries such as jQuery can be a lot of work, when breaking changes have been introduced. jQuery Migrate makes this easier, by restoring the APIs that were removed, and additionally shows warnings in the browser console (development version of jQuery Migrate only) when removed and/or deprecated APIs are used. (https://github.com/jquery/jquery-migrate/blob/main/LICENSE.txt)
-License:        OpenJS
-License File:   jQuery.Migrate.license
-
 jQuery.UI     - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
 License:        MIT
 License File:   jQuery.UI.license
 
-JSON.simple   - JSON.simple is a simple Java toolkit for JSON. You can use JSON.simple to encode or decode JSON text. (https://github.com/fangyidong/json-simple/blob/master/LICENSE.txt)
-License:        Apache 2.0
-License File:   JSON.simple.license
-
-Project Lombok - Project Lombok is a java library that automatically plugs into your editor and build tools. (https://mvnrepository.com/artifact/org.projectlombok/lombok).
-License:        MIT
-License File    lombok.license
-
-ModelMapper   - ModelMapper is an intelligent object mapping library that automatically maps objects to each other. (https://github.com/modelmapper/modelmapper)
-License:        Apache 2.0
-License File    modelmapper.license
-
 Prime JWT     - is intended to be fast and easy to use. Prime JWT has a single external dependency on Jackson. (https://github.com/ws-apps/prime-jwt/blob/master/LICENSE)
 License:        Apache 2.0
 License File:   prime-jwt.license
@@ -184,6 +132,22 @@ Spring Data JPA - Persist data in SQL stores with Java Persistence API using Spr
 License:        Apache 2.0
 License File:   spring-data-jpa.license
 
+H2 Database Engine - This software contains unmodified binary redistributions for H2 database engine. H2 is a relational DBMS that can be embedded in java applications. (https://h2database.com/html/license.html)
+License:        MPL 2.0 or EPL 1.0
+License File:   h2database.license
+
+JSON.simple   - JSON.simple is a simple Java toolkit for JSON. You can use JSON.simple to encode or decode JSON text. (https://github.com/fangyidong/json-simple/blob/master/LICENSE.txt)
+License:        Apache 2.0
+License File:   JSON.simple.license
+
+Gson          - Gson is a Java library that can be used to convert Java Objects into their JSON representation. (https://github.com/google/gson/blob/master/LICENSE)
+License:        Apache 2.0
+License File:   gson.license
+
+Jackson Databind - General-purpose data-binding functionality and tree-model for Jackson Data Processor. (https://github.com/FasterXML/jackson-databind/blob/master/LICENSE)
+License:        Apache 2.0
+License File:   jackson-databind.license
+
 
 web/documentserver-example/nodejs
 
@@ -219,6 +183,10 @@ he            - a robust HTML entity encoder/decoder written in JavaScript. (htt
 License:        MIT
 License File:   he.license
 
+jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
+License:        MIT
+License File:   jQuery.license
+
 jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
 License:        MIT, GPL
 License File:   jQuery.BlockUI.license
@@ -231,14 +199,6 @@ jQuery.iframe-transport - jQuery Iframe Transport Plugin for File Upload (https:
 License:        MIT
 License File:   jQuery.iframe-transport.license
 
-jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
-License:        MIT
-License File:   jQuery.license
-
-jQuery.Migrate - Upgrading libraries such as jQuery can be a lot of work, when breaking changes have been introduced. jQuery Migrate makes this easier, by restoring the APIs that were removed, and additionally shows warnings in the browser console (development version of jQuery Migrate only) when removed and/or deprecated APIs are used. (https://github.com/jquery/jquery-migrate/blob/main/LICENSE.txt)
-License:        OpenJS
-License File:   jQuery.Migrate.license
-
 jQuery.UI     - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
 License:        MIT
 License File:   jQuery.UI.license
@@ -268,9 +228,12 @@ License:        MIT
 License File:   urllib.license
 
 
-
 web/documentserver-example/php
 
+jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
+License:        MIT
+License File:   jQuery.license
+
 jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
 License:        MIT, GPL
 License File:   jQuery.BlockUI.license
@@ -283,14 +246,6 @@ jQuery.iframe-transport - jQuery Iframe Transport Plugin for File Upload (https:
 License:        MIT
 License File:   jQuery.iframe-transport.license
 
-jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
-License:        MIT
-License File:   jQuery.license
-
-jQuery.Migrate - Upgrading libraries such as jQuery can be a lot of work, when breaking changes have been introduced. jQuery Migrate makes this easier, by restoring the APIs that were removed, and additionally shows warnings in the browser console (development version of jQuery Migrate only) when removed and/or deprecated APIs are used. (https://github.com/jquery/jquery-migrate/blob/main/LICENSE.txt)
-License:        OpenJS
-License File:   jQuery.Migrate.license
-
 jQuery.UI     - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
 License:        MIT
 License File:   jQuery.UI.license
@@ -303,81 +258,6 @@ PHP_CodeSniffer - PHP_CodeSniffer is a set of two PHP scripts; the main phpcs sc
 License:        BSD-3-Clause
 License File:   PHP_CodeSniffer.license
 
-PHPUnit         - The PHP Unit Testing framework. (https://github.com/sebastianbergmann/phpunit/blob/main/LICENSE)
-License:        BSD 3-Clause
-License File:   phpunit.license
-
-property-access - Provides functions to read and write from/to an object or array using a simple string notation. (https://github.com/symfony/property-access/blob/6.3/LICENSE)
-License:        MIT
-License File:   property-access.license
-
-serializer      - Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON. (https://github.com/symfony/serializer/blob/6.3/LICENSE)
-License:        MIT
-License File:   serializer.license
-
-
-web/documentserver-example/python
-
-django-stubs  - PEP-484 stubs for Django. (https://github.com/typeddjango/django-stubs/blob/master/LICENSE.md)
-License:        MIT
-License File:   django-stubs.license
-
-Django        - Django is a high-level Python web framework that encourages rapid development and clean, pragmatic design. Thanks for checking it out. (https://github.com/django/django/blob/main/LICENSE)
-License:        BSD-3-Clause
-License File:   Django.license
-
-flake8        - flake8 is a python tool that glues together pycodestyle, pyflakes, mccabe, and third-party plugins to check the style and quality of some python code. (https://github.com/PyCQA/flake8/blob/main/LICENSE)
-License:        MIT
-License File:   flake8.license
-
-jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
-License:        MIT, GPL
-License File:   jQuery.BlockUI.license
-
-jQuery.FileUpload - File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads. (https://github.com/blueimp/jQuery-File-Upload/blob/master/LICENSE.txt)
-License:        MIT
-License File:   jQuery.FileUpload.license
-
-jQuery.iframe-transport - jQuery Iframe Transport Plugin for File Upload (https://github.com/blueimp/jQuery-File-Upload/blob/master/LICENSE.txt)
-License:        MIT
-License File:   jQuery.iframe-transport.license
-
-jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
-License:        MIT
-License File:   jQuery.license
-
-jQuery.Migrate - Upgrading libraries such as jQuery can be a lot of work, when breaking changes have been introduced. jQuery Migrate makes this easier, by restoring the APIs that were removed, and additionally shows warnings in the browser console (development version of jQuery Migrate only) when removed and/or deprecated APIs are used. (https://github.com/jquery/jquery-migrate/blob/main/LICENSE.txt)
-License:        OpenJS
-License File:   jQuery.Migrate.license
-
-jQuery.UI     - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
-License:        MIT
-License File:   jQuery.UI.license
-
-msgspec       - A fast serialization and validation library, with builtin support for JSON, MessagePack, YAML, and TOML. (https://github.com/jcrist/msgspec/blob/0.18.1/LICENSE)
-License:        BSD 3-Clause
-License File:   msgspec.license
-
-mypy          - Optional static typing for Python. (https://github.com/python/mypy/blob/master/LICENSE)
-License:        MIT
-License File:   mypy.license
-
-PyJWT         - A Python implementation of RFC 7519. (https://github.com/jpadilla/pyjwt/blob/master/LICENSE)
-License:        MIT
-License File:   PyJWT.license
-
-python-magic  - python-magic is a Python interface to the libmagic file type identification library. (https://github.com/ahupp/python-magic/blob/master/LICENSE)
-License:        MIT
-License File:   python-magic.license
-
-requests      - Requests allows you to send HTTP/1.1 requests extremely easily. There’s no need to manually add query strings to your URLs, or to form-encode your PUT & POST data — but nowadays, just use the json method! (https://github.com/psf/requests/blob/main/LICENSE)
-License:        Apache 2.0
-License File:   requests.license
-
-typeshed      - Collection of library stubs for Python, with static types. (https://github.com/python/typeshed/blob/main/LICENSE)
-License:        Apache 2.0
-License File:   typeshed.license
-
 
 web/documentserver-example/ruby
 
@@ -389,14 +269,14 @@ coffee-rails  - CoffeeScript adapter for the Rails asset pipeline. (https://gith
 License:        MIT
 License File:   coffee-rails.license
 
-dalli         - High performance memcached client for Ruby. (https://github.com/petergoldstein/dalli/blob/v3.2.0/LICENSE)
-License:        MIT
-License File:   dalli.license
-
 jbuilder      - Create JSON structures via a Builder-style DSL (https://github.com/rails/jbuilder/blob/master/MIT-LICENSE)
 License:        MIT
 License File:   jbuilder.license
 
+jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
+License:        MIT
+License File:   jQuery.license
+
 jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
 License:        MIT, GPL
 License File:   jQuery.BlockUI.license
@@ -409,14 +289,6 @@ jQuery.iframe-transport - jQuery Iframe Transport Plugin for File Upload (https:
 License:        MIT
 License File:   jQuery.iframe-transport.license
 
-jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
-License:        MIT
-License File:   jQuery.license
-
-jQuery.Migrate - Upgrading libraries such as jQuery can be a lot of work, when breaking changes have been introduced. jQuery Migrate makes this easier, by restoring the APIs that were removed, and additionally shows warnings in the browser console (development version of jQuery Migrate only) when removed and/or deprecated APIs are used. (https://github.com/jquery/jquery-migrate/blob/main/LICENSE.txt)
-License:        OpenJS
-License File:   jQuery.Migrate.license
-
 jQuery.UI     - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
 License:        MIT
 License File:   jQuery.UI.license
@@ -425,18 +297,10 @@ jquery-rails  - This gem provides jQuery and the jQuery-ujs driver for your Rail
 License:        MIT
 License File:   jquery-rails.license
 
-mimemagic     - А library to detect the mime type of a file by extension or by content. (https://github.com/mimemagicrb/mimemagic/blob/master/LICENSE)
-License:        MIT
-License File:   mimemagic.license
-
 rails         - Rails is a web-application framework that includes everything needed to create database-backed web applications according to the Model-View-Controller (MVC) pattern. (https://github.com/rails/rails/blob/v6.0.3.2/MIT-LICENSE)
 License:        MIT
 License File:   rails.license
 
-rubocop       - A Ruby static code analyzer and formatter, based on the community Ruby style guide. (https://github.com/rubocop/rubocop/blob/v1.52.0/LICENSE.txt)
-License:        MIT
-License File:   rubocop.license
-
 sass-rails    - This gem provides official integration for Ruby on Rails projects with the Sass stylesheet language. (https://github.com/rails/sass-rails/blob/master/MIT-LICENSE)
 License:        MIT
 License File:   sass-rails.license
@@ -445,13 +309,9 @@ sdoc          - rdoc generator html with javascript search index. (https://githu
 License:        MIT
 License File:   sdoc.license
 
-sorbet        - A fast, powerful type checker designed for Ruby. (https://github.com/sorbet/sorbet/blob/0.5.10871.20230607144259-d9000e2ba/LICENSE)
-License:        Apache License 2.0
-License File:   sorbet.license
-
-tapioca       - The swiss army knife of RBI generation. (https://github.com/Shopify/tapioca/blob/v0.11.6/LICENSE.txt)
-License:        MIT
-License File:   tapioca.license
+sqlite3       - This module allows Ruby programs to interface with the SQLite3 database engine (www.sqlite.org). (https://github.com/sparklemotion/sqlite3-ruby/blob/master/LICENSE)
+License:        BSD-3-Clause
+License File:   sqlite3.license
 
 turbolinks    - Rails engine for Turbolinks 5 support (https://github.com/turbolinks/turbolinks-rails/blob/master/LICENSE)
 License:        MIT

CHANGELOG.md

@@ -1,39 +1,6 @@
 # Change Log
 
-- nodejs: onRequestSelectDocument method
-- nodejs: onRequestSelectSpreadsheet method
-- nodejs: onRequestOpen
-- nodejs: submitForm
-- nodejs: key in referenceData
-- nodejs: change reference source
-- php: using a repo with a list of formats
-- nodejs: using a repo with a list of formats
-- nodejs: delete file without reloading the page
-- nodejs: getting history by a separate request
-- nodejs: restore from history
-- python: restore from history
-- ruby: restore from history
-- php: restore from history
-- csharp-mvc: getting history by a separate request
-- csharp-mvc: restore from history
-- csharp: getting history by a separate request
-- csharp: restore from history
-
-## 1.6.0
-- nodejs: setUsers for region protection
-- si skin languages
-- fix "no" skin languages
-- anonymous can't change viewer to edit
-- referenceData
-- anonymous can't protect file
-- separate setting for checking the token in requests
 - php: linter refactoring
-- horizontal scroll fix for Internet Explorer
-- save file with extension from response after conversation
-- conversation to ooxml
-
-## 1.5.1
-- update jquery
 
 ## 1.5.0
 - nodejs: added wopi putRelativeFile action

web/documentserver-example/csharp-mvc/3rd-Party.license

@@ -4,6 +4,10 @@ Entity Framework - Entity Framework is an object-relational mapper that enables
 License:        MICROSOFT SOFTWARE SUPPLEMENTAL TERMS, MICROSOFT SOFTWARE LICENSE TERMS
 License File:   EntityFramework.license
 
+jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
+License:        MIT
+License File:   jQuery.license
+
 jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
 License:        MIT, GPL
 License File:   jQuery.BlockUI.license
@@ -16,14 +20,6 @@ jQuery.iframe-transport - jQuery Iframe Transport Plugin for File Upload (https:
 License:        MIT
 License File:   jQuery.iframe-transport.license
 
-jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
-License:        MIT
-License File:   jQuery.license
-
-jQuery.Migrate - Upgrading libraries such as jQuery can be a lot of work, when breaking changes have been introduced. jQuery Migrate makes this easier, by restoring the APIs that were removed, and additionally shows warnings in the browser console (development version of jQuery Migrate only) when removed and/or deprecated APIs are used. (https://github.com/jquery/jquery-migrate/blob/main/LICENSE.txt)
-License:        OpenJS
-License File:   jQuery.Migrate.license
-
 jQuery.UI     - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
 License:        MIT
 License File:   jQuery.UI.license

web/documentserver-example/csharp-mvc/App_Start/BundleConfig.cs

@@ -28,7 +28,6 @@ namespace OnlineEditorsExampleMVC
             // create a jquery script bundle
             bundles.Add(new ScriptBundle("~/bundles/jquery").Include(
                 "~/Scripts/jquery-{version}.js",
-                "~/Scripts/jquery-migrate-{version}.js",
                 "~/Scripts/jquery-ui.js",
                 "~/Scripts/jquery.blockUI.js",
                 "~/Scripts/jquery.iframe-transport.js",

web/documentserver-example/csharp-mvc/Content/media.css

@@ -682,8 +682,3 @@
         max-width:15%;
     }
 }
-@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
-    .tableRow td:first-child{
-        max-width: none;
-    }
-}

web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs

@@ -220,7 +220,6 @@ namespace OnlineEditorsExampleMVC.Helpers
             var fileName = GetCorrectName(demoName);  // get a file name with an index if the file with such a name already exists
 
             File.Copy(HttpRuntime.AppDomainAppPath + demoPath + demoName, StoragePath(fileName));  // copy file to the storage directory
-            File.SetLastWriteTime(StoragePath(fileName), DateTime.Now);
 
             return fileName;
         }

web/documentserver-example/csharp-mvc/Helpers/DocumentConverter.cs

@@ -68,24 +68,24 @@ namespace OnlineEditorsExampleMVC.Helpers
         /// <param name="toExtension">Extension to which to convert</param>
         /// <param name="documentRevisionId">Key for caching on service</param>
         /// <param name="isAsync">Perform conversions asynchronously</param>
-        /// <param name="convertedDocumentData">Uri and file type of the converted document</param>
+        /// <param name="convertedDocumentUri">Uri to the converted document</param>
         /// <returns>The percentage of conversion completion</returns>
         /// <example>
-        /// Dictionary<string, string> convertedDocumentData;
-        /// GetConvertedData("http://helpcenter.onlyoffice.com/content/GettingStarted.pdf", ".pdf", ".docx", "http://helpcenter.onlyoffice.com/content/GettingStarted.pdf", false, out convertedDocumentData);
+        /// string convertedDocumentUri;
+        /// GetConvertedUri("http://helpcenter.onlyoffice.com/content/GettingStarted.pdf", ".pdf", ".docx", "http://helpcenter.onlyoffice.com/content/GettingStarted.pdf", false, out convertedDocumentUri);
         /// </example>
         /// <exception>
         /// </exception>
-        public static int GetConvertedData(string documentUri,
+        public static int GetConvertedUri(string documentUri,
                                           string fromExtension,
                                           string toExtension,
                                           string documentRevisionId,
                                           bool isAsync,
-                                          out Dictionary<string, string> convertedDocumentData,
+                                          out string convertedDocumentUri,
                                           string filePass = null,
                                           string lang = null)
         {
-            convertedDocumentData = new Dictionary<string, string>();
+            convertedDocumentUri = string.Empty;
 
             // check if the fromExtension parameter is defined; if not, get it from the document url
             fromExtension = string.IsNullOrEmpty(fromExtension) ? Path.GetExtension(documentUri).ToLower() : fromExtension;
@@ -119,7 +119,7 @@ namespace OnlineEditorsExampleMVC.Helpers
                 { "region", lang }
             };
 
-            if (JwtManager.Enabled && JwtManager.SignatureUseForRequest)
+            if (JwtManager.Enabled)
             {
                 // create payload object
                 var payload = new Dictionary<string, object>
@@ -157,7 +157,7 @@ namespace OnlineEditorsExampleMVC.Helpers
                 }
             }
 
-            return GetResponseData(dataResponse, out convertedDocumentData);
+            return GetResponseUri(dataResponse, out convertedDocumentUri);
         }
 
         /// <summary>
@@ -181,9 +181,9 @@ namespace OnlineEditorsExampleMVC.Helpers
         /// Processing document received from the editing service
         /// </summary>
         /// <param name="jsonDocumentResponse">The resulting json from editing service</param>
-        /// <param name="responseData">Uri and file type of the converted document</param>
+        /// <param name="responseUri">Uri to the converted document</param>
         /// <returns>The percentage of conversion completion</returns>
-        private static int GetResponseData(string jsonDocumentResponse, out Dictionary<string, string> responseData)
+        private static int GetResponseUri(string jsonDocumentResponse, out string responseUri)
         {
             if (string.IsNullOrEmpty(jsonDocumentResponse)) throw new ArgumentException("Invalid param", "jsonDocumentResponse");
 
@@ -197,20 +197,14 @@ namespace OnlineEditorsExampleMVC.Helpers
             var isEndConvert = responseFromService.endConvert;
 
             int resultPercent;
-            responseData = new Dictionary<string, string>(); 
-            var responseUri = string.Empty;
-            var responseFileType = string.Empty;
+            responseUri = string.Empty;
             if (isEndConvert)  // if the conversion is completed
             {
                 responseUri = responseFromService.fileUrl;  // get the file url
-                responseFileType = responseFromService.fileType;  // get the file type
-                responseData.Add("fileUrl", responseUri);
-                responseData.Add("fileType", responseFileType);
                 resultPercent = 100;
             }
             else  // if the conversion isn't completed
             {
-                responseData.Add("fileUrl", "");
                 resultPercent = responseFromService.percent;  // get the percentage value
                 if (resultPercent >= 100) resultPercent = 99;
             }

web/documentserver-example/csharp-mvc/Helpers/JwtManager.cs

@@ -29,13 +29,11 @@ namespace OnlineEditorsExampleMVC.Helpers
     {
         private static readonly string Secret;
         public static readonly bool Enabled;
-        public static readonly bool SignatureUseForRequest;
 
         static JwtManager()
         {
             Secret = WebConfigurationManager.AppSettings["files.docservice.secret"] ?? "";  // get token secret from the config parameters
             Enabled = !string.IsNullOrEmpty(Secret);  // check if the token is enabled
-            SignatureUseForRequest = bool.Parse(WebConfigurationManager.AppSettings["files.docservice.token.useforrequest"]);
         }
 
         // encode a payload object into a token using a secret key

web/documentserver-example/csharp-mvc/Helpers/TrackManager.cs

@@ -53,7 +53,7 @@ namespace OnlineEditorsExampleMVC.Helpers
             var fileData = jss.Deserialize<Dictionary<string, object>>(body);
 
             // check if the document token is enabled
-            if (JwtManager.Enabled && JwtManager.SignatureUseForRequest)
+            if (JwtManager.Enabled)
             {
                 string JWTheader = string.IsNullOrEmpty(WebConfigurationManager.AppSettings["files.docservice.header"]) ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
 
@@ -108,9 +108,8 @@ namespace OnlineEditorsExampleMVC.Helpers
                 try
                 {
                     // convert file and give url to a new file
-                    Dictionary<string, string> newFileData;
-                    var result = ServiceConverter.GetConvertedData(downloadUri, downloadExt, curExt, ServiceConverter.GenerateRevisionId(downloadUri), false, out newFileData);
-                    var newFileUri = newFileData["fileUrl"];
+                    string newFileUri;
+                    var result = ServiceConverter.GetConvertedUri(downloadUri, downloadExt, curExt, ServiceConverter.GenerateRevisionId(downloadUri), false, out newFileUri);
                     if (string.IsNullOrEmpty(newFileUri))
                     {
                         // get the correct file name if it already exists
@@ -196,9 +195,8 @@ namespace OnlineEditorsExampleMVC.Helpers
                 try
                 {
                     // convert file and give url to a new file
-                    Dictionary<string, string> newFileData;
-                    var result = ServiceConverter.GetConvertedData(downloadUri, downloadExt, curExt, ServiceConverter.GenerateRevisionId(downloadUri), false, out newFileData);
-                    var newFileUri = newFileData["fileUrl"];
+                    string newFileUri;
+                    var result = ServiceConverter.GetConvertedUri(downloadUri, downloadExt, curExt, ServiceConverter.GenerateRevisionId(downloadUri), false, out newFileUri);
                     if (string.IsNullOrEmpty(newFileUri))
                     {
                         newFileName = true;
@@ -287,7 +285,7 @@ namespace OnlineEditorsExampleMVC.Helpers
             }
 
             // check if a secret key to generate token exists or not
-            if (JwtManager.Enabled && JwtManager.SignatureUseForRequest)
+            if (JwtManager.Enabled)
             {
                 var payload = new Dictionary<string, object>
                     {

web/documentserver-example/csharp-mvc/Helpers/Users.cs

@@ -69,7 +69,6 @@ namespace OnlineEditorsExampleMVC.Helpers
             "Can’t see anyone’s information",
             "Can't rename files from the editor",
             "Can't view chat",
-            "Can't protect file",
             "View file without collaboration",
         };
 
@@ -132,7 +131,7 @@ namespace OnlineEditorsExampleMVC.Helpers
                     new Dictionary<string,object>(),
                     new List<string>(),
                     null,
-                    new List<string>() { "protect" },
+                    new List<string>(),
                     descr_user_0,
                     false
                 )

web/documentserver-example/csharp-mvc/Models/FileModel.cs

@@ -17,6 +17,7 @@
  */
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Web;
@@ -137,17 +138,6 @@ namespace OnlineEditorsExampleMVC.Models
                                             { "favorite", favorite}
                                         }
                                 },
-                                {
-                                    "referenceData", new Dictionary<string, string>()
-                                    {
-                                        { "fileKey", !user.id.Equals("uid-0") ?
-                                            jss.Serialize(new Dictionary<string, object>{
-                                                {"fileName", FileName},
-                                                {"userAddress", HttpUtility.UrlEncode(DocManagerHelper.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress))}
-                                        }) : null },
-                                        {"instanceId", DocManagerHelper.GetServerUrl(false) }
-                                    }
-                                },
                                 {
                                     // the permission for the document to be edited and downloaded or not
                                     "permissions", new Dictionary<string, object>
@@ -164,8 +154,7 @@ namespace OnlineEditorsExampleMVC.Models
                                             { "chat", !user.id.Equals("uid-0") },
                                             { "reviewGroups", user.reviewGroups },
                                             { "commentGroups", user.commentGroups },
-                                            { "userInfoGroups", user.userInfoGroups },
-                                            { "protect", !user.deniedPermissions.Contains("protect") }
+                                            { "userInfoGroups", user.userInfoGroups }
                                         }
                                 }
                             }
@@ -235,6 +224,123 @@ namespace OnlineEditorsExampleMVC.Models
             return jss.Serialize(config);
         }
 
+        // get the document history
+        public void GetHistory(out string history, out string historyData)
+        {            
+            var storagePath = WebConfigurationManager.AppSettings["storage-path"];
+            var jss = new JavaScriptSerializer();
+            var histDir = DocManagerHelper.HistoryDir(DocManagerHelper.StoragePath(FileName, null));
+
+            history = null;
+            historyData = null;
+
+            if (DocManagerHelper.GetFileVersion(histDir) > 0)  // if the file was modified (the file version is greater than 0)
+            {
+                var currentVersion = DocManagerHelper.GetFileVersion(histDir);
+                var hist = new List<Dictionary<string, object>>();
+                var histData = new Dictionary<string, object>();
+
+                for (var i = 1; i <= currentVersion; i++)  // run through all the file versions
+                {
+                    var obj = new Dictionary<string, object>();
+                    var dataObj = new Dictionary<string, object>();
+                    var verDir = DocManagerHelper.VersionDir(histDir, i);  // get the path to the given file version
+
+                    var key = i == currentVersion ? Key : File.ReadAllText(Path.Combine(verDir, "key.txt"));  // get document key
+
+                    obj.Add("key", key);
+                    obj.Add("version", i);
+
+                    if (i == 1)  // check if the version number is equal to 1
+                    {
+                        var infoPath = Path.Combine(histDir, "createdInfo.json");  // get meta data of this file
+
+                        if (File.Exists(infoPath))
+                        {
+                            var info = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(infoPath));
+                            obj.Add("created", info["created"]);  // write meta information to the object (user information and creation date)
+                            obj.Add("user", new Dictionary<string, object>() {
+                                { "id", info["id"] },
+                                { "name", info["name"] },
+                            });
+                        }
+                    }
+
+                    var ext = Path.GetExtension(FileName).ToLower();
+                    dataObj.Add("fileType", ext.Replace(".", ""));
+                    dataObj.Add("key", key);
+                    // write file url to the data object
+                    string prevFileUrl;
+                    string directPrevFileUrl;
+                    if (Path.IsPathRooted(storagePath) && !string.IsNullOrEmpty(storagePath))
+                    {
+                        prevFileUrl = i == currentVersion ? DocManagerHelper.GetHistoryDownloadUrl(FileName, i.ToString(), "prev" + ext)
+                            : DocManagerHelper.GetDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""));
+                        directPrevFileUrl = i == currentVersion ? DocManagerHelper.GetHistoryDownloadUrl(FileName, i.ToString(), "prev" + ext, false)
+                            : DocManagerHelper.GetDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""), false);
+                    }
+                    else {
+                        prevFileUrl = i == currentVersion ? FileUri
+                            : DocManagerHelper.GetHistoryDownloadUrl(FileName, i.ToString(), "prev" + ext);
+                        directPrevFileUrl = i == currentVersion ? DocManagerHelper.GetHistoryDownloadUrl(FileName, i.ToString(), "prev" + ext, false)
+                            : DocManagerHelper.GetDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""), false);
+                    }
+
+                    dataObj.Add("url", prevFileUrl);
+                    if (IsEnabledDirectUrl)
+                    {
+                        dataObj.Add("directUrl", directPrevFileUrl);
+                    }
+                    dataObj.Add("version", i);
+                    if (i > 1)  // check if the version number is greater than 1 (the file was modified)
+                    {
+                        // get the path to the changes.json file
+                        var changes = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(Path.Combine(DocManagerHelper.VersionDir(histDir, i - 1), "changes.json")));
+                        var changesArray = (ArrayList)changes["changes"];
+                        var change = changesArray.Count > 0
+                            ? (Dictionary<string, object>)changesArray[0]
+                            : new Dictionary<string, object>();
+
+                        // write information about changes to the object
+                        obj.Add("changes", change.Count > 0 ? changes["changes"] : null);
+                        obj.Add("serverVersion", changes["serverVersion"]);
+                        obj.Add("created", change.Count > 0  ? change["created"] : null);
+                        obj.Add("user", change.Count > 0 ? change["user"] : null);
+
+                        var prev = (Dictionary<string, object>)histData[(i - 2).ToString()];  // get the history data from the previous file version
+                        dataObj.Add("previous", IsEnabledDirectUrl ? new Dictionary<string, object>() {  // write information about previous file version to the data object with direct url
+                            { "fileType", prev["fileType"] },
+                            { "key", prev["key"] },  // write key and url information about previous file version
+                            { "url", prev["url"] },
+                            { "directUrl", prev["directUrl"] },
+                        } : new Dictionary<string, object>() {  // write information about previous file version to the data object without direct url
+                            { "fileType", prev["fileType"] },
+                            { "key", prev["key"] },  // write key and url information about previous file version
+                            { "url", prev["url"] },
+                        });
+                        // write the path to the diff.zip archive with differences in this file version
+                        var changesUrl = DocManagerHelper.GetHistoryDownloadUrl(FileName, (i - 1).ToString(), "diff.zip");
+                        dataObj.Add("changesUrl", changesUrl);
+                    }
+                    if(JwtManager.Enabled)
+                    {
+                        var token = JwtManager.Encode(dataObj);
+                        dataObj.Add("token", token);
+                    }
+                    hist.Add(obj);  // add object dictionary to the hist list
+                    histData.Add((i - 1).ToString(), dataObj);  // write data object information to the history data
+                }
+
+                // write history information about the current file version to the history object
+                history = jss.Serialize(new Dictionary<string, object>()
+                {
+                    { "currentVersion", currentVersion },
+                    { "history", hist }
+                });
+                historyData = jss.Serialize(histData);
+            }
+        }
+
         // get a document which will be compared with the current document
         public void GetCompareFileData(out string compareConfig)
         {

web/documentserver-example/csharp-mvc/Scripts/jscript.js

@@ -236,7 +236,6 @@ if (typeof jQuery != "undefined") {
         window.open(url, "_blank");
         jq('#hiddenFileName').val("");
         jq.unblockUI();
-        document.location.reload();
     });
 
     jq(document).on("click", "#beginView:not(.disable)", function () {
@@ -245,7 +244,6 @@ if (typeof jQuery != "undefined") {
         window.open(url, "_blank");
         jq('#hiddenFileName').val("");
         jq.unblockUI();
-        document.location.reload();
     });
 
     jq(document).on("click", "#beginEmbedded:not(.disable)", function () {

web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx

@@ -31,7 +31,7 @@
     -->
     <link rel="icon" href="<%= "content/images/" + Model.DocumentType + ".ico" %>" type="image/x-icon" />
     <title><%= Model.FileName + " - ONLYOFFICE" %></title>
-
+    
     <%: Styles.Render("~/Content/editor") %>
 
 </head>
@@ -40,7 +40,7 @@
         <div id="iframeEditor">
         </div>
     </div>
-
+    
     <%: Scripts.Render(new []{ WebConfigurationManager.AppSettings["files.docservice.url.site"] + WebConfigurationManager.AppSettings["files.docservice.url.api"] }) %>
 
     <script type="text/javascript" language="javascript">
@@ -141,7 +141,7 @@
             <% Model.GetMailMergeConfig(out dataMailMergeRecipients); %>
             docEditor.setMailMergeRecipients(<%= dataMailMergeRecipients%>);  // insert recipient data for mail merge into the file
         };
-
+        
          var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
              var title = event.data.title;
              var url = event.data.url;
@@ -178,59 +178,6 @@
             }
         };
 
-        var onRequestReferenceData = function (event) {  // user refresh external data source
-            event.data.directUrl = !!config.document.directUrl;
-            let xhr = new XMLHttpRequest();
-            xhr.open("POST", "webeditor.ashx?type=reference");
-            xhr.setRequestHeader("Content-Type", "application/json");
-            xhr.send(JSON.stringify(event.data));
-            xhr.onload = function () {
-                console.log(xhr.responseText);
-                docEditor.setReferenceData(JSON.parse(xhr.responseText));
-            }
-        };
-
-        var onRequestHistory = function () {
-            let xhr = new XMLHttpRequest();
-            xhr.open("GET", "webeditor.ashx?type=gethistory&filename=<%= Model.FileName %>");
-            xhr.setRequestHeader("Content-Type", "application/json");
-            xhr.send();
-            xhr.onload = function () {
-                console.log(xhr.responseText);
-                docEditor.refreshHistory(JSON.parse(xhr.responseText));
-            }
-        };
-
-        var onRequestHistoryData = function (event) {
-            var ver = event.data;
-
-            let xhr = new XMLHttpRequest();
-            xhr.open("GET", "webeditor.ashx?type=getversiondata&filename=<%= Model.FileName %>&version=" + ver + "&directUrl=" + !!config.document.directUrl);
-            xhr.setRequestHeader("Content-Type", "application/json");
-            xhr.send();
-            xhr.onload = function () {
-                console.log(xhr.responseText);
-                docEditor.setHistoryData(JSON.parse(xhr.responseText));  // send the link to the document for viewing the version history
-            }
-        };
-
-        var onRequestRestore = function (event) {
-            var fileName = "<%= Model.FileName %>";
-            var version = event.data.version;
-            var data = {
-                fileName: fileName,
-                version: version
-            };
-
-            let xhr = new XMLHttpRequest();
-            xhr.open("POST", "webeditor.ashx?type=restore&directUrl=" + !!config.document.directUrl);
-            xhr.setRequestHeader('Content-Type', 'application/json');
-            xhr.send(JSON.stringify(data));
-            xhr.onload = function () {
-                docEditor.refreshHistory(JSON.parse(xhr.responseText));
-            }
-        }
-
         config = <%= Model.GetDocConfig(Request, Url) %>;
 
         config.width = "100%";
@@ -239,6 +186,7 @@
         config.events = {
             'onAppReady': onAppReady,
             'onDocumentStateChange': onDocumentStateChange,
+            'onRequestEditRights': onRequestEditRights,
             'onError': onError,
             'onOutdatedVersion': onOutdatedVersion,
             "onMakeActionLink": onMakeActionLink,
@@ -248,19 +196,30 @@
             "onRequestMailMergeRecipients": onRequestMailMergeRecipients,
         };
 
+        <% string hist, histData; %>
+        <% Model.GetHistory(out hist, out histData); %>
+
         <% string usersForMentions; %>
         <% Model.GetUsersMentions(Request, out usersForMentions); %>
 
         if (config.editorConfig.user.id) {
-            // the user is trying to show the document version history
-            config.events['onRequestHistory'] = onRequestHistory;
-            // the user is trying to click the specific document version in the document version history
-            config.events['onRequestHistoryData'] = onRequestHistoryData;
-            // the user is trying to go back to the document from viewing the document version history
-            config.events['onRequestHistoryClose'] = function () {
-                document.location.reload();
-            };
-            config.events['onRequestRestore'] = onRequestRestore;
+            <% if (!string.IsNullOrEmpty(hist) && !string.IsNullOrEmpty(histData))
+            { %>
+                // the user is trying to show the document version history
+                config.events['onRequestHistory'] = function () {
+                    docEditor.refreshHistory(<%= hist %>);  // show the document version history
+                };
+                // the user is trying to click the specific document version in the document version history
+                config.events['onRequestHistoryData'] = function (event) {
+                    var ver = event.data;
+                    var histData = <%= histData %>;
+                    docEditor.setHistoryData(histData[ver - 1]);  // send the link to the document for viewing the version history
+                };
+                // the user is trying to go back to the document from viewing the document version history
+                config.events['onRequestHistoryClose '] = function () {
+                    document.location.reload();
+                };
+            <% } %>
 
             // add mentions for not anonymous users
             <% if (!string.IsNullOrEmpty(usersForMentions))
@@ -280,9 +239,6 @@
             };
             // prevent file renaming for anonymous users
             config.events['onRequestRename'] = onRequestRename;
-            config.events['onRequestReferenceData'] = onRequestReferenceData;
-            // prevent switch the document from the viewing into the editing mode for anonymous users
-            config.events['onRequestEditRights'] = onRequestEditRights;
         }
 
         if (config.editorConfig.createUrl) {

web/documentserver-example/csharp-mvc/WebEditor.ashx.cs

@@ -17,7 +17,6 @@
  */
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
@@ -51,15 +50,6 @@ namespace OnlineEditorsExampleMVC
                 case "downloadhistory":
                     DownloadHistory(context);
                     break;
-                case "gethistory":
-                    GetHistory(context);
-                    break;
-                case "getversiondata":
-                    GetVersionData(context);
-                    break;
-                case "restore":
-                    Restore(context);
-                    break;
                 case "convert":
                     Convert(context);
                     break;
@@ -84,9 +74,6 @@ namespace OnlineEditorsExampleMVC
                 case "rename":
                     Rename(context);
                     break;
-                case "reference":
-                    Reference(context);
-                    break;
             }
         }
 
@@ -240,10 +227,11 @@ namespace OnlineEditorsExampleMVC
                 var fileUri = DocManagerHelper.GetDownloadUrl(fileName);
 
                 var extension = (Path.GetExtension(fileName).ToLower() ?? "").Trim('.');
-                var internalExtension = "ooxml";
+                var internalExtension = DocManagerHelper.GetInternalExtension(FileUtility.GetFileType(fileName)).Trim('.');
 
                 // check if the file with such an extension can be converted
-                if (DocManagerHelper.ConvertExts.Contains("." + extension))
+                if (DocManagerHelper.ConvertExts.Contains("." + extension)
+                    && !string.IsNullOrEmpty(internalExtension))
                 {
                     // generate document key
                     var key = ServiceConverter.GenerateRevisionId(fileUri);
@@ -256,19 +244,17 @@ namespace OnlineEditorsExampleMVC
                         Query = "type=download&fileName=" + HttpUtility.UrlEncode(fileName)
                     };
 
-                    // get the url and file type of the converted file
-                    Dictionary<string, string> newFileData;
-                    var result = ServiceConverter.GetConvertedData(downloadUri.ToString(), extension, internalExtension, key, true, out newFileData, filePass, lang);
+                    // get the url to the converted file
+                    string newFileUri;
+                    var result = ServiceConverter.GetConvertedUri(downloadUri.ToString(), extension, internalExtension, key, true, out newFileUri, filePass, lang);
                     if (result != 100)
                     {
                         context.Response.Write("{ \"step\" : \"" + result + "\", \"filename\" : \"" + fileName + "\"}");
                         return;
                     }
 
-                    var newFileUri = newFileData["fileUrl"];
-                    var newFileType = "." + newFileData["fileType"];
                     // get a file name of an internal file extension with an index if the file with such a name already exists
-                    var correctName = DocManagerHelper.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + newFileType);
+                    var correctName = DocManagerHelper.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + "." + internalExtension);
 
                     var req = (HttpWebRequest)WebRequest.Create(newFileUri);
 
@@ -475,7 +461,7 @@ namespace OnlineEditorsExampleMVC
                 var userAddress = context.Request["userAddress"];
                 var isEmbedded = context.Request["dmode"];
 
-                if (JwtManager.Enabled && isEmbedded == null && userAddress != null && JwtManager.SignatureUseForRequest)
+                if (JwtManager.Enabled && isEmbedded == null && userAddress != null)
                 {
                     string JWTheader = string.IsNullOrEmpty(WebConfigurationManager.AppSettings["files.docservice.header"]) ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
 
@@ -523,173 +509,6 @@ namespace OnlineEditorsExampleMVC
             get { return false; }
         }
 
-        private static void GetHistory(HttpContext context)
-        {
-            var jss = new JavaScriptSerializer();
-            var fileName = context.Request["filename"];
-
-            var history = GetHistory(fileName);
-
-            context.Response.Write(jss.Serialize(history));
-        }
-
-        private static void GetVersionData(HttpContext context)
-        {
-            var storagePath = WebConfigurationManager.AppSettings["storage-path"];
-            var jss = new JavaScriptSerializer();
-
-            var fileName = context.Request["filename"];
-            int version;
-
-            if (!int.TryParse(context.Request["version"], out version))
-            {
-                context.Response.Write("{ \"error\": \"Version number invalid!\"}");
-                return;
-            }
-
-            var versionData = new Dictionary<string, object>();
-
-            var histDir = DocManagerHelper.HistoryDir(DocManagerHelper.StoragePath(fileName, null));
-            var lastVersion = DocManagerHelper.GetFileVersion(histDir);
-
-            var verDir = DocManagerHelper.VersionDir(histDir, version);
-
-            var key = version == lastVersion
-                ? ServiceConverter.GenerateRevisionId(DocManagerHelper.CurUserHostAddress()
-                    + "/" + fileName + "/"
-                    + File.GetLastWriteTime(DocManagerHelper.StoragePath(fileName, null)).GetHashCode())
-                : File.ReadAllText(Path.Combine(verDir, "key.txt"));
-
-
-            var ext = Path.GetExtension(fileName).ToLower();
-            versionData.Add("fileType", ext.Replace(".", ""));
-            versionData.Add("key", key);
-
-            // write file url to the data object
-            string prevFileUrl;
-            string directPrevFileUrl;
-            if (Path.IsPathRooted(storagePath) && !string.IsNullOrEmpty(storagePath))
-            {
-                prevFileUrl = version == lastVersion ? DocManagerHelper.GetDownloadUrl(fileName)
-                    : DocManagerHelper.GetDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""));
-                directPrevFileUrl = version == lastVersion ? DocManagerHelper.GetDownloadUrl(fileName, false)
-                    : DocManagerHelper.GetDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""), false);
-            }
-            else
-            {
-                prevFileUrl = version == lastVersion ? DocManagerHelper.GetFileUri(fileName, true)
-                    : DocManagerHelper.GetHistoryDownloadUrl(fileName, version.ToString(), "prev" + ext);
-                directPrevFileUrl = version == lastVersion ? DocManagerHelper.GetFileUri(fileName, false)
-                    : DocManagerHelper.GetHistoryDownloadUrl(fileName, version.ToString(), "prev" + ext, false);
-            }
-
-            versionData.Add("url", prevFileUrl);
-
-            var isEnableDirectUrl = string.Equals(DocManagerHelper.GetDirectUrl(), "true");
-            if (isEnableDirectUrl)
-            {
-                versionData.Add("directUrl", directPrevFileUrl); // write direct url to the data object
-            }
-
-            versionData.Add("version", version);
-            if (version > 1)
-            {
-                var prevVerDir = DocManagerHelper.VersionDir(histDir, version - 1);
-
-                var prevUrl = Path.IsPathRooted(storagePath) && !string.IsNullOrEmpty(storagePath)
-                    ? DocManagerHelper.GetDownloadUrl(Directory.GetFiles(prevVerDir, "prev.*")[0].Replace(storagePath + "\\", ""))
-                    : DocManagerHelper.GetHistoryDownloadUrl(fileName, (version - 1).ToString(), "prev" + ext);
-
-                var prevKey = File.ReadAllText(Path.Combine(prevVerDir, "key.txt"));
-
-                Dictionary<string, object> dataPrev = new Dictionary<string, object>() {  // write information about previous file version to the data object
-                    { "fileType", ext.Replace(".", "") },
-                    { "key", prevKey },  // write key and url information about previous file version
-                    { "url", prevUrl }
-                };
-
-                string directPrevUrl;
-                if (isEnableDirectUrl)
-                {
-                    directPrevUrl = Path.IsPathRooted(storagePath) && !string.IsNullOrEmpty(storagePath)
-                        ? DocManagerHelper.GetDownloadUrl(Directory.GetFiles(prevVerDir, "prev.*")[0].Replace(storagePath + "\\", ""), false)
-                        : DocManagerHelper.GetHistoryDownloadUrl(fileName, version.ToString(), "prev" + ext, false);
-
-                    dataPrev.Add("directUrl", directPrevUrl);
-                }
-
-                versionData.Add("previous", dataPrev);
-
-                if (File.Exists(Path.Combine(prevVerDir, "diff.zip")))
-                {
-                    var changesUrl = DocManagerHelper.GetHistoryDownloadUrl(fileName, (version - 1).ToString(), "diff.zip");
-                    versionData.Add("changesUrl", changesUrl);
-                }
-            }
-
-            if (JwtManager.Enabled)
-            {
-                var token = JwtManager.Encode(versionData);
-                versionData.Add("token", token);
-            }
-
-            context.Response.Write(jss.Serialize(versionData));
-        }
-
-        private static void Restore(HttpContext context)
-        {
-            string fileData;
-            try
-            {
-                using (var receiveStream = context.Request.InputStream)
-                using (var readStream = new StreamReader(receiveStream))
-                {
-                    fileData = readStream.ReadToEnd();
-                    if (string.IsNullOrEmpty(fileData)) return;
-                }
-            }
-            catch (Exception e)
-            {
-                throw new HttpException((int)HttpStatusCode.BadRequest, e.Message);
-            }
-
-            var jss = new JavaScriptSerializer();
-            var body = jss.Deserialize<Dictionary<string, object>>(fileData);
-
-            var fileName = (string)body["fileName"];
-            var version = (int)body["version"];
-
-            var key = ServiceConverter.GenerateRevisionId(DocManagerHelper.CurUserHostAddress()
-                + "/" + fileName + "/"
-                + File.GetLastWriteTime(DocManagerHelper.StoragePath(fileName, null)).GetHashCode());
-
-            var histDir = DocManagerHelper.HistoryDir(DocManagerHelper.StoragePath(fileName, null));
-            var currentVersionDir = DocManagerHelper.VersionDir(histDir, DocManagerHelper.GetFileVersion(histDir));
-            var verDir = DocManagerHelper.VersionDir(histDir, version);
-
-            if (!Directory.Exists(currentVersionDir)) Directory.CreateDirectory(currentVersionDir);
-
-            var ext = Path.GetExtension(fileName).ToLower();
-            File.Copy(DocManagerHelper.StoragePath(fileName, null), Path.Combine(currentVersionDir, "prev" + ext));
-
-            File.WriteAllText(Path.Combine(currentVersionDir, "key.txt"), key);
-
-            var changesPath = Path.Combine(DocManagerHelper.VersionDir(histDir, version - 1), "changes.json");
-            if (File.Exists(changesPath))
-            {
-                File.Copy(changesPath, Path.Combine(currentVersionDir, "changes.json"));
-            }
-
-            File.Copy(Path.Combine(verDir, "prev" + ext), DocManagerHelper.StoragePath(fileName, null), true);
-
-            var fileInfo = new FileInfo(DocManagerHelper.StoragePath(fileName, null));
-            fileInfo.LastWriteTimeUtc = DateTime.UtcNow;
-
-            var history = GetHistory(fileName);
-
-            context.Response.Write(jss.Serialize(history));
-        }
-
         // download a history file
         private static void DownloadHistory(HttpContext context)
         {
@@ -700,7 +519,7 @@ namespace OnlineEditorsExampleMVC
                 var version = System.Convert.ToInt32(context.Request["ver"]);
                 var file = Path.GetFileName(context.Request["file"]);
 
-                if (JwtManager.Enabled && JwtManager.SignatureUseForRequest)
+                if (JwtManager.Enabled)
                 {
                     string JWTheader = string.IsNullOrEmpty(WebConfigurationManager.AppSettings["files.docservice.header"]) ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
 
@@ -772,162 +591,5 @@ namespace OnlineEditorsExampleMVC
             TrackManager.commandRequest("meta", docKey, meta);
             context.Response.Write("{ \"result\": \"OK\"}");
         }
-
-        private static void Reference(HttpContext context)
-        {
-            string fileData;
-            try
-            {
-                using (var receiveStream = context.Request.InputStream)
-                using (var readStream = new StreamReader(receiveStream))
-                {
-                    fileData = readStream.ReadToEnd();
-                    if (string.IsNullOrEmpty(fileData)) return;
-                }
-            }
-            catch (Exception e)
-            {
-                throw new HttpException((int)HttpStatusCode.BadRequest, e.Message);
-            }
-
-            var jss = new JavaScriptSerializer();
-            var body = jss.Deserialize<Dictionary<string, object>>(fileData);
-            Dictionary<string, object> referenceData = null;
-            var fileName = "";
-            var userAddress = "";
-
-            if (body.ContainsKey("referenceData"))
-            {
-                referenceData = jss.Deserialize<Dictionary<string, object>>(jss.Serialize(body["referenceData"]));
-                var instanceId = (string)referenceData["instanceId"];
-                var fileKey = (string)referenceData["fileKey"];
-                if (instanceId == DocManagerHelper.GetServerUrl(false))
-                {
-                    var fileKeyObj = jss.Deserialize<Dictionary<string, object>>(fileKey);
-                    userAddress = (string)fileKeyObj["userAddress"];
-                    if (userAddress == HttpUtility.UrlEncode(DocManagerHelper.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress)))
-                    {
-                        fileName = (string)fileKeyObj["fileName"];
-                    }
-                }
-            }
-
-            if (fileName == "")
-            {
-                try
-                {
-                    var path = (string)body["path"];
-                    path = Path.GetFileName(path);
-                    if (File.Exists(DocManagerHelper.StoragePath(path, null)))
-                    {
-                        fileName = path;
-                    }
-                }
-                catch
-                {
-                    context.Response.Write("{ \"error\": \"Path not found!\"}");
-                    return;
-                }
-            }
-
-            if (fileName == "")
-            {
-                context.Response.Write("{ \"error\": \"File not found!\"}");
-                return;
-            }
-
-            var directUrl = (bool)body["directUrl"];
-
-            var data = new Dictionary<string, object>() {
-            { "fileType", (Path.GetExtension(fileName) ?? "").ToLower().Trim('.') },
-            { "url",  DocManagerHelper.GetDownloadUrl(fileName)},
-            { "directUrl", directUrl ? DocManagerHelper.GetDownloadUrl(fileName, false) : null },
-            { "referenceData", new Dictionary<string, string>()
-                {
-                    { "fileKey", jss.Serialize(new Dictionary<string, object>{
-                            {"fileName", fileName},
-                            {"userAddress", HttpUtility.UrlEncode(DocManagerHelper.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress))}
-                    })
-                    },
-                    { "instanceId", DocManagerHelper.GetServerUrl(false) }
-                }
-            },
-            { "path", fileName }
-            };
-
-            if (JwtManager.Enabled)
-            {
-                var token = JwtManager.Encode(data);
-                data.Add("token", token);
-            }
-
-            context.Response.Write(jss.Serialize(data));
-        }
-
-        // get the document history
-        private static Dictionary<string, object> GetHistory(string fileName)
-        {
-            var jss = new JavaScriptSerializer();
-            var histDir = DocManagerHelper.HistoryDir(DocManagerHelper.StoragePath(fileName, null));
-
-            var history = new Dictionary<string, object>();
-
-            var currentVersion = DocManagerHelper.GetFileVersion(histDir);
-            var currentKey = ServiceConverter.GenerateRevisionId(DocManagerHelper.CurUserHostAddress()
-                + "/" + fileName + "/"
-                + File.GetLastWriteTime(DocManagerHelper.StoragePath(fileName, null)).GetHashCode());
-
-            var versionList = new List<Dictionary<string, object>>();
-            for (var versionNum = 1; versionNum <= currentVersion; versionNum++)
-            {
-                var versionObj = new Dictionary<string, object>();
-                var verDir = DocManagerHelper.VersionDir(histDir, versionNum);  // get the path to the given file version
-
-                var key = versionNum == currentVersion ? currentKey : File.ReadAllText(Path.Combine(verDir, "key.txt"));  // get document key
-
-                versionObj.Add("key", key);
-                versionObj.Add("version", versionNum);
-
-                var changesPath = Path.Combine(DocManagerHelper.VersionDir(histDir, versionNum - 1), "changes.json");
-                if (versionNum == 1 || !File.Exists(changesPath))  // check if the version number is equal to 1
-                {
-                    var infoPath = Path.Combine(histDir, "createdInfo.json");  // get meta data of this file
-                    if (File.Exists(infoPath))
-                    {
-                        var info = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(infoPath));
-                        versionObj.Add("created", info["created"]);  // write meta information to the object (user information and creation date)
-                        versionObj.Add("user", new Dictionary<string, object>()
-                        {
-                            { "id", info["id"] },
-                            { "name", info["name"] },
-                        });
-                    }
-                }
-                else if (versionNum > 1)  // check if the version number is greater than 1 (the file was modified)
-                {
-                    // get the path to the changes.json file 
-                    var changes = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(changesPath));
-                    var changesArray = (ArrayList)changes["changes"];
-                    var change = changesArray.Count > 0
-                        ? (Dictionary<string, object>)changesArray[0]
-                        : new Dictionary<string, object>();
-
-                    // write information about changes to the object
-                    versionObj.Add("changes", change.Count > 0 ? changes["changes"] : null);
-                    versionObj.Add("serverVersion", changes["serverVersion"]);
-                    versionObj.Add("created", change.Count > 0 ? change["created"] : null);
-                    versionObj.Add("user", change.Count > 0 ? change["user"] : null);
-                }
-
-                versionList.Add(versionObj);
-            }
-
-            history.Add("currentVersion", currentVersion);
-            history.Add("history", versionList);
-
-            return history;
-        }
-
     }
- 
 }

web/documentserver-example/csharp-mvc/licenses/3rd-Party.license

@@ -4,6 +4,10 @@ Entity Framework - Entity Framework is an object-relational mapper that enables
 License:        MICROSOFT SOFTWARE SUPPLEMENTAL TERMS, MICROSOFT SOFTWARE LICENSE TERMS
 License File:   EntityFramework.license
 
+jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
+License:        MIT
+License File:   jQuery.license
+
 jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
 License:        MIT, GPL
 License File:   jQuery.BlockUI.license
@@ -16,14 +20,6 @@ jQuery.iframe-transport - jQuery Iframe Transport Plugin for File Upload (https:
 License:        MIT
 License File:   jQuery.iframe-transport.license
 
-jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
-License:        MIT
-License File:   jQuery.license
-
-jQuery.Migrate - Upgrading libraries such as jQuery can be a lot of work, when breaking changes have been introduced. jQuery Migrate makes this easier, by restoring the APIs that were removed, and additionally shows warnings in the browser console (development version of jQuery Migrate only) when removed and/or deprecated APIs are used. (https://github.com/jquery/jquery-migrate/blob/main/LICENSE.txt)
-License:        OpenJS
-License File:   jQuery.Migrate.license
-
 jQuery.UI     - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
 License:        MIT
 License File:   jQuery.UI.license

web/documentserver-example/csharp-mvc/licenses/jQuery.Migrate.license

@@ -1,36 +0,0 @@
-Copyright OpenJS Foundation and other contributors, https://openjsf.org/
-
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/jquery/jquery-migrate
-
-The following license applies to all parts of this software except as
-documented below:
-
-====
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-====
-
-All files located in the node_modules and external directories are
-externally maintained libraries used by this software which have their
-own licenses; we recommend you read them, as their terms may differ from
-the terms above.

web/documentserver-example/csharp-mvc/licenses/jquery.license

@@ -1,4 +1,4 @@
-Copyright OpenJS Foundation and other contributors, https://openjsf.org/
+Copyright (c) 2009 John Resig, http://jquery.com/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

web/documentserver-example/csharp-mvc/web.appsettings.config

@@ -1,24 +1,22 @@
 <?xml version="1.0"?>
 <appSettings>
   <clear />
-  <add key="version" value="1.6.0"/>
+  <add key="version" value="1.5.0"/>
 
   <add key="filesize-max" value="52428800"/>
   <add key="storage-path" value=""/>
   
-  <add key="files.docservice.fillform-docs" value=".docx|.oform"/>
-  <add key="files.docservice.viewed-docs" value=".djvu|.oxps|.pdf|.xps"/>
-  <add key="files.docservice.edited-docs" value=".csv|.docm|.docx|.docxf|.dotm|.dotx|.epub|.fb2|.html|.odp|.ods|.odt|.otp|.ots|.ott|.potm|.potx|.ppsm|.ppsx|.pptm|.pptx|.rtf|.txt|.xlsm|.xlsx|.xltm|.xltx"/>
-  <add key="files.docservice.convert-docs" value=".doc|.dot|.dps|.dpt|.epub|.et|.ett|.fb2|.fodp|.fods|.fodt|.htm|.html|.mht|.mhtml|.odp|.ods|.odt|.otp|.ots|.ott|.pot|.pps|.ppt|.rtf|.stw|.sxc|.sxi|.sxw|.wps|.wpt|.xls|.xlsb|.xlt|.xml"/>
+  <add key="files.docservice.fillform-docs" value=".oform|.docx"/>
+  <add key="files.docservice.viewed-docs" value=".pdf|.djvu|.xps|.oxps"/>
+  <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.txt|.docxf"/>
+  <add key="files.docservice.convert-docs" value=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xlsb|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2"/>
   <add key="files.docservice.timeout" value="120000" />
   <add key="files.docservice.secret" value="" />
   <add key="files.docservice.header" value="Authorization" />
 
-  <add key="files.docservice.token.useforrequest" value="true" />
-
   <add key="files.docservice.verify-peer-off" value="true"/>
 
-  <add key="files.docservice.languages" value="en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA: Test Language"/>
+  <add key="files.docservice.languages" value="en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (People's Republic of China)|zh-TW:Chinese (Traditional, Taiwan)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lv:Latvian|lo:Lao|ms:Malay (Malaysia)|nb:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA: Test Language"/>
 
   <add key="files.docservice.url.site" value="http://documentserver/"/>
 

web/documentserver-example/csharp/3rd-Party.license

@@ -1,5 +1,9 @@
 ONLYOFFICE Applications example uses code from the following 3rd party projects:
 
+jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
+License:        MIT
+License File:   jQuery.license
+
 jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
 License:        MIT, GPL
 License File:   jQuery.BlockUI.license
@@ -12,14 +16,6 @@ jQuery.iframe-transport - jQuery Iframe Transport Plugin for File Upload (https:
 License:        MIT
 License File:   jQuery.iframe-transport.license
 
-jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
-License:        MIT
-License File:   jQuery.license
-
-jQuery.Migrate - Upgrading libraries such as jQuery can be a lot of work, when breaking changes have been introduced. jQuery Migrate makes this easier, by restoring the APIs that were removed, and additionally shows warnings in the browser console (development version of jQuery Migrate only) when removed and/or deprecated APIs are used. (https://github.com/jquery/jquery-migrate/blob/main/LICENSE.txt)
-License:        OpenJS
-License File:   jQuery.Migrate.license
-
 jQuery.UI     - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
 License:        MIT
 License File:   jQuery.UI.license

web/documentserver-example/csharp/App_Themes/media.css

@@ -682,8 +682,3 @@
         max-width:15%;
     }
 }
-@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
-    .tableRow td:first-child{
-        max-width: none;
-    }
-}

web/documentserver-example/csharp/Default.aspx

@@ -356,8 +356,7 @@
         </footer>
     </form>
 
-    <script language="javascript" type="text/javascript" src="script/jquery-3.6.4.min.js"></script>
-    <script language="javascript" type="text/javascript" src="script/jquery-migrate-3.4.1.min.js"></script>
+    <script language="javascript" type="text/javascript" src="script/jquery-1.9.0.min.js"></script>
     <script language="javascript" type="text/javascript" src="script/jquery-ui.min.js"></script>
     <script language="javascript" type="text/javascript" src="script/jquery.blockUI.js"></script>
     <script language="javascript" type="text/javascript" src="script/jquery.iframe-transport.js"></script>

web/documentserver-example/csharp/Default.aspx.cs

@@ -471,10 +471,11 @@ namespace OnlineEditorsExample
             var lang = context.Request.Cookies.GetOrDefault("ulang", null);
 
             var extension = (Path.GetExtension(_fileName).ToLower() ?? "").Trim('.');
-            var internalExtension = "ooxml";
+            var internalExtension = FileType.GetInternalExtension(_fileName).Trim('.');
 
             // check if the file with such an extension can be converted
-            if (ConvertExts.Contains("." + extension))
+            if (ConvertExts.Contains("." + extension)
+                && !string.IsNullOrEmpty(internalExtension))
             {
                 // generate document key
                 var key = ServiceConverter.GenerateRevisionId(FileUri(_fileName, true));
@@ -486,18 +487,16 @@ namespace OnlineEditorsExample
                 fileUrl.Query = "type=download&fileName=" + HttpUtility.UrlEncode(_fileName)
                 + "&userAddress=" + HttpUtility.UrlEncode(CurUserHostAddress(HttpContext.Current.Request.UserHostAddress));
 
-                // get the url and file type of the converted file
-                Dictionary<string, string> newFileData;
-                var result = ServiceConverter.GetConvertedData(fileUrl.ToString() , extension, internalExtension, key, true, out newFileData, filePass, lang);
+                // get the url to the converted file
+                string newFileUri;
+                var result = ServiceConverter.GetConvertedUri(fileUrl.ToString() , extension, internalExtension, key, true, out newFileUri, filePass, lang);
                 if (result != 100)
                 {
                     return "{ \"step\" : \"" + result + "\", \"filename\" : \"" + _fileName + "\"}";
                 }
 
-                var newFileUri = newFileData["fileUrl"];
-                var newFileType = "." + newFileData["fileType"];
                 // get a file name of an internal file extension with an index if the file with such a name already exists
-                var fileName = GetCorrectName(Path.GetFileNameWithoutExtension(_fileName) + newFileType);
+                var fileName = GetCorrectName(Path.GetFileNameWithoutExtension(_fileName) + "." + internalExtension);
 
                 var req = (HttpWebRequest)WebRequest.Create(newFileUri);
 
@@ -633,12 +632,5 @@ namespace OnlineEditorsExample
             string isEnabledDirectUrl = HttpUtility.ParseQueryString(HttpContext.Current.Request.Url.Query).Get("directUrl");
             return "&directUrl=" + (isEnabledDirectUrl != null ? isEnabledDirectUrl : "false");
         }
-
-        // get direct url flag
-        public static bool IsEnabledDirectUrl()
-        {
-            string isEnabledDirectUrl = HttpUtility.ParseQueryString(HttpContext.Current.Request.Url.Query).Get("directUrl");
-            return isEnabledDirectUrl != null ? Convert.ToBoolean(isEnabledDirectUrl) : false;
-        }
     }
 }

web/documentserver-example/csharp/DocEditor.aspx

@@ -153,7 +153,7 @@
         var onRequestMailMergeRecipients = function (event) {
             docEditor.setMailMergeRecipients(<%= DataMailMergeRecipients %>);  // insert recipient data for mail merge into the file
         };
-
+        
         var onRequestSaveAs = function (event) {  //  the user is trying to save file by clicking Save Copy as... button
             var title = event.data.title;
             var url = event.data.url;
@@ -190,19 +190,6 @@
             }
         };
 
-        var onRequestReferenceData = function (event) {  // user refresh external data source
-
-            event.data.directUrl = !!config.document.directUrl;
-            let xhr = new XMLHttpRequest();
-            xhr.open("POST", "webeditor.ashx?type=reference");
-            xhr.setRequestHeader("Content-Type", "application/json");
-            xhr.send(JSON.stringify(event.data));
-            xhr.onload = function () {
-                console.log(xhr.responseText);
-                docEditor.setReferenceData(JSON.parse(xhr.responseText));
-            }
-        };
-
         config = <%= DocConfig %>;
 
         config.width = "100%";
@@ -211,6 +198,7 @@
         config.events = {
             'onAppReady': onAppReady,
             'onDocumentStateChange': onDocumentStateChange,
+            'onRequestEditRights': onRequestEditRights,
             'onError': onError,
             'onOutdatedVersion': onOutdatedVersion,
             'onMakeActionLink': onMakeActionLink,
@@ -221,49 +209,20 @@
         };
 
         if (config.editorConfig.user.id) {
-
-            config.events['onRequestHistory'] = function (event) {  // the user is trying to show the document version history
-
-                let xhr = new XMLHttpRequest();
-                xhr.open("GET", "webeditor.ashx?type=gethistory&filename=<%= FileName %>");
-                xhr.setRequestHeader("Content-Type", "application/json");
-                xhr.send();
-                xhr.onload = function () {
-                    console.log(xhr.responseText);
-                    docEditor.refreshHistory(JSON.parse(xhr.responseText));
-                }
-            };
-            config.events['onRequestHistoryData'] = function (event) {  // the user is trying to click the specific document version in the document version history
-                var ver = event.data;
-
-                let xhr = new XMLHttpRequest();
-                xhr.open("GET", "webeditor.ashx?type=getversiondata&filename=<%= FileName %>&version=" + ver + "&directUrl=" + !!config.document.directUrl);
-                xhr.setRequestHeader("Content-Type", "application/json");
-                xhr.send();
-                xhr.onload = function () {
-                    console.log(xhr.responseText);
-                    docEditor.setHistoryData(JSON.parse(xhr.responseText));  // send the link to the document for viewing the version history
-                }
-            };
-            config.events['onRequestHistoryClose'] = function () {  // the user is trying to go back to the document from viewing the document version history
-                document.location.reload();
-            };
-            config.events['onRequestRestore'] = function (event) {
-                var fileName = "<%= FileName %>";
-                var version = event.data.version;
-                var data = {
-                    fileName: fileName,
-                    version: version
+            <% if (!string.IsNullOrEmpty(History) && !string.IsNullOrEmpty(HistoryData))
+            { %>
+                config.events['onRequestHistory'] = function () {  // the user is trying to show the document version history
+                    docEditor.refreshHistory(<%= History %>);  // show the document version history
                 };
-
-                let xhr = new XMLHttpRequest();
-                xhr.open("POST", "webeditor.ashx?type=restore&directUrl=" + !!config.document.directUrl);
-                xhr.setRequestHeader('Content-Type', 'application/json');
-                xhr.send(JSON.stringify(data));
-                xhr.onload = function () {
-                    docEditor.refreshHistory(JSON.parse(xhr.responseText));
-                }
-            };
+                config.events['onRequestHistoryData'] = function (event) {  // the user is trying to click the specific document version in the document version history
+                    var ver = event.data;
+                    var histData = <%= HistoryData %>;
+                    docEditor.setHistoryData(histData[ver - 1]);  // send the link to the document for viewing the version history
+                };
+                config.events['onRequestHistoryClose '] = function () {  // the user is trying to go back to the document from viewing the document version history
+                    document.location.reload();
+                };
+            <% } %>
 
             // add mentions for not anonymous users
             <% if (!string.IsNullOrEmpty(UsersForMentions))
@@ -283,9 +242,6 @@
             };
             // prevent file renaming for anonymous users
             config.events['onRequestRename'] = onRequestRename;
-            config.events['onRequestReferenceData'] = onRequestReferenceData;
-            // prevent switch the document from the viewing into the editing mode for anonymous users
-            config.events['onRequestEditRights'] = onRequestEditRights;
         }
 
         if (config.editorConfig.createUrl) {

web/documentserver-example/csharp/DocEditor.aspx.cs

@@ -17,6 +17,7 @@
  */
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Web;
@@ -60,6 +61,8 @@ namespace OnlineEditorsExample
         }
 
         protected string DocConfig { get; private set; }
+        protected string History { get; private set; }
+        protected string HistoryData { get; private set; }
         protected string InsertImageConfig { get; private set; }
         protected string CompareFileData { get; private set; }
         protected string DataMailMergeRecipients { get; private set; }
@@ -192,7 +195,7 @@ namespace OnlineEditorsExample
                             {
                                 { "title", FileName },
                                 { "url", getDownloadUrl(FileName) },
-                                { "directUrl", _Default.IsEnabledDirectUrl() ? directUrl : "" },
+                                { "directUrl", IsEnabledDirectUrl() ? directUrl : "" },
                                 { "fileType", ext.Trim('.') },
                                 { "key", Key },
                                 {
@@ -203,17 +206,6 @@ namespace OnlineEditorsExample
                                             { "favorite", favorite }
                                         }
                                 },
-                                {
-                                    "referenceData", new Dictionary<string, string>()
-                                    {
-                                        { "fileKey", !user.id.Equals("uid-0") ?
-                                            jss.Serialize(new Dictionary<string, object>{
-                                                {"fileName", FileName},
-                                                {"userAddress", HttpUtility.UrlEncode(_Default.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress))}
-                                        }) : null },
-                                        {"instanceId", _Default.GetServerUrl(false) }
-                                    }
-                                },
                                 {
                                     // the permission for the document to be edited and downloaded or not
                                     "permissions", new Dictionary<string, object>
@@ -230,8 +222,7 @@ namespace OnlineEditorsExample
                                             { "chat", !user.id.Equals("uid-0") },
                                             { "reviewGroups", user.reviewGroups },
                                             { "commentGroups", user.commentGroups },
-                                            { "userInfoGroups", user.userInfoGroups },
-                                            { "protect", !user.deniedPermissions.Contains("protect") }
+                                            { "userInfoGroups", user.userInfoGroups }
                                         }
                                 }
                             }
@@ -317,10 +308,134 @@ namespace OnlineEditorsExample
                 // get users for mentions
                 List<Dictionary<string, object>> usersData = Users.getUsersForMentions(user.id);
                 UsersForMentions = !user.id.Equals("uid-0") ? jss.Serialize(usersData) : null;
+
+                Dictionary<string, object> hist;
+                Dictionary<string, object> histData;
+  
+                // get the document history
+                GetHistory(out hist, out histData);
+                if (hist != null && histData != null)
+                {
+                    History = jss.Serialize(hist);
+                    HistoryData = jss.Serialize(histData);
+                }
             }
             catch { }
         }
 
+        // get the document history
+        private void GetHistory(out Dictionary<string, object> history, out Dictionary<string, object> historyData)
+        {
+            var storagePath = WebConfigurationManager.AppSettings["storage-path"];
+            var jss = new JavaScriptSerializer();
+            var histDir = _Default.HistoryDir(_Default.StoragePath(FileName, null));
+
+            history = null;
+            historyData = null;
+
+            if (_Default.GetFileVersion(histDir) > 0)  // if the file was modified (the file version is greater than 0)
+            {
+                var currentVersion = _Default.GetFileVersion(histDir);
+                var hist = new List<Dictionary<string, object>>();
+                var histData = new Dictionary<string, object>();
+
+                for (var i = 1; i <= currentVersion; i++)  // run through all the file versions
+                {
+                    var obj = new Dictionary<string, object>();
+                    var dataObj = new Dictionary<string, object>();
+                    var verDir = _Default.VersionDir(histDir, i);  // get the path to the given file version
+
+                    var key = i == currentVersion ? Key : File.ReadAllText(Path.Combine(verDir, "key.txt"));  // get document key
+
+                    obj.Add("key", key);
+                    obj.Add("version", i);
+
+                    if (i == 1)  // check if the version number is equal to 1
+                    {
+                        var infoPath = Path.Combine(histDir, "createdInfo.json");  // get meta data of this file
+
+                        if (File.Exists(infoPath)) {
+                            var info = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(infoPath));
+                            obj.Add("created", info["created"]);  // write meta information to the object (user information and creation date)
+                            obj.Add("user", new Dictionary<string, object>() {
+                                { "id", info["id"] },
+                                { "name", info["name"] },
+                            });
+                        }
+                    }
+
+                    var ext = Path.GetExtension(FileName).ToLower();
+                    dataObj.Add("fileType", ext.Replace(".", ""));
+                    dataObj.Add("key", key);
+                    // write file url to the data object
+                    var directPrevFileUrl = i == currentVersion ? _Default.FileUri(FileName, false) : MakePublicHistoryUrl(FileName, i.ToString(), "prev" + ext, false);
+                    var prevFileUrl = i == currentVersion ? FileUri : MakePublicHistoryUrl(FileName, i.ToString(), "prev" + ext);
+                    if (Path.IsPathRooted(storagePath))
+                    {
+                        prevFileUrl = i == currentVersion ? getDownloadUrl(FileName) : getDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""));
+                        directPrevFileUrl = i == currentVersion ? getDownloadUrl(FileName, false) : getDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""), false);
+                    }
+
+                    dataObj.Add("url", prevFileUrl);  // write file url to the data object
+
+                    if (IsEnabledDirectUrl())
+                    {
+                        dataObj.Add("directUrl", directPrevFileUrl); // write direct url to the data object
+                    } 
+
+                    dataObj.Add("version", i);
+                    if (i > 1)  // check if the version number is greater than 1 (the file was modified)
+                    {
+                        // get the path to the changes.json file 
+                        var changes = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(Path.Combine(_Default.VersionDir(histDir, i - 1), "changes.json")));
+                        var changesArray = (ArrayList)changes["changes"];
+                        var change = changesArray.Count > 0
+                            ? (Dictionary<string, object>)changesArray[0]
+                            : new Dictionary<string, object>();
+
+                        // write information about changes to the object
+                        obj.Add("changes", change.Count > 0 ? changes["changes"] : null);
+                        obj.Add("serverVersion", changes["serverVersion"]);
+                        obj.Add("created", change.Count > 0 ? change["created"] : null);
+                        obj.Add("user", change.Count > 0 ? change["user"] : null);
+
+                        var prev = (Dictionary<string, object>)histData[(i - 2).ToString()];  // get the history data from the previous file version
+
+                        Dictionary<string, object> dataPrev = new Dictionary<string, object>() {  // write information about previous file version to the data object
+                            { "fileType", prev["fileType"] },
+                            { "key", prev["key"] },  // write key and url information about previous file version
+                            { "url", prev["url"] }
+                        };
+
+                        if (IsEnabledDirectUrl())
+                        {
+                            dataPrev.Add("directUrl", prev["directUrl"]);
+                        }
+
+                        dataObj.Add("previous", dataPrev);
+                        // write the path to the diff.zip archive with differences in this file version
+                        var changesUrl = MakePublicHistoryUrl(FileName, (i - 1).ToString(), "diff.zip");
+                        dataObj.Add("changesUrl", changesUrl);
+                    }
+                    if (JwtManager.Enabled)
+                    {
+                        var token = JwtManager.Encode(dataObj);
+                        dataObj.Add("token", token);
+                    }
+                    hist.Add(obj);  // add object dictionary to the hist list
+                    histData.Add((i - 1).ToString(), dataObj);  // write data object information to the history data
+                }
+
+                // write history information about the current file version to the history object
+                history = new Dictionary<string, object>()
+                {
+                    { "currentVersion", currentVersion },
+                    { "history", hist }
+                };
+                historyData = histData;
+            }
+        }
+
         // get a logo config
         private Dictionary<string, object> GetLogoConfig()
         {
@@ -342,7 +457,7 @@ namespace OnlineEditorsExample
                     { "url", InsertImageUrl.ToString()}
                 };
 
-            if (_Default.IsEnabledDirectUrl())
+            if (IsEnabledDirectUrl())
             {
                 logoConfig.Add("directUrl", DirectImageUrl.ToString());
             }
@@ -379,7 +494,7 @@ namespace OnlineEditorsExample
                     { "url", compareFileUrl.ToString() }
                 };
 
-            if (_Default.IsEnabledDirectUrl())
+            if (IsEnabledDirectUrl())
             {
                 dataCompareFile.Add("directUrl", DirectFileUrl.ToString());
             }
@@ -418,7 +533,7 @@ namespace OnlineEditorsExample
                     { "url", mailmergeUrl.ToString() }
                 };
 
-            if (_Default.IsEnabledDirectUrl())
+            if (IsEnabledDirectUrl())
             {
                 mailMergeConfig.Add("directUrl", DirectMailMergeUrl.ToString());
             }
@@ -462,6 +577,21 @@ namespace OnlineEditorsExample
             return _Default.GetServerUrl(true) + fullPath.Substring(root.Length).Replace(Path.DirectorySeparatorChar, '/');
         }
 
+
+        // create the public history url
+        private string MakePublicHistoryUrl(string filename, string version, string file, Boolean isServer = true)
+        {
+            var userAddress = isServer ? "&userAddress=" + HttpUtility.UrlEncode(_Default.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress)) : "";
+            var fileUrl = new UriBuilder(_Default.GetServerUrl(isServer));
+            fileUrl.Path = HttpRuntime.AppDomainAppVirtualPath
+                + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
+                + "webeditor.ashx";
+            fileUrl.Query = "type=downloadhistory&fileName=" + HttpUtility.UrlEncode(filename)
+                + "&ver=" + version + "&file=" + file
+                + userAddress;
+            return fileUrl.ToString();
+        }
+
         // create demo document
         private static void Try(string type, string sample, HttpRequest request)
         {
@@ -490,7 +620,6 @@ namespace OnlineEditorsExample
 
             var filePath = _Default.StoragePath(FileName, null);
             File.Copy(HttpRuntime.AppDomainAppPath + demoPath + demoName, filePath);  // copy this file to the storage directory
-            File.SetLastWriteTime(filePath, DateTime.Now);
 
             // create a json file with file meta data
             var id = request.Cookies.GetOrDefault("uid", null);
@@ -510,5 +639,12 @@ namespace OnlineEditorsExample
                 { "name", uname }
             }));
         }
+
+        // get direct url flag
+        private static bool IsEnabledDirectUrl()
+        {
+            string isEnabledDirectUrl = HttpUtility.ParseQueryString(HttpContext.Current.Request.Url.Query).Get("directUrl");
+            return isEnabledDirectUrl != null ? Convert.ToBoolean(isEnabledDirectUrl) : false;
+        }
     }
 }

web/documentserver-example/csharp/DocumentConverter.cs

@@ -70,24 +70,24 @@ namespace ASC.Api.DocumentConverter
         /// <param name="toExtension">Extension to which to convert</param>
         /// <param name="documentRevisionId">Key for caching on service</param>
         /// <param name="isAsync">Perform conversions asynchronously</param>
-        /// <param name="convertedDocumentData">Uri and file type of the converted document</param>
+        /// <param name="convertedDocumentUri">Uri to the converted document</param>
         /// <returns>The percentage of conversion completion</returns>
         /// <example>
-        /// Dictionary<string, string> convertedDocumentData;
-        /// GetConvertedData("http://helpcenter.onlyoffice.com/content/GettingStarted.pdf", ".pdf", ".docx", "http://helpcenter.onlyoffice.com/content/GettingStarted.pdf", false, out convertedDocumentData);
+        /// string convertedDocumentUri;
+        /// GetConvertedUri("http://helpcenter.onlyoffice.com/content/GettingStarted.pdf", ".pdf", ".docx", "http://helpcenter.onlyoffice.com/content/GettingStarted.pdf", false, out convertedDocumentUri);
         /// </example>
         /// <exception>
         /// </exception>
-        public static int GetConvertedData(string documentUri,
+        public static int GetConvertedUri(string documentUri,
                                           string fromExtension,
                                           string toExtension,
                                           string documentRevisionId,
                                           bool isAsync,
-                                          out Dictionary<string, string> convertedDocumentData,
+                                          out string convertedDocumentUri,
                                           string filePass = null,
                                           string lang = null)
         {
-            convertedDocumentData = new Dictionary<string, string>();
+            convertedDocumentUri = string.Empty;
 
             // check if the fromExtension parameter is defined; if not, get it from the document url
             fromExtension = string.IsNullOrEmpty(fromExtension) ? Path.GetExtension(documentUri).ToLower() : fromExtension;
@@ -121,7 +121,7 @@ namespace ASC.Api.DocumentConverter
                 { "region", lang }
             };
 
-            if (JwtManager.Enabled && JwtManager.SignatureUseForRequest)
+            if (JwtManager.Enabled)
             {
                 // create payload object
                 var payload = new Dictionary<string, object>
@@ -159,7 +159,7 @@ namespace ASC.Api.DocumentConverter
                 }
             }
 
-            return GetResponseData(dataResponse, out convertedDocumentData);
+            return GetResponseUri(dataResponse, out convertedDocumentUri);
         }
 
         /// <summary>
@@ -183,9 +183,9 @@ namespace ASC.Api.DocumentConverter
         /// Processing document received from the editing service
         /// </summary>
         /// <param name="jsonDocumentResponse">The resulting json from editing service</param>
-        /// <param name="responseData">Uri and file type of the converted document</param>
+        /// <param name="responseUri">Uri to the converted document</param>
         /// <returns>The percentage of conversion completion</returns>
-        private static int GetResponseData(string jsonDocumentResponse, out Dictionary<string, string> responseData)
+        private static int GetResponseUri(string jsonDocumentResponse, out string responseUri)
         {
             if (string.IsNullOrEmpty(jsonDocumentResponse)) throw new ArgumentException("Invalid param", "jsonDocumentResponse");
 
@@ -199,20 +199,14 @@ namespace ASC.Api.DocumentConverter
             var isEndConvert = responseFromService.endConvert;
 
             int resultPercent;
-            responseData = new Dictionary<string, string>(); 
-            var responseUri = string.Empty;
-            var responseFileType = string.Empty;
+            responseUri = string.Empty;
             if (isEndConvert)  // if the conversion is completed
             {
                 responseUri = responseFromService.fileUrl;  // get the file url
-                responseFileType = responseFromService.fileType;  // get the file type
-                responseData.Add("fileUrl", responseUri);
-                responseData.Add("fileType", responseFileType);
                 resultPercent = 100;
             }
             else  // if the conversion isn't completed
             {
-                responseData.Add("fileUrl", "");
                 resultPercent = responseFromService.percent;  // get the percentage value
                 if (resultPercent >= 100) resultPercent = 99;
             }

web/documentserver-example/csharp/JwtManager.cs

@@ -29,13 +29,11 @@ namespace OnlineEditorsExample
     {
         private static readonly string Secret;
         public static readonly bool Enabled;
-        public static readonly bool SignatureUseForRequest;
 
         static JwtManager()
         {
             Secret = WebConfigurationManager.AppSettings["files.docservice.secret"] ?? "";  // get token secret from the config parameters
             Enabled = !string.IsNullOrEmpty(Secret);  // check if the token is enabled
-            SignatureUseForRequest = bool.Parse(WebConfigurationManager.AppSettings["files.docservice.token.useforrequest"]);
         }
 
         // encode a payload object into a token using a secret key

web/documentserver-example/csharp/TrackManager.cs

@@ -55,7 +55,7 @@ namespace OnlineEditorsExample
             var fileData = jss.Deserialize<Dictionary<string, object>>(body);
 
             // check if the document token is enabled
-            if (JwtManager.Enabled && JwtManager.SignatureUseForRequest)
+            if (JwtManager.Enabled)
             {
                 string JWTheader = string.IsNullOrEmpty(WebConfigurationManager.AppSettings["files.docservice.header"]) ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
 
@@ -110,9 +110,8 @@ namespace OnlineEditorsExample
                 try
                 {
                     // convert file and give url to a new file
-                    Dictionary<string, string> newFileData;
-                    ServiceConverter.GetConvertedData(downloadUri, downloadExt, curExt, ServiceConverter.GenerateRevisionId(downloadUri), false, out newFileData);
-                    var newFileUri = newFileData["fileUrl"];
+                    string newFileUri;
+                    ServiceConverter.GetConvertedUri(downloadUri, downloadExt, curExt, ServiceConverter.GenerateRevisionId(downloadUri), false, out newFileUri);
                     if (string.IsNullOrEmpty(newFileUri))
                     {
                         // get the correct file name if it already exists
@@ -198,9 +197,8 @@ namespace OnlineEditorsExample
                 try
                 {
                     // convert file and give url to a new file
-                    Dictionary<string, string> newFileData;
-                    var result = ServiceConverter.GetConvertedData(downloadUri, downloadExt, curExt, ServiceConverter.GenerateRevisionId(downloadUri), false, out newFileData);
-                    var newFileUri = newFileData["fileUrl"];
+                    string newFileUri;
+                    var result = ServiceConverter.GetConvertedUri(downloadUri, downloadExt, curExt, ServiceConverter.GenerateRevisionId(downloadUri), false, out newFileUri);
                     if (string.IsNullOrEmpty(newFileUri))
                     {
                         newFileName = true;
@@ -290,7 +288,7 @@ namespace OnlineEditorsExample
             }
 
             // check if a secret key to generate token exists or not
-            if (JwtManager.Enabled && JwtManager.SignatureUseForRequest)
+            if (JwtManager.Enabled)
             {
                 var payload = new Dictionary<string, object>
                 {

web/documentserver-example/csharp/Users.cs

@@ -68,7 +68,6 @@ namespace OnlineEditorsExample
             "Can’t see anyone’s information",
             "Can't rename files from the editor",
             "Can't view chat",
-            "Can't protect file",
             "View file without collaboration",
         };
 
@@ -131,7 +130,7 @@ namespace OnlineEditorsExample
                     new Dictionary<string, object>(),
                     new List<string>(),
                     null,
-                    new List<string>() { "protect" },
+                    new List<string>(),
                     descr_user_0,
                     false
                 )

web/documentserver-example/csharp/WebEditor.ashx.cs

@@ -26,9 +26,6 @@ using System.Diagnostics;
 using System.Web.Configuration;
 using System.Linq;
 using System.Net;
-using System.Collections;
-using System.Net.Sockets;
-using ASC.Api.DocumentConverter;
 
 namespace OnlineEditorsExample
 {
@@ -50,15 +47,6 @@ namespace OnlineEditorsExample
                 case "downloadhistory":
                     DownloadHistory(context);
                     break;
-                case "gethistory":
-                    GetHistory(context);
-                    break;
-                case "getversiondata":
-                    GetVersionData(context);
-                    break;
-                case "restore":
-                    Restore(context);
-                    break;
                 case "convert":
                     Convert(context);
                     break;
@@ -83,9 +71,6 @@ namespace OnlineEditorsExample
                 case "rename":
                     Rename(context);
                     break;
-                case "reference":
-                    Reference(context);
-                    break;
             }
         }
 
@@ -296,7 +281,7 @@ namespace OnlineEditorsExample
                 var userAddress = Path.GetFileName(context.Request["userAddress"]);
                 var isEmbedded = context.Request["dmode"];
 
-                if (JwtManager.Enabled && isEmbedded == null && userAddress != null && JwtManager.SignatureUseForRequest)
+                if (JwtManager.Enabled && isEmbedded == null && userAddress != null)
                 {
                     string JWTheader = string.IsNullOrEmpty(WebConfigurationManager.AppSettings["files.docservice.header"]) ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
 
@@ -344,164 +329,6 @@ namespace OnlineEditorsExample
             get { return false; }
         }
 
-        private static void GetHistory(HttpContext context)
-        {
-            var jss = new JavaScriptSerializer();
-            var fileName = context.Request["filename"];
-
-            var history = GetHistory(fileName);
-
-            context.Response.Write(jss.Serialize(history));
-        }
-
-        private static void GetVersionData(HttpContext context)
-        {
-            var storagePath = WebConfigurationManager.AppSettings["storage-path"];
-            var jss = new JavaScriptSerializer();
-
-            var fileName = context.Request["filename"];
-            int version;
-
-            if (!int.TryParse(context.Request["version"], out version))
-            {
-                context.Response.Write("{ \"error\": \"Version number invalid!\"}");
-                return;
-            }
-
-            var versionData = new Dictionary<string, object>();
-
-            var histDir = _Default.HistoryDir(_Default.StoragePath(fileName, null));
-            var lastVersion = _Default.GetFileVersion(histDir);
-
-            var verDir = _Default.VersionDir(histDir, version);
-
-            var lastVersionUri = _Default.FileUri(fileName, true);
-            var key = version == lastVersion
-                ? ServiceConverter.GenerateRevisionId(_Default.CurUserHostAddress(null)
-                                                           + "/" + Path.GetFileName(lastVersionUri)
-                                                           + "/" + File.GetLastWriteTime(_Default.StoragePath(fileName, null)).GetHashCode())
-                : File.ReadAllText(Path.Combine(verDir, "key.txt"));
-
-
-            var ext = Path.GetExtension(fileName).ToLower();
-            versionData.Add("fileType", ext.Replace(".", ""));
-            versionData.Add("key", key);
-
-            var directPrevFileUrl = version == lastVersion ? _Default.FileUri(fileName, false) : MakePublicHistoryUrl(fileName, version.ToString(), "prev" + ext, false);
-            var prevFileUrl = version == lastVersion ? lastVersionUri : MakePublicHistoryUrl(fileName, version.ToString(), "prev" + ext);
-            if (Path.IsPathRooted(storagePath))
-            {
-                prevFileUrl = version == lastVersion ? DocEditor.getDownloadUrl(fileName) : DocEditor.getDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""));
-                directPrevFileUrl = version == lastVersion ? DocEditor.getDownloadUrl(fileName, false) : DocEditor.getDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""), false);
-            }
-
-            versionData.Add("url", prevFileUrl);
-
-            if (_Default.IsEnabledDirectUrl())
-            {
-                versionData.Add("directUrl", directPrevFileUrl); // write direct url to the data object
-            }
-
-            versionData.Add("version", version);
-            if (version > 1)
-            {
-                var prevVerDir = _Default.VersionDir(histDir, version - 1);
-
-                var prevUrl = MakePublicHistoryUrl(fileName, (version - 1).ToString(), "prev" + ext);
-                if (Path.IsPathRooted(storagePath))
-                    prevUrl = DocEditor.getDownloadUrl(Directory.GetFiles(prevVerDir, "prev.*")[0].Replace(storagePath + "\\", ""));
-
-                var prevKey = File.ReadAllText(Path.Combine(prevVerDir, "key.txt"));
-
-                Dictionary<string, object> dataPrev = new Dictionary<string, object>() {  // write information about previous file version to the data object
-                    { "fileType", ext.Replace(".", "") },
-                    { "key", prevKey },  // write key and url information about previous file version
-                    { "url", prevUrl }
-                };
-
-                string directPrevUrl;
-                if (_Default.IsEnabledDirectUrl())
-                {
-                    directPrevUrl = Path.IsPathRooted(storagePath)
-                        ? DocEditor.getDownloadUrl(Directory.GetFiles(prevVerDir, "prev.*")[0].Replace(storagePath + "\\", ""), false)
-                        : MakePublicHistoryUrl(fileName, (version - 1).ToString(), "prev" + ext, false);
-
-                    dataPrev.Add("directUrl", directPrevUrl); // write direct url to the data object
-                }
-
-                versionData.Add("previous", dataPrev);
-
-                if (File.Exists(Path.Combine(prevVerDir, "diff.zip")))
-                {
-                    var changesUrl = MakePublicHistoryUrl(fileName, (version - 1).ToString(), "diff.zip");
-                    versionData.Add("changesUrl", changesUrl);
-                }
-            }
-
-            if (JwtManager.Enabled)
-            {
-                var token = JwtManager.Encode(versionData);
-                versionData.Add("token", token);
-            }
-
-            context.Response.Write(jss.Serialize(versionData));
-        }
-
-        private void Restore(HttpContext context)
-        {
-            string fileData;
-            try
-            {
-                using (var receiveStream = context.Request.InputStream)
-                using (var readStream = new StreamReader(receiveStream))
-                {
-                    fileData = readStream.ReadToEnd();
-                    if (string.IsNullOrEmpty(fileData)) return;
-                }
-            }
-            catch (Exception e)
-            {
-                throw new HttpException((int)HttpStatusCode.BadRequest, e.Message);
-            }
-
-            var jss = new JavaScriptSerializer();
-            var body = jss.Deserialize<Dictionary<string, object>>(fileData);
-
-            var fileName = (string)body["fileName"];
-            var version = (int)body["version"];
-
-            var lastVersionUri = _Default.FileUri(fileName, true);
-            var key = ServiceConverter.GenerateRevisionId(_Default.CurUserHostAddress(null)
-                + "/" + Path.GetFileName(lastVersionUri)
-                + "/" + File.GetLastWriteTime(_Default.StoragePath(fileName, null)).GetHashCode());
-
-            var histDir = _Default.HistoryDir(_Default.StoragePath(fileName, null));
-            var currentVersionDir = _Default.VersionDir(histDir, _Default.GetFileVersion(histDir));
-            var verDir = _Default.VersionDir(histDir, version);
-
-            if (!Directory.Exists(currentVersionDir)) Directory.CreateDirectory(currentVersionDir);
-
-            var ext = Path.GetExtension(fileName).ToLower();
-            File.Copy(_Default.StoragePath(fileName, null), Path.Combine(currentVersionDir, "prev" + ext));
-
-            File.WriteAllText(Path.Combine(currentVersionDir, "key.txt"), key);
-
-            var changesPath = Path.Combine(_Default.VersionDir(histDir, version - 1), "changes.json");
-            if (File.Exists(changesPath))
-            {
-                File.Copy(changesPath, Path.Combine(currentVersionDir, "changes.json"));
-            }
-
-            File.Copy(Path.Combine(verDir, "prev" + ext), _Default.StoragePath(fileName, null), true);
-
-            var fileInfo = new FileInfo(_Default.StoragePath(fileName, null));
-            fileInfo.LastWriteTimeUtc = DateTime.UtcNow;
-
-            var history = GetHistory(fileName);
-
-            context.Response.Write(jss.Serialize(history));
-        }
-
         private static void DownloadHistory(HttpContext context)
         {
             try
@@ -511,7 +338,7 @@ namespace OnlineEditorsExample
                 var version = Path.GetFileName(context.Request["ver"]);
                 var file = Path.GetFileName(context.Request["file"]);
 
-                if (JwtManager.Enabled && JwtManager.SignatureUseForRequest)
+                if (JwtManager.Enabled)
                 {
                     string JWTheader = string.IsNullOrEmpty(WebConfigurationManager.AppSettings["files.docservice.header"]) ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
 
@@ -582,175 +409,5 @@ namespace OnlineEditorsExample
             TrackManager.commandRequest("meta", docKey, meta);
             context.Response.Write("{ \"result\": \"OK\"}");
         }
-
-        private static void Reference(HttpContext context)
-        {
-            string fileData;
-            try
-            {
-                using (var receiveStream = context.Request.InputStream)
-                using (var readStream = new StreamReader(receiveStream))
-                {
-                    fileData = readStream.ReadToEnd();
-                    if (string.IsNullOrEmpty(fileData)) return;
-                }
-            }
-            catch (Exception e)
-            {
-                throw new HttpException((int)HttpStatusCode.BadRequest, e.Message);
-            }
-
-            var jss = new JavaScriptSerializer();
-            var body = jss.Deserialize<Dictionary<string, object>>(fileData);
-            Dictionary<string, object> referenceData = null;
-            var fileName = "";
-            var userAddress = "";
-
-            if (body.ContainsKey("referenceData"))
-            {
-                referenceData = jss.Deserialize<Dictionary<string, object>>(jss.Serialize(body["referenceData"]));
-                var instanceId = (string)referenceData["instanceId"];
-                var fileKey = (string)referenceData["fileKey"];
-                if (instanceId == _Default.GetServerUrl(false))
-                {
-                    var fileKeyObj = jss.Deserialize<Dictionary<string, object>>(fileKey);
-                    userAddress = (string)fileKeyObj["userAddress"];
-                    if (userAddress == HttpUtility.UrlEncode(_Default.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress)))
-                    {
-                        fileName = (string)fileKeyObj["fileName"];
-                    }
-                }
-            }
-
-            if (fileName == "")
-            {
-                try
-                {
-                    var path = (string)body["path"];
-                    path = Path.GetFileName(path);
-                    if (File.Exists(_Default.StoragePath(path, null)))
-                    {
-                        fileName = path;
-                    }
-                }
-                catch
-                {
-                    context.Response.Write("{ \"error\": \"Path not found!\"}");
-                    return;
-                }
-            }
-
-            if (fileName == "")
-            {
-                context.Response.Write("{ \"error\": \"File not found!\"}");
-                return;
-            }
-
-            var directUrl = (bool) body["directUrl"];
-
-            var data = new Dictionary<string, object>() {
-            { "fileType", (Path.GetExtension(fileName) ?? "").ToLower().Trim('.') },
-            { "url",  DocEditor.getDownloadUrl(fileName)},
-            { "directUrl", directUrl ? DocEditor.getDownloadUrl(fileName, false) : null},
-            { "referenceData", new Dictionary<string, string>()
-                {
-                    { "fileKey", jss.Serialize(new Dictionary<string, object>{
-                            {"fileName", fileName},
-                            {"userAddress", HttpUtility.UrlEncode(_Default.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress))}
-                    })
-                    },
-                    {"instanceId", _Default.GetServerUrl(false) }
-                }
-            },
-            { "path", fileName }
-            };
-
-            if (JwtManager.Enabled)
-            {
-                var token = JwtManager.Encode(data);
-                data.Add("token", token);
-            }
-
-            context.Response.Write(jss.Serialize(data));
-        }
-
-        // get the document history
-        private static Dictionary<string, object> GetHistory(string fileName)
-        {
-            var jss = new JavaScriptSerializer();
-            var histDir = _Default.HistoryDir(_Default.StoragePath(fileName, null));
-
-            var history = new Dictionary<string, object>();
-
-            var currentVersion = _Default.GetFileVersion(histDir);
-            var currentFileUri = _Default.FileUri(fileName, true);
-            var currentKey = ServiceConverter.GenerateRevisionId(_Default.CurUserHostAddress(null)
-                                                           + "/" + Path.GetFileName(currentFileUri)
-                                                           + "/" + File.GetLastWriteTime(_Default.StoragePath(fileName, null)).GetHashCode());
-
-            var versionList = new List<Dictionary<string, object>>();
-            for (var versionNum = 1; versionNum <= currentVersion; versionNum++)
-            {
-                var versionObj = new Dictionary<string, object>();
-                var verDir = _Default.VersionDir(histDir, versionNum);  // get the path to the given file version
-
-                var key = versionNum == currentVersion ? currentKey : File.ReadAllText(Path.Combine(verDir, "key.txt"));  // get document key
-
-                versionObj.Add("key", key);
-                versionObj.Add("version", versionNum);
-
-                var changesPath = Path.Combine(_Default.VersionDir(histDir, versionNum - 1), "changes.json");
-                if (versionNum == 1 || !File.Exists(changesPath))  // check if the version number is equal to 1
-                {
-                    var infoPath = Path.Combine(histDir, "createdInfo.json");  // get meta data of this file
-                    if (File.Exists(infoPath))
-                    {
-                        var info = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(infoPath));
-                        versionObj.Add("created", info["created"]);  // write meta information to the object (user information and creation date)
-                        versionObj.Add("user", new Dictionary<string, object>()
-                        {
-                            { "id", info["id"] },
-                            { "name", info["name"] },
-                        });
-                    }
-                }
-                else if (versionNum > 1)  // check if the version number is greater than 1 (the file was modified)
-                {
-                    // get the path to the changes.json file
-                    var changes = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(changesPath));
-                    var changesArray = (ArrayList)changes["changes"];
-                    var change = changesArray.Count > 0
-                        ? (Dictionary<string, object>)changesArray[0]
-                        : new Dictionary<string, object>();
-
-                    // write information about changes to the object
-                    versionObj.Add("changes", change.Count > 0 ? changes["changes"] : null);
-                    versionObj.Add("serverVersion", changes["serverVersion"]);
-                    versionObj.Add("created", change.Count > 0 ? change["created"] : null);
-                    versionObj.Add("user", change.Count > 0 ? change["user"] : null);
-                }
-
-                versionList.Add(versionObj);
-            }
-
-            history.Add("currentVersion", currentVersion);
-            history.Add("history", versionList);
-
-            return history;
-        }
-
-        // create the public history url
-        private static string MakePublicHistoryUrl(string filename, string version, string file, Boolean isServer = true)
-        {
-            var userAddress = isServer ? "&userAddress=" + HttpUtility.UrlEncode(_Default.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress)) : "";
-            var fileUrl = new UriBuilder(_Default.GetServerUrl(isServer));
-            fileUrl.Path = HttpRuntime.AppDomainAppVirtualPath
-                + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
-                + "webeditor.ashx";
-            fileUrl.Query = "type=downloadhistory&fileName=" + HttpUtility.UrlEncode(filename)
-                + "&ver=" + version + "&file=" + file
-                + userAddress;
-            return fileUrl.ToString();
-        }
     }
 }

web/documentserver-example/csharp/licenses/3rd-Party.license

@@ -1,5 +1,9 @@
 ONLYOFFICE Applications example uses code from the following 3rd party projects:
 
+jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
+License:        MIT
+License File:   jQuery.license
+
 jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
 License:        MIT, GPL
 License File:   jQuery.BlockUI.license
@@ -12,14 +16,6 @@ jQuery.iframe-transport - jQuery Iframe Transport Plugin for File Upload (https:
 License:        MIT
 License File:   jQuery.iframe-transport.license
 
-jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
-License:        MIT
-License File:   jQuery.license
-
-jQuery.Migrate - Upgrading libraries such as jQuery can be a lot of work, when breaking changes have been introduced. jQuery Migrate makes this easier, by restoring the APIs that were removed, and additionally shows warnings in the browser console (development version of jQuery Migrate only) when removed and/or deprecated APIs are used. (https://github.com/jquery/jquery-migrate/blob/main/LICENSE.txt)
-License:        OpenJS
-License File:   jQuery.Migrate.license
-
 jQuery.UI     - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
 License:        MIT
 License File:   jQuery.UI.license

web/documentserver-example/csharp/licenses/jQuery.Migrate.license

@@ -1,36 +0,0 @@
-Copyright OpenJS Foundation and other contributors, https://openjsf.org/
-
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/jquery/jquery-migrate
-
-The following license applies to all parts of this software except as
-documented below:
-
-====
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-====
-
-All files located in the node_modules and external directories are
-externally maintained libraries used by this software which have their
-own licenses; we recommend you read them, as their terms may differ from
-the terms above.

web/documentserver-example/csharp/licenses/jquery.license

@@ -1,4 +1,4 @@
-Copyright OpenJS Foundation and other contributors, https://openjsf.org/
+Copyright (c) 2009 John Resig, http://jquery.com/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

web/documentserver-example/csharp/script/jscript.js

@@ -236,7 +236,6 @@ if (typeof jQuery != "undefined") {
         window.open(url, "_blank");
         jq('#hiddenFileName').val("");
         jq.unblockUI();
-        document.location.reload();
     });
 
     jq(document).on("click", "#beginView:not(.disable)", function () {
@@ -245,7 +244,6 @@ if (typeof jQuery != "undefined") {
         window.open(url, "_blank");
         jq('#hiddenFileName').val("");
         jq.unblockUI();
-        document.location.reload();
     });
 
     jq(document).on("click", "#beginEmbedded:not(.disable)", function () {

web/documentserver-example/csharp/settings.config

@@ -1,23 +1,21 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <appSettings>
   <clear />
-  <add key="version" value="1.6.0"/>
+  <add key="version" value="1.5.0"/>
 
   <add key="filesize-max" value="52428800"/>
   <add key="storage-path" value=""/>
 
-  <add key="files.docservice.fillform-docs" value=".docx|.oform"/>
-  <add key="files.docservice.viewed-docs" value=".djvu|.oxps|.pdf|.xps"/>
-  <add key="files.docservice.edited-docs" value=".csv|.docm|.docx|.docxf|.dotm|.dotx|.epub|.fb2|.html|.odp|.ods|.odt|.otp|.ots|.ott|.potm|.potx|.ppsm|.ppsx|.pptm|.pptx|.rtf|.txt|.xlsm|.xlsx|.xltm|.xltx"/>
-  <add key="files.docservice.convert-docs" value=".doc|.dot|.dps|.dpt|.epub|.et|.ett|.fb2|.fodp|.fods|.fodt|.htm|.html|.mht|.mhtml|.odp|.ods|.odt|.otp|.ots|.ott|.pot|.pps|.ppt|.rtf|.stw|.sxc|.sxi|.sxw|.wps|.wpt|.xls|.xlsb|.xlt|.xml"/>
+  <add key="files.docservice.fillform-docs" value=".oform|.docx"/>
+  <add key="files.docservice.viewed-docs" value=".pdf|.djvu|.xps|.oxps"/>
+  <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.txt|.docxf"/>
+  <add key="files.docservice.convert-docs" value=".docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xlsb|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2"/>
   <add key="files.docservice.timeout" value="120000" />
   <add key="files.docservice.secret" value="" />
   <add key="files.docservice.header" value="Authorization" />
   <add key="files.docservice.verify-peer-off" value="true"/>
 
-  <add key="files.docservice.token.useforrequest" value="true" />
-
-  <add key="files.docservice.languages" value="en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA: Test Language"/>
+  <add key="files.docservice.languages" value="en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (People's Republic of China)|zh-TW:Chinese (Traditional, Taiwan)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lv:Latvian|lo:Lao|ms:Malay (Malaysia)|nb:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA: Test Language"/>
 
   <add key="files.docservice.url.site" value="http://documentserver/"/>
 

web/documentserver-example/java-spring/.gitignore

@@ -0,0 +1,19 @@
+# Eclipse
+.classpath
+.project
+.settings/
+
+# Intellij
+.idea/
+*.iml
+*.iws
+
+# Mac
+.DS_Store
+
+# Maven
+log/
+target/
+
+#project
+documents

web/documentserver-example/java-spring/3rd-Party.license

@@ -1,17 +1,8 @@
 ONLYOFFICE Applications example uses code from the following 3rd party projects:
 
-
-Gson          - Gson is a Java library that can be used to convert Java Objects into their JSON representation. (https://github.com/google/gson/blob/master/LICENSE)
-License:        Apache 2.0
-License File:   gson.license
-
-H2 Database Engine - This software contains unmodified binary redistributions for H2 database engine. H2 is a relational DBMS that can be embedded in java applications. (https://h2database.com/html/license.html)
-License:        MPL 2.0 or EPL 1.0
-License File:   h2database.license
-
-Jackson Databind - General-purpose data-binding functionality and tree-model for Jackson Data Processor. (https://github.com/FasterXML/jackson-databind/blob/master/LICENSE)
-License:        Apache 2.0
-License File:   jackson-databind.license
+jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
+License:        MIT
+License File:   jQuery.license
 
 jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
 License:        MIT, GPL
@@ -25,30 +16,10 @@ jQuery.iframe-transport - jQuery Iframe Transport Plugin for File Upload (https:
 License:        MIT
 License File:   jQuery.iframe-transport.license
 
-jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
-License:        MIT
-License File:   jQuery.license
-
-jQuery.Migrate - Upgrading libraries such as jQuery can be a lot of work, when breaking changes have been introduced. jQuery Migrate makes this easier, by restoring the APIs that were removed, and additionally shows warnings in the browser console (development version of jQuery Migrate only) when removed and/or deprecated APIs are used. (https://github.com/jquery/jquery-migrate/blob/main/LICENSE.txt)
-License:        OpenJS
-License File:   jQuery.Migrate.license
-
 jQuery.UI     - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
 License:        MIT
 License File:   jQuery.UI.license
 
-JSON.simple   - JSON.simple is a simple Java toolkit for JSON. You can use JSON.simple to encode or decode JSON text. (https://github.com/fangyidong/json-simple/blob/master/LICENSE.txt)
-License:        Apache 2.0
-License File:   JSON.simple.license
-
-Project Lombok - Project Lombok is a java library that automatically plugs into your editor and build tools. (https://mvnrepository.com/artifact/org.projectlombok/lombok).
-License:        MIT
-License File    lombok.license
-
-ModelMapper   - ModelMapper is an intelligent object mapping library that automatically maps objects to each other. (https://github.com/modelmapper/modelmapper)
-License:        Apache 2.0
-License File    modelmapper.license
-
 Prime JWT     - is intended to be fast and easy to use. Prime JWT has a single external dependency on Jackson. (https://github.com/ws-apps/prime-jwt/blob/master/LICENSE)
 License:        Apache 2.0
 License File:   prime-jwt.license
@@ -68,3 +39,27 @@ License File:   spring-boot.license
 Spring Data JPA - Persist data in SQL stores with Java Persistence API using Spring Data and Hibernate. (https://github.com/spring-projects/spring-data-jpa/blob/main/LICENSE.txt)
 License:        Apache 2.0
 License File:   spring-data-jpa.license
+
+H2 Database Engine - This software contains unmodified binary redistributions for H2 database engine. H2 is a relational DBMS that can be embedded in java applications. (https://h2database.com/html/license.html)
+License:        MPL 2.0 or EPL 1.0
+License File:   h2database.license
+
+JSON.simple   - JSON.simple is a simple Java toolkit for JSON. You can use JSON.simple to encode or decode JSON text. (https://github.com/fangyidong/json-simple/blob/master/LICENSE.txt)
+License:        Apache 2.0
+License File:   JSON.simple.license
+
+Gson          - Gson is a Java library that can be used to convert Java Objects into their JSON representation. (https://github.com/google/gson/blob/master/LICENSE)
+License:        Apache 2.0
+License File:   gson.license
+
+Jackson Databind - General-purpose data-binding functionality and tree-model for Jackson Data Processor. (https://github.com/FasterXML/jackson-databind/blob/master/LICENSE)
+License:        Apache 2.0
+License File:   jackson-databind.license
+
+ModelMapper   - ModelMapper is an intelligent object mapping library that automatically maps objects to each other. (https://github.com/modelmapper/modelmapper)
+License:        Apache 2.0
+License File    modelmapper.license
+
+Project Lombok - Project Lombok is a java library that automatically plugs into your editor and build tools. (https://mvnrepository.com/artifact/org.projectlombok/lombok).
+License:        MIT
+License File    lombok.license

web/documentserver-example/java-spring/licenses/3rd-Party.license

@@ -1,17 +1,8 @@
 ONLYOFFICE Applications example uses code from the following 3rd party projects:
 
-
-Gson          - Gson is a Java library that can be used to convert Java Objects into their JSON representation. (https://github.com/google/gson/blob/master/LICENSE)
-License:        Apache 2.0
-License File:   gson.license
-
-H2 Database Engine - This software contains unmodified binary redistributions for H2 database engine. H2 is a relational DBMS that can be embedded in java applications. (https://h2database.com/html/license.html)
-License:        MPL 2.0 or EPL 1.0
-License File:   h2database.license
-
-Jackson Databind - General-purpose data-binding functionality and tree-model for Jackson Data Processor. (https://github.com/FasterXML/jackson-databind/blob/master/LICENSE)
-License:        Apache 2.0
-License File:   jackson-databind.license
+jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
+License:        MIT
+License File:   jQuery.license
 
 jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
 License:        MIT, GPL
@@ -25,30 +16,10 @@ jQuery.iframe-transport - jQuery Iframe Transport Plugin for File Upload (https:
 License:        MIT
 License File:   jQuery.iframe-transport.license
 
-jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
-License:        MIT
-License File:   jQuery.license
-
-jQuery.Migrate - Upgrading libraries such as jQuery can be a lot of work, when breaking changes have been introduced. jQuery Migrate makes this easier, by restoring the APIs that were removed, and additionally shows warnings in the browser console (development version of jQuery Migrate only) when removed and/or deprecated APIs are used. (https://github.com/jquery/jquery-migrate/blob/main/LICENSE.txt)
-License:        OpenJS
-License File:   jQuery.Migrate.license
-
 jQuery.UI     - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
 License:        MIT
 License File:   jQuery.UI.license
 
-JSON.simple   - JSON.simple is a simple Java toolkit for JSON. You can use JSON.simple to encode or decode JSON text. (https://github.com/fangyidong/json-simple/blob/master/LICENSE.txt)
-License:        Apache 2.0
-License File:   JSON.simple.license
-
-Project Lombok - Project Lombok is a java library that automatically plugs into your editor and build tools. (https://mvnrepository.com/artifact/org.projectlombok/lombok).
-License:        MIT
-License File    lombok.license
-
-ModelMapper   - ModelMapper is an intelligent object mapping library that automatically maps objects to each other. (https://github.com/modelmapper/modelmapper)
-License:        Apache 2.0
-License File    modelmapper.license
-
 Prime JWT     - is intended to be fast and easy to use. Prime JWT has a single external dependency on Jackson. (https://github.com/ws-apps/prime-jwt/blob/master/LICENSE)
 License:        Apache 2.0
 License File:   prime-jwt.license
@@ -68,3 +39,19 @@ License File:   spring-boot.license
 Spring Data JPA - Persist data in SQL stores with Java Persistence API using Spring Data and Hibernate. (https://github.com/spring-projects/spring-data-jpa/blob/main/LICENSE.txt)
 License:        Apache 2.0
 License File:   spring-data-jpa.license
+
+H2 Database Engine - This software contains unmodified binary redistributions for H2 database engine. H2 is a relational DBMS that can be embedded in java applications. (https://h2database.com/html/license.html)
+License:        MPL 2.0 or EPL 1.0
+License File:   h2database.license
+
+JSON.simple   - JSON.simple is a simple Java toolkit for JSON. You can use JSON.simple to encode or decode JSON text. (https://github.com/fangyidong/json-simple/blob/master/LICENSE.txt)
+License:        Apache 2.0
+License File:   JSON.simple.license
+
+Gson          - Gson is a Java library that can be used to convert Java Objects into their JSON representation. (https://github.com/google/gson/blob/master/LICENSE)
+License:        Apache 2.0
+License File:   gson.license
+
+Jackson Databind - General-purpose data-binding functionality and tree-model for Jackson Data Processor. (https://github.com/FasterXML/jackson-databind/blob/master/LICENSE)
+License:        Apache 2.0
+License File:   jackson-databind.license

web/documentserver-example/java-spring/licenses/jQuery.Migrate.license

@@ -1,36 +0,0 @@
-Copyright OpenJS Foundation and other contributors, https://openjsf.org/
-
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/jquery/jquery-migrate
-
-The following license applies to all parts of this software except as
-documented below:
-
-====
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-====
-
-All files located in the node_modules and external directories are
-externally maintained libraries used by this software which have their
-own licenses; we recommend you read them, as their terms may differ from
-the terms above.

web/documentserver-example/java-spring/licenses/jQuery.license

@@ -1,4 +1,4 @@
-Copyright OpenJS Foundation and other contributors, https://openjsf.org/
+Copyright (c) 2009 John Resig, http://jquery.com/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

web/documentserver-example/java-spring/pom.xml

@@ -35,6 +35,14 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-config</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-web</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java

@@ -45,7 +45,6 @@ public class ExampleData {
                 "Can’t see anyone’s information",
                 "Can't rename files from the editor",
                 "Can't view chat",
-                "Can't protect file",
                 "View file without collaboration"
         );
 
@@ -93,23 +92,22 @@ public class ExampleData {
         userService.createUser("John Smith", "smith@example.com", descriptionUserFirst,
                 "", List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()),
                 List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()),
-                List.of(FilterState.NULL.toString()), null, true, true);
+                List.of(FilterState.NULL.toString()), null, true);
 
         // create user 2 with the specified parameters
         userService.createUser("Mark Pottato", "pottato@example.com", descriptionUserSecond,
                 "group-2", List.of("", "group-2"), List.of(FilterState.NULL.toString()),
-                List.of("group-2", ""), List.of("group-2"), List.of("group-2", ""), true, true,
-                true);
+                List.of("group-2", ""), List.of("group-2"), List.of("group-2", ""), true, true);
 
         // create user 3 with the specified parameters
         userService.createUser("Hamish Mitchell", "mitchell@example.com", descriptionUserThird,
                 "group-3", List.of("group-2"), List.of("group-2", "group-3"), List.of("group-2"),
-                new ArrayList<>(), List.of("group-2"), false, true, true);
+                new ArrayList<>(), List.of("group-2"), false, true);
 
         // create user 0 with the specified parameters
         userService.createUser("Anonymous", null, descriptionUserZero, "",
                 List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()),
                 List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()),
-                new ArrayList<>(), null, false, false);
+                new ArrayList<>(), null, false);
     }
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/config/SecurityConfig.java

@@ -0,0 +1,37 @@
+/**
+ *
+ * (c) Copyright Ascensio System SIA 2023
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.onlyoffice.integration.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.web.SecurityFilterChain;
+
+@Configuration
+public class SecurityConfig {
+
+    @Bean
+    SecurityFilterChain filterChain(final HttpSecurity http) throws Exception {
+        return http
+                .requiresChannel(channel -> channel.anyRequest().requiresSecure())
+                .authorizeRequests(authorize -> authorize.anyRequest().permitAll())
+                .build();
+    }
+
+}

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java

@@ -19,14 +19,11 @@
 package com.onlyoffice.integration.controllers;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.onlyoffice.integration.documentserver.callbacks.CallbackHandler;
 import com.onlyoffice.integration.documentserver.managers.jwt.JwtManager;
 import com.onlyoffice.integration.documentserver.storage.FileStorageMutator;
 import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder;
 import com.onlyoffice.integration.dto.Converter;
-import com.onlyoffice.integration.dto.ConvertedData;
 import com.onlyoffice.integration.dto.Track;
 import com.onlyoffice.integration.entities.User;
 import com.onlyoffice.integration.documentserver.models.enums.DocumentType;
@@ -35,10 +32,7 @@ import com.onlyoffice.integration.documentserver.util.file.FileUtility;
 import com.onlyoffice.integration.documentserver.util.service.ServiceConverter;
 import com.onlyoffice.integration.documentserver.managers.document.DocumentManager;
 import com.onlyoffice.integration.documentserver.managers.callback.CallbackManager;
-
-import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
@@ -51,30 +45,20 @@ import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.InetAddress;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
 
@@ -214,18 +198,15 @@ public class FileController {
         // get document type (word, cell or slide)
         DocumentType type = fileUtility.getDocumentType(fileName);
 
-        // convert to .ooxml
-        String internalFileExt = "ooxml";
+        // get an editor internal extension (".docx", ".xlsx" or ".pptx")
+        String internalFileExt = fileUtility.getInternalExtension(type);
 
         try {
             // check if the file with such an extension can be converted
             if (fileUtility.getConvertExts().contains(fileExt)) {
                 String key = serviceConverter.generateRevisionId(fileUri);  // generate document key
-                ConvertedData response = serviceConverter  // get the URL to the converted file
-                        .getConvertedData(fileUri, fileExt, internalFileExt, key, filePass, true, lang);
-
-                String newFileUri = response.getUri();
-                String newFileType = "." + response.getFileType();
+                String newFileUri = serviceConverter  // get the URL to the converted file
+                        .getConvertedUri(fileUri, fileExt, internalFileExt, key, filePass, true, lang);
 
                 if (newFileUri.isEmpty()) {
                     return "{ \"step\" : \"0\", \"filename\" : \"" + fileName + "\"}";
@@ -233,7 +214,7 @@ public class FileController {
 
                 /* get a file name of an internal file extension with an index if the file
                  with such a name already exists */
-                String nameWithInternalExt = fileUtility.getFileNameWithoutExtension(fileName) + newFileType;
+                String nameWithInternalExt = fileUtility.getFileNameWithoutExtension(fileName) + internalFileExt;
                 String correctedName = documentManager.getCorrectName(nameWithInternalExt);
 
                 URL url = new URL(newFileUri);
@@ -245,9 +226,6 @@ public class FileController {
                     throw new RuntimeException("Input stream is null");
                 }
 
-                // remove source file
-                storageMutator.deleteFile(fileName);
-
                 // create the converted file with input stream
                 storageMutator.createFile(Path.of(storagePathBuilder.getFileLocation(correctedName)), stream);
                 fileName = correctedName;
@@ -288,7 +266,7 @@ public class FileController {
                                              @RequestParam("file") final String file) { // history file
         try {
             // check if a token is enabled or not
-            if (jwtManager.tokenEnabled() && jwtManager.tokenUseForRequest()) {
+            if (jwtManager.tokenEnabled()) {
                 String header = request.getHeader(documentJwtHeader == null  // get the document JWT header
                         || documentJwtHeader.isEmpty() ? "Authorization" : documentJwtHeader);
                 if (header != null && !header.isEmpty()) {
@@ -308,11 +286,10 @@ public class FileController {
     @GetMapping(path = "${url.download}")
     public ResponseEntity<Resource> download(final HttpServletRequest request,  // download a file
                                              @RequestParam("fileName") final String fileName,
-                                             @RequestParam(value = "userAddress", required = false)
-                                                 final String userAddress) {
+                                             @RequestParam(value = "userAddress", required = false) final String userAddress){
         try {
             // check if a token is enabled or not
-            if (jwtManager.tokenEnabled() && userAddress != null && jwtManager.tokenUseForRequest()) {
+            if (jwtManager.tokenEnabled() && userAddress != null) {
                 String header = request.getHeader(documentJwtHeader == null // get the document JWT header
                         || documentJwtHeader.isEmpty() ? "Authorization" : documentJwtHeader);
                 if (header != null && !header.isEmpty()) {
@@ -364,13 +341,13 @@ public class FileController {
     @GetMapping("/assets")
     public ResponseEntity<Resource> assets(@RequestParam("name")
                                                final String name) {  // get sample files from the assests
-        String fileName = Path.of("assets", "document-templates", "sample", fileUtility.getFileName(name)).toString();
+        String fileName = Path.of("assets", "sample", fileUtility.getFileName(name)).toString();
         return downloadFile(fileName);
     }
 
     @GetMapping("/csv")
     public ResponseEntity<Resource> csv() {  // download a csv file
-        String fileName = Path.of("assets", "document-templates", "sample", "csv.csv").toString();
+        String fileName = Path.of("assets", "sample", "csv.csv").toString();
         return downloadFile(fileName);
     }
 
@@ -468,157 +445,4 @@ public class FileController {
             return e.getMessage();
         }
     }
-
-    @PostMapping("/reference")
-    @ResponseBody
-    public String reference(@RequestBody final JSONObject body) {
-        try {
-            JSONParser parser = new JSONParser();
-            Gson gson = new GsonBuilder().disableHtmlEscaping().create();
-
-            String userAddress = "";
-            String fileName = "";
-
-            if (body.containsKey("referenceData")) {
-                LinkedHashMap referenceDataObj = (LinkedHashMap) body.get("referenceData");
-                String instanceId = (String) referenceDataObj.get("instanceId");
-
-                if (instanceId.equals(storagePathBuilder.getServerUrl(false))) {
-                    JSONObject fileKey = (JSONObject) parser.parse((String) referenceDataObj.get("fileKey"));
-                    userAddress = (String) fileKey.get("userAddress");
-                    if (userAddress.equals(InetAddress.getLocalHost().getHostAddress())) {
-                        fileName = (String) fileKey.get("fileName");
-                    }
-                }
-            }
-
-
-            if (fileName.equals("")) {
-                try {
-                    String path = (String) body.get("path");
-                    path = fileUtility.getFileName(path);
-                    File f = new File(storagePathBuilder.getFileLocation(path));
-                    if (f.exists()) {
-                        fileName = path;
-                    }
-                } catch (Exception e) {
-                    return "{ \"error\" : 1, \"message\" : \"" + e.getMessage() + "\"}";
-                }
-            }
-
-            if (fileName.equals("")) {
-                return "{ \"error\": \"File not found\"}";
-            }
-
-            boolean directUrl = (boolean) body.get("directUrl");
-
-            HashMap<String, Object> fileKey = new HashMap<>();
-            fileKey.put("fileName", fileName);
-            fileKey.put("userAddress", InetAddress.getLocalHost().getHostAddress());
-
-            HashMap<String, Object> referenceData = new HashMap<>();
-            referenceData.put("instanceId", storagePathBuilder.getServerUrl(true));
-            referenceData.put("fileKey", gson.toJson(fileKey));
-
-            HashMap<String, Object> data = new HashMap<>();
-            data.put("fileType", fileUtility.getFileExtension(fileName).replace(".", ""));
-            data.put("url", documentManager.getDownloadUrl(fileName, true));
-            data.put("directUrl", directUrl ? documentManager.getDownloadUrl(fileName, false) : null);
-            data.put("referenceData", referenceData);
-            data.put("path", fileName);
-
-            if (jwtManager.tokenEnabled()) {
-                String token = jwtManager.createToken(data);
-                data.put("token", token);
-            }
-            return gson.toJson(data);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return "{ \"error\" : 1, \"message\" : \"" + e.getMessage() + "\"}";
-        }
-    }
-
-    @PutMapping("/restore")
-    @ResponseBody
-    public String restore(@RequestBody final JSONObject body) {
-        try {
-            String sourceBasename = (String) body.get("fileName");
-            Integer version = (Integer) body.get("version");
-            String userID = (String) body.get("userId");
-
-            String sourceStringFile = storagePathBuilder.getFileLocation(sourceBasename);
-            File sourceFile = new File(sourceStringFile);
-            Path sourcePathFile = sourceFile.toPath();
-            String historyDirectory = storagePathBuilder.getHistoryDir(sourcePathFile.toString());
-
-            Integer bumpedVersion = storagePathBuilder.getFileVersion(historyDirectory, false);
-            String bumpedVersionStringDirectory = documentManager.versionDir(historyDirectory, bumpedVersion, true);
-            File bumpedVersionDirectory = new File(bumpedVersionStringDirectory);
-            if (!bumpedVersionDirectory.exists()) {
-                bumpedVersionDirectory.mkdir();
-            }
-
-            Path bumpedKeyPathFile = Paths.get(bumpedVersionStringDirectory, "key.txt");
-            String bumpedKeyStringFile = bumpedKeyPathFile.toString();
-            File bumpedKeyFile = new File(bumpedKeyStringFile);
-            String bumpedKey = serviceConverter.generateRevisionId(
-                storagePathBuilder.getStorageLocation()
-                + "/"
-                + sourceBasename
-                + "/"
-                + Long.toString(sourceFile.lastModified())
-            );
-            FileWriter bumpedKeyFileWriter = new FileWriter(bumpedKeyFile);
-            bumpedKeyFileWriter.write(bumpedKey);
-            bumpedKeyFileWriter.close();
-
-            Integer userInnerID = Integer.parseInt(userID.replace("uid-", ""));
-            User user = userService.findUserById(userInnerID).get();
-
-            Path bumpedChangesPathFile = Paths.get(bumpedVersionStringDirectory, "changes.json");
-            String bumpedChangesStringFile = bumpedChangesPathFile.toString();
-            File bumpedChangesFile = new File(bumpedChangesStringFile);
-            JSONObject bumpedChangesUser = new JSONObject();
-            // Don't add the `uid-` prefix.
-            // https://github.com/ONLYOFFICE/document-server-integration/issues/437#issuecomment-1663526562
-            bumpedChangesUser.put("id", user.getId());
-            bumpedChangesUser.put("name", user.getName());
-            JSONObject bumpedChangesChangesItem = new JSONObject();
-            bumpedChangesChangesItem.put("created", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            bumpedChangesChangesItem.put("user", bumpedChangesUser);
-            JSONArray bumpedChangesChanges = new JSONArray();
-            bumpedChangesChanges.add(bumpedChangesChangesItem);
-            JSONObject bumpedChanges = new JSONObject();
-            bumpedChanges.put("serverVersion", null);
-            bumpedChanges.put("changes", bumpedChangesChanges);
-            String bumpedChangesContent = bumpedChanges.toJSONString();
-            FileWriter bumpedChangesFileWriter = new FileWriter(bumpedChangesFile);
-            bumpedChangesFileWriter.write(bumpedChangesContent);
-            bumpedChangesFileWriter.close();
-
-            String sourceExtension = fileUtility.getFileExtension(sourceBasename);
-            String previousBasename = "prev" + sourceExtension;
-
-            Path bumpedFile = Paths.get(bumpedVersionStringDirectory, previousBasename);
-            Files.move(sourcePathFile, bumpedFile);
-
-            String recoveryVersionStringDirectory = documentManager.versionDir(historyDirectory, version, true);
-            Path recoveryPathFile = Paths.get(recoveryVersionStringDirectory, previousBasename);
-            String recoveryStringFile = recoveryPathFile.toString();
-            FileInputStream recoveryStream = new FileInputStream(recoveryStringFile);
-            storageMutator.createFile(sourcePathFile, recoveryStream);
-            recoveryStream.close();
-
-            JSONObject responseBody = new JSONObject();
-            responseBody.put("error", null);
-            responseBody.put("success", true);
-            return responseBody.toJSONString();
-        } catch (Exception error) {
-            error.printStackTrace();
-            JSONObject responseBody = new JSONObject();
-            responseBody.put("error", error.getMessage());
-            responseBody.put("success", false);
-            return responseBody.toJSONString();
-        }
-    }
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/callback/DefaultCallbackManager.java

@@ -127,9 +127,9 @@ public class DefaultCallbackManager implements CallbackManager {
         if (!curExt.equals(downloadExt)) {
             try {
                 String newFileUri = serviceConverter
-                        .getConvertedData(downloadUri, downloadExt, curExt,
+                        .getConvertedUri(downloadUri, downloadExt, curExt,
                                 serviceConverter.generateRevisionId(downloadUri), null, false,
-                                null).getUri();  // convert a file and get URL to a new file
+                                null);  // convert a file and get URL to a new file
                 if (newFileUri.isEmpty()) {
                     newFileName = documentManager
                             .getCorrectName(fileUtility.getFileNameWithoutExtension(fileName)
@@ -163,8 +163,6 @@ public class DefaultCallbackManager implements CallbackManager {
 
             storageMutator.createDirectory(ver);  // create the file version directory
 
-            lastVersion.toFile().renameTo(new File(versionDir + File.separator + "prev" + curExt));
-
             saveFile(byteArrayFile, toSave); // save document file
 
             byte[] byteArrayChanges = getDownloadFile(changesUri); // download file changes
@@ -213,8 +211,7 @@ public class DefaultCallbackManager implements CallbackManager {
         }
 
         String headerToken;
-        // check if a secret key to generate token exists or not
-        if (jwtManager.tokenEnabled() && jwtManager.tokenUseForRequest()) {
+        if (jwtManager.tokenEnabled()) {  // check if a secret key to generate token exists or not
             Map<String, Object> payloadMap = new HashMap<>();
             payloadMap.put("payload", params);
             headerToken = jwtManager.createToken(payloadMap);  // encode a payload object into a header token
@@ -279,8 +276,8 @@ public class DefaultCallbackManager implements CallbackManager {
             try {
                 // convert file and get URL to a new file
                 String newFileUri = serviceConverter
-                        .getConvertedData(downloadUri, downloadExt, curExt, serviceConverter
-                                .generateRevisionId(downloadUri), null, false, null).getUri();
+                        .getConvertedUri(downloadUri, downloadExt, curExt, serviceConverter
+                                .generateRevisionId(downloadUri), null, false, null);
                 if (newFileUri.isEmpty()) {
                     newFileName = true;
                 } else {

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/document/DefaultDocumentManager.java

@@ -217,14 +217,8 @@ public class DefaultDocumentManager implements DocumentManager {
     public String createDemo(final String fileExt, final Boolean sample, final String uid, final String uname) {
         String demoName = (sample ? "sample." : "new.")
                 + fileExt;  // create sample or new template file with the necessary extension
-        String demoPath =
-            "assets"
-            + File.separator
-            + "document-templates"
-            + File.separator
-            + (sample ? "sample" : "new")
-            + File.separator
-            + demoName;
+        String demoPath = "assets" + File.separator  + (sample ? "sample" : "new")
+                + File.separator + demoName;  // get the path to the sample document
 
         // get a file name with an index if the file with such a name already exists
         String fileName = getCorrectName(demoName);

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/jwt/DefaultJwtManager.java

@@ -37,8 +37,6 @@ import java.util.Map;
 public class DefaultJwtManager implements JwtManager {
     @Value("${files.docservice.secret}")
     private String tokenSecret;
-    @Value("${files.docservice.token-use-for-request}")
-    private String tokenUseForRequest;
     @Autowired
     private ObjectMapper objectMapper;
     @Autowired
@@ -64,10 +62,6 @@ public class DefaultJwtManager implements JwtManager {
         return tokenSecret != null && !tokenSecret.isEmpty();
     }
 
-    public boolean tokenUseForRequest() {
-        return Boolean.parseBoolean(tokenUseForRequest) && !tokenUseForRequest.isEmpty();
-    }
-
     // read document token
     public JWT readToken(final String token) {
         try {
@@ -90,7 +84,7 @@ public class DefaultJwtManager implements JwtManager {
         } catch (Exception ex) {
             throw new RuntimeException("{\"error\":1,\"message\":\"JSON Parsing error\"}");
         }
-        if (tokenEnabled() && tokenUseForRequest()) {  // check if the token is enabled
+        if (tokenEnabled()) {  // check if the token is enabled
             String token = (String) body.get("token");  // get token from the body
             if (token == null) {  // if token is empty
                 if (header != null && !header.isBlank()) {  // and the header is defined

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/jwt/JwtManager.java

@@ -26,7 +26,6 @@ import java.util.Map;
 // specify the jwt manager functions
 public interface JwtManager {
     boolean tokenEnabled();  // check if the token is enabled
-    boolean tokenUseForRequest();  // check if the token is enabled
     String createToken(Map<String, Object> payloadClaims);  // create document token
     JWT readToken(String token);  // read document token
     JSONObject parseBody(String payload, String header);  // parse the body

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/enums/Action.java

@@ -27,6 +27,5 @@ public enum Action {
     comment,
     chat,
     fillForms,
-    blockcontent,
-    protect
+    blockcontent
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/Document.java

@@ -25,8 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
-import java.util.HashMap;
-
 @Component
 @Scope("prototype")
 @Getter
@@ -45,5 +43,4 @@ public class Document {  // the parameters pertaining to the document (title, ur
     as file name when the document is downloaded */
     private String url;  // the absolute URL where the source viewed or edited document is stored
     private String directUrl;
-    private HashMap<String, Object> referenceData;
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/Permission.java

@@ -51,5 +51,4 @@ public class Permission extends AbstractModel {  // the permission for the docum
     private CommentGroup commentGroups;  //  the groups whose comments the user can edit, remove and/or view
     @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = SerializerFilter.class)
     private List<String> userInfoGroups;
-    private Boolean protect = true;
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/ReferenceData.java

@@ -1,42 +0,0 @@
-/**
- *
- * (c) Copyright Ascensio System SIA 2023
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.onlyoffice.integration.documentserver.models.filemodel;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class ReferenceData {
-    @Autowired
-    private FileStoragePathBuilder storagePathBuilder;
-    private final String instanceId;
-    private final Map<String, String> fileKey;
-    public ReferenceData(final String fileName, final String curUserHostAddress, final User user) {
-        instanceId = storagePathBuilder.getServerUrl(true);
-        Map<String, String> fileKeyList = new HashMap<>();
-        if (!user.getId().equals("uid-0")) {
-            fileKeyList.put("fileName", fileName);
-            fileKeyList.put("userAddress", curUserHostAddress);
-        } else {
-            fileKeyList = null;
-        }
-        fileKey = fileKeyList;
-    }
-}

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/service/DefaultServiceConverter.java

@@ -23,7 +23,6 @@ import com.onlyoffice.integration.documentserver.managers.jwt.JwtManager;
 import com.onlyoffice.integration.documentserver.models.enums.ConvertErrorType;
 import com.onlyoffice.integration.documentserver.util.file.FileUtility;
 import com.onlyoffice.integration.dto.Convert;
-import com.onlyoffice.integration.dto.ConvertedData;
 import lombok.SneakyThrows;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
@@ -106,17 +105,17 @@ public class DefaultServiceConverter implements ServiceConverter {
 
             connection.connect();
 
-            try (OutputStream os = connection.getOutputStream()) {
-                os.write(bodyByte);  // write bytes to the output stream
-                os.flush();  // force write data to the output stream that can be cached in the current thread
-            }
-
             int statusCode = connection.getResponseCode();
             if (statusCode != HttpStatus.OK.value()) {  // checking status code
                 connection.disconnect();
                 throw new RuntimeException("Convertation service returned status: " + statusCode);
             }
 
+            try (OutputStream os = connection.getOutputStream()) {
+                os.write(bodyByte);  // write bytes to the output stream
+                os.flush();  // force write data to the output stream that can be cached in the current thread
+            }
+
             response = connection.getInputStream();  // get the input stream
             jsonString = convertStreamToString(response);  // convert the response stream into a string
         } finally {
@@ -126,9 +125,9 @@ public class DefaultServiceConverter implements ServiceConverter {
     }
 
     // get the URL to the converted file
-    public ConvertedData getConvertedData(final String documentUri, final String fromExtension,
-                                          final String toExtension, final String documentRevisionId,
-                                          final String filePass, final Boolean isAsync, final String lang) {
+    public String getConvertedUri(final String documentUri, final String fromExtension,
+                                  final String toExtension, final String documentRevisionId,
+                                  final String filePass, final Boolean isAsync, final String lang) {
         // check if the fromExtension parameter is defined; if not, get it from the document url
         String fromExt = fromExtension == null || fromExtension.isEmpty()
                 ? fileUtility.getFileExtension(documentUri) : fromExtension;
@@ -156,7 +155,7 @@ public class DefaultServiceConverter implements ServiceConverter {
         }
 
         String headerToken = "";
-        if (jwtManager.tokenEnabled() && jwtManager.tokenUseForRequest()) {
+        if (jwtManager.tokenEnabled()) {
             HashMap<String, Object> map = new HashMap<String, Object>();
             map.put("region", lang);
             map.put("url", body.getUrl());
@@ -180,7 +179,7 @@ public class DefaultServiceConverter implements ServiceConverter {
 
         String jsonString = postToServer(body, headerToken);
 
-        return getResponseData(jsonString);
+        return getResponseUri(jsonString);
     }
 
     // generate document key
@@ -204,7 +203,7 @@ public class DefaultServiceConverter implements ServiceConverter {
 
     // get the response URL
     @SneakyThrows
-    private ConvertedData getResponseData(final String jsonString) {
+    private String getResponseUri(final String jsonString) {
         JSONObject jsonObj = convertStringToJSON(jsonString);
 
         Object error = jsonObj.get("error");
@@ -217,15 +216,10 @@ public class DefaultServiceConverter implements ServiceConverter {
 
         Long resultPercent = 0L;
         String responseUri = null;
-        String responseFileType = null;
-        ConvertedData convertedData = new ConvertedData("", "");
 
         if (isEndConvert) {  // if the conversion is completed
             resultPercent = FULL_LOADING_IN_PERCENT;
             responseUri = (String) jsonObj.get("fileUrl");  // get the file URL
-            responseFileType = (String) jsonObj.get("fileType");  // get the file type
-            convertedData.setUri(responseUri);
-            convertedData.setFileType(responseFileType);
         } else {  // if the conversion isn't completed
             resultPercent = (Long) jsonObj.get("percent");
 
@@ -233,7 +227,7 @@ public class DefaultServiceConverter implements ServiceConverter {
             resultPercent = resultPercent >= FULL_LOADING_IN_PERCENT ? FULL_LOADING_IN_PERCENT - 1 : resultPercent;
         }
 
-        return convertedData;
+        return resultPercent >= FULL_LOADING_IN_PERCENT ? responseUri : "";
     }
 
     // convert stream to string

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/service/ServiceConverter.java

@@ -18,16 +18,15 @@
 
 package com.onlyoffice.integration.documentserver.util.service;
 
-import com.onlyoffice.integration.dto.ConvertedData;
 import org.json.simple.JSONObject;
 import java.io.InputStream;
 
 
 // specify the converter service functions
 public interface ServiceConverter {
-    ConvertedData getConvertedData(String documentUri, String fromExtension,  // get the URL to the converted file
-                                   String toExtension, String documentRevisionId,
-                                   String filePass, Boolean isAsync, String lang);
+    String getConvertedUri(String documentUri, String fromExtension,  // get the URL to the converted file
+                                  String toExtension, String documentRevisionId,
+                                  String filePass, Boolean isAsync, String lang);
     String generateRevisionId(String expectedKey);  // generate document key
     String convertStreamToString(InputStream stream);  // convert stream to string
     JSONObject convertStringToJSON(String jsonString);  // convert string to json

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/ConvertedData.java

@@ -1,33 +0,0 @@
-/**
- *
- * (c) Copyright Ascensio System SIA 2023
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.onlyoffice.integration.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-@Getter
-@Setter
-@AllArgsConstructor
-@NoArgsConstructor
-public class ConvertedData {
-    private String uri;
-    private String fileType;
-}

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/entities/Permission.java

@@ -52,5 +52,4 @@ public class Permission extends AbstractEntity {
     private List<Group> commentsRemoveGroups;
     @ManyToMany
     private List<Group> userInfoGroups;
-    private Boolean protect = true;
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/PermissionServices.java

@@ -38,8 +38,7 @@ public class PermissionServices {
                                        final List<Group> commentEditGroups,
                                        final List<Group> commentRemoveGroups,
                                        final List<Group> userInfoGroups,
-                                       final Boolean chat,
-                                       final Boolean protect) {
+                                       final Boolean chat) {
 
         Permission permission = new Permission();
         permission.setReviewGroups(reviewGroups);  // define the groups whose changes the user can accept/reject
@@ -49,7 +48,6 @@ public class PermissionServices {
          whose comments the user can remove */
         permission.setUserInfoGroups(userInfoGroups);
         permission.setChat(chat);
-        permission.setProtect(protect);
 
         permissionRepository.save(permission);  // save new permissions
 

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/UserServices.java

@@ -57,8 +57,7 @@ public class UserServices {
                            final List<String> editGroups,
                            final List<String> removeGroups,
                            final List<String> userInfoGroups, final Boolean favoriteDoc,
-                           final Boolean chat,
-                           final Boolean protect) {
+                           final Boolean chat) {
         User newUser = new User();
         newUser.setName(name);  // set the user name
         newUser.setEmail(email);  // set the user email
@@ -82,8 +81,7 @@ public class UserServices {
                         commentGroupsEdit,
                         commentGroupsRemove,
                         usInfoGroups,
-                        chat,
-                        protect);  // specify permissions for the current user
+                        chat);  // specify permissions for the current user
         newUser.setPermissions(permission);
 
         userRepository.save(newUser); // save a new user

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultDocumentConfigurer.java

@@ -18,7 +18,6 @@
 
 package com.onlyoffice.integration.services.configurers.implementations;
 
-import com.google.gson.Gson;
 import com.onlyoffice.integration.documentserver.models.filemodel.Document;
 import com.onlyoffice.integration.documentserver.models.filemodel.Permission;
 import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder;
@@ -32,8 +31,6 @@ import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
-import java.net.InetAddress;
-import java.util.HashMap;
 
 @Service
 @Primary
@@ -74,20 +71,7 @@ public class DefaultDocumentConfigurer implements DocumentConfigurer<DefaultDocu
                         + "/" + fileName + "/"
                         + new File(storagePathBuilder.getFileLocation(fileName)).lastModified());
 
-        Gson gson = new Gson();
-        HashMap<String, String> fileKey = new HashMap<>();
-        fileKey.put("fileName", fileName);
-        try {
-            fileKey.put("userAddress", InetAddress.getLocalHost().getHostAddress());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        HashMap<String, Object> referenceData = new HashMap<>();
-        referenceData.put("instanceId", storagePathBuilder.getServerUrl(true));
-        referenceData.put("fileKey", gson.toJson(fileKey));
-
         document.setKey(key);  // set the key to the document config
         document.setPermissions(permission);  // set the permission parameters to the document config
-        document.setReferenceData(referenceData);
     }
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultDocumentWrapper.java

@@ -19,7 +19,6 @@
 package com.onlyoffice.integration.services.configurers.wrappers;
 
 import com.onlyoffice.integration.documentserver.models.filemodel.Permission;
-import com.onlyoffice.integration.documentserver.models.filemodel.ReferenceData;
 import lombok.Builder;
 import lombok.Getter;
 
@@ -30,5 +29,4 @@ public class DefaultDocumentWrapper {
     private String fileName;
     private Boolean favorite;
     private Boolean isEnableDirectUrl;
-    private ReferenceData referenceData;
 }

web/documentserver-example/java-spring/src/main/resources/application.properties

@@ -1,17 +1,21 @@
-server.version=1.6.0
+server.version=1.5.0
 
 server.address=
-server.port=4000
+server.port=8443
+server.ssl.key-store=classpath:springboot.p12
+server.ssl.key-store-password=111111
+server.ssl.key-alias=springboot
+server.ssl.key-password=111111
 
 filesize-max=5242880
 
 files.storage=
 files.storage.folder=documents
 
-files.docservice.fillforms-docs=.docx|.oform
-files.docservice.viewed-docs=.djvu|.oxps|.pdf|.xps
-files.docservice.edited-docs=.csv|.docm|.docx|.docxf|.dotm|.dotx|.epub|.fb2|.html|.odp|.ods|.odt|.otp|.ots|.ott|.potm|.potx|.ppsm|.ppsx|.pptm|.pptx|.rtf|.txt|.xlsm|.xlsx|.xltm|.xltx
-files.docservice.convert-docs=.doc|.dot|.dps|.dpt|.epub|.et|.ett|.fb2|.fodp|.fods|.fodt|.htm|.html|.mht|.mhtml|.odp|.ods|.odt|.otp|.ots|.ott|.pot|.pps|.ppt|.rtf|.stw|.sxc|.sxi|.sxw|.wps|.wpt|.xls|.xlsb|.xlt|.xml
+files.docservice.fillforms-docs=.oform|.docx
+files.docservice.viewed-docs=.pdf|.djvu|.xps|.oxps
+files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.txt|.docxf
+files.docservice.convert-docs=.docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xlsb|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2
 files.docservice.timeout=120000
 files.docservice.history.postfix=-hist
 
@@ -24,11 +28,10 @@ files.docservice.url.example=
 
 files.docservice.secret=
 files.docservice.header=Authorization
-files.docservice.token-use-for-request=true
 
 files.docservice.verify-peer-off=true
 
-files.docservice.languages=en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language
+files.docservice.languages=en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (People's Republic of China)|zh-TW:Chinese (Traditional, Taiwan)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lv:Latvian|lo:Lao|ms:Malay (Malaysia)|nb:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language
 
 spring.datasource.url=jdbc:h2:mem:usersdb
 spring.datasource.driverClassName=org.h2.Driver
@@ -38,8 +41,6 @@ spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
 hibernate.ddl-auto
 spring.h2.console.enabled=true
 spring.h2.console.path=/h2
-spring.servlet.multipart.max-file-size=5MB
-spring.servlet.multipart.max-request-size=5MB
 
 url.index=/
 url.converter=/converter

web/documentserver-example/java-spring/src/main/resources/static/css/media.css

@@ -668,9 +668,4 @@
     .main-panel > span{
         max-width:15%;
     }
-}
-@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
-    .tableRow td:first-child{
-        max-width: none;
-    }
-}
+}

web/documentserver-example/java-spring/src/main/resources/static/scripts/jscript.js

@@ -211,10 +211,14 @@ if (typeof jQuery !== "undefined") {
             setCookie("ulang", langSel.val());
         });
         if(!userId){
-            setCookie("uid",1);
+            jq(document).on("ready",function(){
+                setCookie("uid",1)
+            })
         }
         if(!langId){
-            setCookie("ulang","en");
+            jq(document).on("ready",function () {
+                setCookie("ulang","en")
+            })
         }
     };
 

web/documentserver-example/java-spring/src/main/resources/templates/editor.html

@@ -52,7 +52,7 @@
 
                 // the user is trying to switch the document from the viewing into the editing mode
                 var onRequestEditRights = function () {
-                    location.href = location.href.replace(RegExp("\&?action=view", "i"), "");
+                    location.href = location.href.replace(RegExp("\&?action=view\&?", "i"), "");
                 };
 
                 // an error or some other specific event occurs
@@ -160,45 +160,12 @@
                     }
                 };
 
-                var onRequestReferenceData = function(event) {  // user refresh external data source
-                    event.data.directUrl = !!config.document.directUrl;
-                    let xhr = new XMLHttpRequest();
-                    xhr.open("POST", "reference");
-                    xhr.setRequestHeader("Content-Type", "application/json");
-                    xhr.send(JSON.stringify(event.data));
-                    xhr.onload = function () {
-                        innerAlert(xhr.responseText);
-                        docEditor.setReferenceData(JSON.parse(xhr.responseText));
-                    }
-                };
-
-                function onRequestRestore(event) {
-                  const query = new URLSearchParams(window.location.search)
-                  const config = [[${model}]]
-                  const payload = {
-                    fileName: query.get('fileName'),
-                    version: event.data.version,
-                    userId: config.editorConfig.user.id
-                  }
-                  const request = new XMLHttpRequest()
-                  request.open('PUT', 'restore')
-                  request.setRequestHeader('Content-Type', 'application/json')
-                  request.send(JSON.stringify(payload))
-                  request.onload = function () {
-                    if (request.status != 200) {
-                      response = JSON.parse(request.response)
-                      innerAlert(response.error)
-                      return
-                    }
-                    document.location.reload()
-                  }
-                }
-
                 config.width = "100%";
                 config.height = "100%";
                 config.events = {
                     "onAppReady": onAppReady,
                     "onDocumentStateChange": onDocumentStateChange,
+                    'onRequestEditRights': onRequestEditRights,
                     "onError": onError,
                     "onOutdatedVersion": onOutdatedVersion,
                     "onMakeActionLink": onMakeActionLink,
@@ -206,7 +173,6 @@
                     "onRequestInsertImage": onRequestInsertImage,
                     "onRequestCompareFile": onRequestCompareFile,
                     "onRequestMailMergeRecipients": onRequestMailMergeRecipients,
-                    "onRequestRestore": onRequestRestore
                 };
 
                 var histArray = [[${fileHistory}]];
@@ -245,9 +211,6 @@
                     };
                     // prevent file renaming for anonymous users
                     config.events['onRequestRename'] = onRequestRename;
-                    config.events['onRequestReferenceData'] = onRequestReferenceData;
-                    // prevent switch the document from the viewing into the editing mode for anonymous users
-                    config.events['onRequestEditRights'] = onRequestEditRights;
                 }
 
                 if (config.editorConfig.createUrl) {

web/documentserver-example/java-spring/src/main/resources/templates/index.html

@@ -333,8 +333,7 @@
         </div>
     </footer>
 
-    <script type="text/javascript" src="scripts/jquery-3.6.4.min.js"></script>
-    <script type="text/javascript" src="scripts/jquery-migrate-3.4.1.min.js"></script>
+    <script type="text/javascript" src="scripts/jquery-1.8.2.js"></script>
     <script type="text/javascript" src="scripts/jquery-ui.js"></script>
     <script type="text/javascript" src="scripts/jquery.blockUI.js"></script>
     <script type="text/javascript" src="scripts/jquery.iframe-transport.js"></script>

web/documentserver-example/java/3rd-Party.license

@@ -1,5 +1,9 @@
 ONLYOFFICE Applications example uses code from the following 3rd party projects:
 
+jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
+License:        MIT
+License File:   jQuery.license
+
 jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
 License:        MIT, GPL
 License File:   jQuery.BlockUI.license
@@ -12,14 +16,6 @@ jQuery.iframe-transport - jQuery Iframe Transport Plugin for File Upload (https:
 License:        MIT
 License File:   jQuery.iframe-transport.license
 
-jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
-License:        MIT
-License File:   jQuery.license
-
-jQuery.Migrate - Upgrading libraries such as jQuery can be a lot of work, when breaking changes have been introduced. jQuery Migrate makes this easier, by restoring the APIs that were removed, and additionally shows warnings in the browser console (development version of jQuery Migrate only) when removed and/or deprecated APIs are used. (https://github.com/jquery/jquery-migrate/blob/main/LICENSE.txt)
-License:        OpenJS
-License File:   jQuery.Migrate.license
-
 jQuery.UI     - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
 License:        MIT
 License File:   jQuery.UI.license

web/documentserver-example/java/licenses/3rd-Party.license

@@ -1,5 +1,9 @@
 ONLYOFFICE Applications example uses code from the following 3rd party projects:
 
+jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
+License:        MIT
+License File:   jQuery.license
+
 jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
 License:        MIT, GPL
 License File:   jQuery.BlockUI.license
@@ -12,14 +16,6 @@ jQuery.iframe-transport - jQuery Iframe Transport Plugin for File Upload (https:
 License:        MIT
 License File:   jQuery.iframe-transport.license
 
-jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
-License:        MIT
-License File:   jQuery.license
-
-jQuery.Migrate - Upgrading libraries such as jQuery can be a lot of work, when breaking changes have been introduced. jQuery Migrate makes this easier, by restoring the APIs that were removed, and additionally shows warnings in the browser console (development version of jQuery Migrate only) when removed and/or deprecated APIs are used. (https://github.com/jquery/jquery-migrate/blob/main/LICENSE.txt)
-License:        OpenJS
-License File:   jQuery.Migrate.license
-
 jQuery.UI     - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
 License:        MIT
 License File:   jQuery.UI.license

web/documentserver-example/java/licenses/jQuery.Migrate.license

@@ -1,36 +0,0 @@
-Copyright OpenJS Foundation and other contributors, https://openjsf.org/
-
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/jquery/jquery-migrate
-
-The following license applies to all parts of this software except as
-documented below:
-
-====
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-====
-
-All files located in the node_modules and external directories are
-externally maintained libraries used by this software which have their
-own licenses; we recommend you read them, as their terms may differ from
-the terms above.

web/documentserver-example/java/licenses/jQuery.license

@@ -1,4 +1,4 @@
-Copyright OpenJS Foundation and other contributors, https://openjsf.org/
+Copyright (c) 2009 John Resig, http://jquery.com/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

web/documentserver-example/java/src/main/java/controllers/IndexServlet.java

@@ -19,7 +19,6 @@
 package controllers;
 
 import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import entities.FileType;
 import entities.User;
 import helpers.ConfigManager;
@@ -48,7 +47,6 @@ import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -58,15 +56,14 @@ import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Scanner;
 
 import static utils.Constants.KILOBYTE_SIZE;
 
+
 @WebServlet(name = "IndexServlet", urlPatterns = {"/IndexServlet"})
 @MultipartConfig
 public class IndexServlet extends HttpServlet {
@@ -81,11 +78,6 @@ public class IndexServlet extends HttpServlet {
             return;
         }
 
-        // charset for response headers if upload or convert
-        if (action.matches("upload|convert")) {
-           response.setCharacterEncoding("UTF-8");
-        }
-
         DocumentManager.init(request, response);
 
         // create a variable to display information about the application and error messages
@@ -126,12 +118,6 @@ public class IndexServlet extends HttpServlet {
             case "rename":
                 rename(request, response, writer);
                 break;
-            case "reference":
-                reference(request, response, writer);
-                break;
-            case "restore":
-                restore(request, response, writer);
-                break;
             default:
                 break;
         }
@@ -276,18 +262,16 @@ public class IndexServlet extends HttpServlet {
             String fileUri = DocumentManager.getDownloadUrl(fileName, true);
             String fileExt = FileUtility.getFileExtension(fileName);
             FileType fileType = FileUtility.getFileType(fileName);
-            String internalFileExt = "ooxml";
+            String internalFileExt = DocumentManager.getInternalExtension(fileType);
 
             // check if the file with such an extension can be converted
             if (DocumentManager.getConvertExts().contains(fileExt)) {
                 // generate document key
                 String key = ServiceConverter.generateRevisionId(fileUri);
 
-                // get the url and file type to the converted file
-                Map<String, String> newFileData = ServiceConverter
-                        .getConvertedData(fileUri, fileExt, internalFileExt, key, filePass, true, lang);
-                String newFileUri = newFileData.get("fileUrl");
-                String newFileType = "." + newFileData.get("fileType");
+                // get the url to the converted file
+                String newFileUri = ServiceConverter
+                        .getConvertedUri(fileUri, fileExt, internalFileExt, key, filePass, true, lang);
 
                 if (newFileUri.isEmpty()) {
                     writer.write("{ \"step\" : \"0\", \"filename\" : \"" + fileName + "\"}");
@@ -297,7 +281,7 @@ public class IndexServlet extends HttpServlet {
                 /* get a file name of an internal file extension with an index if the file
                  with such a name already exists */
                 String correctName = DocumentManager.getCorrectName(FileUtility
-                                .getFileNameWithoutExtension(fileName) + newFileType, null);
+                                .getFileNameWithoutExtension(fileName) + internalFileExt, null);
 
                 URL url = new URL(newFileUri);
                 java.net.HttpURLConnection connection = (java.net.HttpURLConnection) url.openConnection();
@@ -321,9 +305,9 @@ public class IndexServlet extends HttpServlet {
 
                 connection.disconnect();
 
-                // remove source file
-                File sourceFile = new File(DocumentManager.storagePath(fileName, null));
-                sourceFile.delete();
+                // remove source file ?
+                // File sourceFile = new File(DocumentManager.StoragePath(fileName, null));
+                // sourceFile.delete();
 
                 fileName = correctName;
 
@@ -457,7 +441,7 @@ public class IndexServlet extends HttpServlet {
     private static void csv(final HttpServletRequest request,
                             final HttpServletResponse response,
                             final PrintWriter writer) {
-        String fileName = "assets/document-templates/sample/csv.csv";
+        String fileName = "assets/sample/csv.csv";
         URL fileUrl = Thread.currentThread().getContextClassLoader().getResource(fileName);
         Path filePath = null;
         try {
@@ -472,7 +456,7 @@ public class IndexServlet extends HttpServlet {
     private static void assets(final HttpServletRequest request,
                                final HttpServletResponse response,
                                final PrintWriter writer) {
-        String fileName = "assets/document-templates/sample/" + FileUtility.getFileName(request.getParameter("name"));
+        String fileName = "assets/sample/" + FileUtility.getFileName(request.getParameter("name"));
         URL fileUrl = Thread.currentThread().getContextClassLoader().getResource(fileName);
         Path filePath = null;
         try {
@@ -488,7 +472,7 @@ public class IndexServlet extends HttpServlet {
                                         final HttpServletResponse response,
                                         final PrintWriter writer) {
         try {
-            if (DocumentManager.tokenEnabled() && DocumentManager.tokenUseForRequest()) {
+            if (DocumentManager.tokenEnabled()) {
 
                 String documentJwtHeader = ConfigManager.getProperty("files.docservice.header");
 
@@ -533,8 +517,7 @@ public class IndexServlet extends HttpServlet {
             String userAddress = request.getParameter("userAddress");
             String isEmbedded = request.getParameter("dmode");
 
-            if (DocumentManager.tokenEnabled() && isEmbedded == null && userAddress != null
-                    && DocumentManager.tokenUseForRequest()) {
+            if (DocumentManager.tokenEnabled() && isEmbedded == null && userAddress != null) {
 
                 String documentJwtHeader = ConfigManager.getProperty("files.docservice.header");
 
@@ -650,180 +633,6 @@ public class IndexServlet extends HttpServlet {
         }
     }
 
-    // reference data
-    private static void reference(final HttpServletRequest request,
-                               final HttpServletResponse response,
-                               final PrintWriter writer) {
-        try {
-            Scanner scanner = new Scanner(request.getInputStream());
-            scanner.useDelimiter("\\A");
-            String bodyString = scanner.hasNext() ? scanner.next() : "";
-            scanner.close();
-
-            String fileKeyValue = "";
-            String userAddress = "";
-            String fileName = "";
-            boolean incorrectFileKey = false;
-
-            JSONParser parser = new JSONParser();
-            Gson gson = new GsonBuilder().disableHtmlEscaping().create();
-            JSONObject body = (JSONObject) parser.parse(bodyString);
-
-            if (body.containsKey("referenceData")) {
-                JSONObject referenceDataObj = (JSONObject) body.get("referenceData");
-                String instanceId = (String) referenceDataObj.get("instanceId");
-
-                if (instanceId.equals(DocumentManager.getServerUrl(false))) {
-                    try {
-                        JSONObject fileKey = (JSONObject) parser.parse((String) referenceDataObj.get("fileKey"));
-                        userAddress = (String) fileKey.get("userAddress");
-
-                        if (userAddress.equals(DocumentManager.curUserHostAddress(null))) {
-                            fileName = (String) fileKey.get("fileName");
-                        }
-                    } catch (Exception e) {
-                        incorrectFileKey = true; //data from DocEditor can give incorrect fileKey param in java Example
-                    }
-                }
-            }
-
-            if (fileName.equals("")) {
-                try {
-                    String path = (String) body.get("path");
-                    path = FileUtility.getFileName(path);
-                    File f = new File(DocumentManager.storagePath(path, null));
-                    if (f.exists()) {
-                        fileName = path;
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    writer.write("{ \"error\" : 1, \"message\" : \"" + e.getMessage() + "\"}");
-                }
-            }
-
-            if (fileName.equals("")) {
-                writer.write("{ \"error\": \"File not found\"}");
-                return;
-            }
-
-            boolean directUrl = (boolean) body.get("directUrl");
-
-            HashMap<String, Object> fileKey = new HashMap<>();
-            fileKey.put("fileName", fileName);
-            fileKey.put("userAddress", DocumentManager.curUserHostAddress(null));
-
-            HashMap<String, Object> referenceData = new HashMap<>();
-            referenceData.put("instanceId", DocumentManager.getServerUrl(false));
-            referenceData.put("fileKey", gson.toJson(fileKey));
-
-            HashMap<String, Object> data = new HashMap<>();
-            data.put("fileType", FileUtility.getFileExtension(fileName).replace(".", ""));
-            data.put("url", DocumentManager.getDownloadUrl(fileName, true));
-            data.put("directUrl", directUrl ? DocumentManager.getDownloadUrl(fileName, false) : null);
-            data.put("referenceData", referenceData);
-            data.put("path", fileName);
-
-            if (DocumentManager.tokenEnabled()) {
-                String token = DocumentManager.createToken(data);
-                data.put("token", token);
-            }
-            writer.write(gson.toJson(data));
-        } catch (Exception e) {
-            e.printStackTrace();
-            writer.write("{ \"error\" : 1, \"message\" : \"" + e.getMessage() + "\"}");
-        }
-    }
-
-    private static void restore(final HttpServletRequest request,
-                                final HttpServletResponse response,
-                                final PrintWriter writer) {
-        try {
-            Scanner scanner = new Scanner(request.getInputStream());
-            scanner.useDelimiter("\\A");
-            String bodyString = scanner.hasNext() ? scanner.next() : "";
-            scanner.close();
-
-            JSONParser parser = new JSONParser();
-            JSONObject body = (JSONObject) parser.parse(bodyString);
-
-            String sourceBasename = (String) body.get("fileName");
-            Integer version = ((Long) body.get("version")).intValue();
-            String userID = (String) body.get("userId");
-
-            String sourceStringFile = DocumentManager.storagePath(sourceBasename, null);
-            File sourceFile = new File(sourceStringFile);
-            Path sourcePathFile = sourceFile.toPath();
-            String historyDirectory = DocumentManager.historyDir(sourceStringFile);
-
-            Integer bumpedVersion = DocumentManager.getFileVersion(historyDirectory);
-            String bumpedVersionStringDirectory = DocumentManager.versionDir(historyDirectory, bumpedVersion);
-            File bumpedVersionDirectory = new File(bumpedVersionStringDirectory);
-            if (!bumpedVersionDirectory.exists()) {
-                bumpedVersionDirectory.mkdir();
-            }
-
-            Path bumpedKeyPathFile = Paths.get(bumpedVersionStringDirectory, "key.txt");
-            String bumpedKeyStringFile = bumpedKeyPathFile.toString();
-            File bumpedKeyFile = new File(bumpedKeyStringFile);
-            String bumpedKey = ServiceConverter.generateRevisionId(
-                DocumentManager.curUserHostAddress(null)
-                + "/"
-                + sourceBasename
-                + "/"
-                + Long.toString(sourceFile.lastModified())
-            );
-            FileWriter bumpedKeyFileWriter = new FileWriter(bumpedKeyFile);
-            bumpedKeyFileWriter.write(bumpedKey);
-            bumpedKeyFileWriter.close();
-
-            User user = Users.getUser(userID);
-
-            Path bumpedChangesPathFile = Paths.get(bumpedVersionStringDirectory, "changes.json");
-            String bumpedChangesStringFile = bumpedChangesPathFile.toString();
-            File bumpedChangesFile = new File(bumpedChangesStringFile);
-            JSONObject bumpedChangesUser = new JSONObject();
-            bumpedChangesUser.put("id", user.getId());
-            bumpedChangesUser.put("name", user.getName());
-            JSONObject bumpedChangesChangesItem = new JSONObject();
-            bumpedChangesChangesItem.put("created", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
-            bumpedChangesChangesItem.put("user", bumpedChangesUser);
-            JSONArray bumpedChangesChanges = new JSONArray();
-            bumpedChangesChanges.add(bumpedChangesChangesItem);
-            JSONObject bumpedChanges = new JSONObject();
-            bumpedChanges.put("serverVersion", null);
-            bumpedChanges.put("changes", bumpedChangesChanges);
-            String bumpedChangesContent = bumpedChanges.toJSONString();
-            FileWriter bumpedChangesFileWriter = new FileWriter(bumpedChangesFile);
-            bumpedChangesFileWriter.write(bumpedChangesContent);
-            bumpedChangesFileWriter.close();
-
-            String sourceExtension = FileUtility.getFileExtension(sourceBasename);
-            String previousBasename = "prev" + sourceExtension;
-
-            Path bumpedFile = Paths.get(bumpedVersionStringDirectory, previousBasename);
-            Files.move(sourcePathFile, bumpedFile);
-
-            String recoveryVersionStringDirectory = DocumentManager.versionDir(historyDirectory, version);
-            Path recoveryPathFile = Paths.get(recoveryVersionStringDirectory, previousBasename);
-            String recoveryStringFile = recoveryPathFile.toString();
-            FileInputStream recoveryStream = new FileInputStream(recoveryStringFile);
-            DocumentManager.createFile(sourcePathFile, recoveryStream);
-            recoveryStream.close();
-
-            JSONObject responseBody = new JSONObject();
-            responseBody.put("error", null);
-            responseBody.put("success", true);
-            String responseContent = responseBody.toJSONString();
-            writer.write(responseContent);
-        } catch (Exception error) {
-            error.printStackTrace();
-            JSONObject responseBody = new JSONObject();
-            responseBody.put("error", error.getMessage());
-            responseBody.put("success", false);
-            String responseContent = responseBody.toJSONString();
-            writer.write(responseContent);
-        }
-    }
 
     // process get request
     @Override
@@ -839,12 +648,6 @@ public class IndexServlet extends HttpServlet {
         processRequest(request, response);
     }
 
-    @Override
-    protected void doPut(final HttpServletRequest request,
-                          final HttpServletResponse response) throws ServletException, IOException {
-        processRequest(request, response);
-    }
-
     // get servlet information
     @Override
     public String getServletInfo() {

web/documentserver-example/java/src/main/java/entities/CommentGroups.java

@@ -21,18 +21,6 @@ package entities;
 import java.util.List;
 
 public class CommentGroups {
-    public List<String> getView() {
-        return view;
-    }
-
-    public List<String> getEdit() {
-        return edit;
-    }
-
-    public List<String> getRemove() {
-        return remove;
-    }
-
     private List<String> view;
     private List<String> edit;
     private List<String> remove;

web/documentserver-example/java/src/main/java/entities/FileModel.java

@@ -77,7 +77,6 @@ public class FileModel {
                         .lastModified())));
         document.setInfo(new Info());
         document.getInfo().setFavorite(user.getFavorite());
-        document.setReferenceData(new ReferenceData(fileName, DocumentManager.curUserHostAddress(null), user));
 
         String templatesImageUrl = DocumentManager.getTemplateImageUrl(FileUtility.getFileType(fileName));
         List<Map<String, String>> templates = new ArrayList<>();
@@ -124,26 +123,6 @@ public class FileModel {
         changeType(mode, type, user, fileName);
     }
 
-    public String getType() {
-        return type;
-    }
-
-    public String getMode() {
-        return mode;
-    }
-
-    public Document getDocument() {
-        return document;
-    }
-
-    public EditorConfig getEditorConfig() {
-        return editorConfig;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
     // change the document type
     public void changeType(final String modeParam, final String typeParam, final User user, final String fileName) {
         if (modeParam != null) {
@@ -323,7 +302,6 @@ public class FileModel {
         private String key;
         private Info info;
         private Permissions permissions;
-        private ReferenceData referenceData;
 
         public String getTitle() {
             return title;
@@ -349,10 +327,6 @@ public class FileModel {
             this.directUrl = directUrlParam;
         }
 
-        public String getFileType() {
-            return fileType;
-        }
-
         public void setFileType(final String fileTypeParam) {
             this.fileType = fileTypeParam;
         }
@@ -380,13 +354,6 @@ public class FileModel {
         public void setPermissions(final Permissions permissionsParam) {
             this.permissions = permissionsParam;
         }
-
-        public ReferenceData getReferenceData() {
-            return referenceData;
-        }
-        public void setReferenceData(final ReferenceData referenceDataParam) {
-            this.referenceData = referenceDataParam;
-        }
     }
 
     // the permissions parameters
@@ -404,7 +371,6 @@ public class FileModel {
         private final List<String> reviewGroups;
         private final CommentGroups commentGroups;
         private final List<String> userInfoGroups;
-        private final Boolean protect;
         //public Gson gson = new Gson();
 
         // defines what can be done with a document
@@ -425,115 +391,23 @@ public class FileModel {
             reviewGroups = user.getReviewGroups();
             commentGroups = user.getCommentGroups();
             userInfoGroups = user.getUserInfoGroups();
-            protect = !user.getDeniedPermissions().contains("protect");
-        }
-
-        public Boolean getComment() {
-            return comment;
-        }
-
-        public Boolean getCopy() {
-            return copy;
-        }
-
-        public Boolean getDownload() {
-            return download;
-        }
-
-        public Boolean getEdit() {
-            return edit;
-        }
-
-        public Boolean getPrint() {
-            return print;
-        }
-
-        public Boolean getFillForms() {
-            return fillForms;
-        }
-
-        public Boolean getModifyFilter() {
-            return modifyFilter;
-        }
-
-        public Boolean getModifyContentControl() {
-            return modifyContentControl;
-        }
-
-        public Boolean getReview() {
-            return review;
-        }
-
-        public Boolean getChat() {
-            return chat;
-        }
-
-        public List<String> getReviewGroups() {
-            return reviewGroups;
-        }
-
-        public CommentGroups getCommentGroups() {
-            return commentGroups;
-        }
-
-        public List<String> getUserInfoGroups() {
-            return userInfoGroups;
-        }
-
-        public Boolean getProtect() {
-            return protect;
         }
     }
 
-    public class ReferenceData {
-        private final String instanceId;
-        private final Map<String, String> fileKey;
-        public ReferenceData(final String fileName, final String curUserHostAddress, final User user) {
-            instanceId = DocumentManager.getServerUrl(true);
-            Map<String, String> fileKeyList = new HashMap<>();
-            if (!user.getId().equals("uid-0")) {
-                fileKeyList.put("fileName", fileName);
-                fileKeyList.put("userAddress", curUserHostAddress);
-            } else {
-                fileKeyList = null;
-            }
-            fileKey = fileKeyList;
-        }
-
-        public String getInstanceId() {
-            return instanceId;
-        }
-
-        public Map<String, String> getFileKey() {
-            return fileKey;
-        }
-    }
     // the Favorite icon state
     public class Info {
         private String owner = "Me";
         private Boolean favorite;
         private String uploaded = getDate();
 
-        public String getOwner() {
-            return owner;
-        }
-
-        public Boolean getFavorite() {
-            return favorite;
+        private String getDate() {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("EEE MMM dd yyyy", Locale.US);
+            return simpleDateFormat.format(new Date());
         }
 
         public void setFavorite(final Boolean favoriteParam) {
             this.favorite = favoriteParam;
         }
-
-        public String getUploaded() {
-            return uploaded;
-        }
-
-        private String getDate() {
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("EEE MMM dd yyyy", Locale.US);
-            return simpleDateFormat.format(new Date());
-        }
     }
     // the editor config parameters
     public class EditorConfig {
@@ -558,34 +432,6 @@ public class FileModel {
             customization = new Customization();
         }
 
-        public HashMap<String, Object> getActionLink() {
-            return actionLink;
-        }
-
-        public String getCallbackUrl() {
-            return callbackUrl;
-        }
-
-        public HashMap<String, Object> getCoEditing() {
-            return coEditing;
-        }
-
-        public String getLang() {
-            return lang;
-        }
-
-        public String getCreateUrl() {
-            return createUrl;
-        }
-
-        public List<Map<String, String>> getTemplates() {
-            return templates;
-        }
-
-        public Embedded getEmbedded() {
-            return embedded;
-        }
-
         // set parameters for the embedded document
         public void initDesktop(final String url) {
             embedded = new Embedded();
@@ -683,6 +529,10 @@ public class FileModel {
             private Boolean comments;
             private Boolean feedback;
 
+            public Goback getGoback() {
+                return goback;
+            }
+
             public void setSubmitForm(final Boolean submitFormParam) {
                 this.submitForm = submitFormParam;
             }
@@ -695,30 +545,6 @@ public class FileModel {
                 goback = new Goback();
             }
 
-            public Goback getGoback() {
-                return goback;
-            }
-
-            public Boolean getForcesave() {
-                return forcesave;
-            }
-
-            public Boolean getSubmitForm() {
-                return submitForm;
-            }
-
-            public Boolean getAbout() {
-                return about;
-            }
-
-            public Boolean getComments() {
-                return comments;
-            }
-
-            public Boolean getFeedback() {
-                return feedback;
-            }
-
             public class Goback {
                 private String url;
 
@@ -739,34 +565,18 @@ public class FileModel {
             private String shareUrl;
             private String toolbarDocked;
 
-            public String getSaveUrl() {
-                return saveUrl;
-            }
-
             public void setSaveUrl(final String saveUrlParam) {
                 this.saveUrl = saveUrlParam;
             }
 
-            public String getEmbedUrl() {
-                return embedUrl;
-            }
-
             public void setEmbedUrl(final String embedUrlParam) {
                 this.embedUrl = embedUrlParam;
             }
 
-            public String getShareUrl() {
-                return shareUrl;
-            }
-
             public void setShareUrl(final String shareUrlParam) {
                 this.shareUrl = shareUrlParam;
             }
 
-            public String getToolbarDocked() {
-                return toolbarDocked;
-            }
-
             public void setToolbarDocked(final String toolbarDockedParam) {
                 this.toolbarDocked = toolbarDockedParam;
             }

web/documentserver-example/java/src/main/java/helpers/DocumentManager.java

@@ -306,12 +306,7 @@ public final class DocumentManager {
         String demoName = (sample ? "sample." : "new.") + fileExt;
 
         // get the path to the sample document
-        String demoPath = "assets"
-            + File.separator
-            + "document-templates"
-            + File.separator
-            + (sample ? "sample" : "new")
-            + File.separator;
+        String demoPath = "assets" + File.separator + (sample ? "sample" : "new") + File.separator;
 
         // get a file name with an index if the file with such a name already exists
         String fileName = getCorrectName(demoName, null);
@@ -570,22 +565,11 @@ public final class DocumentManager {
         return secret != null && !secret.isEmpty();
     }
 
-    // check if the token is enabled for request
-    public static Boolean tokenUseForRequest() {
-        String tokenUseForRequest = getTokenUseForRequest();
-        return Boolean.parseBoolean(tokenUseForRequest) && !tokenUseForRequest.isEmpty();
-    }
-
     // get token secret from the config parameters
     public static String getTokenSecret() {
         return ConfigManager.getProperty("files.docservice.secret");
     }
 
-    // get config request jwt
-    public static String getTokenUseForRequest() {
-        return ConfigManager.getProperty("files.docservice.token-use-for-request");
-    }
-
     // get languages
     public static Map<String, String> getLanguages() {
         String langs = ConfigManager.getProperty("files.docservice.languages");