nodejs: encode path in url for wopi

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/document-server-integration/pulls/41

.github/workflows/artifact-go.yml

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

.github/workflows/artifact-php-laravel.yml

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

.github/workflows/lint-go.yml

@@ -0,0 +1,29 @@
+name: Golangci
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [master]
+    paths: ['web/documentserver-example/go/**']
+  pull_request:
+    branches: [master, develop]
+    paths: ['web/documentserver-example/go/**']
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./web/documentserver-example/go
+    steps:
+      - uses: actions/checkout@v3
+      
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.21' 
+
+      - name: Lint Golangci
+        run: |
+          go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
+          golangci-lint run

.github/workflows/lint-java.yml

@@ -3,10 +3,10 @@ name: Lint Java
 on:
   workflow_dispatch:
   push:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/java/**']
   pull_request:
-    branches: [master, main, develop]
+    branches: [master, develop]
     paths: ['web/documentserver-example/java/**']
 
 jobs:

.github/workflows/lint-nodejs.yml

@@ -3,10 +3,10 @@ name: ESLint
 on:
   workflow_dispatch:
   push:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/nodejs/**']
   pull_request:
-    branches: [master, main, develop]
+    branches: [master, develop]
     paths: ['web/documentserver-example/nodejs/**']
 
 env:

.github/workflows/lint-php-laravel.yml

@@ -0,0 +1,37 @@
+name: Laravel Pint
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [master]
+    paths: ['web/documentserver-example/php-laravel/**']
+  pull_request:
+    branches: [master, develop]
+    paths: ['web/documentserver-example/php-laravel/**']
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [8.2]
+    defaults:
+      run:
+        working-directory: ./web/documentserver-example/php-laravel
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: json, dom, curl, libxml, mbstring
+          coverage: none
+
+      - name: Install Pint
+        run: composer global require laravel/pint
+          
+      - name: Run Pint
+        run: pint --test

.github/workflows/lint-php.yml

@@ -3,10 +3,10 @@ name: PHPCs
 on:
   workflow_dispatch:
   push:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/php/**']
   pull_request:
-    branches: [master, main, develop]
+    branches: [master, develop]
     paths: ['web/documentserver-example/php/**']
 
 jobs:

.github/workflows/lint-python.yml

@@ -3,10 +3,10 @@ name: PyLint
 on:
   workflow_dispatch:
   push:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/python/**']
   pull_request:
-    branches: [master, main, develop]
+    branches: [master, develop]
     paths: ['web/documentserver-example/python/**']
 
 jobs:

.github/workflows/lint-ruby.yml

@@ -3,10 +3,10 @@ name: Rubocop
 on:
   workflow_dispatch:
   push:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/ruby/**']
   pull_request:
-    branches: [master, main, develop]
+    branches: [master, develop]
     paths: ['web/documentserver-example/ruby/**']
 
 jobs:

.github/workflows/lint-spring.yml

@@ -3,10 +3,10 @@ name: Lint Spring
 on:
   workflow_dispatch:
   push:
-    branches: [master, main]
+    branches: [master]
     paths: ['web/documentserver-example/java-spring/**']
   pull_request:
-    branches: [master, main, develop]
+    branches: [master, develop]
     paths: ['web/documentserver-example/java-spring/**']
 
 jobs:

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Release
 
 on:
   push:
-    branches: [master,main]
+    branches: [master]
 
 permissions:
   contents: write

.gitmodules

@@ -1,21 +1,21 @@
 [submodule "web/documentserver-example/nodejs/public/assets/document-templates"]
 	path = web/documentserver-example/nodejs/public/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
-	branch = main/en
+	branch = main/default
 [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
 [submodule "web/documentserver-example/csharp-mvc/assets/document-templates"]
 	path = web/documentserver-example/csharp-mvc/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
-	branch = main/en
+	branch = main/default
 [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
 	url = https://github.com/ONLYOFFICE/document-templates
-	branch = main/en
+	branch = main/default
 [submodule "web/documentserver-example/php/assets/document-formats"]
 	path = web/documentserver-example/php/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
@@ -23,19 +23,19 @@
 [submodule "web/documentserver-example/python/assets/document-templates"]
 	path = web/documentserver-example/python/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
-	branch = main/en
+	branch = main/default
 [submodule "web/documentserver-example/java/src/main/resources/assets/document-templates"]
 	path = web/documentserver-example/java/src/main/resources/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
-	branch = main/en
+	branch = main/default
 [submodule "web/documentserver-example/ruby/assets/document-templates"]
 	path = web/documentserver-example/ruby/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
-	branch = main/en
+	branch = main/default
 [submodule "web/documentserver-example/java-spring/src/main/resources/assets/document-templates"]
 	path = web/documentserver-example/java-spring/src/main/resources/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
-	branch = main/en
+	branch = main/default
 [submodule "web/documentserver-example/python/assets/document-formats"]
 	path = web/documentserver-example/python/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
@@ -51,7 +51,7 @@
 [submodule "web/documentserver-example/csharp/assets/document-templates"]
 	path = web/documentserver-example/csharp/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
-	branch = main/en
+	branch = main/default
 [submodule "web/documentserver-example/csharp/assets/document-formats"]
 	path = web/documentserver-example/csharp/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Change Log
 
+## 1.12.0
+- nodejs: refresh config
+- nodejs: support pages, numbers, key formats
+- nodejs: support hwp, hwpx formats
+- sq-AL skin language
+
+## 1.11.0
 - he-IL skin language
+- ConvertService.ashx address replaced with converter
+- coauthoring/CommandService.ashx address replaced with command
+- without submitForm in viewer
 
 ## 1.10.0
 - nodejs: converting function on index page

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

@@ -1 +1,7 @@
-<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 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#287CA9"/>
+    <path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
+    <rect x="7" y="28" width="10" height="2" rx="1" fill="#fff"/>
+    <rect x="7" y="22" width="16" height="2" rx="1" fill="#fff"/>
+    <rect x="7" y="16" width="16" height="2" rx="1" fill="#fff"/>
+</svg>

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

@@ -1,5 +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.34315 1.34315 0 3 0H23L30 7V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#9E1919"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.0062 15V16.0065H24V15H17.0062ZM17.0062 19V20.0163H24V19H17.0062ZM24 23H17.0062V24.0261H24V23ZM6 28V27.0293H24V28H6ZM7 16H14V23H7V16ZM6 15H7H14H15V16V23V24H14H7H6V23V16V15Z" fill="white"/>
-<path d="M23 0L30 7H26C24.3431 7 23 5.65685 23 4V0Z" fill="black" fill-opacity="0.25"/>
+    <path d="M0 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#E54D39"/>
+    <path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
+    <rect x="7" y="28" width="16" height="2" rx="1" fill="#fff"/>
+    <rect x="18" y="22" width="5" height="2" rx="1" fill="#fff"/>
+    <rect x="18" y="16" width="5" height="2" rx="1" fill="#fff"/>
+    <rect x="8" y="17" width="6" height="6" rx=".833" stroke="#fff" stroke-width="2"/>
 </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 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#F36700"/>
+    <path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
+    <rect x="6" y="28" width="18" height="2" rx="1" fill="#fff"/>
+    <rect x="6" y="16" width="18" height="2" rx="1" fill="#fff"/>
+    <rect x="6" y="16" width="2" height="14" rx="1" fill="#fff"/>
+    <rect x="22" y="16" width="2" height="14" rx="1" fill="#fff"/>
+</svg>

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

@@ -1 +1,5 @@
-<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="M0 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#D1D5DA"/>
+    <path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5zm-5.293 14.293a1 1 0 0 0-1.414 0l-4 4a1 1 0 1 0 1.414 1.414L14 17.414V25a1 1 0 1 0 2 0v-7.586l2.293 2.293a1 1 0 0 0 1.414-1.414z" fill="#646464"/>
+    <path d="M8.833 22H11a1 1 0 1 1 0 2H9v4h12v-4h-2a1 1 0 1 1 0-2h2.167c1.012 0 1.833.82 1.833 1.833v4.334C23 29.179 22.18 30 21.167 30H8.833A1.833 1.833 0 0 1 7 28.167v-4.334C7 22.821 7.82 22 8.833 22" fill="#646464"/>
+</svg>

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

@@ -1 +1,10 @@
-<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 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#3AA133"/>
+    <path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
+    <rect x="6" y="28" width="18" height="2" rx="1" fill="#fff"/>
+    <rect x="6" y="16" width="18" height="2" rx="1" fill="#fff"/>
+    <rect x="6" y="22" width="18" height="2" rx="1" fill="#fff"/>
+    <rect x="6" y="16" width="2" height="14" rx="1" fill="#fff"/>
+    <rect x="12" y="16" width="2" height="14" rx="1" fill="#fff"/>
+    <rect x="22" y="16" width="2" height="14" rx="1" fill="#fff"/>
+</svg>

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

@@ -1,12 +1,5 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.84616 1H10.8462L14.8462 5V15H2.84616V1Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.8462 5L10.8462 1H2.84616V15H14.8462V5ZM10.8462 0L15.8462 5V16H1.84616V0H10.8462Z" fill="#BFBFBF"/>
-<rect x="3.84616" y="10" width="10" height="4" fill="#3779A6"/>
-<path d="M3.84616 4H4.84616V5H3.84616V4Z" fill="#BFBFBF"/>
-<path d="M3.84616 6H4.84616V7H3.84616V6Z" fill="#BFBFBF"/>
-<path d="M4.84616 8H3.84616V9H4.84616V8Z" fill="#BFBFBF"/>
-<path d="M12.8462 8H5.84616V9H12.8462V8Z" fill="#BFBFBF"/>
-<path d="M7.84616 6H5.84616V7H7.84616V6Z" fill="#BFBFBF"/>
-<path d="M12.8462 4H5.84616V5H12.8462V4Z" fill="#BFBFBF"/>
-<path opacity="0.3" d="M9.84616 1H10.8462V4H14.8462L15.8462 5H9.84616V1Z" fill="#333333"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M13.5 3.707V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.293z" fill="#fff" stroke="#BBB"/>
+    <path d="M9.5 1v2.7c0 .28 0 .42.055.527a.5.5 0 0 0 .218.218c.107.055.247.055.527.055H13" stroke="#BBB"/>
+    <path fill="#287CA9" d="M5 7h6v1H5zm0 2h6v1H5zm0 2h4v1H5z"/>
 </svg>

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

@@ -1 +1,5 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M2 1h8l4 4v10H2V1z" fill="#fff"/><path fill-rule="evenodd" clip-rule="evenodd" d="M14 5l-4-4H2v14h12V5zm-4-5l5 5v11H1V0h9z" fill="#BFBFBF"/><path fill="#9E1919" d="M3 10h10v4H3z"/><path d="M7 7V2H3v5h4zM8 3V2h2v1H8zM8 5V4h5v1H8zM13 6H8v1h5V6zM13 8H3v1h10V8z" fill="#BFBFBF"/><path opacity=".3" d="M9 1h1v3h4l1 1H9V1z" fill="#333"/></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M13.5 3.707V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.293z" fill="#fff" stroke="#BBB"/>
+    <path d="M9.5 1v2.7c0 .28 0 .42.055.527a.5.5 0 0 0 .218.218c.107.055.247.055.527.055H13" stroke="#BBB"/>
+    <path d="M7.36 5.777c0 1.085-.31 2.363-.833 3.543-.526 1.185-1.235 2.198-1.974 2.796l.803 1.109c1.992-1.342 4.198-2.262 6.333-1.954L12 9.938c-1.819-.612-3.278-2.449-3.278-4.16zm.888 2.84a6.7 6.7 0 0 0 1.161 1.35c-.668.122-1.323.32-1.957.573q.17-.322.316-.657c.183-.41.344-.836.48-1.267" fill="#E54D39"/>
+</svg>

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

@@ -1,12 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 1H10L14 5V15H2V1Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14 5L10 1H2V15H14V5ZM10 0L15 5V16H1V0H10Z" fill="#BFBFBF"/>
-<rect x="3" y="10" width="10" height="4" fill="#F36700"/>
-<path d="M3 4H4V5H3V4Z" fill="#BFBFBF"/>
-<path d="M3 6H4V7H3V6Z" fill="#BFBFBF"/>
-<path d="M4 8H3V9H4V8Z" fill="#BFBFBF"/>
-<path d="M12 8H5V9H12V8Z" fill="#BFBFBF"/>
-<path d="M7 6H5V7H7V6Z" fill="#BFBFBF"/>
-<path d="M12 4H5V5H12V4Z" fill="#BFBFBF"/>
-<path opacity="0.3" d="M9 1H10V4H14L15 5H9V1Z" fill="#333333"/>
+    <path d="M13.5 3.707V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.293z" fill="#fff" stroke="#BBB"/>
+    <path d="M9.5 1v2.7c0 .28 0 .42.055.527a.5.5 0 0 0 .218.218c.107.055.247.055.527.055H13" stroke="#BBB"/>
+    <path d="M5 10a3 3 0 1 0 3-3v3z" fill="#F36700"/>
+    <path d="M4.5 9A2.5 2.5 0 0 1 7 6.5V9z" fill="#F36700"/>
 </svg>

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

@@ -1,12 +1,5 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.84592 1H10.8459L14.8459 5V15H2.84592V1Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.8459 5L10.8459 1H2.84592V15H14.8459V5ZM10.8459 0L15.8459 5V16H1.84592V0H10.8459Z" fill="#BFBFBF"/>
-<rect x="3.84592" y="10" width="10" height="4" fill="#78A73B"/>
-<path d="M3.84592 4H4.84592V5H3.84592V4Z" fill="#BFBFBF"/>
-<path d="M3.84592 6H4.84592V7H3.84592V6Z" fill="#BFBFBF"/>
-<path d="M4.84592 8H3.84592V9H4.84592V8Z" fill="#BFBFBF"/>
-<path d="M12.8459 8H5.84592V9H12.8459V8Z" fill="#BFBFBF"/>
-<path d="M7.84592 6H5.84592V7H7.84592V6Z" fill="#BFBFBF"/>
-<path d="M12.8459 4H5.84592V5H12.8459V4Z" fill="#BFBFBF"/>
-<path opacity="0.3" d="M9.84592 1H10.8459V4H14.8459L15.8459 5H9.84592V1Z" fill="#333333"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M13.5 3.207V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.793z" fill="#fff" stroke="#BBB"/>
+    <path d="M9.5 1v1.9c0 .56 0 .84.109 1.054a1 1 0 0 0 .437.437c.214.109.494.109 1.054.109H13" stroke="#BBB"/>
+    <path fill="#3AA133" d="M8 7h3v2H8zm0 3h3v2H8zM5 7h2v2H5zm0 3h2v2H5z"/>
 </svg>

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

@@ -225,7 +225,7 @@ namespace OnlineEditorsExampleMVC.Helpers
         private static void ProcessResponseError(int errorCode)
         {
             var errorMessage = string.Empty;
-            const string errorMessageTemplate = "Error occurred in the ConvertService.ashx: {0}";
+            const string errorMessageTemplate = "Error occurred in the ConvertService: {0}";
 
             switch (errorCode)
             {

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

@@ -89,7 +89,7 @@ namespace OnlineEditorsExampleMVC.Models
                 editorsMode = "fillForms";
                 canEdit = true;
             }
-            var submitForm = (editorsMode.Equals("fillForms") || editorsMode.Equals("embedded")) && user.id.Equals("uid-1");  // check if the Submit form button is displayed or not
+            var submitForm = !editorsMode.Equals("view") && user.id.Equals("uid-1");  // 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

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

@@ -38,7 +38,15 @@ Configure the IIS components for the server to work correctly:
 * **Common HTTP Features**: Default Document,
 * **Security**: Request Filtering.
 
-## Step 4. Run your website with the editors
+## Step 4. Configure JWT 
+
+Open the *web.appsettings.config* file and [specify the same secret key](https://helpcenter.onlyoffice.com/installation/docs-configure-jwt.aspx) as used in your Document Server to enable JWT: 
+
+```
+<add key="files.docservice.secret" value="secret" />
+```
+
+## Step 5. Run your website with the editors
 1. Run the Internet Information Service (IIS) Manager:
 
 	**Start** -> **Control Panel** -> **System and Security** -> **Administrative Tools** -> **Internet Information Services (IIS) Manager**
@@ -65,7 +73,7 @@ Configure the IIS components for the server to work correctly:
 
 	![browse](screenshots/browse.png)
 
-## Step 5. Check accessibility
+## Step 6. 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. 
 

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

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <appSettings>
   <clear />
-  <add key="version" value="1.10.0"/>
+  <add key="version" value="1.12.0"/>
 
   <add key="filesize-max" value="52428800"/>
   <add key="storage-path" value=""/>
@@ -16,14 +16,14 @@
 
   <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|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|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-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|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|sq-AL:Albanian (Albania)|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|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|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-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|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.url.site" value="http://documentserver/"/>
 
-  <add key="files.docservice.url.converter" value="ConvertService.ashx"/>
+  <add key="files.docservice.url.converter" value="converter"/>
   <add key="files.docservice.url.api" value="web-apps/apps/api/documents/api.js"/>
   <add key="files.docservice.url.preloader" value="web-apps/apps/api/documents/cache-scripts.html"/>
-  <add key="files.docservice.url.command" value="coauthoring/CommandService.ashx"/>
+  <add key="files.docservice.url.command" value="command"/>
 
   <add key="files.docservice.url.example" value=""/>
 

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

@@ -1 +1,7 @@
-<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 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#287CA9"/>
+    <path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
+    <rect x="7" y="28" width="10" height="2" rx="1" fill="#fff"/>
+    <rect x="7" y="22" width="16" height="2" rx="1" fill="#fff"/>
+    <rect x="7" y="16" width="16" height="2" rx="1" fill="#fff"/>
+</svg>

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

@@ -1,5 +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.34315 1.34315 0 3 0H23L30 7V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#9E1919"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.0062 15V16.0065H24V15H17.0062ZM17.0062 19V20.0163H24V19H17.0062ZM24 23H17.0062V24.0261H24V23ZM6 28V27.0293H24V28H6ZM7 16H14V23H7V16ZM6 15H7H14H15V16V23V24H14H7H6V23V16V15Z" fill="white"/>
-<path d="M23 0L30 7H26C24.3431 7 23 5.65685 23 4V0Z" fill="black" fill-opacity="0.25"/>
+    <path d="M0 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#E54D39"/>
+    <path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
+    <rect x="7" y="28" width="16" height="2" rx="1" fill="#fff"/>
+    <rect x="18" y="22" width="5" height="2" rx="1" fill="#fff"/>
+    <rect x="18" y="16" width="5" height="2" rx="1" fill="#fff"/>
+    <rect x="8" y="17" width="6" height="6" rx=".833" stroke="#fff" stroke-width="2"/>
 </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 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#F36700"/>
+    <path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
+    <rect x="6" y="28" width="18" height="2" rx="1" fill="#fff"/>
+    <rect x="6" y="16" width="18" height="2" rx="1" fill="#fff"/>
+    <rect x="6" y="16" width="2" height="14" rx="1" fill="#fff"/>
+    <rect x="22" y="16" width="2" height="14" rx="1" fill="#fff"/>
+</svg>

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

@@ -1 +1,5 @@
-<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="M0 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#D1D5DA"/>
+    <path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5zm-5.293 14.293a1 1 0 0 0-1.414 0l-4 4a1 1 0 1 0 1.414 1.414L14 17.414V25a1 1 0 1 0 2 0v-7.586l2.293 2.293a1 1 0 0 0 1.414-1.414z" fill="#646464"/>
+    <path d="M8.833 22H11a1 1 0 1 1 0 2H9v4h12v-4h-2a1 1 0 1 1 0-2h2.167c1.012 0 1.833.82 1.833 1.833v4.334C23 29.179 22.18 30 21.167 30H8.833A1.833 1.833 0 0 1 7 28.167v-4.334C7 22.821 7.82 22 8.833 22" fill="#646464"/>
+</svg>

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

@@ -1 +1,10 @@
-<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 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#3AA133"/>
+    <path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
+    <rect x="6" y="28" width="18" height="2" rx="1" fill="#fff"/>
+    <rect x="6" y="16" width="18" height="2" rx="1" fill="#fff"/>
+    <rect x="6" y="22" width="18" height="2" rx="1" fill="#fff"/>
+    <rect x="6" y="16" width="2" height="14" rx="1" fill="#fff"/>
+    <rect x="12" y="16" width="2" height="14" rx="1" fill="#fff"/>
+    <rect x="22" y="16" width="2" height="14" rx="1" fill="#fff"/>
+</svg>

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

@@ -1,12 +1,5 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.84616 1H10.8462L14.8462 5V15H2.84616V1Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.8462 5L10.8462 1H2.84616V15H14.8462V5ZM10.8462 0L15.8462 5V16H1.84616V0H10.8462Z" fill="#BFBFBF"/>
-<rect x="3.84616" y="10" width="10" height="4" fill="#3779A6"/>
-<path d="M3.84616 4H4.84616V5H3.84616V4Z" fill="#BFBFBF"/>
-<path d="M3.84616 6H4.84616V7H3.84616V6Z" fill="#BFBFBF"/>
-<path d="M4.84616 8H3.84616V9H4.84616V8Z" fill="#BFBFBF"/>
-<path d="M12.8462 8H5.84616V9H12.8462V8Z" fill="#BFBFBF"/>
-<path d="M7.84616 6H5.84616V7H7.84616V6Z" fill="#BFBFBF"/>
-<path d="M12.8462 4H5.84616V5H12.8462V4Z" fill="#BFBFBF"/>
-<path opacity="0.3" d="M9.84616 1H10.8462V4H14.8462L15.8462 5H9.84616V1Z" fill="#333333"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M13.5 3.707V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.293z" fill="#fff" stroke="#BBB"/>
+    <path d="M9.5 1v2.7c0 .28 0 .42.055.527a.5.5 0 0 0 .218.218c.107.055.247.055.527.055H13" stroke="#BBB"/>
+    <path fill="#287CA9" d="M5 7h6v1H5zm0 2h6v1H5zm0 2h4v1H5z"/>
 </svg>

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

@@ -1 +1,5 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M2 1h8l4 4v10H2V1z" fill="#fff"/><path fill-rule="evenodd" clip-rule="evenodd" d="M14 5l-4-4H2v14h12V5zm-4-5l5 5v11H1V0h9z" fill="#BFBFBF"/><path fill="#9E1919" d="M3 10h10v4H3z"/><path d="M7 7V2H3v5h4zM8 3V2h2v1H8zM8 5V4h5v1H8zM13 6H8v1h5V6zM13 8H3v1h10V8z" fill="#BFBFBF"/><path opacity=".3" d="M9 1h1v3h4l1 1H9V1z" fill="#333"/></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M13.5 3.707V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.293z" fill="#fff" stroke="#BBB"/>
+    <path d="M9.5 1v2.7c0 .28 0 .42.055.527a.5.5 0 0 0 .218.218c.107.055.247.055.527.055H13" stroke="#BBB"/>
+    <path d="M7.36 5.777c0 1.085-.31 2.363-.833 3.543-.526 1.185-1.235 2.198-1.974 2.796l.803 1.109c1.992-1.342 4.198-2.262 6.333-1.954L12 9.938c-1.819-.612-3.278-2.449-3.278-4.16zm.888 2.84a6.7 6.7 0 0 0 1.161 1.35c-.668.122-1.323.32-1.957.573q.17-.322.316-.657c.183-.41.344-.836.48-1.267" fill="#E54D39"/>
+</svg>

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

@@ -1,12 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 1H10L14 5V15H2V1Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14 5L10 1H2V15H14V5ZM10 0L15 5V16H1V0H10Z" fill="#BFBFBF"/>
-<rect x="3" y="10" width="10" height="4" fill="#F36700"/>
-<path d="M3 4H4V5H3V4Z" fill="#BFBFBF"/>
-<path d="M3 6H4V7H3V6Z" fill="#BFBFBF"/>
-<path d="M4 8H3V9H4V8Z" fill="#BFBFBF"/>
-<path d="M12 8H5V9H12V8Z" fill="#BFBFBF"/>
-<path d="M7 6H5V7H7V6Z" fill="#BFBFBF"/>
-<path d="M12 4H5V5H12V4Z" fill="#BFBFBF"/>
-<path opacity="0.3" d="M9 1H10V4H14L15 5H9V1Z" fill="#333333"/>
+    <path d="M13.5 3.707V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.293z" fill="#fff" stroke="#BBB"/>
+    <path d="M9.5 1v2.7c0 .28 0 .42.055.527a.5.5 0 0 0 .218.218c.107.055.247.055.527.055H13" stroke="#BBB"/>
+    <path d="M5 10a3 3 0 1 0 3-3v3z" fill="#F36700"/>
+    <path d="M4.5 9A2.5 2.5 0 0 1 7 6.5V9z" fill="#F36700"/>
 </svg>

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

@@ -1,12 +1,5 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.84592 1H10.8459L14.8459 5V15H2.84592V1Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.8459 5L10.8459 1H2.84592V15H14.8459V5ZM10.8459 0L15.8459 5V16H1.84592V0H10.8459Z" fill="#BFBFBF"/>
-<rect x="3.84592" y="10" width="10" height="4" fill="#78A73B"/>
-<path d="M3.84592 4H4.84592V5H3.84592V4Z" fill="#BFBFBF"/>
-<path d="M3.84592 6H4.84592V7H3.84592V6Z" fill="#BFBFBF"/>
-<path d="M4.84592 8H3.84592V9H4.84592V8Z" fill="#BFBFBF"/>
-<path d="M12.8459 8H5.84592V9H12.8459V8Z" fill="#BFBFBF"/>
-<path d="M7.84592 6H5.84592V7H7.84592V6Z" fill="#BFBFBF"/>
-<path d="M12.8459 4H5.84592V5H12.8459V4Z" fill="#BFBFBF"/>
-<path opacity="0.3" d="M9.84592 1H10.8459V4H14.8459L15.8459 5H9.84592V1Z" fill="#333333"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M13.5 3.207V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.793z" fill="#fff" stroke="#BBB"/>
+    <path d="M9.5 1v1.9c0 .56 0 .84.109 1.054a1 1 0 0 0 .437.437c.214.109.494.109 1.054.109H13" stroke="#BBB"/>
+    <path fill="#3AA133" d="M8 7h3v2H8zm0 3h3v2H8zM5 7h2v2H5zm0 3h2v2H5z"/>
 </svg>

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

@@ -154,7 +154,7 @@ namespace OnlineEditorsExample
                 editorsMode = "fillForms";
                 canEdit = true;
             }            
-            var submitForm = (editorsMode.Equals("fillForms") || editorsMode.Equals("embedded")) && user.id.Equals("uid-1");  // check if the Submit form button is displayed or hidden
+            var submitForm = !editorsMode.Equals("view") && user.id.Equals("uid-1");  // 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();

web/documentserver-example/csharp/DocumentConverter.cs

@@ -227,7 +227,7 @@ namespace ASC.Api.DocumentConverter
         private static void ProcessResponseError(int errorCode)
         {
             var errorMessage = string.Empty;
-            const string errorMessageTemplate = "Error occurred in the ConvertService.ashx: {0}";
+            const string errorMessageTemplate = "Error occurred in the ConvertService: {0}";
 
             switch (errorCode)
             {

web/documentserver-example/csharp/README.md

@@ -39,7 +39,15 @@ Configure the IIS components for the server to work correctly:
 * **Common HTTP Features**: Default Document,
 * **Security**: Request Filtering.
 
-## Step 4. Run your website with the editors
+## Step 4. Configure JWT 
+
+Open the *settings.config* file and [specify the same secret key](https://helpcenter.onlyoffice.com/installation/docs-configure-jwt.aspx) as used in your Document Server to enable JWT: 
+
+```
+<add key="files.docservice.secret" value="secret" />
+```
+
+## Step 5. Run your website with the editors
 1. Run the Internet Information Service (IIS) Manager:
 
 	**Start** -> **Control Panel** -> **System and Security** -> **Administrative Tools** -> **Internet Information Services (IIS) Manager**
@@ -67,7 +75,7 @@ Configure the IIS components for the server to work correctly:
 	
 	![browse](screenshots/browse.png)
 
-## Step 5. Check accessibility
+## Step 6. 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.
 

web/documentserver-example/csharp/settings.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <appSettings>
   <clear />
-  <add key="version" value="1.10.0"/>
+  <add key="version" value="1.12.0"/>
 
   <add key="filesize-max" value="52428800"/>
   <add key="storage-path" value=""/>
@@ -15,14 +15,14 @@
 
   <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|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|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-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|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|sq-AL:Albanian (Albania)|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|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|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-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|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.url.site" value="http://documentserver/"/>
 
-  <add key="files.docservice.url.converter" value="ConvertService.ashx"/>
+  <add key="files.docservice.url.converter" value="converter"/>
   <add key="files.docservice.url.api" value="web-apps/apps/api/documents/api.js"/>
   <add key="files.docservice.url.preloader" value="web-apps/apps/api/documents/cache-scripts.html"/>
-  <add key="files.docservice.url.command" value="coauthoring/CommandService.ashx"/>
+  <add key="files.docservice.url.command" value="command"/>
 
   <add key="files.docservice.url.example" value=""/>
 

web/documentserver-example/java-spring/README.md

@@ -94,8 +94,15 @@ To run the Java example code, install the Java version 11 appropriate for your O
 	echo %MAVEN_HOME%
 	```
 
+### Step 5. Configure JWT 
 
-### Step 5. Start application with Maven
+Open the *src/main/resouces/application.properties* file and [specify the same secret key](https://helpcenter.onlyoffice.com/installation/docs-configure-jwt.aspx) as used in your Document Server to enable JWT: 
+
+```
+docservice.security.key=secret
+```
+
+### Step 6. Start application with Maven
 
 1. Open the console and go the java-spring folder using the **cd** command, for example:
 	```
@@ -113,7 +120,7 @@ To run the Java example code, install the Java version 11 appropriate for your O
      http://server.address:server.port/
      ```
 
-### Step 6. Check accessibility
+### Step 7. 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. 
 
@@ -174,6 +181,11 @@ See the detailed guide to learn how to install Document Server [for Linux](https
 
 	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.
    
+   [Specify the same secret key](https://helpcenter.onlyoffice.com/installation/docs-configure-jwt.aspx) as used in your Document Server to enable JWT: 
+
+    ```
+    docservice.security.key=secret
+    ```
 
 5. Install **Maven**:
 
@@ -260,6 +272,12 @@ 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.
 
+    [Specify the same secret key](https://helpcenter.onlyoffice.com/installation/docs-configure-jwt.aspx) as used in your Document Server to enable JWT: 
+
+    ```
+    docservice.security.key=secret
+    ```
+
 6. Run the next command in the java example directory:
 
 	```

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

@@ -84,7 +84,7 @@
 		<dependency>
 			<groupId>com.onlyoffice</groupId>
 			<artifactId>docs-integration-sdk</artifactId>
-			<version>1.2.1-SNAPSHOT</version>
+			<version>1.2.1</version>
 		</dependency>
 	</dependencies>
 

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

@@ -33,7 +33,6 @@ import com.onlyoffice.manager.security.JwtManager;
 import com.onlyoffice.manager.settings.SettingsManager;
 import com.onlyoffice.model.documenteditor.Config;
 import com.onlyoffice.model.documenteditor.config.document.Type;
-import com.onlyoffice.model.settings.SettingsConstants;
 import lombok.SneakyThrows;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -89,8 +88,6 @@ public class EditorController {
                         @RequestParam(value = "action", required = false) final String actionParam,
                         @RequestParam(value = "type", required = false) final String typeParam,
                         @RequestParam(value = "actionLink", required = false) final String actionLink,
-                        @RequestParam(value = "directUrl", required = false,
-                                defaultValue = "false") final Boolean directUrl,
                         @CookieValue(value = "uid") final String uid,
                         @CookieValue(value = "ulang") final String lang,
                         final Model model) throws JsonProcessingException {
@@ -105,8 +102,6 @@ public class EditorController {
             type = Type.valueOf(typeParam.toUpperCase());
         }
 
-        settingsManager.setSetting(SettingsConstants.DIRECT_URL, String.valueOf(directUrl));
-
         List<String> langsAndKeys = Arrays.asList(langs.split("\\|"));
         for (String langAndKey : langsAndKeys) {
             String[] couple = langAndKey.split(":");
@@ -144,13 +139,13 @@ public class EditorController {
         model.addAttribute("docserviceApiUrl", urlManager.getDocumentServerApiUrl());
 
         // get an image and add it to the model
-        model.addAttribute("dataInsertImage",  getInsertImage(directUrl));
+        model.addAttribute("dataInsertImage",  getInsertImage());
 
         // get a document for comparison and add it to the model
-        model.addAttribute("dataDocument",  getCompareFile(directUrl));
+        model.addAttribute("dataDocument",  getCompareFile());
 
         // get recipients data for mail merging and add it to the model
-        model.addAttribute("dataSpreadsheet", getSpreadsheet(directUrl));
+        model.addAttribute("dataSpreadsheet", getSpreadsheet());
 
         // get user data for mentions and add it to the model
         model.addAttribute("usersForMentions", getUserMentions(uid));
@@ -210,14 +205,10 @@ public class EditorController {
 
 
     @SneakyThrows
-    private String getInsertImage(final Boolean directUrl) {  // get an image that will be inserted into the document
+    private String getInsertImage() {  // get an image that will be inserted into the document
         Map<String, Object> dataInsertImage = new HashMap<>();
         dataInsertImage.put("fileType", "svg");
         dataInsertImage.put("url", storagePathBuilder.getServerUrl(true) + "/css/img/logo.svg");
-        if (directUrl) {
-            dataInsertImage.put("directUrl", storagePathBuilder
-                    .getServerUrl(false) + "/css/img/logo.svg");
-        }
 
         // check if the document token is enabled
         if (settingsManager.isSecurityEnabled()) {
@@ -232,14 +223,10 @@ public class EditorController {
 
     // get a document that will be compared with the current document
     @SneakyThrows
-    private String getCompareFile(final Boolean directUrl) {
+    private String getCompareFile() {
         Map<String, Object> dataDocument = new HashMap<>();
         dataDocument.put("fileType", "docx");
         dataDocument.put("url", storagePathBuilder.getServerUrl(true) + "/assets?name=sample.docx");
-        if (directUrl) {
-            dataDocument.put("directUrl", storagePathBuilder
-                    .getServerUrl(false) + "/assets?name=sample.docx");
-        }
 
         // check if the document token is enabled
         if (settingsManager.isSecurityEnabled()) {
@@ -252,13 +239,10 @@ public class EditorController {
     }
 
     @SneakyThrows
-    private String getSpreadsheet(final Boolean directUrl) {
+    private String getSpreadsheet() {
         Map<String, Object> dataSpreadsheet = new HashMap<>();  // get recipients data for mail merging
         dataSpreadsheet.put("fileType", "csv");
         dataSpreadsheet.put("url", storagePathBuilder.getServerUrl(true) + "/csv");
-        if (directUrl) {
-            dataSpreadsheet.put("directUrl", storagePathBuilder.getServerUrl(false) + "/csv");
-        }
 
         // check if the document token is enabled
         if (settingsManager.isSecurityEnabled()) {

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

@@ -436,8 +436,11 @@ public class FileController {
 
             callbackService.processCallback(callback, fileName);
         } catch (Exception e) {
-            e.printStackTrace();
-            return e.getMessage();
+            String message = e.getMessage();
+            if (!message.contains("\"error\":1")) {
+                e.printStackTrace();
+            }
+            return message;
         }
 
         return "{\"error\":\"0\"}";
@@ -525,7 +528,6 @@ public class FileController {
                 if (!link.contains(storagePathBuilder.getServerUrl(true))) {
                     HashMap<String, String> data = new HashMap<>();
                     data.put("url", link);
-                    data.put("directUrl", link);
                     return gson.toJson(data);
                 }
 
@@ -571,7 +573,6 @@ public class FileController {
                 + new File(storagePathBuilder.getFileLocation(fileName)).lastModified()
                 ));
             data.put("url", urlManager.getFileUrl(fileName));
-            data.put("directUrl", body.getDirectUrl() ? urlManager.getDirectFileUrl(fileName) : null);
             data.put("referenceData", referenceData);
             data.put("path", fileName);
             data.put("link", storagePathBuilder.getServerUrl(true) + "/editor?fileName=" + fileName);
@@ -596,9 +597,8 @@ public class FileController {
     @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);
+                          @RequestParam("version") final String version) {
+        return historyManager.getHistoryData(fileName, version);
     }
 
     @PutMapping("/restore")

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

@@ -33,7 +33,6 @@ import org.springframework.ui.Model;
 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.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.http.ResponseEntity;
 
@@ -83,8 +82,7 @@ public class IndexController {
     private String enableForgotten;
 
     @GetMapping("${url.index}")
-    public String index(@RequestParam(value = "directUrl", required = false) final Boolean directUrl,
-                        final Model model) {
+    public String index(final Model model) {
         java.io.File[] files = storageMutator.getStoredFiles();  // get all the stored files from the storage
         List<String> docTypes = new ArrayList<>();
         List<Boolean> filesEditable = new ArrayList<>();
@@ -128,7 +126,6 @@ public class IndexController {
         model.addAttribute("tooltip", tooltip);
         model.addAttribute("users", users);
         model.addAttribute("languages", languages);
-        model.addAttribute("directUrl", directUrl);
         model.addAttribute("serverVersion", serverVersion);
         model.addAttribute("enableForgotten", Boolean.valueOf(enableForgotten));
 

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

@@ -135,6 +135,11 @@ public class DefaultCallbackManager implements CallbackManager {
 
         String curExt = documentManager.getExtension(fileName);  // get current file extension
         String downloadExt = callback.getFiletype(); // get an extension of the downloaded file
+        String storagePath = storagePathBuilder.getFileLocation(newFileName);  // get the path to a new file
+
+        if (!Paths.get(storagePath).toFile().exists()) {
+            throw new RuntimeException("{\"error\":1, \"message\":\"file does not exist\"}");
+        }
 
         downloadUri = urlManager.replaceToInnerDocumentServerUrl(downloadUri);
         changesUri = urlManager.replaceToInnerDocumentServerUrl(changesUri);
@@ -170,7 +175,6 @@ public class DefaultCallbackManager implements CallbackManager {
 
         byte[] byteArrayFile = getDownloadFile(downloadUri);  // download document file
 
-        String storagePath = storagePathBuilder.getFileLocation(newFileName);  // get the path to a new file
         Path lastVersion = Paths.get(storagePathBuilder
                 .getFileLocation(fileName));  // get the path to the last file version
 

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

@@ -147,7 +147,7 @@ public class DefaultHistoryManager implements HistoryManager {
 
     // todo: Refactoring
     @SneakyThrows
-    public String getHistoryData(final String fileName, final String version, final Boolean directUrl) {
+    public String getHistoryData(final String fileName, final String version) {
         // get history directory
         String histDir = storagePathBuilder.getHistoryDir(storagePathBuilder.getFileLocation(fileName));
         Integer curVer = storagePathBuilder.getFileVersion(histDir, false);  // get current file version
@@ -175,13 +175,6 @@ public class DefaultHistoryManager implements HistoryManager {
                                 .getExtension(fileName), true))
                         .build();
 
-                if (directUrl) {
-                    historyData.setDirectUrl(i == curVer
-                            ? urlManager.getDirectFileUrl(fileName)
-                            : urlManager.getHistoryFileUrl(fileName, i, "prev" + documentManager
-                            .getExtension(fileName), false)
-                    );
-                }
                 historyData.setVersion(String.valueOf(i));
 
                 if (i > 1) {  //check if the version number is greater than 1
@@ -193,9 +186,6 @@ public class DefaultHistoryManager implements HistoryManager {
                             .key(historyDataPrev.getKey())
                             .url(historyDataPrev.getUrl())
                             .build();
-                    if (directUrl) {
-                        previous.setDirectUrl(historyDataPrev.getDirectUrl());
-                    }
 
                     // write information about previous file version to the data object
                     historyData.setPrevious(previous);

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

@@ -21,6 +21,6 @@ package com.onlyoffice.integration.documentserver.managers.history;
 // 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 getHistoryData(String fileName, String version); // get document history data
     String versionDir(String path, Integer version, boolean historyPath);
 }

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

@@ -31,7 +31,6 @@ import lombok.Setter;
 @NoArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Reference {
-    private Boolean directUrl;
     private ReferenceData referenceData;
     private String path;
     private String link;

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/sdk/manager/UrlManagerImpl.java

@@ -55,11 +55,6 @@ public class UrlManagerImpl extends DefaultUrlManager implements UrlManager {
         return getDownloadUrl(fileId, true);
     }
 
-    @Override
-    public String getDirectFileUrl(final String fileId) {
-        return getDownloadUrl(fileId, false);
-    }
-
     @Override
     public String getCreateUrl(final String fileId) {
         return getCreateUrl(fileId, false);

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/sdk/service/ConfigServiceImpl.java

@@ -93,7 +93,7 @@ public class ConfigServiceImpl extends DefaultConfigService implements ConfigSer
 
         Config config = super.createConfig(fileId, mode, type);
 
-        if ((currentAction.equals(Action.fillForms) || currentAction.equals(Action.embedded))
+        if (!currentAction.equals(Action.view)
                 && appUser.getPermissions().getSubmitForm()) {
             config.getEditorConfig().getCustomization().setSubmitForm(true);
         }
@@ -276,7 +276,7 @@ public class ConfigServiceImpl extends DefaultConfigService implements ConfigSer
 
     @Override
     public Embedded getEmbedded(final String fileId) {
-        String url = getUrlManager().getDirectFileUrl(fileId);
+        String url = getUrlManager().getFileUrl(fileId);
 
         return Embedded.builder()
                    .embedUrl(url)

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

@@ -1,4 +1,4 @@
-server.version=1.10.0
+server.version=1.12.0
 
 server.address=
 server.port=4000
@@ -15,7 +15,7 @@ files.docservice.history.postfix=-hist
 files.docservice.url.example=
 
 
-files.docservice.languages=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|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|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-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language
+files.docservice.languages=en:English|sq-AL:Albanian (Albania)|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|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|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-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language
 
 docservice.url=http://documentserver/
 docservice.ignoreSSLCertificate=false

web/documentserver-example/java-spring/src/main/resources/static/css/img/file_docx.svg

@@ -1 +1,7 @@
-<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 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#287CA9"/>
+    <path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
+    <rect x="7" y="28" width="10" height="2" rx="1" fill="#fff"/>
+    <rect x="7" y="22" width="16" height="2" rx="1" fill="#fff"/>
+    <rect x="7" y="16" width="16" height="2" rx="1" fill="#fff"/>
+</svg>

web/documentserver-example/java-spring/src/main/resources/static/css/img/file_pdf.svg

@@ -1,5 +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.34315 1.34315 0 3 0H23L30 7V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#9E1919"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.0062 15V16.0065H24V15H17.0062ZM17.0062 19V20.0163H24V19H17.0062ZM24 23H17.0062V24.0261H24V23ZM6 28V27.0293H24V28H6ZM7 16H14V23H7V16ZM6 15H7H14H15V16V23V24H14H7H6V23V16V15Z" fill="white"/>
-<path d="M23 0L30 7H26C24.3431 7 23 5.65685 23 4V0Z" fill="black" fill-opacity="0.25"/>
+    <path d="M0 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#E54D39"/>
+    <path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
+    <rect x="7" y="28" width="16" height="2" rx="1" fill="#fff"/>
+    <rect x="18" y="22" width="5" height="2" rx="1" fill="#fff"/>
+    <rect x="18" y="16" width="5" height="2" rx="1" fill="#fff"/>
+    <rect x="8" y="17" width="6" height="6" rx=".833" stroke="#fff" stroke-width="2"/>
 </svg>

web/documentserver-example/java-spring/src/main/resources/static/css/img/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 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#F36700"/>
+    <path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
+    <rect x="6" y="28" width="18" height="2" rx="1" fill="#fff"/>
+    <rect x="6" y="16" width="18" height="2" rx="1" fill="#fff"/>
+    <rect x="6" y="16" width="2" height="14" rx="1" fill="#fff"/>
+    <rect x="22" y="16" width="2" height="14" rx="1" fill="#fff"/>
+</svg>

web/documentserver-example/java-spring/src/main/resources/static/css/img/file_upload.svg

@@ -1 +1,5 @@
-<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="M0 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#D1D5DA"/>
+    <path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5zm-5.293 14.293a1 1 0 0 0-1.414 0l-4 4a1 1 0 1 0 1.414 1.414L14 17.414V25a1 1 0 1 0 2 0v-7.586l2.293 2.293a1 1 0 0 0 1.414-1.414z" fill="#646464"/>
+    <path d="M8.833 22H11a1 1 0 1 1 0 2H9v4h12v-4h-2a1 1 0 1 1 0-2h2.167c1.012 0 1.833.82 1.833 1.833v4.334C23 29.179 22.18 30 21.167 30H8.833A1.833 1.833 0 0 1 7 28.167v-4.334C7 22.821 7.82 22 8.833 22" fill="#646464"/>
+</svg>

web/documentserver-example/java-spring/src/main/resources/static/css/img/file_xlsx.svg

@@ -1 +1,10 @@
-<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 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#3AA133"/>
+    <path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
+    <rect x="6" y="28" width="18" height="2" rx="1" fill="#fff"/>
+    <rect x="6" y="16" width="18" height="2" rx="1" fill="#fff"/>
+    <rect x="6" y="22" width="18" height="2" rx="1" fill="#fff"/>
+    <rect x="6" y="16" width="2" height="14" rx="1" fill="#fff"/>
+    <rect x="12" y="16" width="2" height="14" rx="1" fill="#fff"/>
+    <rect x="22" y="16" width="2" height="14" rx="1" fill="#fff"/>
+</svg>

web/documentserver-example/java-spring/src/main/resources/static/css/img/icon_docx.svg

@@ -1,12 +1,5 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.84616 1H10.8462L14.8462 5V15H2.84616V1Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.8462 5L10.8462 1H2.84616V15H14.8462V5ZM10.8462 0L15.8462 5V16H1.84616V0H10.8462Z" fill="#BFBFBF"/>
-<rect x="3.84616" y="10" width="10" height="4" fill="#3779A6"/>
-<path d="M3.84616 4H4.84616V5H3.84616V4Z" fill="#BFBFBF"/>
-<path d="M3.84616 6H4.84616V7H3.84616V6Z" fill="#BFBFBF"/>
-<path d="M4.84616 8H3.84616V9H4.84616V8Z" fill="#BFBFBF"/>
-<path d="M12.8462 8H5.84616V9H12.8462V8Z" fill="#BFBFBF"/>
-<path d="M7.84616 6H5.84616V7H7.84616V6Z" fill="#BFBFBF"/>
-<path d="M12.8462 4H5.84616V5H12.8462V4Z" fill="#BFBFBF"/>
-<path opacity="0.3" d="M9.84616 1H10.8462V4H14.8462L15.8462 5H9.84616V1Z" fill="#333333"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M13.5 3.707V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.293z" fill="#fff" stroke="#BBB"/>
+    <path d="M9.5 1v2.7c0 .28 0 .42.055.527a.5.5 0 0 0 .218.218c.107.055.247.055.527.055H13" stroke="#BBB"/>
+    <path fill="#287CA9" d="M5 7h6v1H5zm0 2h6v1H5zm0 2h4v1H5z"/>
 </svg>

web/documentserver-example/java-spring/src/main/resources/static/css/img/icon_pdf.svg

@@ -1 +1,5 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M2 1h8l4 4v10H2V1z" fill="#fff"/><path fill-rule="evenodd" clip-rule="evenodd" d="M14 5l-4-4H2v14h12V5zm-4-5l5 5v11H1V0h9z" fill="#BFBFBF"/><path fill="#9E1919" d="M3 10h10v4H3z"/><path d="M7 7V2H3v5h4zM8 3V2h2v1H8zM8 5V4h5v1H8zM13 6H8v1h5V6zM13 8H3v1h10V8z" fill="#BFBFBF"/><path opacity=".3" d="M9 1h1v3h4l1 1H9V1z" fill="#333"/></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M13.5 3.707V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.293z" fill="#fff" stroke="#BBB"/>
+    <path d="M9.5 1v2.7c0 .28 0 .42.055.527a.5.5 0 0 0 .218.218c.107.055.247.055.527.055H13" stroke="#BBB"/>
+    <path d="M7.36 5.777c0 1.085-.31 2.363-.833 3.543-.526 1.185-1.235 2.198-1.974 2.796l.803 1.109c1.992-1.342 4.198-2.262 6.333-1.954L12 9.938c-1.819-.612-3.278-2.449-3.278-4.16zm.888 2.84a6.7 6.7 0 0 0 1.161 1.35c-.668.122-1.323.32-1.957.573q.17-.322.316-.657c.183-.41.344-.836.48-1.267" fill="#E54D39"/>
+</svg>

web/documentserver-example/java-spring/src/main/resources/static/css/img/icon_pptx.svg

@@ -1,12 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 1H10L14 5V15H2V1Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14 5L10 1H2V15H14V5ZM10 0L15 5V16H1V0H10Z" fill="#BFBFBF"/>
-<rect x="3" y="10" width="10" height="4" fill="#F36700"/>
-<path d="M3 4H4V5H3V4Z" fill="#BFBFBF"/>
-<path d="M3 6H4V7H3V6Z" fill="#BFBFBF"/>
-<path d="M4 8H3V9H4V8Z" fill="#BFBFBF"/>
-<path d="M12 8H5V9H12V8Z" fill="#BFBFBF"/>
-<path d="M7 6H5V7H7V6Z" fill="#BFBFBF"/>
-<path d="M12 4H5V5H12V4Z" fill="#BFBFBF"/>
-<path opacity="0.3" d="M9 1H10V4H14L15 5H9V1Z" fill="#333333"/>
+    <path d="M13.5 3.707V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.293z" fill="#fff" stroke="#BBB"/>
+    <path d="M9.5 1v2.7c0 .28 0 .42.055.527a.5.5 0 0 0 .218.218c.107.055.247.055.527.055H13" stroke="#BBB"/>
+    <path d="M5 10a3 3 0 1 0 3-3v3z" fill="#F36700"/>
+    <path d="M4.5 9A2.5 2.5 0 0 1 7 6.5V9z" fill="#F36700"/>
 </svg>

web/documentserver-example/java-spring/src/main/resources/static/css/img/icon_xlsx.svg

@@ -1,12 +1,5 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.84592 1H10.8459L14.8459 5V15H2.84592V1Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.8459 5L10.8459 1H2.84592V15H14.8459V5ZM10.8459 0L15.8459 5V16H1.84592V0H10.8459Z" fill="#BFBFBF"/>
-<rect x="3.84592" y="10" width="10" height="4" fill="#78A73B"/>
-<path d="M3.84592 4H4.84592V5H3.84592V4Z" fill="#BFBFBF"/>
-<path d="M3.84592 6H4.84592V7H3.84592V6Z" fill="#BFBFBF"/>
-<path d="M4.84592 8H3.84592V9H4.84592V8Z" fill="#BFBFBF"/>
-<path d="M12.8459 8H5.84592V9H12.8459V8Z" fill="#BFBFBF"/>
-<path d="M7.84592 6H5.84592V7H7.84592V6Z" fill="#BFBFBF"/>
-<path d="M12.8459 4H5.84592V5H12.8459V4Z" fill="#BFBFBF"/>
-<path opacity="0.3" d="M9.84592 1H10.8459V4H14.8459L15.8459 5H9.84592V1Z" fill="#333333"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M13.5 3.207V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.793z" fill="#fff" stroke="#BBB"/>
+    <path d="M9.5 1v1.9c0 .56 0 .84.109 1.054a1 1 0 0 0 .437.437c.214.109.494.109 1.054.109H13" stroke="#BBB"/>
+    <path fill="#3AA133" d="M8 7h3v2H8zm0 3h3v2H8zM5 7h2v2H5zm0 3h2v2H5z"/>
 </svg>

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

@@ -16,7 +16,6 @@
  *
  */
 
-var directUrl;
 var formatManager;
 
 window.onload = function () {
@@ -42,19 +41,8 @@ window.onload = function () {
 if (typeof jQuery !== "undefined") {
     jq = jQuery.noConflict();
 
-    directUrl = getUrlVars()["directUrl"] == "true";
-
     mustReload = false;
 
-    if (directUrl)
-        jq("#directUrl").prop("checked", directUrl);
-    else
-        directUrl = jq("#directUrl").prop("checked");
-
-    jq("#directUrl").change(function() {
-        window.location = "?directUrl=" + jq(this).prop("checked");
-    });
-
     jq(function () {
         jq("#fileupload").fileupload({
             dataType: "json",
@@ -272,7 +260,7 @@ if (typeof jQuery !== "undefined") {
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {
         var fileId = encodeURIComponent(jq("#hiddenFileName").val());
-        var url = UrlEditor + "?action=edit&fileName=" + fileId + "&directUrl=" + directUrl;
+        var url = UrlEditor + "?action=edit&fileName=" + fileId;
         window.open(url, "_blank");
         jq("#hiddenFileName").val("");
         jq.unblockUI();
@@ -280,7 +268,7 @@ if (typeof jQuery !== "undefined") {
 
     jq(document).on("click", "#beginView:not(.disable)", function () {
         var fileId = encodeURIComponent(jq("#hiddenFileName").val());
-        var url = UrlEditor + "?action=view&fileName=" + fileId + "&directUrl=" + directUrl;
+        var url = UrlEditor + "?action=view&fileName=" + fileId;
         window.open(url, "_blank");
         jq("#hiddenFileName").val("");
         jq.unblockUI();
@@ -288,7 +276,7 @@ if (typeof jQuery !== "undefined") {
 
     jq(document).on("click", "#beginEmbedded:not(.disable)", function () {
         var fileId = encodeURIComponent(jq("#hiddenFileName").val());
-        var url = UrlEditor + "?type=embedded&action=embedded&fileName=" + fileId + "&directUrl=" + directUrl;
+        var url = UrlEditor + "?type=embedded&action=embedded&fileName=" + fileId;
 
         jq("#mainProgress").addClass("embedded");
         jq("#beginEmbedded").addClass("disable");

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

@@ -23,7 +23,7 @@
         *
         -->
         <title>ONLYOFFICE</title>
-        <link rel="icon" th:href="@{/css/img/{icon}.ico(icon=${model.getDocumentType()})}" type="image/x-icon"/>
+        <link rel="icon" th:href="@{/css/img/{icon}.ico(icon=${model.getDocumentType().toString().toLowerCase()})}" type="image/x-icon"/>
         <link rel="stylesheet" type="text/css" href="css/editor.css" />
 
         <script type="text/javascript" th:src="@{${docserviceApiUrl}}"></script>
@@ -194,8 +194,6 @@
                 var requestReference = function(data, callback) {
                     innerAlert(data);
 
-                    data.directUrl = !!config.document.directUrl;
-
                     let xhr = new XMLHttpRequest();
                     xhr.open("POST", "reference");
                     xhr.setRequestHeader("Content-Type", "application/json");
@@ -220,8 +218,7 @@
                 var onRequestHistoryData = function (event) {
                     var version = event.data;
                     var historyDataUri = "historydata?fileName=" + config.document.title
-                        + "&version=" + version
-                        + "&directUrl=" + !!config.document.directUrl;
+                        + "&version=" + version;
                     var xhr = new XMLHttpRequest();
                     xhr.open("GET", historyDataUri, false);
                     xhr.send();

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

@@ -109,14 +109,6 @@
                                             </select>
                                         </td>
                                     </tr>
-                                    <tr>
-                                        <td valign="middle">
-                                            <label class="side-option">
-                                                <input id="directUrl" type="checkbox" class="checkbox" />Try opening on client
-                                                <img id="directUrlInfo" class="info info-tooltip" data-id="directUrlInfo" data-tooltip="Some files can be opened in the user's browser without connecting to the document server." src="css/img/info.svg" />
-                                            </label>
-                                        </td>
-                                    </tr>
                                 </tbody>
                             </table>
                         </div>
@@ -173,52 +165,51 @@
                                         <tr th:each="file,iState : ${files}" class="tableRow" th:title="${files[iState.index].getName() + versions[iState.index]}">
                                             <td class="contentCells">
                                                 <a class="stored-edit" th:classappend="${docTypes[iState.index]}"
-                                                   th:with="directUrl=${directUrl}"
-                                                   th:href="@{/editor(fileName=${files[iState.index].getName()}, __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
+                                                   th:href="@{/editor(fileName=${files[iState.index].getName()})}" target="_blank">
                                                 <span th:text="${files[iState.index].getName()}"></span>
                                                 </a>
                                             </td>
                                             <th:block th:if="${filesEditable[iState.index]}">
                                                 <td class="contentCells contentCells-icon">
-                                                    <a th:with="directUrl=${directUrl}"
-                                                       th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='edit', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
+                                                    <a
+                                                       th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='edit')}" target="_blank">
                                                     <img src="css/img/desktop.svg" alt="Open in editor for full size screens" title="Open in editor for full size screens"/>
                                                     </a>
                                                 </td>
                                                 <td class="contentCells contentCells-icon">
-                                                    <a th:with="directUrl=${directUrl}"
-                                                       th:href="@{/editor(fileName=${files[iState.index].getName()},type='mobile',action='edit', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
+                                                    <a
+                                                       th:href="@{/editor(fileName=${files[iState.index].getName()},type='mobile',action='edit')}" target="_blank">
                                                     <img src="css/img/mobile.svg" alt="Open in editor for mobile devices" title="Open in editor for mobile devices"/>
                                                     </a>
                                                 </td>
                                                 <div th:if="not ${docTypes[iState.index]} eq 'pdf'">
                                                     <td class="contentCells contentCells-icon">
-                                                        <a th:with="directUrl=${directUrl}"
-                                                        th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='comment', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
+                                                        <a
+                                                        th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='comment')}" target="_blank">
                                                             <img src="css/img/comment.svg" alt="Open in editor for comment" title="Open in editor for comment"/>
                                                         </a>
                                                     </td>
                                                 </div>
                                                     <div th:if="${docTypes[iState.index]} eq 'word'">
                                                         <td class="contentCells contentCells-icon">
-                                                            <a th:with="directUrl=${directUrl}"
-                                                               th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='review', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
+                                                            <a
+                                                               th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='review')}" target="_blank">
                                                             <img src="css/img/review.svg" alt="Open in editor for review" title="Open in editor for review"/>
                                                             </a>
                                                         </td>
                                                     </div>
                                                     <div th:if="${docTypes[iState.index]} eq 'cell'">
                                                         <td class="contentCells contentCells-icon">
-                                                            <a th:with="directUrl=${directUrl}"
-                                                               th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='filter', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
+                                                            <a
+                                                               th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='filter')}" target="_blank">
                                                             <img src="css/img/filter.svg" alt="Open in editor without access to change the filter" title="Open in editor without access to change the filter" />
                                                             </a>
                                                         </td>
                                                     </div>
                                                     <div th:if="${docTypes[iState.index]} eq 'word'">
                                                         <td class="contentCells contentCells-icon">
-                                                            <a th:with="directUrl=${directUrl}"
-                                                               th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='blockcontent', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
+                                                            <a
+                                                               th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='blockcontent')}" target="_blank">
                                                             <img src="css/img/block-content.svg" alt="Open in editor without content control modification" title="Open in editor without content control modification"/>
                                                             </a>
                                                         </td>
@@ -231,8 +222,8 @@
                                                     </div>
                                                     <div th:if="${isFillFormDoc[iState.index]}">
                                                         <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
-                                                            <a th:with="directUrl=${directUrl}"
-                                                               th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='fillForms', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
+                                                            <a
+                                                               th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='fillForms')}" target="_blank">
                                                                 <img src="css/img/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
                                                             </a>
                                                         </td>
@@ -244,8 +235,8 @@
                                             <th:block th:if="${isFillFormDoc[iState.index] and not filesEditable[iState.index]}">
                                                 <td class="contentCells contentCells-icon "></td>
                                                 <td class="contentCells contentCells-icon">
-                                                    <a th:with="directUrl=${directUrl}"
-                                                       th:href="@{/editor(fileName=${files[iState.index].getName()},type='mobile',action='fillForms', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
+                                                    <a
+                                                       th:href="@{/editor(fileName=${files[iState.index].getName()},type='mobile',action='fillForms')}" target="_blank">
                                                         <img src="css/img/mobile-fill-forms.svg" alt="Open in editor for filling in forms for mobile devices" title="Open in editor for filling in forms for mobile devices" />
                                                     </a>
                                                 </td>
@@ -253,8 +244,8 @@
                                                 <td class="contentCells contentCells-icon "></td>
                                                 <td class="contentCells contentCells-icon "></td>
                                                 <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
-                                                    <a th:with="directUrl=${directUrl}"
-                                                       th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='fillForms', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
+                                                    <a
+                                                       th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='fillForms')}" target="_blank">
                                                         <img src="css/img/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
                                                     </a>
                                                 </td>
@@ -263,20 +254,20 @@
                                                 <td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>
                                             </th:block>
                                             <td class="contentCells contentCells-icon firstContentCellViewers">
-                                                <a th:with="directUrl=${directUrl}"
-                                                   th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='view', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
+                                                <a
+                                                   th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='view')}" target="_blank">
                                                 <img src="css/img/desktop.svg" alt="Open in viewer for full size screens" title="Open in viewer for full size screens"/>
                                                 </a>
                                             </td>
                                             <td class="contentCells contentCells-icon">
-                                                <a th:with="directUrl=${directUrl}"
-                                                   th:href="@{/editor(fileName=${files[iState.index].getName()},type='mobile',action='view', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
+                                                <a
+                                                   th:href="@{/editor(fileName=${files[iState.index].getName()},type='mobile',action='view')}" target="_blank">
                                                 <img src="css/img/mobile.svg" alt="Open in viewer for mobile devices" title="Open in viewer for mobile devices"/>
                                                 </a>
                                             </td>
                                             <td class="contentCells contentCells-icon contentCells-shift">
-                                                <a th:with="directUrl=${directUrl}"
-                                                   th:href="@{/editor(fileName=${files[iState.index].getName()},type='embedded',action='embedded', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
+                                                <a
+                                                   th:href="@{/editor(fileName=${files[iState.index].getName()},type='embedded',action='embedded')}" target="_blank">
                                                 <img src="css/img/embeded.svg" alt="Open in embedded mode" title="Open in embedded mode"/>
                                                 </a>
                                             </td>

web/documentserver-example/java/README.md

@@ -88,7 +88,15 @@ To run the Java example code, install the Java version appropriate for your OS a
 
 	If everything is correct, you will see the Tomcat web page in the browser as shown below.
 
-### Step 5. Run the Java code
+### Step 5. Configure JWT 
+
+Open the *src/main/resouces/settings.properties* file and [specify the same secret key](https://helpcenter.onlyoffice.com/installation/docs-configure-jwt.aspx) as used in your Document Server to enable JWT: 
+
+```
+files.docservice.secret=secret
+```
+
+### Step 6. Run the Java code
 
 1. Open Tomcat Web Application Manager by clicking **Manager App:**
 
@@ -124,7 +132,7 @@ To run the Java example code, install the Java version appropriate for your OS a
 
 6. Click the link with the application name to run it.
 
-### Step 6. Check accessibility
+### Step 7. 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. 
 
@@ -176,6 +184,12 @@ See the detailed guide to learn how to [install Document Server for Linux](https
 	sudo chmod -R ugo+rw /{path}
 	```
 
+	[Specify the same secret key](https://helpcenter.onlyoffice.com/installation/docs-configure-jwt.aspx) as used in your Document Server to enable JWT: 
+
+	```
+	files.docservice.secret=secret
+	```
+
 5. Install **Maven**:
 
     ```
@@ -278,6 +292,12 @@ 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 Document Server installed and the **storage-folder** is the path where files will be created and stored.
 
+	[Specify the same secret key](https://helpcenter.onlyoffice.com/installation/docs-configure-jwt.aspx) as used in your Document Server to enable JWT: 
+
+	```
+	files.docservice.secret=secret
+	```
+
 6. Run the next command in the Java example directory:
 
 	```

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

@@ -164,7 +164,7 @@ public class FileModel {
         }
 
         // check if the Submit form button is displayed or not
-        if (mode.equals("fillForms") || mode.equals("embedded")) {
+        if (!mode.equals("view")) {
             editorConfig.getCustomization().setSubmitForm(user.getId().equals("uid-1"));
         }
 

web/documentserver-example/java/src/main/resources/settings.properties

@@ -1,4 +1,4 @@
-version=1.10.0
+version=1.12.0
 
 filesize-max=5242880
 storage-folder=app_data
@@ -8,13 +8,13 @@ enable-forgotten=TRUE
 files.docservice.timeout=120000
 
 files.docservice.url.site=http://documentserver/
-files.docservice.url.converter=ConvertService.ashx
-files.docservice.url.command=coauthoring/CommandService.ashx
+files.docservice.url.converter=converter
+files.docservice.url.command=command
 files.docservice.url.api=web-apps/apps/api/documents/api.js
 files.docservice.url.preloader=web-apps/apps/api/documents/cache-scripts.html
 files.docservice.url.example=
 
-files.docservice.languages=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|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|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-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language
+files.docservice.languages=en:English|sq-AL:Albanian (Albania)|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|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|he-IL:Hebrew (Israel)|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-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language
 
 files.docservice.secret=
 files.docservice.header=Authorization

web/documentserver-example/java/src/main/webapp/css/img/file_docx.svg

@@ -1 +1,7 @@
-<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 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#287CA9"/>
+    <path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
+    <rect x="7" y="28" width="10" height="2" rx="1" fill="#fff"/>
+    <rect x="7" y="22" width="16" height="2" rx="1" fill="#fff"/>
+    <rect x="7" y="16" width="16" height="2" rx="1" fill="#fff"/>
+</svg>

web/documentserver-example/java/src/main/webapp/css/img/file_pdf.svg

@@ -1,5 +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.34315 1.34315 0 3 0H23L30 7V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#9E1919"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.0062 15V16.0065H24V15H17.0062ZM17.0062 19V20.0163H24V19H17.0062ZM24 23H17.0062V24.0261H24V23ZM6 28V27.0293H24V28H6ZM7 16H14V23H7V16ZM6 15H7H14H15V16V23V24H14H7H6V23V16V15Z" fill="white"/>
-<path d="M23 0L30 7H26C24.3431 7 23 5.65685 23 4V0Z" fill="black" fill-opacity="0.25"/>
+    <path d="M0 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#E54D39"/>
+    <path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
+    <rect x="7" y="28" width="16" height="2" rx="1" fill="#fff"/>
+    <rect x="18" y="22" width="5" height="2" rx="1" fill="#fff"/>
+    <rect x="18" y="16" width="5" height="2" rx="1" fill="#fff"/>
+    <rect x="8" y="17" width="6" height="6" rx=".833" stroke="#fff" stroke-width="2"/>
 </svg>

web/documentserver-example/java/src/main/webapp/css/img/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 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#F36700"/>
+    <path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
+    <rect x="6" y="28" width="18" height="2" rx="1" fill="#fff"/>
+    <rect x="6" y="16" width="18" height="2" rx="1" fill="#fff"/>
+    <rect x="6" y="16" width="2" height="14" rx="1" fill="#fff"/>
+    <rect x="22" y="16" width="2" height="14" rx="1" fill="#fff"/>
+</svg>

web/documentserver-example/java/src/main/webapp/css/img/file_upload.svg

@@ -1 +1,5 @@
-<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="M0 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#D1D5DA"/>
+    <path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5zm-5.293 14.293a1 1 0 0 0-1.414 0l-4 4a1 1 0 1 0 1.414 1.414L14 17.414V25a1 1 0 1 0 2 0v-7.586l2.293 2.293a1 1 0 0 0 1.414-1.414z" fill="#646464"/>
+    <path d="M8.833 22H11a1 1 0 1 1 0 2H9v4h12v-4h-2a1 1 0 1 1 0-2h2.167c1.012 0 1.833.82 1.833 1.833v4.334C23 29.179 22.18 30 21.167 30H8.833A1.833 1.833 0 0 1 7 28.167v-4.334C7 22.821 7.82 22 8.833 22" fill="#646464"/>
+</svg>

web/documentserver-example/java/src/main/webapp/css/img/file_xlsx.svg

@@ -1 +1,10 @@
-<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 2.5A2.5 2.5 0 0 1 2.5 0H21l9 9v28.5a2.5 2.5 0 0 1-2.5 2.5h-25A2.5 2.5 0 0 1 0 37.5z" fill="#3AA133"/>
+    <path d="m21 0 9 9h-6.5A2.5 2.5 0 0 1 21 6.5z" fill="#000" fill-opacity=".25"/>
+    <rect x="6" y="28" width="18" height="2" rx="1" fill="#fff"/>
+    <rect x="6" y="16" width="18" height="2" rx="1" fill="#fff"/>
+    <rect x="6" y="22" width="18" height="2" rx="1" fill="#fff"/>
+    <rect x="6" y="16" width="2" height="14" rx="1" fill="#fff"/>
+    <rect x="12" y="16" width="2" height="14" rx="1" fill="#fff"/>
+    <rect x="22" y="16" width="2" height="14" rx="1" fill="#fff"/>
+</svg>

web/documentserver-example/java/src/main/webapp/css/img/icon_docx.svg

@@ -1,12 +1,5 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.84616 1H10.8462L14.8462 5V15H2.84616V1Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.8462 5L10.8462 1H2.84616V15H14.8462V5ZM10.8462 0L15.8462 5V16H1.84616V0H10.8462Z" fill="#BFBFBF"/>
-<rect x="3.84616" y="10" width="10" height="4" fill="#3779A6"/>
-<path d="M3.84616 4H4.84616V5H3.84616V4Z" fill="#BFBFBF"/>
-<path d="M3.84616 6H4.84616V7H3.84616V6Z" fill="#BFBFBF"/>
-<path d="M4.84616 8H3.84616V9H4.84616V8Z" fill="#BFBFBF"/>
-<path d="M12.8462 8H5.84616V9H12.8462V8Z" fill="#BFBFBF"/>
-<path d="M7.84616 6H5.84616V7H7.84616V6Z" fill="#BFBFBF"/>
-<path d="M12.8462 4H5.84616V5H12.8462V4Z" fill="#BFBFBF"/>
-<path opacity="0.3" d="M9.84616 1H10.8462V4H14.8462L15.8462 5H9.84616V1Z" fill="#333333"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M13.5 3.707V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.293z" fill="#fff" stroke="#BBB"/>
+    <path d="M9.5 1v2.7c0 .28 0 .42.055.527a.5.5 0 0 0 .218.218c.107.055.247.055.527.055H13" stroke="#BBB"/>
+    <path fill="#287CA9" d="M5 7h6v1H5zm0 2h6v1H5zm0 2h4v1H5z"/>
 </svg>

web/documentserver-example/java/src/main/webapp/css/img/icon_pdf.svg

@@ -1 +1,5 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M2 1h8l4 4v10H2V1z" fill="#fff"/><path fill-rule="evenodd" clip-rule="evenodd" d="M14 5l-4-4H2v14h12V5zm-4-5l5 5v11H1V0h9z" fill="#BFBFBF"/><path fill="#9E1919" d="M3 10h10v4H3z"/><path d="M7 7V2H3v5h4zM8 3V2h2v1H8zM8 5V4h5v1H8zM13 6H8v1h5V6zM13 8H3v1h10V8z" fill="#BFBFBF"/><path opacity=".3" d="M9 1h1v3h4l1 1H9V1z" fill="#333"/></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M13.5 3.707V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.293z" fill="#fff" stroke="#BBB"/>
+    <path d="M9.5 1v2.7c0 .28 0 .42.055.527a.5.5 0 0 0 .218.218c.107.055.247.055.527.055H13" stroke="#BBB"/>
+    <path d="M7.36 5.777c0 1.085-.31 2.363-.833 3.543-.526 1.185-1.235 2.198-1.974 2.796l.803 1.109c1.992-1.342 4.198-2.262 6.333-1.954L12 9.938c-1.819-.612-3.278-2.449-3.278-4.16zm.888 2.84a6.7 6.7 0 0 0 1.161 1.35c-.668.122-1.323.32-1.957.573q.17-.322.316-.657c.183-.41.344-.836.48-1.267" fill="#E54D39"/>
+</svg>

web/documentserver-example/java/src/main/webapp/css/img/icon_pptx.svg

@@ -1,12 +1,6 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2 1H10L14 5V15H2V1Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14 5L10 1H2V15H14V5ZM10 0L15 5V16H1V0H10Z" fill="#BFBFBF"/>
-<rect x="3" y="10" width="10" height="4" fill="#F36700"/>
-<path d="M3 4H4V5H3V4Z" fill="#BFBFBF"/>
-<path d="M3 6H4V7H3V6Z" fill="#BFBFBF"/>
-<path d="M4 8H3V9H4V8Z" fill="#BFBFBF"/>
-<path d="M12 8H5V9H12V8Z" fill="#BFBFBF"/>
-<path d="M7 6H5V7H7V6Z" fill="#BFBFBF"/>
-<path d="M12 4H5V5H12V4Z" fill="#BFBFBF"/>
-<path opacity="0.3" d="M9 1H10V4H14L15 5H9V1Z" fill="#333333"/>
+    <path d="M13.5 3.707V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.293z" fill="#fff" stroke="#BBB"/>
+    <path d="M9.5 1v2.7c0 .28 0 .42.055.527a.5.5 0 0 0 .218.218c.107.055.247.055.527.055H13" stroke="#BBB"/>
+    <path d="M5 10a3 3 0 1 0 3-3v3z" fill="#F36700"/>
+    <path d="M4.5 9A2.5 2.5 0 0 1 7 6.5V9z" fill="#F36700"/>
 </svg>

web/documentserver-example/java/src/main/webapp/css/img/icon_xlsx.svg

@@ -1,12 +1,5 @@
-<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.84592 1H10.8459L14.8459 5V15H2.84592V1Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M14.8459 5L10.8459 1H2.84592V15H14.8459V5ZM10.8459 0L15.8459 5V16H1.84592V0H10.8459Z" fill="#BFBFBF"/>
-<rect x="3.84592" y="10" width="10" height="4" fill="#78A73B"/>
-<path d="M3.84592 4H4.84592V5H3.84592V4Z" fill="#BFBFBF"/>
-<path d="M3.84592 6H4.84592V7H3.84592V6Z" fill="#BFBFBF"/>
-<path d="M4.84592 8H3.84592V9H4.84592V8Z" fill="#BFBFBF"/>
-<path d="M12.8459 8H5.84592V9H12.8459V8Z" fill="#BFBFBF"/>
-<path d="M7.84592 6H5.84592V7H7.84592V6Z" fill="#BFBFBF"/>
-<path d="M12.8459 4H5.84592V5H12.8459V4Z" fill="#BFBFBF"/>
-<path opacity="0.3" d="M9.84592 1H10.8459V4H14.8459L15.8459 5H9.84592V1Z" fill="#333333"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M13.5 3.207V15a.5.5 0 0 1-.5.5H3a.5.5 0 0 1-.5-.5V1A.5.5 0 0 1 3 .5h7.793z" fill="#fff" stroke="#BBB"/>
+    <path d="M9.5 1v1.9c0 .56 0 .84.109 1.054a1 1 0 0 0 .437.437c.214.109.494.109 1.054.109H13" stroke="#BBB"/>
+    <path fill="#3AA133" d="M8 7h3v2H8zm0 3h3v2H8zM5 7h2v2H5zm0 3h2v2H5z"/>
 </svg>

web/documentserver-example/nodejs/README.md

@@ -32,7 +32,33 @@ If you want to experiment with the editor configuration, modify the [parameters]
 
 Install the **node.js** environment which is going to be used to run the Node.js project. Please follow the link at the [official website](https://nodejs.org/en/download/) choosing the correct version for your Windows OS (32-bit or 64-bit).
 
-### Step 4. Run the Node.js code
+### Step 4. Configure JWT 
+
+Open the *config/default.json* file and enable JWT:
+
+```
+{
+    "server": {
+        "token": {
+            "enable": true
+        }
+    }
+}
+```
+
+Also, [specify the same secret key](https://helpcenter.onlyoffice.com/installation/docs-configure-jwt.aspx) as used in your Document Server: 
+
+```
+{
+    "server": {
+        "token": {
+            "secret": "secret"
+        }
+    }
+}
+```
+
+### Step 5. Run the Node.js code
 
 We will run the code in Node.js runtime environment and will interact with it using the **command line interface (cmd)**.
 
@@ -62,7 +88,7 @@ We will run the code in Node.js runtime environment and will interact with it us
     http://localhost:3000
     ```
 
-### Step 5. Check accessibility
+### Step 6. 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. 
 
@@ -129,6 +155,30 @@ See the detailed guide to learn how to [install Document Server for Linux](https
    sudo chmod -R ugo+rw /{path}
    ```
 
+   Enable JWT:
+
+    ```
+    {
+      "server": {
+        "token": {
+          "enable: true
+        }
+      }
+    }
+    ```
+
+    Also, [specify the same secret key](https://helpcenter.onlyoffice.com/installation/docs-configure-jwt.aspx) as used in your Document Server: 
+
+    ```
+    {
+      "server": {
+        "token": {
+          "secret": "secret"
+        }
+      }
+    }
+    ```
+
 6. Run the project with Node.js:
 
     ```

web/documentserver-example/nodejs/app.js

@@ -274,7 +274,8 @@ app.post('/upload', (req, res) => { // define a handler for uploading files
   req.DocManager.createDirectory(uploadDirTmp);
 
   const fileSizeLimit = configServer.get('maxFileSize');
-  const form = new formidable.IncomingForm({maxFileSize: fileSizeLimit, maxTotalFileSize: fileSizeLimit }); // create a new incoming form
+  // create a new incoming form
+  const form = new formidable.IncomingForm({ maxFileSize: fileSizeLimit, maxTotalFileSize: fileSizeLimit });
   form.uploadDir = uploadDirTmp; // and write there all the necessary parameters
   form.keepExtensions = true;
 
@@ -459,7 +460,7 @@ app.post('/convert', (req, res) => { // define a handler for converting files
       if (fileUtility.getFileType(correctName) !== null) {
         fileSystem.writeFileSync(req.DocManager.storagePath(correctName), data);
       } else {
-        writeResult(newFileUri, result, 'FileTypeIsNotSupported');
+        writeResult(newFileUri.replace('http://localhost/', siteUrl), result, 'FileTypeIsNotSupported');
         return;
       }
       // remove file with the origin extension
@@ -1011,6 +1012,54 @@ app.post('/track', async (req, res) => { // define a handler for tracking file c
   }
 });
 
+app.get('/config', async (req, res) => {
+  try {
+    req.DocManager = new DocManager(req, res);
+    const fileName = fileUtility.getFileName(req.query.fileName);
+
+    const userAddress = req.DocManager.curUserHostAddress();
+    // if the file with a given name doesn't exist
+    if (!req.DocManager.existsSync(req.DocManager.storagePath(fileName, userAddress))) {
+      throw new Error(`File not found: ${fileName}`); // display error message
+    }
+
+    // file config data
+    const data = {
+      document: {
+        key: req.DocManager.getKey(fileName),
+        title: fileName,
+        url: req.DocManager.getDownloadUrl(fileName, true),
+        permissions: JSON.parse(req.query.permissions || '{}'),
+        referenceData: {
+          fileKey: JSON.stringify({ fileName, userAddress: req.DocManager.curUserHostAddress() }),
+          instanceId: req.DocManager.getInstanceId(),
+        },
+      },
+      editorConfig: {
+        callbackUrl: req.DocManager.getCallback(fileName),
+        mode: 'edit',
+      },
+    };
+
+    if (req.query.directUrl === 'true') {
+      data.document.directUrl = req.DocManager.getDownloadUrl(fileName);
+    }
+
+    if (cfgSignatureEnable) {
+      // sign token with given data using signature secret
+      data.token = jwt.sign(data, cfgSignatureSecret, { expiresIn: cfgSignatureSecretExpiresIn });
+    }
+
+    res.setHeader('Content-Type', 'application/json');
+    res.write(JSON.stringify(data));
+  } catch (ex) {
+    console.log(ex);
+    res.status(500);
+    res.write('error');
+  }
+  res.end();
+});
+
 app.get('/editor', (req, res) => { // define a handler for editing document
   try {
     req.DocManager = new DocManager(req, res);
@@ -1115,7 +1164,7 @@ app.get('/editor', (req, res) => { // define a handler for editing document
     }
 
     let submitForm = false;
-    if (mode === 'fillForms' || mode === 'embedded') {
+    if (mode !== 'view') {
       submitForm = userid === 'uid-1';
     }
 

web/documentserver-example/nodejs/config/default.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.10.0",
+  "version": "1.12.0",
   "log": {
     "appenders": [
       {
@@ -17,8 +17,8 @@
     "wopi": {
       "discovery": "hosting/discovery"
     },
-    "commandUrl": "coauthoring/CommandService.ashx",
-    "converterUrl": "ConvertService.ashx",
+    "commandUrl": "command",
+    "converterUrl": "converter",
     "apiUrl": "web-apps/apps/api/documents/api.js",
     "preloaderUrl": "web-apps/apps/api/documents/cache-scripts.html",
     "exampleUrl": null,
@@ -40,6 +40,7 @@
     "verify_peer_off": true,
     "languages": {
       "en": "English",
+      "sq-AL": "Albanian (Albania)",
       "ar": "Arabic",
       "hy": "Armenian",
       "az": "Azerbaijani",

web/documentserver-example/nodejs/helpers/users.js

@@ -102,6 +102,7 @@ const descrUser0 = [
   'Can\'t protect file',
   'View file without collaboration',
   'Can’t submit forms',
+  'Can’t refresh outdated file',
 ];
 
 const users = [

web/documentserver-example/nodejs/helpers/wopi/utils.js

@@ -150,7 +150,7 @@ const getDefaultAction = async function getDefaultAction(DocManager, ext) {
 
 // get the action url
 const getActionUrl = function getActionUrl(host, userAddress, action, filename) {
-  const WOPISrc = `${host}/wopi/files/${filename}@${userAddress}`;
+  const WOPISrc = `${host}/wopi/files/${encodeURIComponent(filename)}@${encodeURIComponent(userAddress)}`;
   return `${action.urlsrc.replace(/<.*&>/g, '')}WOPISrc=${encodeURIComponent(WOPISrc)}`;
 };