java-spring: https

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

@@ -1,31 +0,0 @@
-name: Artifact Csharp MVC
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [master]
-    paths: ['web/documentserver-example/csharp-mvc/**']
-  pull_request:
-    branches: [master]
-    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 MVC) Example'
-          rsync -av --exclude='deploy' ./ ./deploy/'DotNet (Csharp MVC) Example'
-          rm -rf ./deploy/'DotNet (Csharp MVC) Example'/assets/.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,30 +0,0 @@
-name: Artifact Csharp
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [master]
-    paths: ['web/documentserver-example/csharp/**']
-  pull_request:
-    branches: [master]
-    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 }}
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/csharp
-          mkdir -p ./deploy/'DotNet (Csharp) Example'
-          rsync -av --exclude='deploy' ./ ./deploy/'DotNet (Csharp) Example'
-          rm -rf ./deploy/'DotNet (Csharp) Example'/assets/.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,31 +0,0 @@
-name: Artifact Java
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [master]
-    paths: ['web/documentserver-example/java/**']
-  pull_request:
-    branches: [master]
-    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 }}
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/java
-          mkdir -p ./deploy/'Java Example'
-          rsync -av --exclude='deploy' ./ ./deploy/'Java Example'
-          rm -rf ./deploy/'Java Example'/src/main/resources/assets/document-formats/.git
-          rm -rf ./deploy/'Java Example'/src/main/resources/assets/document-templates/.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,31 +0,0 @@
-name: Artifact Nodejs
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [master]
-    paths: ['web/documentserver-example/nodejs/**']
-  pull_request:
-    branches: [master]
-    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 }}
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/nodejs
-          mkdir -p ./deploy/'Node.js Example'
-          rsync -av --exclude='deploy' ./ ./deploy/'Node.js Example'
-          rm -rf ./deploy/'Node.js Example'/public/assets/document-formats/.git
-          rm -rf ./deploy/'Node.js Example'/public/assets/document-templates/.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,31 +0,0 @@
-name: Artifact PHP
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [master]
-    paths: ['web/documentserver-example/php/**']
-  pull_request:
-    branches: [master]
-    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 }}
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/php
-          mkdir -p ./deploy/'PHP Example'
-          rsync -av --exclude='deploy' ./ ./deploy/'PHP Example'
-          rm -rf ./deploy/'PHP Example'/assets/document-formats/.git
-          rm -rf ./deploy/'PHP Example'/assets/document-templates/.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,31 +0,0 @@
-name: Artifact Python
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [master]
-    paths: ['web/documentserver-example/python/**']
-  pull_request:
-    branches: [master]
-    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 }}
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/python
-          mkdir -p ./deploy/'Python Example'
-          rsync -av --exclude='deploy' ./ ./deploy/'Python Example'
-          rm -rf ./deploy/'Python Example'/assets/document-formats/.git
-          rm -rf ./deploy/'Python Example'/assets/document-templates/.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,31 +0,0 @@
-name: Artifact Ruby
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [master]
-    paths: ['web/documentserver-example/ruby/**']
-  pull_request:
-    branches: [master]
-    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 }}
-          git submodule update --init --recursive
-          cd ./web/documentserver-example/ruby
-          mkdir -p ./deploy/'Ruby Example'
-          rsync -av --exclude='deploy' ./ ./deploy/'Ruby Example'
-          rm -rf ./deploy/'Ruby Example'/public/assets/document-formats/.git
-          rm -rf ./deploy/'Ruby Example'/public/assets/document-templates/.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,32 +0,0 @@
-name: Artifact Java Spring
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [master]
-    paths: ['web/documentserver-example/java-spring/**']
-  pull_request:
-    branches: [master]
-    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'
-          rm -rf ./deploy/'Java Spring Example'/src/main/resources/assets/document-formats/.git
-          rm -rf ./deploy/'Java Spring Example'/src/main/resources/assets/document-templates/.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:
@@ -21,17 +21,20 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.11' 
+          python-version: '3.10' 
 
       - name: Install Dependencies
         run: |
-          make dev
+          python -m pip install --upgrade pip
+          pip install flake8
+          pip install pylint
+          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
 
       - name: Lint Flake8
         run: |
-          make lint
-
-      # TODO: Configure mypy
-      # - name: Types mypy
-      #   run: |
-      #     make types
+          flake8 ./**/*.py --count --select=E9,F63,F7,F82 --show-source --statistics
+          flake8 ./**/*.py --count --max-complexity=10 --max-line-length=79 --statistics
+          
+      - name: Lint Pylint
+        run: |
+          pylint ./**/*.py

.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:
@@ -16,22 +16,16 @@ jobs:
       run:
         working-directory: ./web/documentserver-example/ruby
     steps:
-    - name: Checkout Repository
-      uses: actions/checkout@v3
-
-    - name: Setup Ruby
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: '3.2.2'
-
-    - name: Update Submodules
-      run: |
-        git submodule update --init --recursive
-
-    - name: Install Dependencies
-      run: |
-        bundle update
-
-    - name: Rubocop
-      run: |
-        bundle exec rubocop
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0'
+          bundler-cache: true
+      - name: Install dependencies
+        run: | 
+          bundle install
+      - name: Rubocop
+        run: |
+          gem install rubocop
+          rubocop

.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,123 +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: Clone Submodules
-        run: |
-          cd ${{ github.workspace }}
-          git submodule update --init --recursive
-      - 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 }}
-          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
-      - name: Build Csharp Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cd ./web/documentserver-example/csharp
-          mkdir -p ./'DotNet (Csharp) Example'
-          rsync -av --exclude='DotNet (Csharp) Example' ./ ./'DotNet (Csharp) Example'
-          rm -rf ./'DotNet (Csharp) Example'/assets/.git
-      - name: Build Java Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cd ./web/documentserver-example/java
-          mkdir -p ./'Java Example'
-          rsync -av --exclude='Java Example' ./ ./'Java Example'
-          rm -rf ./'Java Example'/src/main/resources/assets/document-formats/.git
-          rm -rf ./'Java Example'/src/main/resources/assets/document-templates/.git
-      - name: Build Nodejs Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cd ./web/documentserver-example/nodejs
-          mkdir -p ./'Node.js Example'
-          rsync -av --exclude='Node.js Example' ./ ./'Node.js Example'
-          rm -rf ./'Node.js Example'/public/assets/document-formats/.git
-          rm -rf ./'Node.js Example'/public/assets/document-templates/.git
-      - name: Build PHP Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cd ./web/documentserver-example/php
-          mkdir -p ./'PHP Example'
-          rsync -av --exclude='PHP Example' ./ ./'PHP Example'
-          rm -rf ./'PHP Example'/assets/document-formats/.git
-          rm -rf ./'PHP Example'/assets/document-templates/.git
-      - name: Build Python Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cd ./web/documentserver-example/python
-          mkdir -p ./'Python Example'
-          rsync -av --exclude='Python Example' ./ ./'Python Example'
-          rm -rf ./'Python Example'/assets/document-formats/.git
-          rm -rf ./'Python Example'/assets/document-templates/.git
-      - name: Build Ruby Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cd ./web/documentserver-example/ruby
-          mkdir -p ./'Ruby Example'
-          rsync -av --exclude='Ruby Example' ./ ./'Ruby Example'
-          rm -rf ./'Ruby Example'/public/assets/document-formats/.git
-          rm -rf ./'Ruby Example'/public/assets/document-templates/.git
-      - name: Build Spring Artifact
-        run: |
-          cd ${{ github.workspace }}
-          cd ./web/documentserver-example/java-spring
-          mkdir -p ./'Java Spring Example'
-          rsync -av --exclude='Java Spring Example' ./ ./'Java Spring Example'
-          rm -rf ./'Java Spring Example'/src/main/resources/assets/document-formats/.git
-          rm -rf ./'Java Spring Example'/src/main/resources/assets/document-templates/.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,62 +1,32 @@
-[submodule "web/documentserver-example/nodejs/public/assets/document-templates"]
-	path = web/documentserver-example/nodejs/public/assets/document-templates
+[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/nodejs/public/assets/document-formats"]
-	path = web/documentserver-example/nodejs/public/assets/document-formats
-	url = https://github.com/ONLYOFFICE/document-formats
-	branch = feature/v8.0
-[submodule "web/documentserver-example/csharp-mvc/assets/document-templates"]
-	path = web/documentserver-example/csharp-mvc/assets/document-templates
+[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/csharp-mvc/assets/document-formats"]
-	path = web/documentserver-example/csharp-mvc/assets/document-formats
-	url = https://github.com/ONLYOFFICE/document-formats
-[submodule "web/documentserver-example/php/assets/document-templates"]
-	path = web/documentserver-example/php/assets/document-templates
+[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/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
+[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/java/src/main/resources/assets/document-templates"]
-	path = web/documentserver-example/java/src/main/resources/assets/document-templates
+[submodule "web/documentserver-example/csharp-mvc/assets"]
+	path = web/documentserver-example/csharp-mvc/assets
 	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
+[submodule "web/documentserver-example/csharp/assets"]
+	path = web/documentserver-example/csharp/assets
 	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
+[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/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
-[submodule "web/documentserver-example/java/src/main/resources/assets/document-formats"]
-	path = web/documentserver-example/java/src/main/resources/assets/document-formats
-	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
-[submodule "web/documentserver-example/java-spring/src/main/resources/assets/document-formats"]
-	path = web/documentserver-example/java-spring/src/main/resources/assets/document-formats
-	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
-[submodule "web/documentserver-example/csharp/assets/document-templates"]
-	path = web/documentserver-example/csharp/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/csharp/assets/document-formats"]
-	path = web/documentserver-example/csharp/assets/document-formats
-	url = https://github.com/ONLYOFFICE/document-formats

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
@@ -113,24 +89,12 @@ Prime JWT     - is intended to be fast and easy to use. Prime JWT has a single e
 License:        Apache 2.0
 License File:   prime-jwt.license
 
-Project Lombok - Spice up your java: Automatic Resource Management, automatic generation of getters, setters, equals, hashCode and toString, and more! (https://projectlombok.org/LICENSE)
-License:        MIT
-License File:   lombok.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
@@ -144,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
@@ -188,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
 
@@ -223,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
@@ -235,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
@@ -272,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
@@ -287,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
@@ -307,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
 
@@ -393,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
@@ -413,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
@@ -429,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
@@ -449,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,58 +1,6 @@
 # Change Log
 
-- nodejs: pdf, djvu, xps, oxps as pdf documentType
-- nodejs: filling pdf
-- version number to page meta
-- ar skin languages
-- sr-Latn-CS skin languages
-- getting history via api
-- using a repo with a list of formats
-- convert after uploading only tagged formats
-- link in referenceData
-- setUsers for region protection
-- onRequestOpen method
-- user avatar
-- trimming long name of uploading file
-- onRequestSelectDocument method
-- onRequestSelectSpreadsheet method
-- key in referenceData
-- restore from history
-
-## 1.7.0
-- nodejs: onRequestSelectDocument method
-- nodejs: onRequestSelectSpreadsheet method
-- nodejs: onRequestOpen
-- nodejs: submitForm
-- nodejs: key in referenceData
-- nodejs: change reference source
-- 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
-- php: using a repo with a list of formats
-- php: restore from history
-- python: restore from history
-- ruby: 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

Readme.md

@@ -11,10 +11,8 @@ You should change `http://documentserver` to your server address in these files:
 * [.Net (C# MVC)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/csharp-mvc) - `web/documentserver-example/csharp-mvc/web.appsettings.config`
 * [.Net (C#)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/csharp) - `web/documentserver-example/csharp/settings.config`
 * [Java](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/java) - `web/documentserver-example/java/src/main/resources/settings.properties`
-* [Java Spring](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/java-spring) - `web/documentserver-example/java-spring/src/main/resources/application.properties`
 * [Node.js](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/nodejs) - `web/documentserver-example/nodejs/config/default.json`
-* [PHP](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/php) - `web/documentserver-example/php/config.json`
-* [Python](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/python) - `web/documentserver-example/python/config.py`
+* [PHP](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/php) - `web/documentserver-example/php/config.php`
 * [Ruby](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/ruby) - `web/documentserver-example/ruby/config/application.rb`
 
 More information on how to use these examples can be found here: [http://api.onlyoffice.com/editors/demopreview](http://api.onlyoffice.com/editors/demopreview "http://api.onlyoffice.com/editors/demopreview")

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/images/file_docx.svg

@@ -1 +1,8 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#1E7AAA"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path d="M6 15h18v1H6v-1zM6 19h18v1H6v-1zM6 23h18v1H6v-1zM6 27h18v1H6v-1z" fill="#fff"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H21.674C22.4697 0 23.2327 0.316071 23.7953 0.87868L29.1213 6.20465C29.6839 6.76726 30 7.53032 30 8.32597V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#3779A6"/>
+<path d="M22.9167 0L30.0001 7.08333H25.9167C24.2599 7.08333 22.9167 5.74019 22.9167 4.08333V0Z" fill="#1D5880"/>
+<path d="M6.17627 14.7059H23.8233V15.8823H6.17627V14.7059Z" fill="white"/>
+<path d="M6.17627 18.5294H23.8233V19.7059H6.17627V18.5294Z" fill="white"/>
+<path d="M6.17627 22.3529H23.8233V23.5294H6.17627V22.3529Z" fill="white"/>
+<path d="M6.17627 26.1765H23.8233V27.3529H6.17627V26.1765Z" fill="white"/>
+</svg>

web/documentserver-example/csharp-mvc/Content/images/file_docxf.svg

@@ -1 +1,6 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#27ABA3"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#008078"/><path fill-rule="evenodd" clip-rule="evenodd" d="M24 14H6v7h18v-7zm-.8182 5.9978H6.81818V15H23.1818v4.9978zM24 23H6v7h18v-7zm-.8182 5.9978H6.81818V24H23.1818v4.9978z" fill="#fff"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>

web/documentserver-example/csharp-mvc/Content/images/file_pptx.svg

@@ -1 +1,8 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#F36700"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path stroke="#fff" stroke-opacity=".95" d="M6.5 15.5h17v12h-17z"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#F36700"/>
+<path d="M22.9167 0L30.0001 7.08333H25.9168C24.2599 7.08333 22.9167 5.74019 22.9167 4.08333V0Z" fill="#AB531F"/>
+<path d="M6.17627 16.1275H23.8233V17.3039H6.17627V16.1275Z" fill="white"/>
+<path d="M6.17627 28.7745L6.17627 16.1275L7.35274 16.1275L7.35274 28.7745H6.17627Z" fill="white"/>
+<path d="M23.8233 16.1275V28.7745H22.6469V16.1275L23.8233 16.1275Z" fill="white"/>
+<path d="M6.17627 27.598H23.8233V28.7745H6.17627L6.17627 27.598Z" fill="white"/>
+</svg>

web/documentserver-example/csharp-mvc/Content/images/file_upload.svg

@@ -1 +1,6 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#D0D5DA"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#646464"/><path fill-rule="evenodd" clip-rule="evenodd" d="M7.5 23c-.27614 0-.5.2239-.5.5v4c0 .2761.22386.5.5.5h15c.2761 0 .5-.2239.5-.5v-4c0-.2761-.2239-.5-.5-.5h-2c-.2761 0-.5-.2239-.5-.5s.2239-.5.5-.5h2c.8284 0 1.5.6716 1.5 1.5v4c0 .8284-.6716 1.5-1.5 1.5h-15c-.82843 0-1.5-.6716-1.5-1.5v-4c0-.8284.67157-1.5 1.5-1.5h2c.27614 0 .5.2239.5.5s-.22386.5-.5.5h-2z" fill="#646464"/><path fill-rule="evenodd" clip-rule="evenodd" d="M20 20.0001L15 14l-5 6.0001h3v4c0 .5523.4477 1 1 1h2c.5523 0 1-.4477 1-1v-4h3z" fill="#646464"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30 7.44186L22 0H3C1.22739 0 0 0.822551 0 2.32558V37.2093C0 38.7123 1.22739 40 3 40H27C28.7726 40 30 38.7123 30 37.2093V7.44186Z" fill="#D0D5DA"/>
+<path d="M24.1042 7.27273H29.9631L22 0V5.32334C22 6.4105 22.949 7.27273 24.1042 7.27273Z" fill="#646464"/>
+<path d="M16.9562 22.3485H12.9746V17.803H10.9839L14.9654 14.1667L18.947 17.803H16.9562V22.3485Z" fill="#646464"/>
+<path d="M20.9378 23.7121C20.9378 24.1666 20.4401 24.6212 19.9424 24.6212H9.98848C9.49078 24.6212 8.99309 24.1666 8.99309 23.7121V22.3485C8.99309 21.8939 9.49078 21.4394 9.98848 21.4394H10.9839V20.0757H9.49078C8.49539 20.0757 7.5 20.9848 7.5 21.8939V24.1666C7.5 25.0757 8.61982 25.9848 9.49078 25.9848H20.4401C21.3111 25.9848 22.4309 25.0757 22.4309 24.1666V21.8939C22.4309 20.9848 21.4355 20.0757 20.4401 20.0757H18.947V21.4394H19.9424C20.4401 21.4394 20.9378 21.8939 20.9378 22.3485V23.7121Z" fill="#646464"/>
+</svg>

web/documentserver-example/csharp-mvc/Content/images/file_xlsx.svg

@@ -1 +1,12 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#6AAA1E"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path fill-rule="evenodd" clip-rule="evenodd" d="M6 15h18v13H7.00001v-1H12v-3H7v4H6V15zm7 12h4v-3h-4v3zm5 0h5v-3h-5v3zm5-7v3h-5v-3h5zm-6 0v3h-4v-3h4zm-5 0v3H7v-3h5zm11-1v-3h-5v3h5zm-10-3h4v3h-4v-3zm-1 3v-3H7v3h5z" fill="#fff" fill-opacity=".95"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#78A73B"/>
+<path d="M22.9167 0L30.0001 7.08333H25.9168C24.2599 7.08333 22.9167 5.74019 22.9167 4.08333V0Z" fill="#5A7D2B"/>
+<path d="M6.17644 15.2941H23.8235V16.4706H6.17644V15.2941Z" fill="white"/>
+<path d="M6.17644 19.1177H23.8235V20.2941H6.17644V19.1177Z" fill="white"/>
+<path d="M6.17644 22.9412H23.8235V24.1177H6.17644V22.9412Z" fill="white"/>
+<path d="M6.17644 26.7647H23.8235V27.9412H6.17644V26.7647Z" fill="white"/>
+<path d="M5.88232 27.9412L5.88232 15.2941L7.0588 15.2941L7.0588 27.9412H5.88232Z" fill="white"/>
+<path d="M11.4706 27.9412L11.4706 15.2941L12.647 15.2941V27.9412H11.4706Z" fill="white"/>
+<path d="M17.0588 27.9412L17.0588 15.2941L18.2353 15.2941V27.9412H17.0588Z" fill="white"/>
+<path d="M22.647 27.9412V15.2941H23.8235V27.9412H22.647Z" fill="white"/>
+</svg>

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

@@ -31,12 +31,6 @@ namespace OnlineEditorsExampleMVC.Helpers
 {
     public class DocManagerHelper
     {
-        //get server version
-        public static string GetVersion()
-        {
-            return WebConfigurationManager.AppSettings["version"];
-        }
-
         // get max file size
         public static long MaxFileSize
         {
@@ -57,24 +51,24 @@ namespace OnlineEditorsExampleMVC.Helpers
         // get file extensions that can be viewed
         public static List<string> ViewedExts
         {
-            get { return FormatManager.ViewableExtensions(); }
+            get { return (WebConfigurationManager.AppSettings["files.docservice.viewed-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
         }
 
         public static List<string> FillFormExts
         {
-            get { return FormatManager.FillableExtensions(); }
+            get { return (WebConfigurationManager.AppSettings["files.docservice.fillform-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
         }
 
         // get file extensions that can be edited
         public static List<string> EditedExts
         {
-            get { return FormatManager.EditableExtensions(); }
+            get { return (WebConfigurationManager.AppSettings["files.docservice.edited-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
         }
 
         // get file extensions that can be converted
         public static List<string> ConvertExts
         {
-            get { return FormatManager.ConvertibleExtensions(); }
+            get { return (WebConfigurationManager.AppSettings["files.docservice.convert-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
         }
 
         // get current user host address
@@ -183,12 +177,7 @@ namespace OnlineEditorsExampleMVC.Helpers
         // get a file name with an index if the file with such a name already exists
         public static string GetCorrectName(string fileName, string userAddress = null)
         {
-            int maxName;
-            int.TryParse(WebConfigurationManager.AppSettings["filename-max"], out maxName);
             var baseName = Path.GetFileNameWithoutExtension(fileName);
-            if (baseName.Length > maxName){
-                baseName = baseName.Substring(0, maxName) + "[...]";
-            }
             var ext = Path.GetExtension(fileName).ToLower();
             var name = baseName + ext;
 
@@ -226,12 +215,11 @@ namespace OnlineEditorsExampleMVC.Helpers
         public static string CreateDemo(string fileExt, bool withContent)
         {
             var demoName = (withContent ? "sample." : "new.") + fileExt;  // create sample or new template file with the necessary extension
-            var demoPath = "assets\\document-templates\\" + (withContent ? "sample\\" : "new\\");  // get the path to the sample document
+            var demoPath = "assets\\" + (withContent ? "sample\\" : "new\\");  // get the path to the sample document
 
             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;
@@ -256,22 +254,6 @@ namespace OnlineEditorsExampleMVC.Helpers
                     var action = jss.Deserialize<Dictionary<string, object>>(jss.Serialize(actions[0]));
                     var user = action["userid"].ToString();  // get the user id
                     DocManagerHelper.CreateMeta(fileName, user, "Filling Form", userAddress);  // create meta data for the forcesaved file
-
-                    string formsDataUrl = fileData["formsdataurl"].ToString();
-
-                    if (!string.IsNullOrEmpty(formsDataUrl))
-                    {
-                        string formsName = DocManagerHelper.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + ".txt", userAddress);
-                        string formsPath = DocManagerHelper.StoragePath(formsName, userAddress);
-
-                        var bytesForms = DownloadFile(formsDataUrl);
-
-                        SaveFile(bytesForms, formsPath);
-                    }
-                    else
-                    {
-                        throw new Exception("Document editing service did not return formsDataUrl");
-                    }
                 }
             } catch (Exception)
             {
@@ -303,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

@@ -31,9 +31,7 @@ namespace OnlineEditorsExampleMVC.Helpers
             "Can perform all actions with comments",
             "The file favorite state is undefined",
             "Can create files from templates using data from the editor",
-            "Can see the information about all users",
-            "Has an avatar",
-            "Can submit forms"
+            "Can see the information about all users"
         };
 
         static List<string> descr_user_2 = new List<string>()
@@ -43,9 +41,7 @@ namespace OnlineEditorsExampleMVC.Helpers
             "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only",
             "This file is marked as favorite",
             "Can create new files from the editor",
-            "Can see the information about users from Group2 and users who don’t belong to any group",
-            "Has an avatar",
-            "Can’t submit forms"
+            "Can see the information about users from Group2 and users who don’t belong to any group"
         };
 
         static List<string> descr_user_3 = new List<string>()
@@ -58,8 +54,7 @@ namespace OnlineEditorsExampleMVC.Helpers
             "Can’t download the file",
             "Can’t print the file",
             "Can create new files from the editor",
-            "Can see the information about Group2 users",
-            "Can’t submit forms"
+            "Can see the information about Group2 users"
         };
 
         static List<string> descr_user_0 = new List<string>()
@@ -74,9 +69,7 @@ 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",
-            "Can’t submit forms"
         };
 
         private static List<User> users = new List<User>() {
@@ -91,7 +84,6 @@ namespace OnlineEditorsExampleMVC.Helpers
                     null,
                     new List<string>(),
                     descr_user_1,
-                    true,
                     true
                 ),
             new User(
@@ -110,13 +102,12 @@ namespace OnlineEditorsExampleMVC.Helpers
                     true,
                     new List<string>(),
                     descr_user_2,
-                    false,
-                    true
+                    false
                 ),
             new User(
                     "uid-3",
                     "Hamish Mitchell",
-                    null,
+                    "mitchell@example.com",
                     "group-3",
                     new List<string>() { "group-2" },
                     new Dictionary<string,object>()
@@ -129,7 +120,6 @@ namespace OnlineEditorsExampleMVC.Helpers
                     false,
                     new List<string>() { "copy", "download", "print" },
                     descr_user_3,
-                    false,
                     false
                 ),
             new User(
@@ -141,9 +131,8 @@ namespace OnlineEditorsExampleMVC.Helpers
                     new Dictionary<string,object>(),
                     new List<string>(),
                     null,
-                    new List<string>() { "protect" },
+                    new List<string>(),
                     descr_user_0,
-                    false,
                     false
                 )
         };
@@ -181,43 +170,6 @@ namespace OnlineEditorsExampleMVC.Helpers
             }
             return usersData;
         }
-
-        public static List<Dictionary<string, object>> getUsersInfo(string id)
-        {
-            List<Dictionary<string, object>> usersData = new List<Dictionary<string, object>>();
-            if (id != "uid-0") {
-                foreach (User user in users)
-                {
-                    usersData.Add(new Dictionary<string, object>()
-                        {
-                            {"id", user.id},
-                            {"name", user.name },
-                            {"email", user.email },
-                            {"image", user.avatar ? DocManagerHelper.GetServerUrl(false) + "/Content/images/" + user.id + ".png" : null}
-                        });
-                }
-            }
-            return usersData;
-        }
-
-        // get a list of users with their names and emails for protect
-        public static List<Dictionary<string, object>> getUsersForProtect(string id)
-        {
-            List<Dictionary<string, object>> usersData = new List<Dictionary<string, object>>();
-            foreach (User user in users)
-            {
-                if (!user.id.Equals(id) && user.name != null)
-                {
-                    usersData.Add(new Dictionary<string, object>()
-                    {
-                        {"name", user.name },
-                        {"email", user.email },
-                        {"id", user.id}
-                    });
-                }
-            }
-            return usersData;
-        }
     }
 
     public class User
@@ -233,9 +185,8 @@ namespace OnlineEditorsExampleMVC.Helpers
         public List<string> descriptions;
         public bool templates;
         public List<string> userInfoGroups;
-        public bool avatar;
 
-        public User(string id, string name, string email, string group, List<string> reviewGroups, Dictionary<string, object> commentGroups, List<string> userInfoGroups, bool? favorite, List<string> deniedPermissions, List<string> descriptions, bool templates, bool avatar)
+        public User(string id, string name, string email, string group, List<string> reviewGroups, Dictionary<string, object> commentGroups, List<string> userInfoGroups, bool? favorite, List<string> deniedPermissions, List<string> descriptions, bool templates)
         {
             this.id = id;
             this.name = name;
@@ -248,7 +199,6 @@ namespace OnlineEditorsExampleMVC.Helpers
             this.descriptions = descriptions;
             this.templates = templates;
             this.userInfoGroups = userInfoGroups;
-            this.avatar = avatar;
         }
     }
 }

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;
@@ -88,7 +89,7 @@ namespace OnlineEditorsExampleMVC.Models
                 editorsMode = "fillForms";
                 canEdit = true;
             }
-            var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1");  // check if the Submit form button is displayed or not
+            var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1") && false;  // check if the Submit form button is displayed or not
             var mode = canEdit && editorsMode != "view" ? "edit" : "view";  // set the mode parameter: change it to view if the document can't be edited
 
             // favorite icon state
@@ -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 }
                                         }
                                 }
                             }
@@ -190,8 +179,7 @@ namespace OnlineEditorsExampleMVC.Models
                                         {
                                             { "id", !user.id.Equals("uid-0") ? user.id : null  },
                                             { "name", user.name },
-                                            { "group", user.group },
-                                            { "image", user.avatar ? DocManagerHelper.GetServerUrl(false) + "/Content/images/" + user.id + ".png" : null}
+                                            { "group", user.group }
                                         }
                                 },
                                 {
@@ -236,8 +224,125 @@ 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 GetDocumentData(out string compareConfig)
+        public void GetCompareFileData(out string compareConfig)
         {
             var jss = new JavaScriptSerializer();
 
@@ -321,7 +426,7 @@ namespace OnlineEditorsExampleMVC.Models
         }
 
         // get a mail merge config
-        public void GetSpreadsheetConfig(out string dataSpreadsheet)
+        public void GetMailMergeConfig(out string dataMailMergeRecipients)
         {
             var jss = new JavaScriptSerializer();
 
@@ -362,7 +467,7 @@ namespace OnlineEditorsExampleMVC.Models
                 mailMergeConfig.Add("token", mailmergeToken);  // and add it to the mail merge config
             }
 
-            dataSpreadsheet = jss.Serialize(mailMergeConfig);
+            dataMailMergeRecipients = jss.Serialize(mailMergeConfig);
         }
 
         //get a users for mentions
@@ -373,22 +478,5 @@ namespace OnlineEditorsExampleMVC.Models
             var user = Users.getUser(id);
             usersForMentions = !user.id.Equals("uid-0") ? jss.Serialize(Users.getUsersForMentions(user.id)) : null;
         }
-
-        public void GetUsersInfo(HttpRequest request, out string usersInfo)
-        {
-            var jss = new JavaScriptSerializer();
-            var id = request.Cookies.GetOrDefault("uid", null);
-            var user = Users.getUser(id);
-            usersInfo = jss.Serialize(Users.getUsersInfo(user.id));
-        }
-
-        //get a users for protect
-        public void GetUsersProtect(HttpRequest request, out string usersForProtect)
-        {
-            var jss = new JavaScriptSerializer();
-            var id = request.Cookies.GetOrDefault("uid", null);
-            var user = Users.getUser(id);
-            usersForProtect = !user.id.Equals("uid-0") ? jss.Serialize(Users.getUsersForProtect(user.id)) : null;
-        }
     }
 }

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

@@ -16,13 +16,8 @@
  *
  */
 
-using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
 using System.IO;
-using static OnlineEditorsExampleMVC.Models.FileUtility;
-using System.Linq;
-using System.Text;
 
 namespace OnlineEditorsExampleMVC.Models
 {
@@ -40,176 +35,38 @@ namespace OnlineEditorsExampleMVC.Models
         {
             var ext = Path.GetExtension(fileName).ToLower();
 
-            if (FormatManager.DocumentExtensions().Contains(ext)) return FileType.Word;  // word type for document extensions
-            if (FormatManager.SpreadsheetExtensions().Contains(ext)) return FileType.Cell;  // cell type for spreadsheet extensions
-            if (FormatManager.PresentationExtensions().Contains(ext)) return FileType.Slide;  // slide type for presentation extensions
+            if (ExtsDocument.Contains(ext)) return FileType.Word;  // word type for document extensions
+            if (ExtsSpreadsheet.Contains(ext)) return FileType.Cell;  // cell type for spreadsheet extensions
+            if (ExtsPresentation.Contains(ext)) return FileType.Slide;  // slide type for presentation extensions
 
             return FileType.Word;  // the default type is word
         }
-    }
 
-    public class Format
-    {
-        public string Name { get; }
-        public FileType Type { get; }
-        public List<string> Actions { get; }
-        public List<string> Convert { get; }
-        public List<string> Mime { get; }
-
-        public Format(string name, FileType type, List<string> actions, List<string> convert, List<string> mime)
-        {
-            Name = name;
-            Type = type;
-            Actions = actions;
-            Convert = convert;
-            Mime = mime;
-        }
-
-        public string Extension()
-        {
-            return "." + Name;
-        }
-    }
-
-    public static class FormatManager
-    {
-        private static List<Format> cachedFormats;
-        public static List<string> FillableExtensions()
-        {
-            return Fillable()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Fillable()
-        {
-            return All()
-                .Where(format => format.Actions.Contains("fill"))
-                .ToList();
-        }
-
-        public static List<string> ViewableExtensions()
-        {
-            return Viewable()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Viewable()
-        {
-            return All()
-                .Where(format => format.Actions.Contains("view"))
-                .ToList();
-        }
-
-        public static List<string> EditableExtensions()
-        {
-            return Editable()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Editable()
-        {
-            return All()
-                .Where(format => format.Actions.Contains("edit") || format.Actions.Contains("lossy-edit"))
-                .ToList();
-        }
-
-        public static List<string> ConvertibleExtensions()
-        {
-            return Convertible()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Convertible()
-        {
-            return All()
-                .Where(format => format.Actions.Contains("auto-convert"))
-                .ToList();
-        }
-
-        public static List<string> SpreadsheetExtensions()
-        {
-            return Spreadsheets()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Spreadsheets()
-        {
-            return All()
-                .Where(format => format.Type == FileType.Cell)
-                .ToList();
-        }
-
-        public static List<string> PresentationExtensions()
-        {
-            return Presentations()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Presentations()
-        {
-            return All()
-                .Where(format => format.Type == FileType.Slide)
-                .ToList();
-        }
-
-        public static List<string> DocumentExtensions()
-        {
-            return Documents()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Documents()
-        {
-            return All()
-                .Where(format => format.Type == FileType.Word)
-                .ToList();
-        }
-
-        public static List<string> AllExtensions()
-        {
-            return All()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> All()
-        {
-            if (cachedFormats == null)
+        // document extensions
+        public static readonly List<string> ExtsDocument = new List<string>
             {
-                var path = GetPath();
-                var lines = File.ReadLines(path, Encoding.UTF8);
-                var contents = string.Join(Environment.NewLine, lines);
-                var formats = JsonConvert.DeserializeObject<Format[]>(contents);
-                cachedFormats = formats.ToList();
-            }
+                ".doc", ".docx", ".docm",
+                ".dot", ".dotx", ".dotm",
+                ".odt", ".fodt", ".ott", ".rtf", ".txt",
+                ".html", ".htm", ".mht", ".xml",
+                ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps", ".oform"
+            };
 
-            return cachedFormats;
-        }
-
-        private static string GetPath()
-        {
-            string path = Path.Combine(GetDirectory(), "onlyoffice-docs-formats.json");
-            if (File.Exists(path))
+        // spreadsheet extensions
+        public static readonly List<string> ExtsSpreadsheet = new List<string>
             {
-                return path;
-            }
-            else
-            {
-                throw new FileNotFoundException("The JSON file does not exist.");
-            }
-        }
+                ".xls", ".xlsx", ".xlsm", ".xlsb",
+                ".xlt", ".xltx", ".xltm",
+                ".ods", ".fods", ".ots", ".csv"
+            };
 
-        private static string GetDirectory()
-        {
-            string directory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets", "document-formats");
-            return Path.GetFullPath(directory);
-        }
+        // presentation extensions
+        public static readonly List<string> ExtsPresentation = new List<string>
+            {
+                ".pps", ".ppsx", ".ppsm",
+                ".ppt", ".pptx", ".pptm",
+                ".pot", ".potx", ".potm",
+                ".odp", ".fodp", ".otp"
+            };
     }
 }

web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj

@@ -159,6 +159,7 @@
     <Content Include="favicon.ico" />
     <Content Include="Global.asax" />
     <Content Include="LICENSE" />
+    <Content Include="Scripts\jquery-1.8.2.js" />
     <Content Include="Scripts\jquery-ui.js" />
     <Content Include="Scripts\jquery.blockUI.js" />
     <Content Include="Scripts\jquery.dropdownToggle.js" />
@@ -181,23 +182,17 @@
     <Content Include="WebEditor.ashx" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="assets\document-templates\AUTHORS.md" />
-    <Content Include="assets\document-templates\LICENSE" />
-    <Content Include="assets\document-templates\new\new.docx" />
-    <Content Include="assets\document-templates\new\new.docxf" />
-    <Content Include="assets\document-templates\new\new.pptx" />
-    <Content Include="assets\document-templates\new\new.xlsx" />
-    <Content Include="assets\document-templates\README.md" />
-    <Content Include="assets\document-templates\sample\csv.csv" />
-    <Content Include="assets\document-templates\sample\sample.docx" />
-    <Content Include="assets\document-templates\sample\sample.docxf" />
-    <Content Include="assets\document-templates\sample\sample.pptx" />
-    <Content Include="assets\document-templates\sample\sample.xlsx" />
-    <Content Include="assets\document-formats\AUTHORS.md" />
-    <Content Include="assets\document-formats\CHANGELOG.md" />
-    <Content Include="assets\document-formats\LICENSE" />
-    <Content Include="assets\document-formats\onlyoffice-docs-formats.json" />
-    <Content Include="assets\document-formats\README.md" />
+    <Content Include="assets\AUTHORS.md" />
+    <Content Include="assets\LICENSE" />
+    <Content Include="assets\new\new.docx" />
+    <Content Include="assets\new\new.docxf" />
+    <Content Include="assets\new\new.pptx" />
+    <Content Include="assets\new\new.xlsx" />
+    <Content Include="assets\sample\csv.csv" />
+    <Content Include="assets\sample\sample.docx" />
+    <Content Include="assets\sample\sample.docxf" />
+    <Content Include="assets\sample\sample.pptx" />
+    <Content Include="assets\sample\sample.xlsx" />
     <None Include="packages.config" />
   </ItemGroup>
   <PropertyGroup>

web/documentserver-example/csharp-mvc/README.md

@@ -14,7 +14,7 @@ See the detailed guide to learn how to install Document Server [for Windows](htt
 
 Download the [.Net (C# MVC) example](https://api.onlyoffice.com/editors/demopreview) from our site.
 
-To connect the editors to your website, specify the path to the editors installation and the path to the storage folder in the *web.appsettings.config* file:
+To connect the editors to your website, specify the path to the editors installation and the path to the storage folder in the *settings.config* file:
 ```
 <add key="storage-path" value=""/>
 <add key="files.docservice.url.site" value="https://documentserver/" />

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">
@@ -129,23 +129,19 @@
         };
 
         // the user is trying to select document for comparing by clicking the Document from Storage button
-        var onRequestSelectDocument = function (event) {
-            <% string documentData; %>
-            <% Model.GetDocumentData(out documentData); %>
-            var data = <%=documentData%>;
-            data.c = event.data.c;
-            docEditor.setRequestedDocument(data);  // select a document for comparing
+        var onRequestCompareFile = function () {
+            <% string compareFileData; %>
+            <% Model.GetCompareFileData(out compareFileData); %>
+            docEditor.setRevisedFile(<%=compareFileData%>);  // select a document for comparing
         };
 
         // the user is trying to select recipients data by clicking the Mail merge button
-        var onRequestSelectSpreadsheet = function (event) {
-            <% string dataSpreadsheet; %>
-            <% Model.GetSpreadsheetConfig(out dataSpreadsheet); %>
-            var data = <%= dataSpreadsheet%>;
-            data.c = event.data.c;
-            docEditor.setRequestedSpreadsheet(data);  // insert recipient data for mail merge into the file
+        var onRequestMailMergeRecipients = function (event) {
+            <% string dataMailMergeRecipients; %>
+            <% 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;
@@ -182,83 +178,6 @@
             }
         };
 
-        var onRequestOpen = function (event) {  // user open external data source
-            innerAlert("onRequestOpen");
-            var windowName = event.data.windowName;
-            requestReference(event.data, function (data) {
-                if (data.error) {
-                    var winEditor = window.open("", windowName);
-                    winEditor.close();
-                    innerAlert(data.error, true);
-                    return;
-                }
-                var link = data.link;
-                window.open(link, windowName);
-            });
-        };
-
-        var onRequestReferenceData = function (event) {  // user refresh external data source
-            innerAlert("onRequestReferenceData");
-
-            requestReference(event.data, function (data) {
-                docEditor.setReferenceData(data);
-            });
-        };
-
-        var requestReference = function (data, callback) {
-            innerAlert(data);
-            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(data));
-            xhr.onload = function () {
-                console.log(xhr.responseText);
-                callback(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%";
@@ -267,62 +186,47 @@
         config.events = {
             'onAppReady': onAppReady,
             'onDocumentStateChange': onDocumentStateChange,
+            'onRequestEditRights': onRequestEditRights,
             'onError': onError,
             'onOutdatedVersion': onOutdatedVersion,
             "onMakeActionLink": onMakeActionLink,
             "onMetaChange": onMetaChange,
             "onRequestInsertImage": onRequestInsertImage,
-            "onRequestSelectDocument": onRequestSelectDocument,
-            "onRequestSelectSpreadsheet": onRequestSelectSpreadsheet,
+            "onRequestCompareFile": onRequestCompareFile,
+            "onRequestMailMergeRecipients": onRequestMailMergeRecipients,
         };
 
+        <% string hist, histData; %>
+        <% Model.GetHistory(out hist, out histData); %>
+
         <% string usersForMentions; %>
         <% Model.GetUsersMentions(Request, out usersForMentions); %>
-        <% string usersInfo; %>
-        <% Model.GetUsersInfo(Request, out usersInfo); %>
-        <% string usersForProtect; %>
-        <% Model.GetUsersProtect(Request, out usersForProtect); %>
 
         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))
             { %>
-                config.events['onRequestUsers'] = function (event) {
-                    if (event && event.data){
-                        var c = event.data.c;
-                    }
-                    switch (c) {
-                        case "info":
-                            users = [];
-                            var allUsers = <%= usersInfo %>;
-                            for (var i = 0; i < event.data.id.length; i++) {
-                                for (var j = 0; j < allUsers.length; j++) {
-                                    if (allUsers[j].id == event.data.id[i]) {
-                                        users.push(allUsers[j]);
-                                        break;
-                                    }
-                                }
-                            }
-                            break;
-                        case "protect":
-                            var users = <%= usersForProtect %>;
-                            break;
-                        default:
-                            users = <%= usersForMentions %>;
-                    }
-                    docEditor.setUsers({
-                        "c": c,
-                        "users": users,
+                config.events['onRequestUsers'] = function () {
+                    docEditor.setUsers({  // set a list of users to mention in the comments
+                        "users": <%= usersForMentions %>
                     });
                 };
             <% } %>
@@ -335,10 +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;
-            config.events['onRequestOpen'] = onRequestOpen;
         }
 
         if (config.editorConfig.createUrl) {

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

@@ -13,7 +13,6 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width" />
-    <meta name="server-version" content=<%= DocManagerHelper.GetVersion() %> />
     <!--
     *
     * (c) Copyright Ascensio System SIA 2023

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);
 
@@ -453,7 +439,7 @@ namespace OnlineEditorsExampleMVC
         private static void Assets(HttpContext context)
         {
             var fileName = Path.GetFileName(context.Request["filename"]);
-            var filePath = HttpRuntime.AppDomainAppPath + "assets/document-templates/sample/" + fileName;
+            var filePath = HttpRuntime.AppDomainAppPath + "assets/sample/" + fileName;
             download(filePath, context);
         }
 
@@ -461,7 +447,7 @@ namespace OnlineEditorsExampleMVC
         private static void GetCsv(HttpContext context)
         {
             var fileName = "csv.csv";
-            var filePath = HttpRuntime.AppDomainAppPath + "assets/document-templates/sample/" + fileName;
+            var filePath = HttpRuntime.AppDomainAppPath + "assets/sample/" + fileName;
             download(filePath, context);
         }
 
@@ -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,185 +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 == "" && body.ContainsKey("link"))
-            {
-                string link = body["link"].ToString();
-                if (!link.Contains(DocManagerHelper.GetServerUrl(false)))
-                {
-                    context.Response.Write(jss.Serialize(new Dictionary<string, string>() {
-                        { "url", link },
-                        { "directUrl", link }
-                    }));
-                    return;
-                }
-
-                Uri linkUri = new Uri(link);
-                fileName = HttpUtility.ParseQueryString(linkUri.Query).Get("fileName");
-                if (string.IsNullOrEmpty(fileName) || !File.Exists(DocManagerHelper.StoragePath(fileName, null)))
-                {
-                    context.Response.Write("{ \"error\": \"File is not exist\"}");
-                    return;
-                }
-            }
-
-            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('.') },
-            { "key",  ServiceConverter.GenerateRevisionId(DocManagerHelper.CurUserHostAddress() + "/" + fileName + "/" + File.GetLastWriteTime(DocManagerHelper.StoragePath(fileName, null)).GetHashCode())},
-            { "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 },
-            { "link", DocManagerHelper.GetServerUrl(false) + "Editor?fileName=" + 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,21 +1,22 @@
 <?xml version="1.0"?>
 <appSettings>
   <clear />
-  <add key="version" value="1.7.0"/>
+  <add key="version" value="1.5.0"/>
 
   <add key="filesize-max" value="52428800"/>
   <add key="storage-path" value=""/>
-  <add key="filename-max" value="50"/>
   
+  <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|ar:Arabic|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|sr-Latn-CS:Serbian|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/images/file_docx.svg

@@ -1 +1,8 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#1E7AAA"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path d="M6 15h18v1H6v-1zM6 19h18v1H6v-1zM6 23h18v1H6v-1zM6 27h18v1H6v-1z" fill="#fff"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H21.674C22.4697 0 23.2327 0.316071 23.7953 0.87868L29.1213 6.20465C29.6839 6.76726 30 7.53032 30 8.32597V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#3779A6"/>
+<path d="M22.9167 0L30.0001 7.08333H25.9167C24.2599 7.08333 22.9167 5.74019 22.9167 4.08333V0Z" fill="#1D5880"/>
+<path d="M6.17627 14.7059H23.8233V15.8823H6.17627V14.7059Z" fill="white"/>
+<path d="M6.17627 18.5294H23.8233V19.7059H6.17627V18.5294Z" fill="white"/>
+<path d="M6.17627 22.3529H23.8233V23.5294H6.17627V22.3529Z" fill="white"/>
+<path d="M6.17627 26.1765H23.8233V27.3529H6.17627V26.1765Z" fill="white"/>
+</svg>

web/documentserver-example/csharp/App_Themes/images/file_docxf.svg

@@ -1 +1,6 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#27ABA3"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#008078"/><path fill-rule="evenodd" clip-rule="evenodd" d="M24 14H6v7h18v-7zm-.8182 5.9978H6.81818V15H23.1818v4.9978zM24 23H6v7h18v-7zm-.8182 5.9978H6.81818V24H23.1818v4.9978z" fill="#fff"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#27ABA3"/>
+<path d="M22.9165 0L29.9998 7.08333H25.9165C24.2597 7.08333 22.9165 5.74019 22.9165 4.08333V0Z" fill="#008078"/>
+<rect x="6.5" y="15.5" width="17" height="5" stroke="white"/>
+<rect x="6.5" y="23.5" width="17" height="5" stroke="white"/>
+</svg>

web/documentserver-example/csharp/App_Themes/images/file_pptx.svg

@@ -1 +1,8 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#F36700"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path stroke="#fff" stroke-opacity=".95" d="M6.5 15.5h17v12h-17z"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#F36700"/>
+<path d="M22.9167 0L30.0001 7.08333H25.9168C24.2599 7.08333 22.9167 5.74019 22.9167 4.08333V0Z" fill="#AB531F"/>
+<path d="M6.17627 16.1275H23.8233V17.3039H6.17627V16.1275Z" fill="white"/>
+<path d="M6.17627 28.7745L6.17627 16.1275L7.35274 16.1275L7.35274 28.7745H6.17627Z" fill="white"/>
+<path d="M23.8233 16.1275V28.7745H22.6469V16.1275L23.8233 16.1275Z" fill="white"/>
+<path d="M6.17627 27.598H23.8233V28.7745H6.17627L6.17627 27.598Z" fill="white"/>
+</svg>

web/documentserver-example/csharp/App_Themes/images/file_upload.svg

@@ -1 +1,6 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#D0D5DA"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#646464"/><path fill-rule="evenodd" clip-rule="evenodd" d="M7.5 23c-.27614 0-.5.2239-.5.5v4c0 .2761.22386.5.5.5h15c.2761 0 .5-.2239.5-.5v-4c0-.2761-.2239-.5-.5-.5h-2c-.2761 0-.5-.2239-.5-.5s.2239-.5.5-.5h2c.8284 0 1.5.6716 1.5 1.5v4c0 .8284-.6716 1.5-1.5 1.5h-15c-.82843 0-1.5-.6716-1.5-1.5v-4c0-.8284.67157-1.5 1.5-1.5h2c.27614 0 .5.2239.5.5s-.22386.5-.5.5h-2z" fill="#646464"/><path fill-rule="evenodd" clip-rule="evenodd" d="M20 20.0001L15 14l-5 6.0001h3v4c0 .5523.4477 1 1 1h2c.5523 0 1-.4477 1-1v-4h3z" fill="#646464"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M30 7.44186L22 0H3C1.22739 0 0 0.822551 0 2.32558V37.2093C0 38.7123 1.22739 40 3 40H27C28.7726 40 30 38.7123 30 37.2093V7.44186Z" fill="#D0D5DA"/>
+<path d="M24.1042 7.27273H29.9631L22 0V5.32334C22 6.4105 22.949 7.27273 24.1042 7.27273Z" fill="#646464"/>
+<path d="M16.9562 22.3485H12.9746V17.803H10.9839L14.9654 14.1667L18.947 17.803H16.9562V22.3485Z" fill="#646464"/>
+<path d="M20.9378 23.7121C20.9378 24.1666 20.4401 24.6212 19.9424 24.6212H9.98848C9.49078 24.6212 8.99309 24.1666 8.99309 23.7121V22.3485C8.99309 21.8939 9.49078 21.4394 9.98848 21.4394H10.9839V20.0757H9.49078C8.49539 20.0757 7.5 20.9848 7.5 21.8939V24.1666C7.5 25.0757 8.61982 25.9848 9.49078 25.9848H20.4401C21.3111 25.9848 22.4309 25.0757 22.4309 24.1666V21.8939C22.4309 20.9848 21.4355 20.0757 20.4401 20.0757H18.947V21.4394H19.9424C20.4401 21.4394 20.9378 21.8939 20.9378 22.3485V23.7121Z" fill="#646464"/>
+</svg>

web/documentserver-example/csharp/App_Themes/images/file_xlsx.svg

@@ -1 +1,12 @@
-<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#6AAA1E"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#000" fill-opacity=".25"/><path fill-rule="evenodd" clip-rule="evenodd" d="M6 15h18v13H7.00001v-1H12v-3H7v4H6V15zm7 12h4v-3h-4v3zm5 0h5v-3h-5v3zm5-7v3h-5v-3h5zm-6 0v3h-4v-3h4zm-5 0v3H7v-3h5zm11-1v-3h-5v3h5zm-10-3h4v3h-4v-3zm-1 3v-3H7v3h5z" fill="#fff" fill-opacity=".95"/></svg>
+<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 3C0 1.34315 1.34315 0 3 0H22.9167L30 7.08333V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#78A73B"/>
+<path d="M22.9167 0L30.0001 7.08333H25.9168C24.2599 7.08333 22.9167 5.74019 22.9167 4.08333V0Z" fill="#5A7D2B"/>
+<path d="M6.17644 15.2941H23.8235V16.4706H6.17644V15.2941Z" fill="white"/>
+<path d="M6.17644 19.1177H23.8235V20.2941H6.17644V19.1177Z" fill="white"/>
+<path d="M6.17644 22.9412H23.8235V24.1177H6.17644V22.9412Z" fill="white"/>
+<path d="M6.17644 26.7647H23.8235V27.9412H6.17644V26.7647Z" fill="white"/>
+<path d="M5.88232 27.9412L5.88232 15.2941L7.0588 15.2941L7.0588 27.9412H5.88232Z" fill="white"/>
+<path d="M11.4706 27.9412L11.4706 15.2941L12.647 15.2941V27.9412H11.4706Z" fill="white"/>
+<path d="M17.0588 27.9412L17.0588 15.2941L18.2353 15.2941V27.9412H17.0588Z" fill="white"/>
+<path d="M22.647 27.9412V15.2941H23.8235V27.9412H22.647Z" fill="white"/>
+</svg>

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

@@ -13,7 +13,6 @@
 <head runat="server">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="viewport" content="width=device-width" />
-    <meta name="server-version" content=<%= GetVersion() %> />
     <title>ONLYOFFICE</title>
     <!--
     *
@@ -357,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

@@ -30,15 +30,49 @@ using ASC.Api.DocumentConverter;
 
 namespace OnlineEditorsExample
 {
+    internal static class FileType
+    {
+        // the spreadsheet extension list
+        public static readonly List<string> ExtsSpreadsheet = new List<string>
+            {
+                ".xls", ".xlsx", ".xlsm", ".xlsb",
+                ".xlt", ".xltx", ".xltm",
+                ".ods", ".fods", ".ots", ".csv"
+            };
+
+        // the presentation extension list
+        public static readonly List<string> ExtsPresentation = new List<string>
+            {
+                ".pps", ".ppsx", ".ppsm",
+                ".ppt", ".pptx", ".pptm",
+                ".pot", ".potx", ".potm",
+                ".odp", ".fodp", ".otp"
+            };
+
+        // the document extension list
+        public static readonly List<string> ExtsDocument = new List<string>
+            {
+                ".doc", ".docx", ".docm",
+                ".dot", ".dotx", ".dotm",
+                ".odt", ".fodt", ".ott", ".rtf", ".txt",
+                ".html", ".htm", ".mht", ".xml",
+                ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps", ".oform"
+            };
+
+        // get an internal file extension
+        public static string GetInternalExtension(string extension)
+        {
+            extension = Path.GetExtension(extension).ToLower();  // get file extension
+            if (ExtsDocument.Contains(extension)) return ".docx";  // .docx for text document extensions
+            if (ExtsSpreadsheet.Contains(extension)) return ".xlsx";  // .xlsx for spreadsheet extensions
+            if (ExtsPresentation.Contains(extension)) return ".pptx";  // .pptx for presentation extensions
+            return string.Empty;
+        }
+    }
+
     public partial class _Default : Page
     {
 
-        //get server version
-        public static string GetVersion()
-        {
-            return WebConfigurationManager.AppSettings["version"];
-        }
-        
         // get the virtual path
         public static string VirtualPath
         {
@@ -81,24 +115,24 @@ namespace OnlineEditorsExample
         // file extensions that can be viewed
         private static List<string> ViewedExts
         {
-            get { return FormatManager.ViewableExtensions(); }
+            get { return (WebConfigurationManager.AppSettings["files.docservice.viewed-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
         }
-
+        
         public static List<string> FillFormsExts
         {
-            get { return FormatManager.FillableExtensions(); }
+            get { return (WebConfigurationManager.AppSettings["files.docservice.fillform-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
         }
 
         // file extensions that can be edited
         public static List<string> EditedExts
         {
-            get { return FormatManager.EditableExtensions(); }
+            get { return (WebConfigurationManager.AppSettings["files.docservice.edited-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
         }
 
         // file extensions that can be converted
         public static List<string> ConvertExts
         {
-            get { return FormatManager.ConvertibleExtensions(); }
+            get { return (WebConfigurationManager.AppSettings["files.docservice.convert-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
         }
 
         private static string _fileName;
@@ -250,9 +284,9 @@ namespace OnlineEditorsExample
         {
             var ext = Path.GetExtension(fileName).ToLower();
 
-            if (FormatManager.DocumentExtensions().Contains(ext)) return "word";  // word for text document extensions
-            if (FormatManager.SpreadsheetExtensions().Contains(ext)) return "cell";  // cell for spreadsheet extensions
-            if (FormatManager.PresentationExtensions().Contains(ext)) return "slide";  // slide for presentation extensions
+            if (FileType.ExtsDocument.Contains(ext)) return "word";  // word for text document extensions
+            if (FileType.ExtsSpreadsheet.Contains(ext)) return "cell";  // cell for spreadsheet extensions
+            if (FileType.ExtsPresentation.Contains(ext)) return "slide";  // slide for presentation extensions
 
             return "word";  // the default document type is word
         }
@@ -437,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));
@@ -452,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);
 
@@ -504,12 +537,7 @@ namespace OnlineEditorsExample
         // get the correct file name if such a name already exists
         public static string GetCorrectName(string fileName, string userAddress = null)
         {
-            int maxName;
-            int.TryParse(WebConfigurationManager.AppSettings["filename-max"], out maxName);
             var baseName = Path.GetFileNameWithoutExtension(fileName);  // get file name without extension
-            if (baseName.Length > maxName){
-                baseName = baseName.Substring(0, maxName) + "[...]";
-            }
             var ext = Path.GetExtension(fileName).ToLower();  // get file extension
             var name = baseName + ext;  // get full file name
 
@@ -604,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

@@ -145,19 +145,15 @@
         };
 
         // the user is trying to select document for comparing by clicking the Document from Storage button
-        var onRequestSelectDocument = function (event) {
-            var data = <%= DocumentData %>;
-            data.c = event.data.c;
-            docEditor.setRequestedDocument(data);  // select a document for comparing
+        var onRequestCompareFile = function () {
+            docEditor.setRevisedFile(<%= CompareFileData %>);  // select a document for comparing
         };
 
         // the user is trying to select recipients data by clicking the Mail merge button
-        var onRequestSelectSpreadsheet = function (event) {
-            var data = <%= DataSpreadsheet %>;
-            data.c = event.data.c;
-            docEditor.setRequestedSpreadsheet(data);  // insert recipient data for spreadsheet into the file
+        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;
@@ -194,45 +190,6 @@
             }
         };
 
-        var onRequestOpen = function (event) {  // user open external data source
-            innerAlert("onRequestOpen");
-            var windowName = event.data.windowName;
-
-            requestReference(event.data, function (data) {
-                if (data.error) {
-                    var winEditor = window.open("", windowName);
-                    winEditor.close();
-                    innerAlert(data.error, true);
-                    return;
-                }
-
-                var link = data.link;
-                window.open(link, windowName);
-            });
-        };
-
-        var onRequestReferenceData = function (event) {  // user refresh external data source
-            innerAlert("onRequestReferenceData");
-
-            requestReference(event.data, function (data) {
-                docEditor.setReferenceData(data);
-            });
-        };
-
-        var requestReference = function (data, callback) {
-            innerAlert(data);
-
-            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(data));
-            xhr.onload = function () {
-                console.log(xhr.responseText);
-                callback(JSON.parse(xhr.responseText));
-            }
-        };
-
         config = <%= DocConfig %>;
 
         config.width = "100%";
@@ -241,89 +198,38 @@
         config.events = {
             'onAppReady': onAppReady,
             'onDocumentStateChange': onDocumentStateChange,
+            'onRequestEditRights': onRequestEditRights,
             'onError': onError,
             'onOutdatedVersion': onOutdatedVersion,
             'onMakeActionLink': onMakeActionLink,
             'onMetaChange': onMetaChange,
             'onRequestInsertImage': onRequestInsertImage,
-            'onRequestSelectDocument': onRequestSelectDocument,
-            "onRequestSelectSpreadsheet": onRequestSelectSpreadsheet,
+            'onRequestCompareFile': onRequestCompareFile,
+            "onRequestMailMergeRecipients": onRequestMailMergeRecipients,
         };
 
         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))
             { %>
-                config.events['onRequestUsers'] = function (event) {
-                    if (event && event.data){
-                        var c = event.data.c;
-                    }
-                    switch (c) {
-                        case "info":
-                            users = [];
-                            var allUsers = <%= UsersInfo %>;
-                            for (var i = 0; i < event.data.id.length; i++) {
-                                for (var j = 0; j < allUsers.length; j++) {
-                                    if (allUsers[j].id == event.data.id[i]) {
-                                        users.push(allUsers[j]);
-                                        break;
-                                    }
-                                }
-                            }
-                            break;
-                        case "protect":
-                            var users = <%= UsersForProtect %>;
-                            break;
-                        default:
-                            users = <%= UsersForMentions %>;
-                    }
-                    docEditor.setUsers({
-                        "c": c,
-                        "users": users,
+                config.events['onRequestUsers'] = function () {
+                    docEditor.setUsers({  // set a list of users to mention in the comments
+                        "users": <%= UsersForMentions %>
                     });
                 };
             <% } %>
@@ -336,10 +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;
-            config.events['onRequestOpen'] = onRequestOpen;
         }
 
         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,12 +61,12 @@ 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 DocumentData { get; private set; }
-        protected string DataSpreadsheet { get; private set; }
+        protected string CompareFileData { get; private set; }
+        protected string DataMailMergeRecipients { get; private set; }
         protected string UsersForMentions { get; private set; }
-        protected string UsersInfo { get; private set; }
-        protected string UsersForProtect { get; private set; }
         protected string DocumentType { get { return _Default.DocumentType(FileName); } }
 
         // get callback url
@@ -154,7 +155,7 @@ namespace OnlineEditorsExample
                 editorsMode = "fillForms";
                 canEdit = true;
             }            
-            var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1");  // check if the Submit form button is displayed or hidden
+            var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1") && false;  // check if the Submit form button is displayed or hidden
             var mode = canEdit && editorsMode != "view" ? "edit" : "view";  // get the editor opening mode (edit or view)
 
             var jss = new JavaScriptSerializer();
@@ -194,7 +195,7 @@ namespace OnlineEditorsExample
                             {
                                 { "title", FileName },
                                 { "url", getDownloadUrl(FileName) },
-                                { "directUrl", _Default.IsEnabledDirectUrl() ? directUrl : "" },
+                                { "directUrl", IsEnabledDirectUrl() ? directUrl : "" },
                                 { "fileType", ext.Trim('.') },
                                 { "key", Key },
                                 {
@@ -205,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>
@@ -232,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 }
                                         }
                                 }
                             }
@@ -258,8 +247,7 @@ namespace OnlineEditorsExample
                                         {
                                             { "id", !user.id.Equals("uid-0") ? user.id : null },
                                             { "name",  user.name },
-                                            { "group", user.group },
-                                            { "image", user.avatar ? _Default.GetServerUrl(false) + "/App_Themes/images/"+ user.id + ".png" : null }
+                                            { "group", user.group }
                                         }
                                 },
                                 {
@@ -311,26 +299,143 @@ namespace OnlineEditorsExample
 
                 // a document which will be compared with the current document
                 Dictionary<string, object> compareFile = GetCompareFile();
-                DocumentData = jss.Serialize(compareFile);
+                CompareFileData = jss.Serialize(compareFile);
 
-                // recipient data for spreadsheet
-                Dictionary<string, object> spreadsheetConfig = GetSpreadsheetConfig();
-                DataSpreadsheet = jss.Serialize(spreadsheetConfig);
+                // recipient data for mail merging
+                Dictionary<string, object> mailMergeConfig = GetMailMergeConfig();
+                DataMailMergeRecipients = jss.Serialize(mailMergeConfig);
 
                 // get users for mentions
                 List<Dictionary<string, object>> usersData = Users.getUsersForMentions(user.id);
                 UsersForMentions = !user.id.Equals("uid-0") ? jss.Serialize(usersData) : null;
 
-                List<Dictionary<string, object>> usersInfo = Users.getUsersInfo(user.id);
-                UsersInfo = jss.Serialize(usersData);
-
-                // get users for protect
-                List<Dictionary<string, object>> usersProtectData = Users.getUsersForProtect(user.id);
-                UsersForProtect = !user.id.Equals("uid-0") ? jss.Serialize(usersProtectData) : 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()
         {
@@ -352,7 +457,7 @@ namespace OnlineEditorsExample
                     { "url", InsertImageUrl.ToString()}
                 };
 
-            if (_Default.IsEnabledDirectUrl())
+            if (IsEnabledDirectUrl())
             {
                 logoConfig.Add("directUrl", DirectImageUrl.ToString());
             }
@@ -389,7 +494,7 @@ namespace OnlineEditorsExample
                     { "url", compareFileUrl.ToString() }
                 };
 
-            if (_Default.IsEnabledDirectUrl())
+            if (IsEnabledDirectUrl())
             {
                 dataCompareFile.Add("directUrl", DirectFileUrl.ToString());
             }
@@ -403,43 +508,43 @@ namespace OnlineEditorsExample
             return dataCompareFile;
         }
 
-        // get a spreadsheet config
-        private Dictionary<string, object> GetSpreadsheetConfig()
+        // get a mail merge config
+        private Dictionary<string, object> GetMailMergeConfig()
         {
-            // get the path to the recipients data for spreadsheet
-            var spreadsheetUrl = new UriBuilder(_Default.GetServerUrl(true));
-            spreadsheetUrl.Path =
+            // get the path to the recipients data for mail merging
+            var mailmergeUrl = new UriBuilder(_Default.GetServerUrl(true));
+            mailmergeUrl.Path =
                     HttpRuntime.AppDomainAppVirtualPath
                     + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
                     + "webeditor.ashx";
-            spreadsheetUrl.Query = "type=csv";
+            mailmergeUrl.Query = "type=csv";
 
-            var DirectSpreadsheetUrl = new UriBuilder(_Default.GetServerUrl(false));
-            DirectSpreadsheetUrl.Path =
+            var DirectMailMergeUrl = new UriBuilder(_Default.GetServerUrl(false));
+            DirectMailMergeUrl.Path =
                     HttpRuntime.AppDomainAppVirtualPath
                     + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
                     + "webeditor.ashx";
-            DirectSpreadsheetUrl.Query = "type=csv";
+            DirectMailMergeUrl.Query = "type=csv";
 
-            // create a spreadsheet config
-            Dictionary<string, object> spreadsheetConfig = new Dictionary<string, object>
+            // create a mail merge config
+            Dictionary<string, object> mailMergeConfig = new Dictionary<string, object>
                 {
                     { "fileType", "csv" },
-                    { "url", spreadsheetUrl.ToString() }
+                    { "url", mailmergeUrl.ToString() }
                 };
 
-            if (_Default.IsEnabledDirectUrl())
+            if (IsEnabledDirectUrl())
             {
-                spreadsheetConfig.Add("directUrl", DirectSpreadsheetUrl.ToString());
+                mailMergeConfig.Add("directUrl", DirectMailMergeUrl.ToString());
             }
 
             if (JwtManager.Enabled)  // if the secret key to generate token exists
             {
-                var spreadsheetToken = JwtManager.Encode(spreadsheetConfig);  // encode spreadsheetConfig into the token
-                spreadsheetConfig.Add("token", spreadsheetToken);  // and add it to the spreadsheet config
+                var mailmergeToken = JwtManager.Encode(mailMergeConfig);  // encode mailMergeConfig into the token
+                mailMergeConfig.Add("token", mailmergeToken);  // and add it to the mail merge config
             }
 
-            return spreadsheetConfig;
+            return mailMergeConfig;
         }
 
         // get image url for templates
@@ -472,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)
         {
@@ -494,13 +614,12 @@ namespace OnlineEditorsExample
                     return;
             }
             var demoName = (string.IsNullOrEmpty(sample) ? "new" : "sample") + ext;  // create demo document name with the necessary extension
-            var demoPath = "assets\\document-templates\\" + (string.IsNullOrEmpty(sample) ? "new\\" : "sample\\");  // and put this file into the assets directory
+            var demoPath = "assets\\" + (string.IsNullOrEmpty(sample) ? "new\\" : "sample\\");  // and put this file into the assets directory
 
             FileName = _Default.GetCorrectName(demoName);  // get file name with an index if such a file name already exists
 
             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);
@@ -520,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/FormatManager.cs

@@ -1,192 +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.
- *
- */
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using Newtonsoft.Json;
-
-namespace OnlineEditorsExample
-{
-    public class Format
-    {
-        public string Name { get; }
-        public string Type { get; }
-        public List<string> Actions { get; }
-        public List<string> Convert { get; }
-        public List<string> Mime { get; }
-
-        public Format(string name, string type, List<string> actions, List<string> convert, List<string> mime)
-        {
-            Name = name;
-            Type = type;
-            Actions = actions;
-            Convert = convert;
-            Mime = mime;
-        }
-
-        public string Extension()
-        {
-            return "." + Name;
-        }
-    }
-
-    public class FormatManager
-    {
-        private static List<Format> cachedFormats;
-
-        public static List<string> FillableExtensions()
-        {
-            return Fillable()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Fillable()
-        {
-            return All()
-                .Where(format => format.Actions.Contains("fill"))
-                .ToList();
-        }
-
-        public static List<string> ViewableExtensions()
-        {
-            return Viewable()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Viewable()
-        {
-            return All()
-                .Where(format => format.Actions.Contains("view"))
-                .ToList();
-        }
-
-        public static List<string> EditableExtensions()
-        {
-            return Editable()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Editable()
-        {
-            return All()
-                .Where(format => format.Actions.Contains("edit") || format.Actions.Contains("lossy-edit"))
-                .ToList();
-        }
-
-        public static List<string> ConvertibleExtensions()
-        {
-            return Convertible()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Convertible()
-        {
-            return All()
-                .Where(format => format.Actions.Contains("auto-convert"))
-                .ToList();
-        }
-
-        public static List<string> SpreadsheetExtensions()
-        {
-            return Spreadsheets()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Spreadsheets()
-        {
-            return All()
-                .Where(format => format.Type == "cell")
-                .ToList();
-        }
-
-        public static List<string> PresentationExtensions()
-        {
-            return Presentations()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Presentations()
-        {
-            return All()
-                .Where(format => format.Type == "slide")
-                .ToList();
-        }
-
-        public static List<string> DocumentExtensions()
-        {
-            return Documents()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> Documents()
-        {
-            return All()
-                .Where(format => format.Type == "word")
-                .ToList();
-        }
-
-        public static List<string> AllExtensions()
-        {
-            return All()
-                .Select(format => format.Extension())
-                .ToList();
-        }
-
-        public static List<Format> All()
-        {
-            if (cachedFormats == null) { 
-                var path = GetPath();
-                var lines = File.ReadLines(path, Encoding.UTF8);
-                var contents = string.Join(Environment.NewLine, lines);
-                var formats = JsonConvert.DeserializeObject<Format[]>(contents);
-                cachedFormats = formats.ToList();
-            }
-
-            return cachedFormats;
-        }
-
-        private static string GetPath()
-        {
-            string path = Path.Combine(GetDirectory(), "onlyoffice-docs-formats.json");
-            if (File.Exists(path))
-            {
-                return path;
-            }
-            else
-            {
-                throw new FileNotFoundException("The JSON file does not exist.");
-            }
-        }
-
-        private static string GetDirectory()
-        {
-            string directory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets", "document-formats");
-            return Path.GetFullPath(directory);
-        }
-    }
-}

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/OnlineEditorsExample.csproj

@@ -119,7 +119,6 @@
       <DependentUpon>DocEditor.aspx</DependentUpon>
     </Compile>
     <Compile Include="DocumentConverter.cs" />
-    <Compile Include="FormatManager.cs" />
     <Compile Include="JwtManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Default.aspx.cs">
@@ -149,6 +148,7 @@
     <Content Include="App_Themes\jquery-ui.css" />
     <Content Include="App_Themes\stylesheet.css" />
     <Content Include="DocEditor.aspx" />
+    <Content Include="script\jquery-1.9.0.min.js" />
     <Content Include="script\jquery-ui.min.js" />
     <Content Include="script\jquery.blockUI.js" />
     <Content Include="script\jquery.dropdownToggle.js" />
@@ -158,23 +158,17 @@
     <Content Include="WebEditor.ashx" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="assets\document-formats\AUTHORS.md" />
-    <Content Include="assets\document-formats\CHANGELOG.md" />
-    <Content Include="assets\document-formats\LICENSE" />
-    <Content Include="assets\document-formats\onlyoffice-docs-formats.json" />
-    <Content Include="assets\document-formats\README.md" />
-    <Content Include="assets\document-templates\AUTHORS.md" />
-    <Content Include="assets\document-templates\LICENSE" />
-    <Content Include="assets\document-templates\new\new.docx" />
-    <Content Include="assets\document-templates\new\new.docxf" />
-    <Content Include="assets\document-templates\new\new.pptx" />
-    <Content Include="assets\document-templates\new\new.xlsx" />
-    <Content Include="assets\document-templates\README.md" />
-    <Content Include="assets\document-templates\sample\csv.csv" />
-    <Content Include="assets\document-templates\sample\sample.docx" />
-    <Content Include="assets\document-templates\sample\sample.docxf" />
-    <Content Include="assets\document-templates\sample\sample.pptx" />
-    <Content Include="assets\document-templates\sample\sample.xlsx" />
+    <Content Include="assets\AUTHORS.md" />
+    <Content Include="assets\LICENSE" />
+    <Content Include="assets\new\new.docx" />
+    <Content Include="assets\new\new.docxf" />
+    <Content Include="assets\new\new.pptx" />
+    <Content Include="assets\new\new.xlsx" />
+    <Content Include="assets\sample\csv.csv" />
+    <Content Include="assets\sample\sample.docx" />
+    <Content Include="assets\sample\sample.docxf" />
+    <Content Include="assets\sample\sample.pptx" />
+    <Content Include="assets\sample\sample.xlsx" />
     <None Include="packages.config" />
   </ItemGroup>
   <PropertyGroup>

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;
@@ -258,22 +256,6 @@ namespace OnlineEditorsExample
                     var action = jss.Deserialize<Dictionary<string, object>>(jss.Serialize(actions[0]));
                     var user = action["userid"].ToString();  // get the user id
                     DocEditor.CreateMeta(fileName, user, "Filling Form", userAddress);  // create meta data for the forcesaved file
-
-                    string formsDataUrl = fileData["formsdataurl"].ToString();
-
-                    if (!string.IsNullOrEmpty(formsDataUrl))
-                    {
-                        string formsName = _Default.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + ".txt", userAddress);
-                        string formsPath = _Default.StoragePath(formsName, userAddress);
-
-                        var bytesForms = DownloadFile(formsDataUrl);
-
-                        SaveFile(bytesForms, formsPath);
-                    }
-                    else
-                    {
-                        throw new Exception("Document editing service did not return formsDataUrl");
-                    }
                 }
             }
             catch (Exception)
@@ -306,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

@@ -30,9 +30,7 @@ namespace OnlineEditorsExample
             "Can perform all actions with comments",
             "The file favorite state is undefined",
             "Can create files from templates using data from the editor",
-            "Can see the information about all users",
-            "Has an avatar",
-            "Can submit forms"
+            "Can see the information about all users"
         };
 
         static List<string> descr_user_2 = new List<string>()
@@ -42,9 +40,7 @@ namespace OnlineEditorsExample
             "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only",
             "This file is marked as favorite",
             "Can create new files from the editor",
-            "Can see the information about users from Group2 and users who don’t belong to any group",
-            "Has an avatar",
-            "Can’t submit forms"
+            "Can see the information about users from Group2 and users who don’t belong to any group"
         };
 
         static List<string> descr_user_3 = new List<string>()
@@ -57,8 +53,7 @@ namespace OnlineEditorsExample
             "Can’t download the file",
             "Can’t print the file",
             "Can create new files from the editor",
-            "Can see the information about Group2 users",
-            "Can’t submit forms"
+            "Can see the information about Group2 users"
         };
 
         static List<string> descr_user_0 = new List<string>()
@@ -73,9 +68,7 @@ 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",
-            "Can’t submit forms"
         };
 
         private static List<User> users = new List<User>() {
@@ -90,7 +83,6 @@ namespace OnlineEditorsExample
                     null,
                     new List<string>(),
                     descr_user_1,
-                    true,
                     true
                 ),
             new User(
@@ -109,13 +101,12 @@ namespace OnlineEditorsExample
                     true,
                     new List<string>(),
                     descr_user_2,
-                    false,
-                    true
+                    false
                 ),
             new User(
                     "uid-3",
                     "Hamish Mitchell",
-                    null,
+                    "mitchell@example.com",
                     "group-3",
                     new List<string>() { "group-2" },
                     new Dictionary<string,object>()
@@ -128,7 +119,6 @@ namespace OnlineEditorsExample
                     false,
                     new List<string>() { "copy", "download", "print" },
                     descr_user_3,
-                    false,
                     false
                 ),
             new User(
@@ -140,9 +130,8 @@ namespace OnlineEditorsExample
                     new Dictionary<string, object>(),
                     new List<string>(),
                     null,
-                    new List<string>() { "protect" },
+                    new List<string>(),
                     descr_user_0,
-                    false,
                     false
                 )
         };
@@ -181,44 +170,6 @@ namespace OnlineEditorsExample
             }
             return usersData;
         }
-
-        public static List<Dictionary<string, object>> getUsersInfo(string id)
-        {
-            List<Dictionary<string, object>> usersData = new List<Dictionary<string, object>>();
-            if(id != "uid-0"){
-                foreach (User user in users)
-                {
-                    usersData.Add(new Dictionary<string, object>()
-                    {
-                        {"id", user.id},
-                        {"name", user.name },
-                        {"email", user.email },
-                        {"image", user.avatar ? _Default.GetServerUrl(false) + "/App_Themes/images/"+ user.id + ".png" : null }
-                    });
-                }
-            }
-            return usersData;
-        }
-
-        // get a list of users with their names and emails for protect
-        public static List<Dictionary<string, object>> getUsersForProtect(string id)
-        {
-            List<Dictionary<string, object>> usersData = new List<Dictionary<string, object>>();
-
-            foreach (User user in users)
-            {
-                if (!user.id.Equals(id) && user.name != null)
-                {
-                    usersData.Add(new Dictionary<string, object>()
-                    {
-                        {"name", user.name },
-                        {"email", user.email },
-                        {"id", user.id}
-                    });
-                }
-            }
-            return usersData;
-        }
     }
 
     public class User
@@ -234,9 +185,8 @@ namespace OnlineEditorsExample
         public List<string> descriptions;
         public bool templates;
         public List<string> userInfoGroups;
-        public bool avatar;
 
-        public User(string id, string name, string email, string group, List<string> reviewGroups, Dictionary<string, object> commentGroups, List<string> userInfoGroups, bool? favorite, List<string> deniedPermissions, List<string> descriptions, bool templates, bool avatar)
+        public User(string id, string name, string email, string group, List<string> reviewGroups, Dictionary<string, object> commentGroups, List<string> userInfoGroups, bool? favorite, List<string> deniedPermissions, List<string> descriptions, bool templates)
         {
             this.id = id;
             this.name = name;
@@ -249,7 +199,6 @@ namespace OnlineEditorsExample
             this.descriptions = descriptions;
             this.templates = templates;
             this.userInfoGroups = userInfoGroups;
-            this.avatar = avatar;
         }
     }
 }

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

@@ -26,10 +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;
-using Newtonsoft.Json;
 
 namespace OnlineEditorsExample
 {
@@ -51,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;
@@ -84,9 +71,6 @@ namespace OnlineEditorsExample
                 case "rename":
                     Rename(context);
                     break;
-                case "reference":
-                    Reference(context);
-                    break;
             }
         }
 
@@ -276,7 +260,7 @@ namespace OnlineEditorsExample
         private static void Assets(HttpContext context)
         {
             var fileName = Path.GetFileName(context.Request["filename"]);
-            var filePath = HttpRuntime.AppDomainAppPath + "assets/document-templates/sample/" + fileName;
+            var filePath = HttpRuntime.AppDomainAppPath + "assets/sample/" + fileName;
             download(filePath, context);
         }
 
@@ -284,7 +268,7 @@ namespace OnlineEditorsExample
         private static void GetCsv(HttpContext context)
         {
             var fileName = "csv.csv";
-            var filePath = HttpRuntime.AppDomainAppPath + "assets/document-templates/sample/" + fileName;
+            var filePath = HttpRuntime.AppDomainAppPath + "assets/sample/" + fileName;
             download(filePath, context);
         }
 
@@ -297,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"];
 
@@ -345,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
@@ -512,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"];
 
@@ -583,200 +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 == "" && body.ContainsKey("link"))
-            {
-                string link = body["link"].ToString();
-                if (!link.Contains(_Default.GetServerUrl(false)))
-                {
-                    context.Response.Write(jss.Serialize(new Dictionary<string, string>() {
-                        { "url", link },
-                        { "directUrl", link }
-                    }));
-                    return;
-                }
-
-                Uri linkUri = new Uri(link);
-                fileName = HttpUtility.ParseQueryString(linkUri.Query).Get("fileID");
-                if (string.IsNullOrEmpty(fileName) || !File.Exists(_Default.StoragePath(fileName, null)))
-                {
-                    context.Response.Write("{ \"error\": \"File is not exist\"}");
-                    return;
-                }
-            }
-
-            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('.') },
-            { "key", ServiceConverter.GenerateRevisionId(_Default.CurUserHostAddress(null)
-                        + "/" + Path.GetFileName(_Default.FileUri(fileName, true))
-                        + "/" + File.GetLastWriteTime(_Default.StoragePath(fileName, null)).GetHashCode()) },
-            { "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 },
-            { "link", _Default.GetServerUrl(false) + "doceditor.aspx?fileID=" + 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,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <appSettings>
   <clear />
-  <add key="version" value="1.7.0"/>
+  <add key="version" value="1.5.0"/>
 
   <add key="filesize-max" value="52428800"/>
   <add key="storage-path" value=""/>
-  <add key="filename-max" value="50"/>
 
+  <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|ar:Arabic|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|sr-Latn-CS:Serbian|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/README.md

@@ -20,7 +20,7 @@ See the detailed guide to learn how to install Document Server [for Windows](htt
 
 Download the [Java-Spring example](https://api.onlyoffice.com/editors/demopreview) from our site.
 
-To connect the editors to your website, specify the path to the editors installation, server port and the path to the storage folder in the *src/main/resources/application.properties* file:
+To connect the editors to your website, specify the path to the editors installation, server port and the path to the storage folder in the *\src\main\resources\application.properties* file:
 
 ```
  files.storage=
@@ -128,18 +128,22 @@ See the detailed guide to learn how to install Document Server [for Linux](https
 
 ### Step 2. Install the prerequisites and run the website with the editors
 
-1. Install **Java** following the instructions [here](https://docs.oracle.com/en/java/javase/20/install/installation-jdk-linux-platforms.html#GUID-737A84E4-2EFF-4D38-8E60-3E29D1B884B8).
+1. Install **Java**:
+
+    ```
+    sudo add-apt-repository ppa:webupd8team/java sudo apt-get update sudo apt-get install oracle-java11-installer
+    ```
 
 2. Download the archive with the Java-Spring example and unpack the archive or clone git repository:
 
     a) archive with Java-Spring:
 
     ```
-    wget https://api.onlyoffice.com/app_data/editor/Java.Spring.Example.zip
+    wget https://api.onlyoffice.com/app_data/editor/Java%20Spring%20Example.zip
     ```
     
     ```
-    unzip Java.Spring.Example.zip
+    unzip Java\ Spring\ Example.zip
     ```
     b) git repository:
     ```
@@ -158,7 +162,7 @@ See the detailed guide to learn how to install Document Server [for Linux](https
     ```
     cd document-server-integration/web/documentserver-example/java-spring
     ```
-4. Edit the *src/main/resources/application.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed.
+4. Edit the *application.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed.
 
     ```
     nano src/main/resources/application.properties
@@ -206,51 +210,13 @@ Make sure that the Document Server has access to the server with the example ins
 
 ##  For Docker
 
-### Step 1. Install ONLYOFFICE Docs
-
-Download and install ONLYOFFICE Docs (packaged as Document Server). 
-
-See the detailed guide to learn how to install Document Server [for Docker](https://helpcenter.onlyoffice.com/installation/docs-developer-install-docker.aspx). 
-
-### Step 2. Install the prerequisites and run the website with the editors
-
-1. Install **Java** following the instructions [here](https://docs.oracle.com/en/java/javase/20/install/installation-jdk-linux-platforms.html#GUID-737A84E4-2EFF-4D38-8E60-3E29D1B884B8).
-
-2. Download the archive with the Java-Spring example and unpack the archive or clone git repository:
-
-    a) archive with Java-Spring:
-
-    ```
-    wget https://api.onlyoffice.com/app_data/editor/Java.Spring.Example.zip
-    ```
-    
-    ```
-    unzip Java.Spring.Example.zip
-    ```
-    b) git repository:
-    ```
-    git clone https://github.com/ONLYOFFICE/document-server-integration.git
-    ```
-
-
-3. Change the current directory for the project directory:
-
-    a) from archive
-
-    ```
-   cd Java\ Spring\ Example/
-   ```
-   b) from git repository 
-    ```
-    cd document-server-integration/web/documentserver-example/java-spring
-    ```
-4. Edit the *src/main/resources/application.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed:
+1. Edit the *application.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed ([installation instructions](https://helpcenter.onlyoffice.com/installation/docs-developer-install-docker.aspx)).
 
 	```
 	nano src/main/resources/application.properties
 	```
 	
-5. Edit the following lines:
+2. Edit the following lines:
 
    ```
    files.storage=
@@ -260,23 +226,17 @@ See the detailed guide to learn how to install Document Server [for Docker](http
 
     where the **documentserver** is the name of the server with the ONLYOFFICE Docs installed, **port** is any available port and **files.storage** is the path where files will be created and stored (in the project folder by default). You can set an absolute path.
 
-6. Run the next command in the java example directory:
+3. Run the next command in the java example directory:
 
 	```
 	docker-compose up
 	```
-7. Open your browser using **server.address** and **server.port**:
+4. Open your browser using **server.address** and **server.port**:
 
       ```
       http://server.address:server.port/
       ```
 
-### Step 3. Check accessibility
-
-In case the example and Document Server are installed on different computers, make sure that your server with the example installed has access to the Document Server with the address which you specify instead of **documentserver** in the configuration files. 
-
-Make sure that the Document Server has access to the server with the example installed with the address which you specify instead of **example.com** in the configuration files.
-
 ## Important security info
 
 Please keep in mind the following security aspects when you are using test examples:

web/documentserver-example/java-spring/checkstyle-suppressions.xml

@@ -10,5 +10,4 @@
     <suppress checks="JavadocPackage" files="."/>
     <suppress checks="JavadocVariable" files="."/>
     <suppress checks="MissingJavadocMethod" files="."/>
-    <suppress checks="MagicNumber" files="DefaultDocumentManager.java"/>
 </suppressions>

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,9 +45,7 @@ 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",
-                "Can’t submit forms"
+                "View file without collaboration"
         );
 
         // the description for user 1
@@ -59,9 +57,7 @@ public class ExampleData {
                 "The file favorite state is undefined",
                 "Can create a file from a template with data from the editor",
                 "Can see the information about all users",
-                "Can view chat",
-                "Has an avatar",
-                "Can submit forms"
+                "Can view chat"
         );
 
         // the description for user 2
@@ -74,9 +70,7 @@ public class ExampleData {
                 "This file is favorite",
                 "Can create a file from an editor",
                 "Can see the information about users from Group2 and users who don’t belong to any group",
-                "Can view chat",
-                "Has an avatar",
-                "Can’t submit forms"
+                "Can view chat"
         );
 
         // the description for user 3
@@ -91,31 +85,29 @@ public class ExampleData {
                 "He can’t print the file",
                 "Can create a file from an editor",
                 "Can see the information about Group2 users",
-                "Can view chat",
-                "Can’t submit forms"
+                "Can view chat"
         );
 
         // create user 1 with the specified parameters
         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, 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, 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", null, descriptionUserThird,
+        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, false);
+                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, 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/EditorController.java

@@ -20,13 +20,12 @@ package com.onlyoffice.integration.controllers;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.onlyoffice.integration.documentserver.managers.history.HistoryManager;
 import com.onlyoffice.integration.documentserver.managers.jwt.JwtManager;
 import com.onlyoffice.integration.documentserver.models.enums.Action;
 import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder;
 import com.onlyoffice.integration.entities.User;
 import com.onlyoffice.integration.dto.Mentions;
-import com.onlyoffice.integration.dto.UserInfo;
-import com.onlyoffice.integration.dto.Protect;
 import com.onlyoffice.integration.documentserver.models.enums.Type;
 import com.onlyoffice.integration.documentserver.models.filemodel.FileModel;
 import com.onlyoffice.integration.services.UserServices;
@@ -74,6 +73,9 @@ public class EditorController {
     @Autowired
     private UserServices userService;
 
+    @Autowired
+    private HistoryManager historyManager;
+
     @Autowired
     private ObjectMapper objectMapper;
 
@@ -119,8 +121,6 @@ public class EditorController {
         }
 
         User user = optionalUser.get();
-        user.setImage(user.getAvatar() ? storagePathBuilder.getServerUrl(true) + "/css/img/uid-"
-                + user.getId() + ".png" : null);
 
         // get file model with the default file parameters
         FileModel fileModel = fileConfigurer.getFileModel(
@@ -140,6 +140,9 @@ public class EditorController {
         // add file model with the default parameters to the original model
         model.addAttribute("model", fileModel);
 
+        // get file history and add it to the model
+        model.addAttribute("fileHistory", historyManager.getHistory(fileModel.getDocument()));
+
         // create the document service api URL and add it to the model
         model.addAttribute("docserviceApiUrl", docserviceSite + docserviceApiUrl);
 
@@ -147,19 +150,13 @@ public class EditorController {
         model.addAttribute("dataInsertImage",  getInsertImage(directUrl));
 
         // get a document for comparison and add it to the model
-        model.addAttribute("dataDocument",  getCompareFile(directUrl));
+        model.addAttribute("dataCompareFile",  getCompareFile(directUrl));
 
         // get recipients data for mail merging and add it to the model
-        model.addAttribute("dataSpreadsheet", getSpreadsheet(directUrl));
+        model.addAttribute("dataMailMergeRecipients", getMailMerge(directUrl));
 
         // get user data for mentions and add it to the model
         model.addAttribute("usersForMentions", getUserMentions(uid));
-
-        model.addAttribute("usersInfo", getUsersInfo(uid));
-
-        // get user data for protect and add it to the model
-        model.addAttribute("usersForProtect", getUserProtect(uid));
-
         return "editor.html";
     }
 
@@ -179,36 +176,6 @@ public class EditorController {
         return usersForMentions;
     }
 
-    private List<UserInfo> getUsersInfo(final String uid) {  // get user data for mentions
-        List<UserInfo> usersInfo = new ArrayList<>();
-        if (uid != null && !uid.equals("4")) {
-            List<User> list = userService.findAll();
-            for (User u : list) {
-                String image = u.getAvatar() ? storagePathBuilder.getServerUrl(true) + "/css/img/uid-"
-                + u.getId() + ".png" : null;
-                usersInfo.add(new UserInfo(u.getId(), u.getName(), u.getEmail(), image));
-            }
-        }
-        return usersInfo;
-    }
-
-    private List<Protect> getUserProtect(final String uid) {  // get user data for protect
-        List<Protect> usersForProtect = new ArrayList<>();
-        if (uid != null && !uid.equals("4")) {
-            List<User> list = userService.findAll();
-            for (User u : list) {
-                if (u.getId() != Integer.parseInt(uid) && u.getId() != ANONYMOUS_USER_ID) {
-
-                    // user data includes user names, IDs and emails
-                    usersForProtect.add(new Protect(u.getId(), u.getName(), u.getEmail()));
-                }
-            }
-        }
-
-        return usersForProtect;
-    }
-
-
     @SneakyThrows
     private String getInsertImage(final Boolean directUrl) {  // get an image that will be inserted into the document
         Map<String, Object> dataInsertImage = new HashMap<>();
@@ -233,40 +200,40 @@ public class EditorController {
     // get a document that will be compared with the current document
     @SneakyThrows
     private String getCompareFile(final Boolean directUrl) {
-        Map<String, Object> dataDocument = new HashMap<>();
-        dataDocument.put("fileType", "docx");
-        dataDocument.put("url", storagePathBuilder.getServerUrl(true) + "/assets?name=sample.docx");
+        Map<String, Object> dataCompareFile = new HashMap<>();
+        dataCompareFile.put("fileType", "docx");
+        dataCompareFile.put("url", storagePathBuilder.getServerUrl(true) + "/assets?name=sample.docx");
         if (directUrl) {
-            dataDocument.put("directUrl", storagePathBuilder
+            dataCompareFile.put("directUrl", storagePathBuilder
                     .getServerUrl(false) + "/assets?name=sample.docx");
         }
 
         // check if the document token is enabled
         if (jwtManager.tokenEnabled()) {
 
-            // create token from the dataDocument object
-            dataDocument.put("token", jwtManager.createToken(dataDocument));
+            // create token from the dataCompareFile object
+            dataCompareFile.put("token", jwtManager.createToken(dataCompareFile));
         }
 
-        return objectMapper.writeValueAsString(dataDocument);
+        return objectMapper.writeValueAsString(dataCompareFile);
     }
 
     @SneakyThrows
-    private String getSpreadsheet(final Boolean directUrl) {
-        Map<String, Object> dataSpreadsheet = new HashMap<>();  // get recipients data for mail merging
-        dataSpreadsheet.put("fileType", "csv");
-        dataSpreadsheet.put("url", storagePathBuilder.getServerUrl(true) + "/csv");
+    private String getMailMerge(final Boolean directUrl) {
+        Map<String, Object> dataMailMergeRecipients = new HashMap<>();  // get recipients data for mail merging
+        dataMailMergeRecipients.put("fileType", "csv");
+        dataMailMergeRecipients.put("url", storagePathBuilder.getServerUrl(true) + "/csv");
         if (directUrl) {
-            dataSpreadsheet.put("directUrl", storagePathBuilder.getServerUrl(false) + "/csv");
+            dataMailMergeRecipients.put("directUrl", storagePathBuilder.getServerUrl(false) + "/csv");
         }
 
         // check if the document token is enabled
         if (jwtManager.tokenEnabled()) {
 
-            // create token from the dataSpreadsheet object
-            dataSpreadsheet.put("token", jwtManager.createToken(dataSpreadsheet));
+            // create token from the dataMailMergeRecipients object
+            dataMailMergeRecipients.put("token", jwtManager.createToken(dataMailMergeRecipients));
         }
 
-        return objectMapper.writeValueAsString(dataSpreadsheet);
+        return objectMapper.writeValueAsString(dataMailMergeRecipients);
     }
 }

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

@@ -19,20 +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.history.HistoryManager;
 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.Reference;
-import com.onlyoffice.integration.dto.ReferenceData;
-import com.onlyoffice.integration.dto.Rename;
-import com.onlyoffice.integration.dto.Restore;
-import com.onlyoffice.integration.dto.SaveAs;
 import com.onlyoffice.integration.dto.Track;
 import com.onlyoffice.integration.entities.User;
 import com.onlyoffice.integration.documentserver.models.enums.DocumentType;
@@ -41,14 +32,10 @@ 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;
-import org.springframework.core.io.UrlResource;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -58,31 +45,19 @@ 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 org.springframework.web.util.UriComponents;
-import org.springframework.web.util.UriComponentsBuilder;
 
 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.MalformedURLException;
 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.Map;
 import java.util.Optional;
@@ -123,8 +98,6 @@ public class FileController {
     private ServiceConverter serviceConverter;
     @Autowired
     private CallbackManager callbackManager;
-    @Autowired
-    private HistoryManager historyManager;
 
     // create user metadata
     private String createUserMetadata(final String uid, final String fullFileName) {
@@ -151,28 +124,6 @@ public class FileController {
                 .body(resource);
     }
 
-    private ResponseEntity<Resource> downloadSample(final String fileName) {
-        String serverPath = System.getProperty("user.dir");
-        String contentType = "application/octet-stream";
-        String[] fileLocation = new String[] {serverPath, "src", "main", "resources", "assets", "document-templates",
-                                              "sample", fileName};
-        Path filePath = Paths.get(String.join(File.separator, fileLocation));
-        Resource resource;
-        try {
-            resource = new UrlResource(filePath.toUri());
-            if (resource.exists()) {
-                return ResponseEntity.ok()
-                        .contentType(MediaType.parseMediaType(contentType))
-                        .header(HttpHeaders.CONTENT_DISPOSITION,
-                                "attachment; filename=\"" + resource.getFilename() + "\"")
-                        .body(resource);
-        }
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
     // download data from the specified history file
     private ResponseEntity<Resource> downloadFileHistory(final String fileName,
                                                          final String version,
@@ -217,8 +168,7 @@ public class FileController {
                 throw new IOException("Could not update a file");  // if the file cannot be updated, an error occurs
             }
 
-            fullFileName = fileUtility.getFileNameWithoutExtension(fileNamePath)
-                    + "." + fileExtension;  // get full file name
+            fullFileName = fileUtility.getFileNameWithoutExtension(fileNamePath) + fileExtension;  // get full file name
 
             return createUserMetadata(uid, fullFileName);  // create user metadata and return it
         } catch (Exception e) {
@@ -248,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 + "\"}";
@@ -267,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);
@@ -279,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;
@@ -322,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()) {
@@ -342,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()) {
@@ -398,12 +341,14 @@ public class FileController {
     @GetMapping("/assets")
     public ResponseEntity<Resource> assets(@RequestParam("name")
                                                final String name) {  // get sample files from the assests
-        return downloadSample(name);
+        String fileName = Path.of("assets", "sample", fileUtility.getFileName(name)).toString();
+        return downloadFile(fileName);
     }
 
     @GetMapping("/csv")
     public ResponseEntity<Resource> csv() {  // download a csv file
-        return downloadSample("csv.csv");
+        String fileName = Path.of("assets", "sample", "csv.csv").toString();
+        return downloadFile(fileName);
     }
 
     @GetMapping("/files")
@@ -444,16 +389,19 @@ public class FileController {
 
     @PostMapping("/saveas")
     @ResponseBody
-    public String saveAs(@RequestBody final SaveAs body, @CookieValue("uid") final String uid) {
+    public String saveAs(@RequestBody final JSONObject body, @CookieValue("uid") final String uid) {
+        String title = (String) body.get("title");
+        String saveAsFileUrl = (String) body.get("url");
+
         try {
-            String fileName = documentManager.getCorrectName(body.getTitle());
+            String fileName = documentManager.getCorrectName(title);
             String curExt = fileUtility.getFileExtension(fileName);
 
             if (!fileUtility.getFileExts().contains(curExt)) {
                 return "{\"error\":\"File type is not supported\"}";
             }
 
-            URL url = new URL(body.getUrl());
+            URL url = new URL(saveAsFileUrl);
             java.net.HttpURLConnection connection = (java.net.HttpURLConnection) url.openConnection();
             InputStream stream = connection.getInputStream();
 
@@ -472,203 +420,29 @@ public class FileController {
 
     @PostMapping("/rename")
     @ResponseBody
-    public String rename(@RequestBody final Rename body) {
-        String fileName = body.getFileName();
+    public String rename(@RequestBody final JSONObject body) {
+        String newfilename = (String) body.get("newfilename");
+        String dockey = (String) body.get("dockey");
+        String origExt = "." + (String) body.get("ext");
+        String curExt = newfilename;
+
+        if (newfilename.indexOf(".") != -1) {
+            curExt = (String) fileUtility.getFileExtension(newfilename);
+        }
+
+        if (origExt.compareTo(curExt) != 0) {
+            newfilename += origExt;
+        }
 
         HashMap<String, String> meta = new HashMap<>();
-        meta.put("title", fileName + "." + body.getFileType());
+        meta.put("title", newfilename);
 
         try {
-            callbackManager.commandRequest("meta", body.getFileKey(), meta);
+            callbackManager.commandRequest("meta", dockey, meta);
             return "result ok";
         } catch (Exception e) {
             e.printStackTrace();
             return e.getMessage();
         }
     }
-
-    @PostMapping("/reference")
-    @ResponseBody
-    public String reference(@RequestBody final Reference body) {
-        try {
-            JSONParser parser = new JSONParser();
-            Gson gson = new GsonBuilder().disableHtmlEscaping().create();
-
-            String userAddress = "";
-            String fileName = "";
-
-            if (body.getReferenceData() != null) {
-                ReferenceData referenceData = body.getReferenceData();
-
-                if (referenceData.getInstanceId().equals(storagePathBuilder.getServerUrl(false))) {
-                    JSONObject fileKey = (JSONObject) parser.parse(referenceData.getFileKey());
-                    userAddress = (String) fileKey.get("userAddress");
-                    if (userAddress.equals(InetAddress.getLocalHost().getHostAddress())) {
-                        fileName = (String) fileKey.get("fileName");
-                    }
-                }
-            }
-
-            String link = body.getLink();
-            if (fileName.equals("") && link != null) {
-                if (!link.contains(storagePathBuilder.getServerUrl(true))) {
-                    HashMap<String, String> data = new HashMap<>();
-                    data.put("url", link);
-                    data.put("directUrl", link);
-                    return gson.toJson(data);
-                }
-
-                UriComponents uriComponents = UriComponentsBuilder.fromUriString(body.getLink()).build();
-                fileName = uriComponents.getQueryParams().getFirst("fileName");
-                boolean fileExists = new File(storagePathBuilder.getFileLocation(fileName)).exists();
-                if (!fileExists) {
-                    return "{ \"error\": \"File is not exist\"}";
-                }
-            }
-
-            if (fileName.equals("")) {
-                try {
-                    String path = (String) body.getPath();
-                    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\"}";
-            }
-
-            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));
-            data.put("key", serviceConverter.generateRevisionId(
-                storagePathBuilder.getStorageLocation()
-                + "/" + fileName + "/"
-                + new File(storagePathBuilder.getFileLocation(fileName)).lastModified()
-                ));
-            data.put("url", documentManager.getDownloadUrl(fileName, true));
-            data.put("directUrl", body.getDirectUrl() ? documentManager.getDownloadUrl(fileName, false) : null);
-            data.put("referenceData", referenceData);
-            data.put("path", fileName);
-            data.put("link", storagePathBuilder.getServerUrl(true) + "/editor?fileName=" + 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() + "\"}";
-        }
-    }
-
-    @GetMapping("/history")
-    @ResponseBody
-    public String history(@RequestParam("fileName") final String fileName) {
-        return historyManager.getHistory(fileName);
-    }
-
-    @GetMapping("/historydata")
-    @ResponseBody
-    public String history(@RequestParam("fileName") final String fileName,
-                          @RequestParam("version") final String version,
-                          @RequestParam(value = "directUrl", defaultValue = "false") final Boolean directUrl) {
-        return historyManager.getHistoryData(fileName, version, directUrl);
-    }
-
-    @PutMapping("/restore")
-    @ResponseBody
-    public String restore(@RequestBody final Restore body, @CookieValue("uid") final Integer uid) {
-        try {
-            String sourceStringFile = storagePathBuilder.getFileLocation(body.getFileName());
-            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()
-                + "/"
-                + body.getFileName()
-                + "/"
-                + Long.toString(sourceFile.lastModified())
-            );
-            FileWriter bumpedKeyFileWriter = new FileWriter(bumpedKeyFile);
-            bumpedKeyFileWriter.write(bumpedKey);
-            bumpedKeyFileWriter.close();
-
-            User user = userService.findUserById(uid).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(body.getFileName());
-            String previousBasename = "prev." + sourceExtension;
-
-            Path bumpedFile = Paths.get(bumpedVersionStringDirectory, previousBasename);
-            Files.move(sourcePathFile, bumpedFile);
-
-            String recoveryVersionStringDirectory = documentManager.versionDir(
-                    historyDirectory,
-                    body.getVersion(),
-                    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/controllers/IndexController.java

@@ -76,9 +76,6 @@ public class IndexController {
     @Value("${files.docservice.languages}")
     private String langs;
 
-    @Value("${server.version}")
-    private String serverVersion;
-
     @GetMapping("${url.index}")
     public String index(@RequestParam(value = "directUrl", required = false) final Boolean directUrl,
                         final Model model) {
@@ -127,7 +124,6 @@ public class IndexController {
         model.addAttribute("users", users);
         model.addAttribute("languages", languages);
         model.addAttribute("directUrl", directUrl);
-        model.addAttribute("serverVersion", serverVersion);
 
         return "index.html";
     }

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

@@ -120,26 +120,26 @@ public class DefaultCallbackManager implements CallbackManager {
         String newFileName = fileName;
 
         String curExt = fileUtility.getFileExtension(fileName);  // get current file extension
-        String downloadExt = body.getFiletype(); // get an extension of the downloaded file
+        String downloadExt = "." + body.getFiletype(); // get an extension of the downloaded file
 
         // todo: Refactoring
         // convert downloaded file to the file with the current extension if these extensions aren't equal
         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) + "."
+                            .getCorrectName(fileUtility.getFileNameWithoutExtension(fileName)
                                     + downloadExt);  // get the correct file name if it already exists
                 } else {
                     downloadUri = newFileUri;
                 }
             } catch (Exception e) {
                 newFileName = documentManager
-                        .getCorrectName(fileUtility.getFileNameWithoutExtension(fileName) + "." + downloadExt);
+                        .getCorrectName(fileUtility.getFileNameWithoutExtension(fileName) + downloadExt);
             }
         }
 
@@ -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
@@ -269,7 +266,7 @@ public class DefaultCallbackManager implements CallbackManager {
         String fileName = fileNameParam;
 
         String curExt = fileUtility.getFileExtension(fileName);  // get current file extension
-        String downloadExt = body.getFiletype();  // get an extension of the downloaded file
+        String downloadExt = "." + body.getFiletype();  // get an extension of the downloaded file
 
         Boolean newFileName = false;
 
@@ -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 {
@@ -304,10 +301,10 @@ public class DefaultCallbackManager implements CallbackManager {
                 // get the correct file name if it already exists
                 fileName = documentManager
                         .getCorrectName(fileUtility
-                                .getFileNameWithoutExtension(fileName) + "-form." + downloadExt);
+                                .getFileNameWithoutExtension(fileName) + "-form" + downloadExt);
             } else {
                 fileName = documentManager
-                        .getCorrectName(fileUtility.getFileNameWithoutExtension(fileName) + "-form." + curExt);
+                        .getCorrectName(fileUtility.getFileNameWithoutExtension(fileName) + "-form" + curExt);
             }
             forcesavePath = storagePathBuilder.getFileLocation(fileName);  // create forcesave path if it doesn't exist
             List<Action> actions =  body.getActions();
@@ -315,24 +312,6 @@ public class DefaultCallbackManager implements CallbackManager {
             String user = action.getUserid();  // get the user ID
             // create meta data for the forcesaved file
             storageMutator.createMeta(fileName, user, "Filling Form");
-
-            try {
-                String formsDataUrl = body.getFormsdataurl();
-
-                if (formsDataUrl != null && !formsDataUrl.isEmpty()) {
-                    String formsName = documentManager.getCorrectName(fileUtility
-                            .getFileNameWithoutExtension(fileName) + ".txt");
-                    String formsPath = storagePathBuilder.getFileLocation(formsName);
-
-                    byte[] byteArrayFormsData = getDownloadFile(formsDataUrl);
-
-                    saveFile(byteArrayFormsData, Paths.get(formsPath));
-                } else {
-                    throw new RuntimeException("Document editing service did not return formsDataUrl");
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
         } else {
             if (newFileName) {
                 fileName = documentManager

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

@@ -20,14 +20,11 @@ package com.onlyoffice.integration.documentserver.managers.document;
 
 import com.onlyoffice.integration.documentserver.storage.FileStorageMutator;
 import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder;
-import com.onlyoffice.integration.documentserver.util.Constants;
 import com.onlyoffice.integration.documentserver.util.file.FileUtility;
 import com.onlyoffice.integration.documentserver.util.service.ServiceConverter;
-import lombok.SneakyThrows;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Primary;
-import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Component;
 
 import java.io.File;
@@ -72,7 +69,7 @@ public class DefaultDocumentManager implements DocumentManager {
 
     // get URL to the created file
     public String getCreateUrl(final String fileName, final Boolean sample) {
-        String fileExt = fileUtility.getFileExtension(fileName);
+        String fileExt = fileUtility.getFileExtension(fileName).replace(".", "");
         String url = storagePathBuilder.getServerUrl(true)
                 + "/create?fileExt=" + fileExt + "&sample=" + sample;
         return url;
@@ -82,13 +79,13 @@ public class DefaultDocumentManager implements DocumentManager {
     public String getCorrectName(final String fileName) {
         String baseName = fileUtility.getFileNameWithoutExtension(fileName);  // get file name without extension
         String ext = fileUtility.getFileExtension(fileName);  // get file extension
-        String name = baseName + "." + ext;  // create a full file name
+        String name = baseName + ext;  // create a full file name
 
         Path path = Paths.get(storagePathBuilder.getFileLocation(name));
 
         // run through all the files with such a name in the storage directory
         for (int i = 1; Files.exists(path); i++) {
-            name = baseName + " (" + i + ")." + ext;  // and add an index to the base name
+            name = baseName + " (" + i + ")" + ext;  // and add an index to the base name
             path = Paths.get(storagePathBuilder.getFileLocation(name));
         }
 
@@ -220,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);
@@ -246,58 +237,4 @@ public class DefaultDocumentManager implements DocumentManager {
 
         return fileName;
     }
-
-    @SneakyThrows
-    public Boolean isExtendedPDFFile(final String fileName) {
-        Resource resource = storageMutator.loadFileAsResource(fileName);
-
-        byte[] bytes;
-
-        try (InputStream inputStream = resource.getInputStream()) {
-            bytes = inputStream.readNBytes(110);
-        } catch (Exception e) {
-            return false;
-        }
-
-        String pBuffer = new String(bytes, "Windows-1252");
-
-        int indexFirst = pBuffer.indexOf("%\315\312\322\251\015");
-        if (indexFirst == -1) {
-            return false;
-        }
-
-        String pFirst = pBuffer.substring(indexFirst + 6);
-
-        if (!pFirst.startsWith("1 0 obj\012<<\012")) {
-            return false;
-        }
-
-        pFirst = pFirst.substring(11);
-
-        int indexStream = pFirst.indexOf("stream\015\012");
-        int indexMeta = pFirst.indexOf(Constants.G_FORMAT_OFORM_PDF_META_TAG);
-
-        if (indexStream == -1 || indexMeta == -1 || indexStream < indexMeta) {
-            return false;
-        }
-
-        String pMeta = pFirst.substring(indexMeta);
-        pMeta = pMeta.substring(Constants.G_FORMAT_OFORM_PDF_META_TAG.length() + 3);
-
-        int indexMetaLast = pMeta.indexOf(" ");
-
-        if (indexMetaLast == -1) {
-            return false;
-        }
-
-        pMeta = pMeta.substring(indexMetaLast + 1);
-
-        indexMetaLast = pMeta.indexOf(" ");
-
-        if (indexMetaLast == -1) {
-            return false;
-        }
-
-        return true;
-    }
 }

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

@@ -39,5 +39,4 @@ public interface DocumentManager {
     // create demo document
     String createDemo(String fileExt, Boolean sample, String uid, String uname) throws Exception;
     String getCreateUrl(String fileName, Boolean sample);  // get URL to the created file
-    Boolean isExtendedPDFFile(String fileName);
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/history/DefaultHistoryManager.java

@@ -25,7 +25,6 @@ import com.onlyoffice.integration.documentserver.managers.jwt.JwtManager;
 import com.onlyoffice.integration.documentserver.models.filemodel.Document;
 import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder;
 import com.onlyoffice.integration.documentserver.util.file.FileUtility;
-import com.onlyoffice.integration.documentserver.util.service.ServiceConverter;
 import lombok.SneakyThrows;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
@@ -40,7 +39,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
-import java.nio.file.Paths;
 
 // todo: Rebuild completely
 @Component
@@ -64,9 +62,6 @@ public class DefaultHistoryManager implements HistoryManager {
     @Autowired
     private ObjectMapper objectMapper;
 
-    @Autowired
-    private ServiceConverter serviceConverter;
-
     // todo: Refactoring
     @SneakyThrows
     public String[] getHistory(final Document document) {  // get document history
@@ -104,14 +99,14 @@ public class DefaultHistoryManager implements HistoryManager {
                 }
 
                 dataObj.put("fileType", fileUtility
-                        .getFileExtension(document.getTitle()));
+                        .getFileExtension(document.getTitle()).replace(".", ""));
                 dataObj.put("key", key);
                 dataObj.put("url", i == curVer ? document.getUrl()
-                        : documentManager.getHistoryFileUrl(document.getTitle(), i, "prev." + fileUtility
+                        : documentManager.getHistoryFileUrl(document.getTitle(), i, "prev" + fileUtility
                         .getFileExtension(document.getTitle()), true));
                 if (!document.getDirectUrl().equals("")) {
                     dataObj.put("directUrl", i == curVer ? document.getDirectUrl()
-                            : documentManager.getHistoryFileUrl(document.getTitle(), i, "prev." + fileUtility
+                            : documentManager.getHistoryFileUrl(document.getTitle(), i, "prev" + fileUtility
                             .getFileExtension(document.getTitle()), false));
                 }
                 dataObj.put("version", i);
@@ -169,156 +164,6 @@ public class DefaultHistoryManager implements HistoryManager {
         return new String[]{"", ""};
     }
 
-    // todo: Refactoring
-    @SneakyThrows
-    public String getHistory(final String fileName) {  // get document history
-
-        // get history directory
-        String histDir = storagePathBuilder.getHistoryDir(storagePathBuilder.getFileLocation(fileName));
-        Integer curVer = storagePathBuilder.getFileVersion(histDir, false);  // get current file version
-
-        if (curVer > 0) {  // check if the current file version is greater than 0
-            List<Object> hist = new ArrayList<>();
-
-            for (Integer i = 1; i <= curVer; i++) {  // run through all the file versions
-                Map<String, Object> obj = new HashMap<String, Object>();
-                String verDir = documentManager
-                        .versionDir(histDir, i, true);  // get the path to the given file version
-
-                String key;
-                if (i == curVer) {
-                    key = serviceConverter
-                            .generateRevisionId(storagePathBuilder.getStorageLocation()
-                                    + "/" + fileName + "/"
-                                    + new File(storagePathBuilder.getFileLocation(fileName)).lastModified());
-                } else {
-                    key = readFileToEnd(new File(verDir + File.separator + "key.txt"));
-                }
-
-                obj.put("key", key);
-                obj.put("version", i);
-
-                if (i == 1) {  // check if the version number is equal to 1
-                    String createdInfo = readFileToEnd(new File(histDir
-                            + File.separator + "createdInfo.json"));  // get file with meta data
-                    JSONObject json = (JSONObject) parser.parse(createdInfo);  // and turn it into json object
-
-                    // write meta information to the object (user information and creation date)
-                    obj.put("created", json.get("created"));
-                    Map<String, Object> user = new HashMap<String, Object>();
-                    user.put("id", json.get("id"));
-                    user.put("name", json.get("name"));
-                    obj.put("user", user);
-                }
-
-                if (i > 1) {  //check if the version number is greater than 1
-                    // if so, get the path to the changes.json file
-                    JSONObject changes = (JSONObject) parser.parse(readFileToEnd(new File(documentManager
-                            .versionDir(histDir, i - 1, true) + File.separator + "changes.json")));
-                    JSONObject change = (JSONObject) ((JSONArray) changes.get("changes")).get(0);
-
-                    // write information about changes to the object
-                    obj.put("changes", changes.get("changes"));
-                    obj.put("serverVersion", changes.get("serverVersion"));
-                    obj.put("created", change.get("created"));
-                    obj.put("user", change.get("user"));
-                }
-
-                hist.add(obj);
-            }
-
-            // write history information about the current file version to the history object
-            Map<String, Object> histObj = new HashMap<String, Object>();
-            histObj.put("currentVersion", curVer);
-            histObj.put("history", hist);
-
-            try {
-                return objectMapper.writeValueAsString(histObj);
-            } catch (JsonProcessingException e) {
-                e.printStackTrace();
-            }
-        }
-        return "";
-    }
-
-    // todo: Refactoring
-    @SneakyThrows
-    public String getHistoryData(final String fileName, final String version, final Boolean directUrl) {
-        // get history directory
-        String histDir = storagePathBuilder.getHistoryDir(storagePathBuilder.getFileLocation(fileName));
-        Integer curVer = storagePathBuilder.getFileVersion(histDir, false);  // get current file version
-
-        if (curVer > 0) {  // check if the current file version is greater than 0
-            Map<String, Object> histData = new HashMap<>();
-
-            for (Integer i = 1; i <= curVer; i++) {  // run through all the file versions
-                Map<String, Object> dataObj = new HashMap<String, Object>();
-                String verDir = documentManager
-                        .versionDir(histDir, i, true);  // get the path to the given file version
-
-                String key;
-                if (i == curVer) {
-                    key = serviceConverter
-                            .generateRevisionId(storagePathBuilder.getStorageLocation()
-                                    + "/" + fileName + "/"
-                                    + new File(storagePathBuilder.getFileLocation(fileName)).lastModified());
-                } else {
-                    key = readFileToEnd(new File(verDir + File.separator + "key.txt"));
-                }
-
-                dataObj.put("fileType", fileUtility
-                        .getFileExtension(fileName).replace(".", ""));
-                dataObj.put("key", key);
-                dataObj.put("url", i == curVer ? documentManager.getDownloadUrl(fileName, true)
-                        : documentManager.getHistoryFileUrl(fileName, i, "prev" + fileUtility
-                        .getFileExtension(fileName), true));
-                if (directUrl) {
-                    dataObj.put("directUrl", i == curVer
-                            ? documentManager.getDownloadUrl(fileName, false)
-                            : documentManager.getHistoryFileUrl(fileName, i, "prev" + fileUtility
-                                    .getFileExtension(fileName), false));
-                }
-                dataObj.put("version", i);
-
-                if (i > 1) {  //check if the version number is greater than 1
-                    Integer verdiff = i - 1;
-                    // get the history data from the previous file version
-                    Map<String, Object> prev = (Map<String, Object>) histData.get(Integer.toString(verdiff));
-                    Map<String, Object> prevInfo = new HashMap<String, Object>();
-                    prevInfo.put("fileType", prev.get("fileType"));
-                    prevInfo.put("key", prev.get("key"));  // write key and URL information about previous file version
-                    prevInfo.put("url", prev.get("url"));
-                    if (directUrl) {
-                        prevInfo.put("directUrl", prev.get("directUrl"));
-                    }
-
-                    // write information about previous file version to the data object
-                    dataObj.put("previous", prevInfo);
-
-                    if (diffExists(histDir, verdiff)) {
-                        // write the path to the diff.zip archive with differences in this file version
-                        dataObj.put("changesUrl", documentManager
-                                .getHistoryFileUrl(fileName, verdiff, "diff.zip", true));
-                    }
-                }
-
-                if (jwtManager.tokenEnabled()) {
-                    dataObj.put("token", jwtManager.createToken(dataObj));
-                }
-
-                histData.put(Integer.toString(i), dataObj);
-            }
-
-            try {
-                return objectMapper.writeValueAsString(histData.get(version));
-            } catch (JsonProcessingException e) {
-                e.printStackTrace();
-            }
-        }
-        return "";
-    }
-
-
     // read a file
     private String readFileToEnd(final File file) {
         String output = "";
@@ -335,11 +180,4 @@ public class DefaultHistoryManager implements HistoryManager {
         }
         return output;
     }
-
-    // diff.zip existence check
-    private Boolean diffExists(final String histDir, final Integer verdiff) {
-        String filePath = Paths.get(histDir, String.valueOf(verdiff), "diff.zip").toString();
-        File file = new File(filePath);
-        return file.exists();
-    }
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/history/HistoryManager.java

@@ -18,9 +18,9 @@
 
 package com.onlyoffice.integration.documentserver.managers.history;
 
+import com.onlyoffice.integration.documentserver.models.filemodel.Document;
+
 // specify the history manager functions
 public interface HistoryManager {
-    String getHistory(String fileName);  // get document history
-
-    String getHistoryData(String fileName, String version, Boolean directUrl); // get document history data
+    String[] getHistory(Document document);  // get document history
 }