java-raw: inner

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

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

@@ -25,7 +25,7 @@ jobs:
           rsync -av --exclude='deploy' ./ ./deploy/'DotNet (Csharp MVC) Example'
           rm -rf ./deploy/'DotNet (Csharp MVC) Example'/assets/.git
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: DotNet.Csharp.MVC.Example
           path: ${{ github.workspace }}/web/documentserver-example/csharp-mvc/deploy

.github/workflows/artifact-csharp.yml

@@ -24,7 +24,7 @@ jobs:
           rsync -av --exclude='deploy' ./ ./deploy/'DotNet (Csharp) Example'
           rm -rf ./deploy/'DotNet (Csharp) Example'/assets/.git
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: DotNet.Csharp.Example
           path: ${{ github.workspace }}/web/documentserver-example/csharp/deploy

.github/workflows/artifact-java.yml

@@ -25,7 +25,7 @@ jobs:
           rm -rf ./deploy/'Java Example'/src/main/resources/assets/document-formats/.git
           rm -rf ./deploy/'Java Example'/src/main/resources/assets/document-templates/.git
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Java.Example
           path: ${{ github.workspace }}/web/documentserver-example/java/deploy

.github/workflows/artifact-node.yml

@@ -25,7 +25,7 @@ jobs:
           rm -rf ./deploy/'Node.js Example'/public/assets/document-formats/.git
           rm -rf ./deploy/'Node.js Example'/public/assets/document-templates/.git
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Node.js.Example
           path: ${{ github.workspace }}/web/documentserver-example/nodejs/deploy

.github/workflows/artifact-php.yml

@@ -25,7 +25,7 @@ jobs:
           rm -rf ./deploy/'PHP Example'/assets/document-formats/.git
           rm -rf ./deploy/'PHP Example'/assets/document-templates/.git
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: PHP.Example
           path: ${{ github.workspace }}/web/documentserver-example/php/deploy

.github/workflows/artifact-python.yml

@@ -25,7 +25,7 @@ jobs:
           rm -rf ./deploy/'Python Example'/assets/document-formats/.git
           rm -rf ./deploy/'Python Example'/assets/document-templates/.git
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Python.Example
           path: ${{ github.workspace }}/web/documentserver-example/python/deploy

.github/workflows/artifact-ruby.yml

@@ -25,7 +25,7 @@ jobs:
           rm -rf ./deploy/'Ruby Example'/public/assets/document-formats/.git
           rm -rf ./deploy/'Ruby Example'/public/assets/document-templates/.git
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Ruby.Example
           path: ${{ github.workspace }}/web/documentserver-example/ruby/deploy

.github/workflows/artifact-spring.yml

@@ -26,7 +26,7 @@ jobs:
           rm -rf ./deploy/'Java Spring Example'/src/main/resources/assets/document-formats/.git
           rm -rf ./deploy/'Java Spring Example'/src/main/resources/assets/document-templates/.git
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Java.Spring.Example
           path: ${{ github.workspace }}/web/documentserver-example/java-spring/deploy

.github/workflows/create-tag.yml

@@ -0,0 +1,27 @@
+name: Create Tag
+
+on:
+  push:
+    branches: [master]
+    paths-ignore:
+      - '.github/**'
+      - '**/AUTHORS.md'
+      - '**/LICENSE'
+      - '**/README.md'
+
+jobs:
+  create-tag:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+      - name: Get Info
+        run: |
+          echo "version=$(grep -Eo '[0-9]+(\.[0-9]+)+' CHANGELOG.md | head -n 1)" >> $GITHUB_OUTPUT
+        id: info
+      - name: Create Tag
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+          git tag -a 'v${{ steps.info.outputs.version }}' -m 'Release/v${{ steps.info.outputs.version }}'
+          git push origin 'v${{ steps.info.outputs.version }}'

.github/workflows/release.yml

@@ -2,7 +2,8 @@ name: Release
 
 on:
   push:
-    branches: [master]
+    tags:
+      - 'v*'
 
 permissions:
   contents: write

.gitmodules

@@ -5,7 +5,6 @@
 [submodule "web/documentserver-example/nodejs/public/assets/document-formats"]
 	path = web/documentserver-example/nodejs/public/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
-	branch = feature/v8.3
 [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
@@ -20,7 +19,6 @@
 [submodule "web/documentserver-example/php/assets/document-formats"]
 	path = web/documentserver-example/php/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
 [submodule "web/documentserver-example/python/assets/document-templates"]
 	path = web/documentserver-example/python/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
@@ -44,19 +42,15 @@
 [submodule "web/documentserver-example/go/static/assets/document-formats"]
 	path = web/documentserver-example/go/static/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
 [submodule "web/documentserver-example/python/assets/document-formats"]
 	path = web/documentserver-example/python/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
 [submodule "web/documentserver-example/ruby/assets/document-formats"]
 	path = web/documentserver-example/ruby/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
 [submodule "web/documentserver-example/java/src/main/resources/assets/document-formats"]
 	path = web/documentserver-example/java/src/main/resources/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
 [submodule "web/documentserver-example/csharp/assets/document-templates"]
 	path = web/documentserver-example/csharp/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
@@ -64,10 +58,6 @@
 [submodule "web/documentserver-example/csharp/assets/document-formats"]
 	path = web/documentserver-example/csharp/assets/document-formats
 	url = https://github.com/ONLYOFFICE/document-formats
-[submodule "web/documentserver-example/php-laravel/public/assets/document-formats"]
-	path = web/documentserver-example/php-laravel/public/assets/document-formats
-	url = https://github.com/ONLYOFFICE/document-formats
-	branch = master
 [submodule "web/documentserver-example/php-laravel/public/assets/document-templates"]
 	path = web/documentserver-example/php-laravel/public/assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates

3rd-Party.license

@@ -361,6 +361,41 @@ License:        MIT
 License File:   serializer.license
 
 
+web/documentserver-example/php-laravel
+
+jQuery.BlockUI - The jQuery BlockUI Plugin lets you simulate synchronous behavior when using AJAX, without locking the browser. (https://github.com/malsup/blockui/)
+License:        MIT, GPL
+License File:   jQuery.BlockUI.license
+
+jQuery.FileUpload - File Upload widget with multiple file selection, drag&drop support, progress bar, validation and preview images, audio and video for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads. (https://github.com/blueimp/jQuery-File-Upload/blob/master/LICENSE.txt)
+License:        MIT
+License File:   jQuery.FileUpload.license
+
+jQuery.iframe-transport - jQuery Iframe Transport Plugin for File Upload (https://github.com/blueimp/jQuery-File-Upload/blob/master/LICENSE.txt)
+License:        MIT
+License File:   jQuery.iframe-transport.license
+
+jQuery        - jQuery is a new kind of JavaScript Library.        jQuery is a fast and concise JavaScript Library that simplifies HTML document traversing, event handling, animating, and Ajax interactions for rapid web development. jQuery is designed to change the way that you write JavaScript.        NOTE: This package is maintained on behalf of the library owners by the NuGet Community Packages project at https://nugetpackages.codeplex.com/ (https://jquery.org/license/)
+License:        MIT
+License File:   jQuery.license
+
+jQuery.Migrate - Upgrading libraries such as jQuery can be a lot of work, when breaking changes have been introduced. jQuery Migrate makes this easier, by restoring the APIs that were removed, and additionally shows warnings in the browser console (development version of jQuery Migrate only) when removed and/or deprecated APIs are used. (https://github.com/jquery/jquery-migrate/blob/main/LICENSE.txt)
+License:        OpenJS
+License File:   jQuery.Migrate.license
+
+jQuery.UI     - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
+License:        MIT
+License File:   jQuery.UI.license
+
+JWT           - PHP package for JWT (https://github.com/firebase/php-jwt/blob/main/LICENSE)
+License:        BSD-3-Clause
+License File:   jwt.license
+
+Laravel       - Laravel is a web application framework with expressive, elegant syntax. We’ve already laid the foundation for your next big idea — freeing you to create without sweating the small things. (https://github.com/laravel/framework/blob/master/LICENSE.md)
+License       - MIT
+License File  - laravel.license
+
+
 web/documentserver-example/python
 
 django-stubs  - PEP-484 stubs for Django. (https://github.com/typeddjango/django-stubs/blob/master/LICENSE.md)

CHANGELOG.md

@@ -1,10 +1,33 @@
 # Change Log
 
-- restore by url
-- ku skin language
+- update demo files
+- set users by parts
+- open the conversion dialog box with a gray check mark on the type selection step
+- preload frame moved from uploading popap
+- change tab title on rename
+- change uploaded file name in popap if converted
+- php-laravel: fix custom jwt header
+- features tips for anonymous
+- view odg, md
+- edit xlsb
+- support vsdx in diagram editor
+
+## 1.14.0
+- nodejs: set users by parts
+- nodejs: preload frame moved from uploading popap
+- nodejs: view odg, md
+- nodejs: edit xlsb
 - nodejs: support vsdx in diagram editor
-- nodejs: support pages, numbers, key formats
-- nodejs: support hwp, hwpx formats
+- nodejs: fix wopi verification
+- nodejs: user role
+- nodejs: start filling
+- ur skin language
+- change preload.html address
+
+## 1.13.0
+- nodejs: rename in wopi
+- nodejs: using faviconUrl from WOPI discovery
+- nodejs: wopi proof key verification
 - golang: new integration example
 - golang: upload files to the server
 - golang: create blank files and files with sample content
@@ -19,6 +42,12 @@
 - php-laravel: create, edit, and submit pdf forms
 - php-laravel: show forgotten files on a seperate page
 - php-laravel: fetch files
+- php-laravel: integrate sdk
+- jwt token lifetime from config
+- onUserActionRequired
+- support pages, numbers, key formats
+- support hwp, hwpx formats
+- restore by url
 - refresh config
 - on uploading xml convert to supported type only
 - converting function on index page
@@ -26,7 +55,12 @@
 - change reference source
 - filename in editor page title
 - close editor
-- sq-AL, ku skin languages
+
+## 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

Readme.md

@@ -5,7 +5,7 @@ Do NOT use these integration examples on your own server without proper code mod
 In case you enabled any of the test examples, disable it before going for production.
 
 These examples show the way to integrate [ONLYOFFICE Docs][2] into your own website or application using one of the programming languages.
-The package contains examples written in .Net (C# MVC), .Net (C#), Java, Java Spring, Node.js, PHP, Python and Ruby.
+The package contains examples written in .Net (C# MVC), .Net (C#), Go, Java, Java Spring, Node.js, PHP, PHP (Laravel), Python and Ruby.
 
 You should change `http://documentserver` to your server address in these files:
 * [.Net (C# MVC)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/csharp-mvc) - `web/documentserver-example/csharp-mvc/web.appsettings.config`
@@ -15,10 +15,11 @@ You should change `http://documentserver` to your server address in these files:
 * [Java Spring](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/java-spring) - `web/documentserver-example/java-spring/src/main/resources/application.properties`
 * [Node.js](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/nodejs) - `web/documentserver-example/nodejs/config/default.json`
 * [PHP](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/php) - `web/documentserver-example/php/src/configuration/ConfigurationManager.php`
+* [PHP (Laravel)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/php-laravel) - `web/documentserver-example/php-laravel/.env.example`
 * [Python](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/python) - `web/documentserver-example/python/src/configuration/configuration.py`
 * [Ruby](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/ruby) - `web/documentserver-example/ruby/app/configuration/configuration.rb`
 
-More information on how to use these examples can be found here: [http://api.onlyoffice.com/editors/demopreview](http://api.onlyoffice.com/editors/demopreview "http://api.onlyoffice.com/editors/demopreview")
+More information on how to use these examples can be found here: [https://api.onlyoffice.com/docs/docs-api/samples/language-specific-examples/](https://api.onlyoffice.com/docs/docs-api/samples/language-specific-examples/)
 
 ## API methods for test examples
 

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

@@ -146,7 +146,7 @@ header a {
     }
 }
 
-@media (max-width: 592px) and (min-width: 320px) {
+@media (max-width: 592px) {
     .center, .table-main {
         width: 100%;
     }

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

@@ -0,0 +1,6 @@
+<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="M5 8h6v1H5zm0 1h1v1H5zm5 0h1v1h-1zM7 6h2v2H7z" fill="#5951BB"/>
+    <path stroke="#5951BB" d="M4.5 10.5h2v2h-2zm5 0h2v2h-2z"/>
+</svg>

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

@@ -639,7 +639,7 @@
     }
 }
 
-@media (max-width: 420px) and (min-width: 320px) {
+@media (max-width: 420px) {
     .tableRow,
     menu.links {
         width: 25%;
@@ -715,7 +715,7 @@
         max-width: 45%;
     }
 }
-@media (max-width: 600px) and (min-width: 320px) {
+@media (max-width: 600px) {
     .main-panel{
         display: flex;
         flex-direction: column;
@@ -742,7 +742,7 @@
     }
 }
 
-@media (max-width: 592px) and (min-width: 320px) {
+@media (max-width: 592px) {
     body.menu-open {
         overflow: hidden;
     }

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

@@ -511,10 +511,6 @@ label .checkbox {
     line-height: 150%;
 }
 
-#loadScripts {
-    display: none;
-}
-
 #iframeScripts {
     position: absolute;
     visibility: hidden;
@@ -631,6 +627,11 @@ footer table tr td:first-child {
     background-image: url("images/icon_pdf.svg");
 }
 
+.stored-edit.diagram,
+.uploadFileName.diagram {
+    background-image: url("images/icon_vsdx.svg");
+}
+
 .stored-edit span {
     font-size: 12px;
     line-height: 12px;

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

@@ -217,7 +217,9 @@ namespace OnlineEditorsExampleMVC.Helpers
             var directoryInfo = new DirectoryInfo(directory);
 
             // take files from the root directory
-            List<FileInfo> storedFiles = directoryInfo.GetFiles("*.*", SearchOption.TopDirectoryOnly).ToList();
+            List<FileInfo> storedFiles = directoryInfo.GetFiles("*.*", SearchOption.TopDirectoryOnly)
+                .OrderByDescending(f => f.LastWriteTimeUtc)
+                .ToList();
 
             return storedFiles;
         }

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

@@ -83,7 +83,8 @@ namespace OnlineEditorsExampleMVC.Helpers
                                           bool isAsync,
                                           out Dictionary<string, string> convertedDocumentData,
                                           string filePass = null,
-                                          string lang = null)
+                                          string lang = null,
+                                          string fileName = null)
         {
             convertedDocumentData = new Dictionary<string, string>();
 
@@ -91,7 +92,7 @@ namespace OnlineEditorsExampleMVC.Helpers
             fromExtension = string.IsNullOrEmpty(fromExtension) ? Path.GetExtension(documentUri).ToLower() : fromExtension;
 
             // check if the file name parameter is defined; if not, get random uuid for this file
-            var title = Path.GetFileName(documentUri);
+            var title = string.IsNullOrEmpty(fileName) ? Path.GetFileName(documentUri) : fileName;
             title = string.IsNullOrEmpty(title) ? Guid.NewGuid().ToString() : title;
 
             // get document key

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

@@ -20,6 +20,7 @@ using JWT;
 using JWT.Algorithms;
 using JWT.Builder;
 using JWT.Serializers;
+using System;
 using System.Collections.Generic;
 using System.Web.Configuration;
 
@@ -30,17 +31,25 @@ namespace OnlineEditorsExampleMVC.Helpers
         private static readonly string Secret;
         public static readonly bool Enabled;
         public static readonly bool SignatureUseForRequest;
+        public static readonly int ExpiresIn;
 
         static JwtManager()
         {
             Secret = WebConfigurationManager.AppSettings["files.docservice.secret"] ?? "";  // get token secret from the config parameters
             Enabled = !string.IsNullOrEmpty(Secret);  // check if the token is enabled
+            ExpiresIn = int.Parse(WebConfigurationManager.AppSettings["files.docservice.token.expires-in"]);
             SignatureUseForRequest = bool.Parse(WebConfigurationManager.AppSettings["files.docservice.token.useforrequest"]);
         }
 
         // encode a payload object into a token using a secret key
         public static string Encode(IDictionary<string, object> payload)
         {
+            var now = (int)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
+            var expires = now + ExpiresIn * 60;
+
+            payload["iat"] = now;
+            payload["exp"] = expires;
+
             var encoder = new JwtEncoder(new HMACSHA256Algorithm(),
                                          new JsonNetSerializer(),
                                          new JwtBase64UrlEncoder());

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

@@ -26,12 +26,12 @@ namespace OnlineEditorsExampleMVC.Helpers
         static List<string> descr_user_1 = new List<string>()
         {
             "File author by default",
-            "Doesn’t belong to any group",
+            "Doesn't belong to any group",
             "Can review all the changes",
             "Can perform all actions with comments",
-            "The file favorite state is undefined",
-            "Can create files from templates using data from the editor",
             "Can see the information about all users",
+            "This file isn't marked as favorite",
+            "Can create files from templates using data from the editor",
             "Has an avatar",
             "Can submit forms"
         };
@@ -41,11 +41,11 @@ namespace OnlineEditorsExampleMVC.Helpers
             "Belongs to Group2",
             "Can review only his own changes or changes made by users with no group",
             "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only",
+            "Can see the information about users from Group2 and users who don't belong to any group",
             "This file is marked as favorite",
             "Can create new files from the editor",
-            "Can see the information about users from Group2 and users who don’t belong to any group",
             "Has an avatar",
-            "Can’t submit forms"
+            "Can't submit forms"
         };
 
         static List<string> descr_user_3 = new List<string>()
@@ -53,13 +53,13 @@ namespace OnlineEditorsExampleMVC.Helpers
             "Belongs to Group3",
             "Can review changes made by Group2 users",
             "Can view comments left by Group2 and Group3 users. Can edit comments left by the Group2 users",
-            "This file isn’t marked as favorite",
-            "Can’t copy data from the file to clipboard",
-            "Can’t download the file",
-            "Can’t print the file",
-            "Can create new files from the editor",
             "Can see the information about Group2 users",
-            "Can’t submit forms",
+            "The file favorite state is undefined",
+            "Can't copy data from the file to clipboard",
+            "Can't download the file",
+            "Can't print the file",
+            "Can create new files from the editor",
+            "Can't submit forms",
             "Can't close history",
             "Can't restore the file version"
         };
@@ -67,19 +67,20 @@ namespace OnlineEditorsExampleMVC.Helpers
         static List<string> descr_user_0 = new List<string>()
         {
             "The name is requested when the editor is opened",
-            "Doesn’t belong to any group",
+            "Doesn't belong to any group",
             "Can review all the changes",
             "Can perform all actions with comments",
+            "Can't see anyone's information",
             "The file favorite state is undefined",
             "Can't mention others in comments",
             "Can't create new files from the editor",
-            "Can’t see anyone’s information",
             "Can't rename files from the editor",
             "Can't view chat",
             "Can't protect file",
             "View file without collaboration",
-            "Can’t submit forms",
-            "Can’t refresh outdated file"
+            "Can't refresh outdated file",
+            "Can't submit forms",
+            "Tour of tips when opening a document"
         };
 
         private static List<User> users = new List<User>() {
@@ -91,7 +92,7 @@ namespace OnlineEditorsExampleMVC.Helpers
                     null,
                     new Dictionary<string, object>(),
                     null,
-                    null,
+                    false,
                     new List<string>(),
                     descr_user_1,
                     true,
@@ -133,7 +134,7 @@ namespace OnlineEditorsExampleMVC.Helpers
                         { "remove", new List<string>() { } }
                     },
                     new List<string>() { "group-2" },
-                    false,
+                    null,
                     new List<string>() { "copy", "download", "print" },
                     descr_user_3,
                     false,

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

@@ -227,6 +227,12 @@ namespace OnlineEditorsExampleMVC.Models
                                                         { "text", user.close.text },
                                                         { "visible", user.close. visible }
                                                     } : new Dictionary<string, object>{}
+                                            },
+                                            {
+                                                "features", new Dictionary<string, object>
+                                                    {
+                                                        { "featuresTips", user.id.Equals("uid-0") }
+                                                    }
                                             }
                                         }
                                 }
@@ -380,7 +386,7 @@ namespace OnlineEditorsExampleMVC.Models
             var jss = new JavaScriptSerializer();
             var id = request.Cookies.GetOrDefault("uid", null);
             var user = Users.getUser(id);
-            usersForMentions = !user.id.Equals("uid-0") ? jss.Serialize(Users.getUsersForMentions(user.id)) : null;
+            usersForMentions = jss.Serialize(!user.id.Equals("uid-0") ? Users.getUsersForMentions(user.id) : null);
         }
 
         public void GetUsersInfo(HttpRequest request, out string usersInfo)
@@ -397,7 +403,7 @@ namespace OnlineEditorsExampleMVC.Models
             var jss = new JavaScriptSerializer();
             var id = request.Cookies.GetOrDefault("uid", null);
             var user = Users.getUser(id);
-            usersForProtect = !user.id.Equals("uid-0") ? jss.Serialize(Users.getUsersForProtect(user.id)) : null;
+            usersForProtect = jss.Serialize(!user.id.Equals("uid-0") ? Users.getUsersForProtect(user.id) : null);
         }
     }
 }

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

@@ -35,7 +35,8 @@ namespace OnlineEditorsExampleMVC.Models
             Word,
             Cell,
             Slide,
-            Pdf
+            Pdf,
+            Diagram
         }
 
         // get file type
@@ -47,6 +48,7 @@ namespace OnlineEditorsExampleMVC.Models
             if (FormatManager.DocumentExtensions().Contains(ext)) return FileType.Word;  // word type for document extensions
             if (FormatManager.SpreadsheetExtensions().Contains(ext)) return FileType.Cell;  // cell type for spreadsheet extensions
             if (FormatManager.PresentationExtensions().Contains(ext)) return FileType.Slide;  // slide type for presentation extensions
+            if (FormatManager.DiagramExtensions().Contains(ext)) return FileType.Diagram;  // diagram type for diagram extensions
 
             return FileType.Null;  // the default type is word
         }
@@ -202,6 +204,20 @@ namespace OnlineEditorsExampleMVC.Models
                 .ToList();
         }
 
+        public static List<string> DiagramExtensions()
+        {
+            return Diagrams()
+                .Select(format => format.Extension())
+                .ToList();
+        }
+
+        public static List<Format> Diagrams()
+        {
+            return All()
+                .Where(format => format.Type == FileType.Diagram)
+                .ToList();
+        }
+
         public static List<string> AllExtensions()
         {
             return All()

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

@@ -12,7 +12,7 @@ See the detailed guide to learn how to install Document Server [for Windows](htt
 
 ## Step 2. Download the .Net (C# MVC) code for the editors integration
 
-Download the [.Net (C# MVC) example](https://api.onlyoffice.com/editors/demopreview) from our site.
+Download the [.Net (C# MVC) example](https://api.onlyoffice.com/docs/docs-api/samples/language-specific-examples/) from our site.
 
 To connect the editors to your website, specify the path to the editors installation and the path to the storage folder in the *web.appsettings.config* file:
 ```
@@ -21,7 +21,7 @@ To connect the editors to your website, specify the path to the editors installa
 ```
 where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed and the **storage-path** is the path where files will be created and stored. You can set an absolute path.
 
-If you want to experiment with the editor configuration, modify the [parameters](https://api.onlyoffice.com/editors/advanced) in the *DocEditor.aspx* file.
+If you want to experiment with the editor configuration, modify the [parameters](https://api.onlyoffice.com/docs/docs-api/usage-api/advanced-parameters/) in the *DocEditor.aspx* file.
 
 ## Step 3. Install the prerequisites
 Сheck if your system meets the system requirements:
@@ -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/Scripts/jscript.js

@@ -126,7 +126,7 @@ if (typeof jQuery != "undefined") {
 
         if (!formatManager.isAutoConvertible(posExt)) {
             jq("#step2").addClass("done").removeClass("current");
-            loadScripts();
+            onuploaded();
             return;
         }
 
@@ -182,36 +182,16 @@ if (typeof jQuery != "undefined") {
                     if (response.step && response.step < 100) {
                         checkConvert(filePass, fileType);
                     } else {
+                        jq("#uploadFileName").text(response.filename);
                         jq("#step2").addClass("done").removeClass("current");
-                        loadScripts();
+                        onuploaded();
                     }
                 }
             });
         }, 1000);
     };
 
-    var loadScripts = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("current");
-
-        if (jq("#loadScripts").is(":empty")) {
-            var urlScripts = jq("#loadScripts").attr("data-docs");
-            var frame = '<iframe id="iframeScripts" width=1 height=1 style="position: absolute; visibility: hidden;" ></iframe>';
-            jq("#loadScripts").html(frame);
-            document.getElementById("iframeScripts").onload = onloadScripts;
-            jq("#loadScripts iframe").attr("src", urlScripts);
-        } else {
-            onloadScripts();
-        }
-    };
-
-    var onloadScripts = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("done").removeClass("current");
+    var onuploaded = function () {
         jq("#beginView, #beginEmbedded").removeClass("disable");
 
         var fileName = jq("#hiddenFileName").val();
@@ -273,7 +253,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#skipPass", function () {
         jq("#blockPassword").hide();
-        loadScripts();
+        onuploaded();
     });
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {
@@ -354,7 +334,7 @@ if (typeof jQuery != "undefined") {
         }
 
         jq("#hiddenFileName").val(fileName);
-        jq("#convertStep1").addClass("done");
+        jq("#convertStep1").addClass("error");
         jq("#convertStep2").addClass("waiting");
     });
 
@@ -364,6 +344,7 @@ if (typeof jQuery != "undefined") {
         let fileExt = jq(`#${id}`).attr("data");
         jq(`#${id}`).addClass("orange");
         jq("td[name='convertingTypeButton']").addClass("disable");
+        jq("#convertStep1").removeClass("error").addClass("done");
         jq("#convertStep2").removeClass("waiting").removeClass("done").addClass("current");
         jq("#convertStep2").text('2. File conversion');
         jq("#convert-descr").removeClass("disable");
@@ -415,14 +396,12 @@ if (typeof jQuery != "undefined") {
                         jq("#convertStep2").removeClass("current").addClass("done");
                         jq("#convertStep2").text(`2. File conversion to ${fileExt}`);
                         jq("#downloadConverted").removeClass("disable");
+                        jq("#hiddenFileName").attr("data",response.filename);
                         if (response.error !== "FileTypeIsNotSupported") {
-                            jq("#hiddenFileName").attr("data",response.filename);
                             jq("#beginEditConverted").removeClass("disable");
                             jq("#beginViewConverted").removeClass("disable");
                             jq("#downloadConverted").attr("data","fromStorage");
                         } else {
-                            let newFilename = fileName.split('.').slice(0,-1).join('.')
-                            jq("#hiddenFileName").attr("data",response.filename.split("&filename=download").join(`&filename=${newFilename}`));
                             jq("#downloadConverted").attr("data","fromConverter");
                         }
                         jq("td[name='convertingTypeButton']").removeClass("disable orange");

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

@@ -111,8 +111,16 @@
             innerAlert("Document editor closed successfully");
         };
 
+        var onUserActionRequired = function () {
+            console.log("User action required");
+        };
+
         // the meta information of the document is changed via the meta command
         var onMetaChange = function (event) {
+            if (event.data.title !== undefined) {
+                document.title = event.data.title + " - ONLYOFFICE";
+            }
+
             if (event.data.favorite !== undefined) {
                 var favorite = !!event.data.favorite;
                 var title = document.title.replace(/^\☆/g, "");
@@ -354,10 +362,33 @@
                 default:
                     users = <%= usersForMentions %>;
             }
-            docEditor.setUsers({
+            if ((c === "protect" || c === "mention") && users && event.data.count) {
+                let from = event.data.from;
+                let count = event.data.count;
+                let search = event.data.search;
+                if (from != 0) users = [];
+                var resultCount = 234;
+                for (var i = Math.max(users.length, from); i < Math.min(from + count, resultCount); i++){
+                    users.push({
+                        email: "test@test.test" + (i + 1),
+                        id: "id" + (i + 1),
+                        name: "test_" + search + (i + 1)
+                    });
+                }
+            }
+
+            var result = {
                 "c": c,
                 "users": users,
-            });
+            };
+            if (resultCount) {
+                // support v9.0
+                result.total = 1 + (!event.data.count || users.length < event.data.count ? 0 : (event.data.from + event.data.count));
+                // since v9.0.1
+                result.isPaginated = true;
+            }
+
+            docEditor.setUsers(result);
         };
 
         var onRequestSendNotify = function (event) {
@@ -374,6 +405,7 @@
         config.events = {
             'onAppReady': onAppReady,
             'onDocumentStateChange': onDocumentStateChange,
+            'onUserActionRequired': onUserActionRequired,
             'onError': onError,
             'onOutdatedVersion': onOutdatedVersion,
             "onMakeActionLink": onMakeActionLink,

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

@@ -125,7 +125,7 @@
                 <tbody>
                     <tr>
                         <td>
-                            <a href="http://api.onlyoffice.com/editors/howitworks" target="_blank">API Documentation</a>
+                            <a href="https://api.onlyoffice.com/docs/docs-api/get-started/how-it-works/" target="_blank">API Documentation</a>
                         </td>
                         <td>
                             <a href="mailto:sales@onlyoffice.com">Submit your request</a>

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

@@ -362,10 +362,7 @@
                 <span class="errorPass"></span>
                 <br />
             </div>
-            <span id="step3" class="step">3. Loading editor scripts.</span>
-            <span class="step-descr">They are loaded only once, they will be cached on your computer.</span>
             <input type="hidden" name="hiddenFileName" id="hiddenFileName" />
-            <br />
             <span class="progress-descr">Note the speed of all operations depends on your connection quality and server location.</span>
             <br />
             <div class="error-message">
@@ -410,7 +407,7 @@
         </div>
     </div>
 
-    <span id="loadScripts" data-docs="<%= WebConfigurationManager.AppSettings["files.docservice.url.site"] + WebConfigurationManager.AppSettings["files.docservice.url.preloader"] %>"></span>
+    <iframe id="iframeScripts" src="<%= WebConfigurationManager.AppSettings["files.docservice.url.site"] + WebConfigurationManager.AppSettings["files.docservice.url.preloader"] %>" width=1 height=1 style="position: absolute; visibility: hidden; top: 0;" ></iframe>
 
     <footer>
         <div class="center">
@@ -418,7 +415,7 @@
                 <tbody>
                     <tr>
                         <td>
-                            <a href="http://api.onlyoffice.com/editors/howitworks" target="_blank">API Documentation</a>
+                            <a href="https://api.onlyoffice.com/docs/docs-api/get-started/how-it-works/" target="_blank">API Documentation</a>
                         </td>
                         <td>
                             <a href="mailto:sales@onlyoffice.com">Submit your request</a>

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

@@ -280,7 +280,7 @@ namespace OnlineEditorsExampleMVC
 
                     // get the url and file type of the converted file
                     Dictionary<string, string> newFileData;
-                    var result = ServiceConverter.GetConvertedData(downloadUri.ToString(), extension, conversionExtension, key, true, out newFileData, filePass, lang);
+                    var result = ServiceConverter.GetConvertedData(downloadUri.ToString(), extension, conversionExtension, key, true, out newFileData, filePass, lang, fileName);
                     if (result != 100)
                     {
                         context.Response.Write("{ \"step\" : \"" + result + "\", \"filename\" : \"" + fileName + "\"}");
@@ -990,7 +990,7 @@ namespace OnlineEditorsExampleMVC
                     var changes = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(changesPath));
                     var changesArray = (ArrayList)changes["changes"];
                     var change = changesArray.Count > 0
-                        ? (Dictionary<string, object>)changesArray[0]
+                        ? (Dictionary<string, object>)changesArray[changesArray.Count - 1]
                         : new Dictionary<string, object>();
 
                     // write information about changes to the object

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

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <appSettings>
   <clear />
-  <add key="version" value="1.11.0"/>
+  <add key="version" value="1.14.0"/>
 
   <add key="filesize-max" value="52428800"/>
   <add key="storage-path" value=""/>
@@ -13,16 +13,17 @@
   <add key="files.docservice.header" value="Authorization" />
 
   <add key="files.docservice.token.useforrequest" value="true" />
+  <add key="files.docservice.token.expires-in" value="5"/>
 
   <add key="files.docservice.verify-peer-off" value="true"/>
 
-  <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|ku:Kurdish|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|ur:Urdu|vi:Vietnamese|aa-AA:Test Language"/>
 
   <add key="files.docservice.url.site" value="http://documentserver/"/>
 
   <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.preloader" value="web-apps/apps/api/documents/preload.html"/>
   <add key="files.docservice.url.command" value="command"/>
 
   <add key="files.docservice.url.example" value=""/>

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

@@ -146,7 +146,7 @@ header a {
     }
 }
 
-@media (max-width: 592px) and (min-width: 320px) {
+@media (max-width: 592px) {
     .center, .table-main {
         width: 100%;
     }

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

@@ -0,0 +1,6 @@
+<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="M5 8h6v1H5zm0 1h1v1H5zm5 0h1v1h-1zM7 6h2v2H7z" fill="#5951BB"/>
+    <path stroke="#5951BB" d="M4.5 10.5h2v2h-2zm5 0h2v2h-2z"/>
+</svg>

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

@@ -639,7 +639,7 @@
     }
 }
 
-@media (max-width: 420px) and (min-width: 320px) {
+@media (max-width: 420px) {
     .tableRow,
     menu.links {
         width: 25%;
@@ -715,7 +715,7 @@
         max-width: 45%;
     }
 }
-@media (max-width: 600px) and (min-width: 320px) {
+@media (max-width: 600px) {
     .main-panel{
         display: flex;
         flex-direction: column;
@@ -742,7 +742,7 @@
     }
 }
 
-@media (max-width: 592px) and (min-width: 320px) {
+@media (max-width: 592px) {
     body.menu-open {
         overflow: hidden;
     }

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

@@ -511,10 +511,6 @@ label .checkbox {
     line-height: 150%;
 }
 
-#loadScripts {
-    display: none;
-}
-
 #iframeScripts {
     position: absolute;
     visibility: hidden;
@@ -635,6 +631,11 @@ footer a:hover {
     background-image: url("images/icon_pdf.svg");
 }
 
+.stored-edit.diagram,
+.uploadFileName.diagram {
+    background-image: url("images/icon_vsdx.svg");
+}
+
 .stored-edit span {
     font-size: 12px;
     line-height: 12px;

web/documentserver-example/csharp/Default.aspx

@@ -364,10 +364,7 @@
                     <span class="errorPass"></span>
                     <br />
                 </div>
-                <span id="step3" class="step">3. Loading editor scripts.</span>
-                <span class="step-descr">They are loaded only once, they will be cached on your computer.</span>
                 <input type="hidden" name="hiddenFileName" id="hiddenFileName" />
-                <br />
                 <span class="progress-descr">Note the speed of all operations depends on your connection quality and server location.</span>
                 <br />
                 <div class="error-message">
@@ -412,7 +409,7 @@
         </div>
     </div>
 
-        <span id="loadScripts" data-docs="<%= UrlPreloadScripts %>"></span>
+        <iframe id="iframeScripts" src="<%= UrlPreloadScripts %>" width=1 height=1 style="position: absolute; visibility: hidden; top: 0;" ></iframe>
 
         <footer>
             <div class="center">
@@ -420,7 +417,7 @@
                     <tbody>
                         <tr>
                             <td>
-                                <a href="http://api.onlyoffice.com/editors/howitworks" target="_blank">API Documentation</a>
+                                <a href="https://api.onlyoffice.com/docs/docs-api/get-started/how-it-works/" target="_blank">API Documentation</a>
                             </td>
                             <td>
                                 <a href="mailto:sales@onlyoffice.com">Submit your request</a>

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

@@ -254,6 +254,7 @@ namespace OnlineEditorsExample
             if (FormatManager.DocumentExtensions().Contains(ext)) return "word";  // word for text document extensions
             if (FormatManager.SpreadsheetExtensions().Contains(ext)) return "cell";  // cell for spreadsheet extensions
             if (FormatManager.PresentationExtensions().Contains(ext)) return "slide";  // slide for presentation extensions
+            if (FormatManager.DiagramExtensions().Contains(ext)) return "diagram";  // diagram for diagram extensions
 
             return "word";  // the default document type is word
         }
@@ -469,7 +470,7 @@ namespace OnlineEditorsExample
 
                 // get the url and file type of the converted file
                 Dictionary<string, string> newFileData;
-                var result = ServiceConverter.GetConvertedData(fileUrl.ToString() , extension, conversionExtension, key, true, out newFileData, filePass, lang);
+                var result = ServiceConverter.GetConvertedData(fileUrl.ToString() , extension, conversionExtension, key, true, out newFileData, filePass, lang, _fileName);
                 if (result != 100)
                 {
                     return "{ \"step\" : \"" + result + "\", \"filename\" : \"" + _fileName + "\"}";
@@ -562,7 +563,10 @@ namespace OnlineEditorsExample
             var directoryInfo = new DirectoryInfo(directory);  // read the user host directory contents
 
             // get the list of stored files from the host directory
-            List<FileInfo> storedFiles = directoryInfo.GetFiles("*.*", SearchOption.TopDirectoryOnly).ToList();
+            var storedFiles = directoryInfo.GetFiles("*.*", SearchOption.TopDirectoryOnly).ToList();
+
+            storedFiles.Sort((a, b) => b.LastWriteTimeUtc.CompareTo(a.LastWriteTimeUtc));  // sort files by the modification date
+
             return storedFiles;
         }
 

web/documentserver-example/csharp/DocEditor.aspx

@@ -129,8 +129,16 @@
             innerAlert("Document editor closed successfully");
         };
 
+        var onUserActionRequired = function () {
+            console.log("User action required");
+        };
+
         // the meta information of the document is changed via the meta command
         var onMetaChange = function (event) {
+            if (event.data.title !== undefined) {
+                document.title = event.data.title + " - ONLYOFFICE";
+            }
+
             if (event.data.favorite !== undefined) {
                 var favorite = !!event.data.favorite;
                 var title = document.title.replace(/^\☆/g, "");
@@ -319,10 +327,33 @@
                 default:
                     users = <%= UsersForMentions %>;
             }
-            docEditor.setUsers({
+            if ((c === "protect" || c === "mention") && users && event.data.count) {
+                let from = event.data.from;
+                let count = event.data.count;
+                let search = event.data.search;
+                if (from != 0) users = [];
+                var resultCount = 234;
+                for (var i = Math.max(users.length, from); i < Math.min(from + count, resultCount); i++){
+                    users.push({
+                        email: "test@test.test" + (i + 1),
+                        id: "id" + (i + 1),
+                        name: "test_" + search + (i + 1)
+                    });
+                }
+            }
+
+            var result = {
                 "c": c,
                 "users": users,
-            });
+            };
+            if (resultCount) {
+                // support v9.0
+                result.total = 1 + (!event.data.count || users.length < event.data.count ? 0 : (event.data.from + event.data.count));
+                // since v9.0.1
+                result.isPaginated = true;
+            }
+
+            docEditor.setUsers(result);
         };
 
         var onRequestSendNotify = function (event) {
@@ -339,6 +370,7 @@
         config.events = {
             'onAppReady': onAppReady,
             'onDocumentStateChange': onDocumentStateChange,
+            'onUserActionRequired': onUserActionRequired,
             'onError': onError,
             'onOutdatedVersion': onOutdatedVersion,
             'onMakeActionLink': onMakeActionLink,

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

@@ -294,6 +294,12 @@ namespace OnlineEditorsExample
                                                         { "visible", user.close.visible },
                                                         { "text", user.close.text }
                                                     } : new Dictionary<string, object>{}
+                                            },
+                                            {
+                                                "features", new Dictionary<string, object>
+                                                    {
+                                                        { "featuresTips", user.id.Equals("uid-0") }
+                                                    }
                                             }
                                         }
                                 }
@@ -327,14 +333,14 @@ namespace OnlineEditorsExample
 
                 // get users for mentions
                 List<Dictionary<string, object>> usersData = Users.getUsersForMentions(user.id);
-                UsersForMentions = !user.id.Equals("uid-0") ? jss.Serialize(usersData) : null;
+                UsersForMentions = jss.Serialize(!user.id.Equals("uid-0") ? usersData : null);
 
                 List<Dictionary<string, object>> usersInfo = Users.getUsersInfo(user.id);
                 UsersInfo = jss.Serialize(usersData);
 
                 // get users for protect
                 List<Dictionary<string, object>> usersProtectData = Users.getUsersForProtect(user.id);
-                UsersForProtect = !user.id.Equals("uid-0") ? jss.Serialize(usersProtectData) : null;
+                UsersForProtect = jss.Serialize(!user.id.Equals("uid-0") ? usersProtectData : null);
             }
             catch { }
         }

web/documentserver-example/csharp/DocumentConverter.cs

@@ -85,7 +85,8 @@ namespace ASC.Api.DocumentConverter
                                           bool isAsync,
                                           out Dictionary<string, string> convertedDocumentData,
                                           string filePass = null,
-                                          string lang = null)
+                                          string lang = null,
+                                          string filename = null)
         {
             convertedDocumentData = new Dictionary<string, string>();
 
@@ -93,7 +94,7 @@ namespace ASC.Api.DocumentConverter
             fromExtension = string.IsNullOrEmpty(fromExtension) ? Path.GetExtension(documentUri).ToLower() : fromExtension;
 
             // check if the file name parameter is defined; if not, get random uuid for this file
-            var title = Path.GetFileName(documentUri);
+            var title = string.IsNullOrEmpty(filename) ? Path.GetFileName(documentUri) : filename;
             title = string.IsNullOrEmpty(title) ? Guid.NewGuid().ToString() : title;
 
             // get document key

web/documentserver-example/csharp/Forgotten.aspx

@@ -126,7 +126,7 @@
                     <tbody>
                         <tr>
                             <td>
-                                <a href="http://api.onlyoffice.com/editors/howitworks" target="_blank">API Documentation</a>
+                                <a href="https://api.onlyoffice.com/docs/docs-api/get-started/how-it-works/" target="_blank">API Documentation</a>
                             </td>
                             <td>
                                 <a href="mailto:sales@onlyoffice.com">Submit your request</a>

web/documentserver-example/csharp/FormatManager.cs

@@ -164,6 +164,20 @@ namespace OnlineEditorsExample
                 .ToList();
         }
 
+        public static List<string> DiagramExtensions()
+        {
+            return Diagrams()
+                .Select(format => format.Extension())
+                .ToList();
+        }
+
+        public static List<Format> Diagrams()
+        {
+            return All()
+                .Where(format => format.Type == "diagram")
+                .ToList();
+        }
+
         public static List<string> AllExtensions()
         {
             return All()

web/documentserver-example/csharp/JwtManager.cs

@@ -20,6 +20,7 @@ using JWT;
 using JWT.Algorithms;
 using JWT.Builder;
 using JWT.Serializers;
+using System;
 using System.Collections.Generic;
 using System.Web.Configuration;
 
@@ -28,6 +29,7 @@ namespace OnlineEditorsExample
     public static class JwtManager
     {
         private static readonly string Secret;
+        private static readonly int ExpiresIn;
         public static readonly bool Enabled;
         public static readonly bool SignatureUseForRequest;
 
@@ -35,12 +37,19 @@ namespace OnlineEditorsExample
         {
             Secret = WebConfigurationManager.AppSettings["files.docservice.secret"] ?? "";  // get token secret from the config parameters
             Enabled = !string.IsNullOrEmpty(Secret);  // check if the token is enabled
+            ExpiresIn = int.Parse(WebConfigurationManager.AppSettings["files.docservice.token.expires-in"]);
             SignatureUseForRequest = bool.Parse(WebConfigurationManager.AppSettings["files.docservice.token.useforrequest"]);
         }
 
         // encode a payload object into a token using a secret key
         public static string Encode(IDictionary<string, object> payload)
         {
+            var now = (int)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
+            var expires = now + ExpiresIn * 60;
+
+            payload["iat"] = now;
+            payload["exp"] = expires;
+
             var encoder = new JwtEncoder(new HMACSHA256Algorithm(),
                                          new JsonNetSerializer(),
                                          new JwtBase64UrlEncoder());

web/documentserver-example/csharp/README.md

@@ -12,7 +12,7 @@ See the detailed guide to learn how to install Document Server [for Windows](htt
 
 ## Step 2. Download the .Net (C#) code for the editors integration
 
-Download the [.Net (C#) example](https://api.onlyoffice.com/editors/demopreview) from our site.
+Download the [.Net (C#) example](https://api.onlyoffice.com/docs/docs-api/samples/language-specific-examples/) from our site.
 
 To connect the editors to your website, specify the path to the editors installation and the path to the storage folder in the *settings.config* file:
 ```
@@ -21,7 +21,7 @@ To connect the editors to your website, specify the path to the editors installa
 ```
 where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed and the **storage-path** is the path where files will be created and stored. You can set an absolute path.
 
-If you want to experiment with the editor configuration, modify the [parameters](https://api.onlyoffice.com/editors/advanced) in the *DocEditor.aspx* file.
+If you want to experiment with the editor configuration, modify the [parameters](https://api.onlyoffice.com/docs/docs-api/usage-api/advanced-parameters/) in the *DocEditor.aspx* file.
 
 ## Step 3. Install the prerequisites
 
@@ -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/Users.cs

@@ -25,12 +25,12 @@ namespace OnlineEditorsExample
         static List<string> descr_user_1 = new List<string>()
         {
             "File author by default",
-            "Doesn’t belong to any group",
+            "Doesn't belong to any group",
             "Can review all the changes",
             "Can perform all actions with comments",
-            "The file favorite state is undefined",
-            "Can create files from templates using data from the editor",
             "Can see the information about all users",
+            "This file isn't marked as favorite",
+            "Can create files from templates using data from the editor",
             "Has an avatar",
             "Can submit forms"
         };
@@ -40,11 +40,11 @@ namespace OnlineEditorsExample
             "Belongs to Group2",
             "Can review only his own changes or changes made by users with no group",
             "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only",
+            "Can see the information about users from Group2 and users who don't belong to any group",
             "This file is marked as favorite",
             "Can create new files from the editor",
-            "Can see the information about users from Group2 and users who don’t belong to any group",
             "Has an avatar",
-            "Can’t submit forms"
+            "Can't submit forms"
         };
 
         static List<string> descr_user_3 = new List<string>()
@@ -52,33 +52,34 @@ namespace OnlineEditorsExample
             "Belongs to Group3",
             "Can review changes made by Group2 users",
             "Can view comments left by Group2 and Group3 users. Can edit comments left by the Group2 users",
-            "This file isn’t marked as favorite",
-            "Can’t copy data from the file to clipboard",
-            "Can’t download the file",
-            "Can’t print the file",
-            "Can create new files from the editor",
             "Can see the information about Group2 users",
-            "Can’t submit forms",
+            "The file favorite state is undefined",
+            "Can't copy data from the file to clipboard",
+            "Can't download the file",
+            "Can't print the file",
+            "Can create new files from the editor",
             "Can't close history",
-            "Can't restore the file version"
+            "Can't restore the file version",
+            "Can't submit forms"
         };
 
         static List<string> descr_user_0 = new List<string>()
         {
             "The name is requested when the editor is opened",
-            "Doesn’t belong to any group",
+            "Doesn't belong to any group",
             "Can review all the changes",
             "Can perform all actions with comments",
+            "Can't see anyone's information",
             "The file favorite state is undefined",
             "Can't mention others in comments",
             "Can't create new files from the editor",
-            "Can’t see anyone’s information",
             "Can't rename files from the editor",
             "Can't view chat",
             "Can't protect file",
             "View file without collaboration",
-            "Can’t submit forms",
-            "Can’t refresh outdated file"
+            "Can't refresh outdated file",
+            "Can't submit forms",
+            "Tour of tips when opening a document"
         };
 
         private static List<User> users = new List<User>() {
@@ -90,7 +91,7 @@ namespace OnlineEditorsExample
                     null,
                     new Dictionary<string, object>(),
                     null,
-                    null,
+                    false,
                     new List<string>(),
                     descr_user_1,
                     true,
@@ -132,7 +133,7 @@ namespace OnlineEditorsExample
                         { "remove", new List<string>() { } }
                     },
                     new List<string>() { "group-2" },
-                    false,
+                    null,
                     new List<string>() { "copy", "download", "print" },
                     descr_user_3,
                     false,

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

@@ -778,7 +778,7 @@ namespace OnlineEditorsExample
                     var changes = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(changesPath));
                     var changesArray = (ArrayList)changes["changes"];
                     var change = changesArray.Count > 0
-                        ? (Dictionary<string, object>)changesArray[0]
+                        ? (Dictionary<string, object>)changesArray[changesArray.Count - 1]
                         : new Dictionary<string, object>();
 
                     // write information about changes to the object

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

@@ -126,7 +126,7 @@ if (typeof jQuery != "undefined") {
 
         if (!formatManager.isAutoConvertible(posExt)) {
             jq("#step2").addClass("done").removeClass("current");
-            loadScripts();
+            onuploaded();
             return;
         }
 
@@ -182,36 +182,16 @@ if (typeof jQuery != "undefined") {
                     if (response.step && response.step < 100) {
                         checkConvert(filePass, fileType);
                     } else {
+                        jq("#uploadFileName").text(response.filename);
                         jq("#step2").addClass("done").removeClass("current");
-                        loadScripts();
+                        onuploaded();
                     }
                 }
             });
         }, 1000);
     };
 
-    var loadScripts = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("current");
-
-        if (jq("#loadScripts").is(":empty")) {
-            var urlScripts = jq("#loadScripts").attr("data-docs");
-            var frame = '<iframe id="iframeScripts" width=1 height=1 style="position: absolute; visibility: hidden;" ></iframe>';
-            jq("#loadScripts").html(frame);
-            document.getElementById("iframeScripts").onload = onloadScripts;
-            jq("#loadScripts iframe").attr("src", urlScripts);
-        } else {
-            onloadScripts();
-        }
-    };
-
-    var onloadScripts = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("done").removeClass("current");
+    var onuploaded = function () {
         jq("#beginView, #beginEmbedded").removeClass("disable");
 
         var fileName = jq("#hiddenFileName").val();
@@ -273,7 +253,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#skipPass", function () {
         jq("#blockPassword").hide();
-        loadScripts();
+        onuploaded();
     });
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {
@@ -354,7 +334,7 @@ if (typeof jQuery != "undefined") {
         }
 
         jq("#hiddenFileName").val(fileName);
-        jq("#convertStep1").addClass("done");
+        jq("#convertStep1").addClass("error");
         jq("#convertStep2").addClass("waiting");
     });
 
@@ -364,6 +344,7 @@ if (typeof jQuery != "undefined") {
         let fileExt = jq(`#${id}`).attr("data");
         jq(`#${id}`).addClass("orange");
         jq("td[name='convertingTypeButton']").addClass("disable");
+        jq("#convertStep1").removeClass("error").addClass("done");
         jq("#convertStep2").removeClass("waiting").removeClass("done").addClass("current");
         jq("#convertStep2").text('2. File conversion');
         jq("#convert-descr").removeClass("disable");
@@ -415,14 +396,12 @@ if (typeof jQuery != "undefined") {
                         jq("#convertStep2").removeClass("current").addClass("done");
                         jq("#convertStep2").text(`2. File conversion to ${fileExt}`);
                         jq("#downloadConverted").removeClass("disable");
+                        jq("#hiddenFileName").attr("data",response.filename);
                         if (response.error !== "FileTypeIsNotSupported") {
-                            jq("#hiddenFileName").attr("data",response.filename);
                             jq("#beginEditConverted").removeClass("disable");
                             jq("#beginViewConverted").removeClass("disable");
                             jq("#downloadConverted").attr("data","fromStorage");
                         } else {
-                            let newFilename = fileName.split('.').slice(0,-1).join('.')
-                            jq("#hiddenFileName").attr("data",response.filename.split("&filename=download").join(`&filename=${newFilename}`));
                             jq("#downloadConverted").attr("data","fromConverter");
                         }
                         jq("td[name='convertingTypeButton']").removeClass("disable orange");

web/documentserver-example/csharp/settings.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <appSettings>
   <clear />
-  <add key="version" value="1.11.0"/>
+  <add key="version" value="1.14.0"/>
 
   <add key="filesize-max" value="52428800"/>
   <add key="storage-path" value=""/>
@@ -14,14 +14,15 @@
   <add key="files.docservice.verify-peer-off" value="true"/>
 
   <add key="files.docservice.token.useforrequest" value="true" />
+  <add key="files.docservice.token.expires-in" value="5"/>
 
-  <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|ku:Kurdish|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|ur:Urdu|vi:Vietnamese|aa-AA: Test Language"/>
 
   <add key="files.docservice.url.site" value="http://documentserver/"/>
 
   <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.preloader" value="web-apps/apps/api/documents/preload.html"/>
   <add key="files.docservice.url.command" value="command"/>
 
   <add key="files.docservice.url.example" value=""/>

web/documentserver-example/go/.golangci.yml

@@ -4,6 +4,7 @@ linters:
     - cyclop
     - depguard
     - dogsled
+    - durationcheck
     - err113
     - errchkjson
     - execinquery

web/documentserver-example/go/README.md

@@ -13,7 +13,7 @@ See the detailed guide to learn how to install Document Server [for Windows](htt
 
 ### Step 2. Download the Go code for the editors integration
 
-Download the [Go example](https://api.onlyoffice.com/editors/demopreview) from our site.
+Download the [Go example](https://api.onlyoffice.com/docs/docs-api/samples/language-specific-examples/) from our site.
 
 To connect the editors to your website, specify the path to the editors installation, server protocol, address and port  in the *configuration.env* file:
 
@@ -31,7 +31,7 @@ JWT_HEADER=Authorization
 where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed.
 **address** is the address of the server, **port** is the server port.
 
-If you want to experiment with the editor configuration, modify the [parameters](https://api.onlyoffice.com/editors/advanced) it the *templates/editor.html* file.
+If you want to experiment with the editor configuration, modify the [parameters](https://api.onlyoffice.com/docs/docs-api/usage-api/advanced-parameters/) it the *templates/editor.html* file.
 
 ### Step 3. Install the prerequisites
 To run the Go example code, install the Go compiler:
@@ -48,7 +48,26 @@ export PATH=$PATH:$GOPATH/bin
 export PATH=$PATH:/usr/local/go/bin
 ```
 
-### Step 5. Start the application
+### Step 5. Configure JWT 
+
+Open the *config/configuration.json* file and enable JWT:
+
+```
+{
+    "JWT_IS_ENABLED" : true,
+}
+```
+
+Also, [specify the same secret key](https://helpcenter.onlyoffice.com/installation/docs-configure-jwt.aspx) as used in your Document Server: 
+
+```
+{
+    "JWT_SECRET" : "secret",
+}
+```
+
+
+### Step 6. Start the application
 
 1. Go to the project root.
 2. Run:
@@ -57,6 +76,6 @@ export PATH=$PATH:/usr/local/go/bin
     ```
 3. In your browser go to **server.address** and **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.

web/documentserver-example/go/config/configuration.json

@@ -1,5 +1,5 @@
 {
-  "VERSION": "1.11.0",
+  "VERSION": "1.14.0",
 
   "SERVER_ADDRESS" : "",
   "SERVER_PORT" : 3000,
@@ -7,10 +7,11 @@
   "DOC_SERVER_HOST" : "http://documentserver/",
   "DOC_SERVER_CONVERTER_URL" : "converter",
   "DOC_SERVER_API_URL" : "web-apps/apps/api/documents/api.js",
-  "DOC_SERVER_PRELOADER_URL" : "web-apps/apps/api/documents/cache-scripts.html",
+  "DOC_SERVER_PRELOADER_URL" : "web-apps/apps/api/documents/preload.html",
   "DOC_SERVER_COMMAND_URL" : "command",
 
   "JWT_IS_ENABLED" : false,
+  "JWT_EXPIRES_IN" : 5,
   "JWT_SECRET" : "secret",
   "JWT_HEADER" : "Authorization",
 
@@ -48,7 +49,6 @@
     "it": "Italian",
     "ja": "Japanese",
     "ko": "Korean",
-    "ku": "Kurdish",
     "lo": "Lao",
     "lv": "Latvian",
     "ms": "Malay (Malaysia)",
@@ -67,6 +67,7 @@
     "sv": "Swedish",
     "tr": "Turkish",
     "uk": "Ukrainian",
+    "ur": "Urdu",
     "vi": "Vietnamese",
     "aa-AA": "Test Language"
   }

web/documentserver-example/go/config/models.go

@@ -29,4 +29,5 @@ type ExtensionTypes struct {
 	Presentation []string `json:"presentation"`
 	Document     []string `json:"document"`
 	Pdf          []string `json:"pdf"`
+	Diagram      []string `json:"diagram"`
 }

web/documentserver-example/go/config/module.go

@@ -20,6 +20,7 @@ package config
 import (
 	"path/filepath"
 	"runtime"
+	"time"
 
 	"github.com/ONLYOFFICE/document-server-integration/utils"
 	"github.com/spf13/viper"
@@ -36,6 +37,7 @@ type ApplicationConfig struct {
 	DocumentServerPreloader  string            `mapstructure:"DOC_SERVER_PRELOADER_URL"`
 	DocumentServerCommandUrl string            `mapstructure:"DOC_SERVER_COMMAND_URL"`
 	JwtEnabled               bool              `mapstructure:"JWT_IS_ENABLED"`
+	JwtExpiresIn             time.Duration     `mapstructure:"JWT_EXPIRES_IN"`
 	JwtHeader                string            `mapstructure:"JWT_HEADER"`
 	JwtSecret                string            `mapstructure:"JWT_SECRET"`
 	StoragePath              string            `mapstructure:"STORAGE_PATH"`
@@ -91,6 +93,7 @@ func NewSpecification() (specification SpecificationConfig, err error) {
 		fm.GetPresentationExtensions(),
 		fm.GetDocumentExtensions(),
 		fm.GetPdfExtensions(),
+		fm.GetDiagramExtensions(),
 	}
 	specification = SpecificationConfig{
 		exts,

web/documentserver-example/go/server/api/default/config.go

@@ -22,10 +22,12 @@ import (
 	"fmt"
 	"net/http"
 	"strings"
+	"time"
 
 	"github.com/ONLYOFFICE/document-server-integration/server/managers"
 	"github.com/ONLYOFFICE/document-server-integration/server/models"
 	"github.com/ONLYOFFICE/document-server-integration/server/shared"
+	"github.com/golang-jwt/jwt"
 )
 
 func (srv *DefaultServerEndpointsHandler) Config(w http.ResponseWriter, r *http.Request) {
@@ -71,6 +73,10 @@ func (srv *DefaultServerEndpointsHandler) Config(w http.ResponseWriter, r *http.
 			),
 			Mode: "edit",
 		},
+		StandardClaims: jwt.StandardClaims{
+			ExpiresAt: time.Now().Add(time.Minute * srv.config.JwtExpiresIn).Unix(),
+			IssuedAt:  time.Now().Unix(),
+		},
 	}
 
 	secret := strings.TrimSpace(srv.config.JwtSecret)

web/documentserver-example/go/server/api/default/convert.go

@@ -79,7 +79,7 @@ func (srv *DefaultServerEndpointsHandler) Convert(w http.ResponseWriter, r *http
 			return
 		}
 
-		newUrl, newExt, err := srv.ConversionManager.GetConverterUri(fileUrl, fileExt, toExt, key, true)
+		newUrl, newExt, err := srv.ConversionManager.GetConverterUri(fileUrl, fileExt, toExt, key, true, filename)
 		if err != nil {
 			response.Error = err.Error()
 			srv.logger.Errorf("File conversion error: %s", err.Error())

web/documentserver-example/go/server/api/default/create.go

@@ -96,6 +96,10 @@ func (srv *DefaultServerEndpointsHandler) Create(w http.ResponseWriter, r *http.
 			srv.logger.Errorf("meta creation error: %s", err.Error())
 		}
 
+		res := map[string]interface{}{
+			"file": correctName,
+		}
+		shared.SendResponse(w, res)
 		return
 	}
 

web/documentserver-example/go/server/api/default/reference.go

@@ -23,11 +23,13 @@ import (
 	"net/http"
 	"net/url"
 	"strings"
+	"time"
 
 	"github.com/ONLYOFFICE/document-server-integration/server/managers"
 	"github.com/ONLYOFFICE/document-server-integration/server/models"
 	"github.com/ONLYOFFICE/document-server-integration/server/shared"
 	"github.com/ONLYOFFICE/document-server-integration/utils"
+	"github.com/golang-jwt/jwt"
 )
 
 func (srv *DefaultServerEndpointsHandler) Reference(w http.ResponseWriter, r *http.Request) {
@@ -43,15 +45,11 @@ func (srv *DefaultServerEndpointsHandler) Reference(w http.ResponseWriter, r *ht
 
 	var fileKey map[string]string
 	err := json.Unmarshal([]byte(body.ReferenceData.FileKey), &fileKey)
-	if err != nil {
-		srv.logger.Error("FileKey decoding error")
-		shared.SendDocumentServerRespose(w, true)
-		return
-	}
-
-	path, _ := srv.GenerateFilePath(fileKey["fileName"])
-	if body.ReferenceData.InstanceId == remoteAddr && srv.PathExists(path) {
-		fileName = fileKey["fileName"]
+	if err == nil {
+		path, _ := srv.GenerateFilePath(fileKey["fileName"])
+		if body.ReferenceData.InstanceId == remoteAddr && srv.PathExists(path) {
+			fileName = fileKey["fileName"]
+		}
 	}
 
 	if fileName == "" && body.Link != "" {
@@ -99,6 +97,10 @@ func (srv *DefaultServerEndpointsHandler) Reference(w http.ResponseWriter, r *ht
 		},
 		Link: remoteAddr + "/editor?filename=" + url.QueryEscape(fileName),
 		Path: fileName,
+		StandardClaims: jwt.StandardClaims{
+			ExpiresAt: time.Now().Add(time.Minute * srv.config.JwtExpiresIn).Unix(),
+			IssuedAt:  time.Now().Unix(),
+		},
 	}
 
 	secret := strings.TrimSpace(srv.config.JwtSecret)

web/documentserver-example/go/server/api/default/upload.go

@@ -44,7 +44,7 @@ func (srv *DefaultServerEndpointsHandler) Upload(w http.ResponseWriter, r *http.
 	srv.logger.Debug("A new upload call")
 	if !srv.DocumentManager.IsDocumentConvertable(handler.Filename) {
 		srv.logger.Errorf("File %s is not supported", handler.Filename)
-		shared.SendCustomErrorResponse(w, "File type is not supported")
+		shared.SendResponse(w, map[string]string{"error": "File type is not supported"})
 		return
 	}
 

web/documentserver-example/go/server/managers/config.go

@@ -77,7 +77,7 @@ type ConversionManager interface {
 	GetInternalExtension(fileType string) string
 	IsCanConvert(ext string) bool
 	IsCanFill(ext string) bool
-	GetConverterUri(docUri, fromExt, toExt, docKey string, isAsync bool) (string, string, error)
+	GetConverterUri(docUri, fromExt, toExt, docKey string, isAsync bool, title string) (string, string, error)
 }
 
 type CommandManager interface {

web/documentserver-example/go/server/managers/default/command.go

@@ -23,6 +23,7 @@ import (
 	"net/http"
 	"net/url"
 	"strings"
+	"time"
 
 	"github.com/ONLYOFFICE/document-server-integration/config"
 	"github.com/ONLYOFFICE/document-server-integration/server/managers"
@@ -59,6 +60,10 @@ func (cm DefaultCommandManager) CommandRequest(method string, docKey string, met
 	payload := CommandPayload{
 		C:   method,
 		Key: docKey,
+		StandardClaims: jwt.StandardClaims{
+			ExpiresAt: time.Now().Add(time.Minute * cm.config.JwtExpiresIn).Unix(),
+			IssuedAt:  time.Now().Unix(),
+		},
 	}
 	if meta != nil {
 		payload.Meta = meta
@@ -68,7 +73,7 @@ func (cm DefaultCommandManager) CommandRequest(method string, docKey string, met
 	var headerToken string
 	secret := strings.TrimSpace(cm.config.JwtSecret)
 	if secret != "" && cm.config.JwtEnabled {
-		headerPayload := fillJwtByUrl(uri, payload)
+		headerPayload := fillJwtByUrl(uri, payload, cm.config)
 		headerToken, err = cm.JwtManager.JwtSign(headerPayload, []byte(secret))
 		if err != nil {
 			return nil, err
@@ -103,7 +108,7 @@ func (cm DefaultCommandManager) CommandRequest(method string, docKey string, met
 	return response, nil
 }
 
-func fillJwtByUrl(uri string, payload CommandPayload) CommandRequestHeaderPayload {
+func fillJwtByUrl(uri string, payload CommandPayload, config config.ApplicationConfig) CommandRequestHeaderPayload {
 	urlObj, _ := url.Parse(uri)
 	query, _ := url.ParseQuery(urlObj.RawQuery)
 	queryMap := make(map[string]string)
@@ -114,5 +119,9 @@ func fillJwtByUrl(uri string, payload CommandPayload) CommandRequestHeaderPayloa
 	return CommandRequestHeaderPayload{
 		Query:   queryMap,
 		Payload: payload,
+		StandardClaims: jwt.StandardClaims{
+			ExpiresAt: time.Now().Add(time.Minute * config.JwtExpiresIn).Unix(),
+			IssuedAt:  time.Now().Unix(),
+		},
 	}
 }

web/documentserver-example/go/server/managers/default/conversion.go

@@ -24,11 +24,13 @@ import (
 	"io"
 	"net/http"
 	"strings"
+	"time"
 
 	"github.com/ONLYOFFICE/document-server-integration/config"
 	"github.com/ONLYOFFICE/document-server-integration/server/managers"
 	"github.com/ONLYOFFICE/document-server-integration/server/shared"
 	"github.com/ONLYOFFICE/document-server-integration/utils"
+	"github.com/golang-jwt/jwt"
 	"go.uber.org/zap"
 )
 
@@ -66,6 +68,9 @@ func (cm DefaultConversionManager) GetFileType(filename string) string {
 	if utils.IsInList(ext, exts.Presentation) {
 		return shared.ONLYOFFICE_PRESENTATION
 	}
+	if utils.IsInList(ext, exts.Diagram) {
+		return shared.ONLYOFFICE_DIAGRAM
+	}
 
 	return shared.ONLYOFFICE_DOCUMENT
 }
@@ -97,6 +102,7 @@ func (cm DefaultConversionManager) GetConverterUri(
 	toExt string,
 	docKey string,
 	isAsync bool,
+	title string,
 ) (string, string, error) {
 	if fromExt == "" {
 		fromExt = utils.GetFileExt(docUri, true)
@@ -106,9 +112,13 @@ func (cm DefaultConversionManager) GetConverterUri(
 		DocUrl:     docUri,
 		OutputType: strings.ReplaceAll(toExt, ".", ""),
 		FileType:   fromExt,
-		Title:      utils.GetFileName(docUri),
+		Title:      title,
 		Key:        docKey,
 		Async:      isAsync,
+		StandardClaims: jwt.StandardClaims{
+			ExpiresAt: time.Now().Add(time.Minute * cm.config.JwtExpiresIn).Unix(),
+			IssuedAt:  time.Now().Unix(),
+		},
 	}
 
 	var headerToken string
@@ -116,7 +126,13 @@ func (cm DefaultConversionManager) GetConverterUri(
 
 	secret := strings.TrimSpace(cm.config.JwtSecret)
 	if secret != "" && cm.config.JwtEnabled {
-		headerPayload := managers.ConvertRequestHeaderPayload{Payload: payload}
+		headerPayload := managers.ConvertRequestHeaderPayload{
+			Payload: payload,
+			StandardClaims: jwt.StandardClaims{
+				ExpiresAt: time.Now().Add(time.Minute * cm.config.JwtExpiresIn).Unix(),
+				IssuedAt:  time.Now().Unix(),
+			},
+		}
 		headerToken, err = cm.JwtManager.JwtSign(headerPayload, []byte(secret))
 		if err != nil {
 			return "", "", err

web/documentserver-example/go/server/managers/default/document.go

@@ -28,6 +28,7 @@ import (
 	"github.com/ONLYOFFICE/document-server-integration/server/managers"
 	"github.com/ONLYOFFICE/document-server-integration/server/models"
 	"github.com/ONLYOFFICE/document-server-integration/utils"
+	"github.com/golang-jwt/jwt"
 	"go.uber.org/zap"
 )
 
@@ -152,7 +153,7 @@ func (dm DefaultDocumentManager) BuildDocumentConfig(
 		return nil, err
 	}
 
-	config := models.Config{
+	config := &models.Config{
 		Type:         parameters.Type,
 		DocumentType: dm.ConversionManager.GetFileType(parameters.Filename),
 		Document: models.Document{
@@ -221,8 +222,15 @@ func (dm DefaultDocumentManager) BuildDocumentConfig(
 				Goback: models.Goback{
 					RequestClose: false,
 				},
+				Features: models.Features{
+					FeaturesTips: user.Id == "uid-0",
+				},
 			},
 		},
+		StandardClaims: jwt.StandardClaims{
+			ExpiresAt: time.Now().Add(time.Minute * dm.config.JwtExpiresIn).Unix(),
+			IssuedAt:  time.Now().Unix(),
+		},
 	}
 
 	secret := strings.TrimSpace(dm.config.JwtSecret)
@@ -231,7 +239,7 @@ func (dm DefaultDocumentManager) BuildDocumentConfig(
 		config.Token = token
 	}
 
-	return &config, nil
+	return config, nil
 }
 
 func (dm DefaultDocumentManager) IsDocumentConvertable(filename string) bool {

web/documentserver-example/go/server/managers/default/history.go

@@ -23,12 +23,14 @@ import (
 	"fmt"
 	"net/http"
 	"path"
+	"time"
 
 	"github.com/ONLYOFFICE/document-server-integration/config"
 	"github.com/ONLYOFFICE/document-server-integration/server/managers"
 	"github.com/ONLYOFFICE/document-server-integration/server/models"
 	"github.com/ONLYOFFICE/document-server-integration/server/shared"
 	"github.com/ONLYOFFICE/document-server-integration/utils"
+	"github.com/golang-jwt/jwt"
 	"go.uber.org/zap"
 )
 
@@ -195,6 +197,10 @@ func (hm DefaultHistoryManager) fetchNextHistoryEntry(
 			Key:     key,
 			Url:     url,
 			Version: version,
+			StandardClaims: jwt.StandardClaims{
+				ExpiresAt: time.Now().Add(time.Minute * hm.config.JwtExpiresIn).Unix(),
+				IssuedAt:  time.Now().Unix(),
+			},
 		}
 	}
 
@@ -261,6 +267,10 @@ func (hm DefaultHistoryManager) GetHistory(
 		Url:        hm.StorageManager.GeneratePublicFileUri(filename, remoteAddress, managers.FileMeta{}),
 		Version:    version,
 		ChangesUrl: changesUrl,
+		StandardClaims: jwt.StandardClaims{
+			ExpiresAt: time.Now().Add(time.Minute * hm.config.JwtExpiresIn).Unix(),
+			IssuedAt:  time.Now().Unix(),
+		},
 	}
 
 	rhist.History = append(rhist.History, models.History{

web/documentserver-example/go/server/managers/default/storage.go

@@ -94,7 +94,7 @@ func (sm DefaultStorageManager) GetStoredFiles(remoteAddress string) ([]models.D
 	}
 
 	sort.Slice(files, func(i, j int) bool {
-		return files[i].ModTime().Before(files[j].ModTime())
+		return !files[i].ModTime().Before(files[j].ModTime())
 	})
 
 	for _, v := range files {

web/documentserver-example/go/server/managers/default/user.go

@@ -54,7 +54,7 @@ func NewDefaultUserManager(logger *zap.SugaredLogger) managers.UserManager {
 			ReviewGroups:      nil,
 			CommentGroups:     nil,
 			UserInfoGroups:    nil,
-			Favorite:          -1,
+			Favorite:          0,
 			DeniedPermissions: nil,
 			Description:       descriptionUser1,
 			Templates:         true,
@@ -86,7 +86,9 @@ func NewDefaultUserManager(logger *zap.SugaredLogger) managers.UserManager {
 			Goback: map[string]interface{}{
 				"text": "Go to Documents",
 			},
-			Close: nil,
+			Close: map[string]interface{}{
+				"visible": true,
+			},
 		},
 		{
 			Id:           "uid-3",
@@ -100,13 +102,15 @@ func NewDefaultUserManager(logger *zap.SugaredLogger) managers.UserManager {
 				"remove": "",
 			},
 			UserInfoGroups:    []string{"group-2"},
-			Favorite:          0,
+			Favorite:          -1,
 			DeniedPermissions: []string{"copy", "download", "print"},
 			Description:       descriptionUser3,
 			Templates:         false,
 			Avatar:            false,
 			Goback:            nil,
-			Close:             nil,
+			Close: map[string]interface{}{
+				"visible": true,
+			},
 		},
 	}
 	return &DefaultUserManager{
@@ -120,25 +124,26 @@ var descriptionUser0 []string = []string{
 	"Doesn't belong to any group",
 	"Can review all the changes",
 	"Can perform all actions with comments",
+	"Can't see anyone's information",
 	"The file favorite state is undefined",
 	"Can't mention others in comments",
 	"Can't create new files from the editor",
-	"Can't see anyone's information",
 	"Can't rename files from the editor",
 	"Can't view chat",
 	"Can't protect file",
 	"View file without collaboration",
-	"Can't submit forms",
 	"Can't refresh outdated file",
+	"Can't submit forms",
+	"Tour of tips when opening a document",
 }
 var descriptionUser1 []string = []string{
 	"File author by default",
 	"Doesn't belong to any group",
 	"Can review all the changes",
 	"Can perform all actions with comments",
-	"The file favorite state is undefined",
-	"Can create files from templates using data from the editor",
 	"Can see the information about all users",
+	"This file isn't marked as favorite",
+	"Can create files from templates using data from the editor",
 	"Can submit forms",
 	"Has an avatar",
 }
@@ -146,25 +151,25 @@ var descriptionUser2 []string = []string{
 	"Belongs to Group2",
 	"Can review only his own changes or changes made by users with no group",
 	"Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only",
+	"Can see the information about users from Group2 and users who don't belong to any group",
 	"This file is marked as favorite",
 	"Can create new files from the editor",
-	"Can see the information about users from Group2 and users who don’t belong to any group",
-	"Can't submit forms",
 	"Has an avatar",
+	"Can't submit forms",
 }
 var descriptionUser3 []string = []string{
 	"Belongs to Group3",
 	"Can review changes made by Group2 users",
 	"Can view comments left by Group2 and Group3 users. Can edit comments left by the Group2 users",
-	"This file isn't marked as favorite",
+	"Can see the information about Group2 users",
+	"The file favorite state is undefined",
 	"Can't copy data from the file to clipboard",
 	"Can't download the file",
 	"Can't print the file",
 	"Can create new files from the editor",
-	"Can see the information about Group2 users",
-	"Can't submit forms",
 	"Can't close history",
 	"Can't restore the file version",
+	"Can't submit forms",
 }
 
 func (um DefaultUserManager) GetUsers() []models.User {

web/documentserver-example/go/server/models/config.go

@@ -20,10 +20,10 @@ package models
 import "github.com/golang-jwt/jwt"
 
 type Config struct {
-	Type               string       `json:"type"`
-	Document           Document     `json:"document"`
-	DocumentType       string       `json:"documentType"`
-	EditorConfig       EditorConfig `json:"editorConfig"`
-	Token              string       `json:"token,omitempty"`
-	jwt.StandardClaims `json:"-"`
+	Type         string       `json:"type"`
+	Document     Document     `json:"document"`
+	DocumentType string       `json:"documentType"`
+	EditorConfig EditorConfig `json:"editorConfig"`
+	Token        string       `json:"token,omitempty"`
+	jwt.StandardClaims
 }

web/documentserver-example/go/server/models/editor.go

@@ -21,6 +21,10 @@ type Goback struct {
 	RequestClose bool `json:"requestClose"`
 }
 
+type Features struct {
+	FeaturesTips bool `json:"featuresTips"`
+}
+
 type Customization struct {
 	About      bool                   `json:"about"`
 	Comments   bool                   `json:"comments,omitempty"`
@@ -28,6 +32,7 @@ type Customization struct {
 	Forcesave  bool                   `json:"forcesave,omitempty"`
 	SubmitForm bool                   `json:"submitForm,omitempty"`
 	Goback     Goback                 `json:"goback,omitempty"`
+	Features   Features               `json:"features,omitempty"`
 	Close      map[string]interface{} `json:"close,omitempty"`
 }
 

web/documentserver-example/go/server/models/reference.go

@@ -25,12 +25,12 @@ type ReferenceData struct {
 }
 
 type Reference struct {
-	ReferenceData      ReferenceData `json:"referenceData"`
-	Link               string        `json:"link"`
-	Path               string        `json:"path"`
-	FileType           string        `json:"fileType"`
-	Key                string        `json:"key"`
-	Url                string        `json:"url"`
-	Token              string        `json:"token,omitempty"`
-	jwt.StandardClaims `json:"-"`
+	ReferenceData ReferenceData `json:"referenceData"`
+	Link          string        `json:"link"`
+	Path          string        `json:"path"`
+	FileType      string        `json:"fileType"`
+	Key           string        `json:"key"`
+	Url           string        `json:"url"`
+	Token         string        `json:"token,omitempty"`
+	jwt.StandardClaims
 }

web/documentserver-example/go/server/shared/const.go

@@ -22,5 +22,6 @@ const (
 	ONLYOFFICE_SPREADSHEET     = "cell"
 	ONLYOFFICE_PRESENTATION    = "slide"
 	ONLYOFFICE_PDF             = "pdf"
+	ONLYOFFICE_DIAGRAM         = "diagram"
 	ONLYOFFICE_HISTORY_POSTFIX = "-hist"
 )

web/documentserver-example/go/static/images/icon_vsdx.svg

@@ -0,0 +1,6 @@
+<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="M5 8h6v1H5zm0 1h1v1H5zm5 0h1v1h-1zM7 6h2v2H7z" fill="#5951BB"/>
+    <path stroke="#5951BB" d="M4.5 10.5h2v2h-2zm5 0h2v2h-2z"/>
+</svg>

web/documentserver-example/go/static/javascripts/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",
@@ -126,7 +114,7 @@ if (typeof jQuery !== "undefined") {
 
         if (!formatManager.isAutoConvertible(posExt)) {
             jq("#step2").addClass("done").removeClass("current");
-            loadScripts();
+            onuploaded();
             return;
         }
 
@@ -181,36 +169,16 @@ if (typeof jQuery !== "undefined") {
                     if (response.step != undefined && response.step < 100) {
                         checkConvert(filePass, fileType);
                     } else {
+                        jq("#uploadFileName").text(response.filename);
                         jq("#step2").addClass("done").removeClass("current");
-                        loadScripts();
+                        onuploaded();
                     }
                 }
             });
         }, 1000);
     };
 
-    var loadScripts = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("current");
-
-        if (jq("#loadScripts").is(":empty")) {
-            var urlScripts = jq("#loadScripts").attr("data-docs");
-            var frame = "<iframe id=\"iframeScripts\" width=1 height=1 style=\"position: absolute; visibility: hidden;\" ></iframe>";
-            jq("#loadScripts").html(frame);
-            document.getElementById("iframeScripts").onload = onloadScripts;
-            jq("#loadScripts iframe").attr("src", urlScripts);
-        } else {
-            onloadScripts();
-        }
-    };
-
-    var onloadScripts = function () {
-        if (!jq("#mainProgress").is(":visible")) {
-            return;
-        }
-        jq("#step3").addClass("done").removeClass("current");
+    var onuploaded = function () {
         jq("#beginView, #beginEmbedded").removeClass("disable");
 
         var fileName = jq("#hiddenFileName").val();
@@ -272,12 +240,12 @@ if (typeof jQuery !== "undefined") {
 
     jq(document).on("click", "#skipPass", function () {
         jq("#blockPassword").hide();
-        loadScripts();
+        onuploaded();
     });
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {
         var fileId = encodeURIComponent(jq("#hiddenFileName").val());
-        var url = UrlEditor + "?mode=edit&fileName=" + fileId+ "&directUrl=" + directUrl;
+        var url = UrlEditor + "?mode=edit&fileName=" + fileId;
         window.open(url, "_blank");
         jq("#hiddenFileName").val("");
         jq.unblockUI();
@@ -286,7 +254,7 @@ if (typeof jQuery !== "undefined") {
 
     jq(document).on("click", "#beginView:not(.disable)", function () {
         var fileId = encodeURIComponent(jq("#hiddenFileName").val());
-        var url = UrlEditor + "?mode=view&fileName=" + fileId+ "&directUrl=" + directUrl;
+        var url = UrlEditor + "?mode=view&fileName=" + fileId;
         window.open(url, "_blank");
         jq("#hiddenFileName").val("");
         jq.unblockUI();
@@ -295,7 +263,7 @@ if (typeof jQuery !== "undefined") {
 
     jq(document).on("click", "#beginEmbedded:not(.disable)", function () {
         var fileId = encodeURIComponent(jq("#hiddenFileName").val());
-        var url = UrlEditor + "?type=embedded&mode=embedded&fileName=" + fileId + "&directUrl=" + directUrl;
+        var url = UrlEditor + "?type=embedded&mode=embedded&fileName=" + fileId;
 
         jq("#mainProgress").addClass("embedded");
         jq("#beginEmbedded").addClass("disable");
@@ -353,7 +321,7 @@ if (typeof jQuery !== "undefined") {
         }
 
         jq("#hiddenFileName").val(fileName);
-        jq("#convertStep1").addClass("done");
+        jq("#convertStep1").addClass("error");
         jq("#convertStep2").addClass("waiting");
     });
 
@@ -363,6 +331,7 @@ if (typeof jQuery !== "undefined") {
         let fileExt = jq(`#${id}`).attr("data");
         jq(`#${id}`).addClass("orange");
         jq("td[name='convertingTypeButton']").addClass("disable");
+        jq("#convertStep1").removeClass("error").addClass("done");
         jq("#convertStep2").removeClass("waiting").removeClass("done").addClass("current");
         jq("#convertStep2").text('2. File conversion');
         jq("#convert-descr").removeClass("disable");
@@ -414,14 +383,12 @@ if (typeof jQuery !== "undefined") {
                         jq("#convertStep2").removeClass("current").addClass("done");
                         jq("#convertStep2").text(`2. File conversion to ${fileExt}`);
                         jq("#downloadConverted").removeClass("disable");
+                        jq("#hiddenFileName").attr("data",response.filename);
                         if (response.error !== "FileTypeIsNotSupported") {
-                            jq("#hiddenFileName").attr("data",response.filename);
                             jq("#beginEditConverted").removeClass("disable");
                             jq("#beginViewConverted").removeClass("disable");
                             jq("#downloadConverted").attr("data","fromStorage");
                         } else {
-                            let newFilename = fileName.split('.').slice(0,-1).join('.')
-                            jq("#hiddenFileName").attr("data",response.filename.split("&filename=download").join(`&filename=${newFilename}`));
                             jq("#downloadConverted").attr("data","fromConverter");
                         }
                         jq("td[name='convertingTypeButton']").removeClass("disable orange");

web/documentserver-example/go/static/stylesheets/forgotten.css

@@ -146,7 +146,7 @@ header a {
     }
 }
 
-@media (max-width: 592px) and (min-width: 320px) {
+@media (max-width: 592px) {
     .center, .table-main {
         width: 100%;
     }

web/documentserver-example/go/static/stylesheets/media.css

@@ -640,7 +640,7 @@
     }
 }
 
-@media (max-width: 420px) and (min-width: 320px) {
+@media (max-width: 420px) {
     .tableRow,
     menu.links {
         width: 25%;
@@ -716,7 +716,7 @@
         max-width: 45%;
     }
 }
-@media (max-width: 600px) and (min-width: 320px) {
+@media (max-width: 600px) {
     .main-panel{
         display: flex;
         flex-direction: column;
@@ -743,7 +743,7 @@
     }
 }
 
-@media (max-width: 592px) and (min-width: 320px) {
+@media (max-width: 592px) {
     body.menu-open {
         overflow: hidden;
     }

web/documentserver-example/go/static/stylesheets/stylesheet.css

@@ -511,10 +511,6 @@ label .checkbox {
     line-height: 150%;
 }
 
-#loadScripts {
-    display: none;
-}
-
 #iframeScripts {
     position: absolute;
     visibility: hidden;
@@ -632,6 +628,11 @@ footer table tr td:first-child {
     background-image: url("../images/icon_pdf.svg");
 }
 
+.stored-edit.diagram,
+.uploadFileName.diagram {
+    background-image: url("../images/icon_vsdx.svg");
+}
+
 .stored-edit span {
     font-size: 12px;
     line-height: 12px;

web/documentserver-example/go/templates/editor.html

@@ -78,7 +78,15 @@
             docEditor.destroyEditor();
         };
 
+        var onUserActionRequired = function () {
+          console.log("User action required");
+        };
+
         var onMetaChange = function (event) {  // the meta information of the document is changed via the meta command
+          if (event.data.title !== undefined) {
+              document.title = event.data.title + " - ONLYOFFICE";
+          }
+
             if (event.data.favorite) {
                 var favorite = !!event.data.favorite;
                 var title = document.title.replace(/^\☆/g, "");
@@ -232,10 +240,33 @@
                     users = {{.usersForMentions}};
             }
 
-            docEditor.setUsers({
+            if ((c === "protect" || c === "mention") && users && event.data.count) {
+                let from = event.data.from;
+                let count = event.data.count;
+                let search = event.data.search;
+                if (from != 0) users = [];
+                var resultCount = 234;
+                for (var i = Math.max(users.length, from); i < Math.min(from + count, resultCount); i++){
+                    users.push({
+                        email: "test@test.test" + (i + 1),
+                        id: "id" + (i + 1),
+                        name: "test_" + search + (i + 1)
+                    });
+                }
+            }
+
+            var result = {
                 "c": c,
                 "users": users,
-            });
+            };
+            if (resultCount) {
+                // support v9.0
+                result.total = 1 + (!event.data.count || users.length < event.data.count ? 0 : (event.data.from + event.data.count));
+                // since v9.0.1
+                result.isPaginated = true;
+            }
+
+            docEditor.setUsers(result);
         };
 
         var onRequestSendNotify = function(event) {  // the user is mentioned in a comment
@@ -378,6 +409,7 @@
         var events = {
             "onAppReady": onAppReady,
             "onDocumentStateChange": onDocumentStateChange,
+            "onUserActionRequired": onUserActionRequired,
             "onMetaChange": onMetaChange,
             "onRequestInsertImage": onRequestInsertImage,
             "onRequestSelectDocument": onRequestSelectDocument,

web/documentserver-example/go/templates/forgotten.html

@@ -118,7 +118,7 @@
                 <tbody>
                     <tr>
                         <td>
-                            <a href="http://api.onlyoffice.com/editors/howitworks" target="_blank">API Documentation</a>
+                            <a href="https://api.onlyoffice.com/docs/docs-api/get-started/how-it-works/" target="_blank">API Documentation</a>
                         </td>
                         <td>
                             <a href="mailto:sales@onlyoffice.com">Submit your request</a>

web/documentserver-example/go/templates/index.html

@@ -341,10 +341,7 @@
                 <span class="errorPass"></span>
                 <br />
             </div>
-            <span id="step3" class="step">3. Loading editor scripts.</span>
-            <span class="step-descr">They are loaded only once, they will be cached on your computer.</span>
             <input type="hidden" name="hiddenFileName" id="hiddenFileName" />
-            <br />
             <span class="progress-descr">Note the speed of all operations depends on your connection quality and server location.</span>
             <br />
             <div class="error-message">
@@ -388,7 +385,7 @@
         </div>
     </div>
 
-    <span id="loadScripts" data-docs="{{ .Preloader }}"></span>
+    <iframe id="iframeScripts" src="{{ .Preloader }}" width=1 height=1 style="position: absolute; visibility: hidden; top: 0;" ></iframe>
 
     <footer>
         <div class="center">
@@ -396,7 +393,7 @@
                 <tbody>
                     <tr>
                         <td>
-                            <a href="http://api.onlyoffice.com/editors/howitworks" target="_blank">API Documentation</a>
+                            <a href="https://api.onlyoffice.com/docs/docs-api/get-started/how-it-works/" target="_blank">API Documentation</a>
                         </td>
                         <td>
                             <a href="mailto:sales@onlyoffice.com">Submit your request</a>

web/documentserver-example/go/utils/format.go

@@ -48,6 +48,7 @@ type FormatManager interface {
 	GetSpreadsheetExtensions() []string
 	GetPresentationExtensions() []string
 	GetPdfExtensions() []string
+	GetDiagramExtensions() []string
 }
 
 func NewFormatManager() (FormatManager, error) {
@@ -141,10 +142,19 @@ func (fm DefaultFormatManager) GetPresentationExtensions() (slide []string) {
 	return
 }
 
-func (fm DefaultFormatManager) GetPdfExtensions() (slide []string) {
+func (fm DefaultFormatManager) GetPdfExtensions() (pdf []string) {
 	for _, f := range fm.formats {
 		if f.FormatType == "pdf" {
-			slide = append(slide, f.Name)
+			pdf = append(pdf, f.Name)
+		}
+	}
+	return
+}
+
+func (fm DefaultFormatManager) GetDiagramExtensions() (diagram []string) {
+	for _, f := range fm.formats {
+		if f.FormatType == "diagram" {
+			diagram = append(diagram, f.Name)
 		}
 	}
 	return

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

@@ -18,7 +18,7 @@ See the detailed guide to learn how to install Document Server [for Windows](htt
 
 ### Step 2. Download the Java code for the editors integration
 
-Download the [Java-Spring example](https://api.onlyoffice.com/editors/demopreview) from our site.
+Download the [Java-Spring example](https://api.onlyoffice.com/docs/docs-api/samples/language-specific-examples/) from our site.
 
 To connect the editors to your website, specify the path to the editors installation, server port and the path to the storage folder in the *src/main/resources/application.properties* file:
 
@@ -30,7 +30,7 @@ To connect the editors to your website, specify the path to the editors installa
 
 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. For example, *D:\\\\folder*. Please note that on Windows OS the double backslash must be used as a separator.
 
-If you want to experiment with the editor configuration, modify the [parameters](https://api.onlyoffice.com/editors/advanced) it the *\src\main\resources\editor.html* file.
+If you want to experiment with the editor configuration, modify the [parameters](https://api.onlyoffice.com/docs/docs-api/usage-api/advanced-parameters/) it the *\src\main\resources\editor.html* file.
 
 ### Step 3. Install the prerequisites
 To run the Java example code, install the Java version 11 appropriate for your OS and framework  **Apache Maven**:
@@ -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:
 
 	```