Merge pull request #310 from ONLYOFFICE/bugfix/file-request-status

Bugfix/file request status

CHANGELOG.md

@@ -0,0 +1,41 @@
+# Change Log
+
+- nodejs: referenceData
+- option to send directUrl
+
+## 1.4.0
+- nodejs: option to send directUrl
+- opening file on client by directUrl
+- offline viewer for anonymous
+- added hy, eu, zh-TW, ms, pt-PT
+
+## 1.3.1
+- charp: fix references
+- ruby: update rails 
+
+## 1.3.0
+- update empty files
+- anonymous without chat
+- changed jwt implementation in csharp, csharp-mvc, php, ruby
+
+## 1.2.0
+- ruby v3.0
+- set filetype in setHistoryData
+- read filetype from input request
+- creating file on WOPI
+- upload on WOPI page
+- fix xss
+- set userInfoGroups
+- check JWT on downloading history
+- upload dialog on mobile
+- anonymous without id
+- renaming from editor
+- new skin languages
+- ignore certificate
+
+## 1.1.0
+- creating docxf
+- opening docxf, oform
+
+## 1.0.0
+- added java spring

Readme.md

@@ -1,10 +1,11 @@
 ## Integration examples
 
-Test examples are simple document management systems that can be built into your
-application for testing (please, do not use it for production without proper code
-modifications).
+Test examples are simple document management systems that can be built into your application for testing.
+Do NOT use these integration examples on your own server without proper code modifications!
+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, Node.js, PHP and Ruby.
+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, Node.js, PHP 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`
@@ -66,6 +67,15 @@ The methods described below are available for all of the test examples.
 | **Response**       | **Code:** 200 OK <br />**Content on success:**<br /> `[{ "version": <file_version>, "id": <file_id>, "contentLength": <file_size_in_kilobytes>, "pureContentLength": <file_size_in_bytes>, "title": <file_name>, "updated": <last_change_date>}]`<br />**Content on error:**<br /> `"File not found"` |
 | **Sample**         | `curl -X GET http://localhost/files/{fileId}`                |
 
+## Important security info
+
+Please keep in mind the following security aspects when you are using test examples:
+
+* There is no protection of the storage from unauthorized access since there is no need for authorization.
+* There are no checks against parameter substitution in links, since the parameters are generated by the code according to the pre-arranged scripts.
+* There are no data checks in requests of saving the file after editing, since each test example is intended for requests only from ONLYOFFICE Document Server.
+* There are no prohibitions on using test examples from other sites, since they are intended to interact with ONLYOFFICE Document Server from another domain.
+
 ## Project Information
 
 Official website: [https://www.onlyoffice.com](https://www.onlyoffice.com/?utm_source=github&utm_medium=cpc&utm_campaign=GitHubIntegrationEx)

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

@@ -24,11 +24,15 @@ jQuery.UI     - jQuery UI is an open source library of interface components —
 License:        MIT
 License File:   jQuery.UI.license
 
+JWT           - JWT (JSON Web Token) Implementation for .NET (Public Domain) (https://github.com/jwt-dotnet/jwt/)
+License:        MIT
+License File:   JWT.license
+
 Microsoft.Web.Infrastructure - This package contains the Microsoft.Web.Infrastructure assembly that lets you dynamically register HTTP modules at run time. (https://www.microsoft.com/web/webpi/eula/aspnetmvc3update-eula.htm)
 License:        MS-EULA License
 License File:   Microsoft.Web.Infrastructure.license
 
-Newtonsoft.Json - Json.NET is a popular high-performance JSON framework for .NET (https://licenses.nuget.org/MIT)
+Newtonsoft.Json - Json.NET is a popular high-performance JSON framework for .NET (https://github.com/JamesNK/Newtonsoft.Json)
 License:        MIT
 License File:   Newtonsoft.Json.license
 

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

@@ -87,10 +87,6 @@
 }
 
 @media (max-width: 1008px) {
-    #portal-info {
-        width: 65vw;
-    }
-
     .left-panel {
         margin-left: 0;
     }
@@ -128,6 +124,10 @@
         height: 80px;
     }
 
+    .main {
+        height: calc(100% - 128px); 
+    }
+
     .main-panel {
         left: 0;
         padding: 48px 18px 24px;
@@ -312,6 +312,9 @@
     .tableRow td:first-child {
         max-width: 17%;
     }
+    #portal-info {
+        max-width: 60vw;
+    }
 }
 
 .downloadContentCellShift:after {
@@ -363,6 +366,10 @@
         height: 80px;
     }
 
+    .main {
+        height: calc(100% - 128px); 
+    }
+    
     .copy {
         width: 100%;
         text-align: center;
@@ -436,6 +443,58 @@
         display: none;
         width: 1%;
     }
+    /* Mobile Upload*/
+    .blockUI.blockMsg.blockPage.ui-dialog.ui-widget.ui-corner-all.ui-widget-content.ui-draggable {
+        width: 344px !important;
+        box-shadow: 0px 7px 15px rgba(85, 85, 85, 0.1);
+        border-radius: 2px;
+        top: 10% !important;
+        margin-left: -172px !important;
+    }
+
+    .ui-dialog .ui-dialog-titlebar {
+        padding: 0;
+    }
+    .ui-dialog .ui-dialog-content {
+        padding: 0 !important;
+    }
+    #mainProgress {
+        margin: 24px 16px 0 !important;
+    }
+    .blockTitle {
+        padding: 10px 10px 6px 16px !important;
+        font-size: 14px !important;
+    }
+    #mainProgress .describeUpload {
+        padding: 8px 0 !important;
+    }
+    .dialog-close {
+        margin: 0 !important;
+    }
+    .step-descr{
+        line-height: 150%;
+    }
+    .step {
+        line-height: 160%;
+    }
+    .buttonsMobile{
+        display: flex;
+        flex-direction: row;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        align-items: center;
+    }
+    .button.gray{
+        margin: 0;
+    }
+    .button, .button:hover{
+        display: flex;
+        justify-content: center;
+        padding: 0 !important;
+        width: 144px;
+        height: 56px;
+        margin-bottom: 24px !important;
+    }
 }
 
 @media (max-width: 560px) and (min-width: 510px) {

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

@@ -22,6 +22,7 @@
 }
 
 body {
+    display: block;
     background: #FFFFFF;
     color: #333333;
     font-family: Open Sans;
@@ -71,6 +72,7 @@ header img {
 }
 
 .main {
+    display: table;
     height: calc(100% - 112px);
     min-height: 536px;
 }
@@ -97,6 +99,10 @@ header img {
     width: 896px;
 }
 
+#portal-info {
+    max-width: 65vw;
+}
+
 .portal-name {
     color: #FF6F3D;
     font-size: 24px;
@@ -161,7 +167,7 @@ label .checkbox {
     background-image: url("images/file_docxf.svg");
 }
 
-.create-sample {
+.side-option {
     color: #666666;
     line-height: 24px;
 }
@@ -728,12 +734,9 @@ html {
     width: 30vw;
     min-width: 200px;
     max-width: 400px;
+    margin-top: 20px;
 }
 
 .user-descr > b {
     margin-left: 25px;
 }
-
-.portal-descr:nth-child(3) {
-    margin-bottom: 20px;
-}

web/documentserver-example/csharp-mvc/Controllers/HomeController.cs

@@ -16,6 +16,7 @@
  *
  */
 
+using System;
 using System.IO;
 using System.Web.Mvc;
 using OnlineEditorsExampleMVC.Helpers;
@@ -31,13 +32,14 @@ namespace OnlineEditorsExampleMVC.Controllers
         }
 
         // viewing file in the editor
-        public ActionResult Editor(string fileName, string editorsMode, string editorsType)
+        public ActionResult Editor(string fileName, string editorsMode, string editorsType, string directUrl)
         {
             var file = new FileModel
             {
                 Mode = editorsMode,  // editor mode: edit or view
                 Type = editorsType,  // editor type: desktop, mobile, embedded
-                FileName = Path.GetFileName(fileName)  // file name
+                FileName = Path.GetFileName(fileName),  // file name
+                IsEnabledDirectUrl = directUrl != null ? Convert.ToBoolean(directUrl) : false
             };
 
             return View("Editor", file);

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

@@ -25,6 +25,7 @@ using System.Web;
 using System.Web.Configuration;
 using System.Web.Script.Serialization;
 using OnlineEditorsExampleMVC.Models;
+using System.Net;
 
 namespace OnlineEditorsExampleMVC.Helpers
 {
@@ -79,19 +80,37 @@ namespace OnlineEditorsExampleMVC.Helpers
         // get the storage path of the file
         public static string StoragePath(string fileName, string userAddress = null)
         {
-            var directory = HttpRuntime.AppDomainAppPath + CurUserHostAddress(userAddress) + "\\";
+            var directory = "";
+            if (!string.IsNullOrEmpty(WebConfigurationManager.AppSettings["storage-path"]) && Path.IsPathRooted(WebConfigurationManager.AppSettings["storage-path"]))
+            {
+                directory = WebConfigurationManager.AppSettings["storage-path"] + "\\";
+            }
+            else
+            {
+                directory = HttpRuntime.AppDomainAppPath + WebConfigurationManager.AppSettings["storage-path"] + CurUserHostAddress(userAddress) + "\\";
+            }
+            
             if (!Directory.Exists(directory))
             {
                 Directory.CreateDirectory(directory);
             }
-            return directory + Path.GetFileName(fileName);
+            return directory + (fileName.Contains("\\") ? fileName : Path.GetFileName(fileName));
         }
 
         // get the path to the forcesaved file version
         public static string ForcesavePath(string fileName, string userAddress, Boolean create)
         {
             // create the directory to this file version
-            var directory = HttpRuntime.AppDomainAppPath + CurUserHostAddress(userAddress) + "\\";
+            var directory = "";
+            if (!string.IsNullOrEmpty(WebConfigurationManager.AppSettings["storage-path"]) && Path.IsPathRooted(WebConfigurationManager.AppSettings["storage-path"]))
+            {
+                directory = WebConfigurationManager.AppSettings["storage-path"] + "\\";
+            }
+            else
+            {
+                directory = HttpRuntime.AppDomainAppPath + WebConfigurationManager.AppSettings["storage-path"] + CurUserHostAddress(userAddress) + "\\";
+            }
+            
             if (!Directory.Exists(directory))
             {
                 return "";
@@ -172,7 +191,16 @@ namespace OnlineEditorsExampleMVC.Helpers
         // get all the stored files from the user host address
         public static List<FileInfo> GetStoredFiles()
         {
-            var directory = HttpRuntime.AppDomainAppPath + WebConfigurationManager.AppSettings["storage-path"] + CurUserHostAddress(null) + "\\";
+            var directory = "";
+            if (!string.IsNullOrEmpty(WebConfigurationManager.AppSettings["storage-path"]) && Path.IsPathRooted(WebConfigurationManager.AppSettings["storage-path"]))
+            {
+                directory = WebConfigurationManager.AppSettings["storage-path"] + "\\";
+            }
+            else
+            {
+                directory = HttpRuntime.AppDomainAppPath + WebConfigurationManager.AppSettings["storage-path"] + CurUserHostAddress(null) + "\\";
+            }
+            
             if (!Directory.Exists(directory)) return new List<FileInfo>();
 
             var directoryInfo = new DirectoryInfo(directory);
@@ -214,7 +242,8 @@ namespace OnlineEditorsExampleMVC.Helpers
         {
             var uri = new UriBuilder(GetServerUrl(forDocumentServer))
                 {
-                    Path = HttpRuntime.AppDomainAppVirtualPath + "/"
+                    Path = HttpRuntime.AppDomainAppVirtualPath
+                           + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
                            + CurUserHostAddress() + "/"
                            + fileName,
                     Query = ""
@@ -228,8 +257,7 @@ namespace OnlineEditorsExampleMVC.Helpers
         {
             var uri = new UriBuilder(GetServerUrl(true))
             {
-                Path = HttpRuntime.AppDomainAppVirtualPath + "/"
-                           + path,
+                Path = HttpRuntime.AppDomainAppVirtualPath + "/" + path,
                 Query = ""
             };
 
@@ -265,7 +293,7 @@ namespace OnlineEditorsExampleMVC.Helpers
                     + "webeditor.ashx",
                 Query = "type=track"
                         + "&fileName=" + HttpUtility.UrlEncode(fileName)
-                        + "&userAddress=" + HttpUtility.UrlEncode(HttpContext.Current.Request.UserHostAddress)
+                        + "&userAddress=" + HttpUtility.UrlEncode(CurUserHostAddress(HttpContext.Current.Request.UserHostAddress))
             };
             return callbackUrl.ToString();
         }
@@ -284,10 +312,30 @@ namespace OnlineEditorsExampleMVC.Helpers
             return createUrl.ToString();
         }
 
-        // get url to download a file
-        public static string GetDownloadUrl(string fileName)
+        // create the public history url
+        public static string GetHistoryDownloadUrl(string filename, string version, string file, Boolean isServer = true)
         {
-            var downloadUrl = new UriBuilder(GetServerUrl(true))
+            var userAddress = "&userAddress=" + HttpUtility.UrlEncode(CurUserHostAddress(HttpContext.Current.Request.UserHostAddress));
+            var downloadUrl = new UriBuilder(GetServerUrl(isServer))
+            {
+                Path =
+                    HttpRuntime.AppDomainAppVirtualPath
+                    + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
+                    + "webeditor.ashx",
+                Query = "type=downloadhistory"
+                        + "&fileName=" + HttpUtility.UrlEncode(filename)
+                        + userAddress
+                        + "&ver=" + version
+                        + "&file="+ file
+            };
+            return downloadUrl.ToString();
+        }
+
+        // get url to download a file
+        public static string GetDownloadUrl(string fileName, Boolean isServer = true)
+        {
+            var userAddress = isServer ? "&userAddress=" + HttpUtility.UrlEncode(CurUserHostAddress(HttpContext.Current.Request.UserHostAddress)) : "";
+            var downloadUrl = new UriBuilder(GetServerUrl(isServer))
             {
                 Path =
                     HttpRuntime.AppDomainAppVirtualPath
@@ -295,7 +343,7 @@ namespace OnlineEditorsExampleMVC.Helpers
                     + "webeditor.ashx",
                 Query = "type=download"
                         + "&fileName=" + HttpUtility.UrlEncode(fileName)
-                        + "&userAddress=" + HttpUtility.UrlEncode(HttpContext.Current.Request.UserHostAddress)
+                        + userAddress
             };
             return downloadUrl.ToString();
         }
@@ -372,5 +420,33 @@ namespace OnlineEditorsExampleMVC.Helpers
 
             return files;
         }
+
+        // enable certificate ignore
+        public static void VerifySSL()
+        {
+            // hack. http://ubuntuforums.org/showthread.php?t=1841740
+            if(WebConfigurationManager.AppSettings["files.docservice.verify-peer-off"].Equals("true")) {
+                ServicePointManager.ServerCertificateValidationCallback += (s, ce, ca, p) => true;
+                ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
+            }
+        }
+
+        public static Dictionary<string, string> GetLanguages()
+        {
+            var languages = new Dictionary<string, string>();
+            String[] couples = (WebConfigurationManager.AppSettings["files.docservice.languages"] ?? "").Split('|');
+            foreach (string couple in couples)
+            {   
+                String[] tmp = couple.Split(':');
+                languages.Add(tmp[0],tmp[1]);
+            }
+            return languages;
+        }
+
+        public static string GetDirectUrl()
+        {
+            string isEnabledDirectUrl = HttpUtility.ParseQueryString(HttpContext.Current.Request.Url.Query).Get("directUrl");
+            return isEnabledDirectUrl != null ? isEnabledDirectUrl : "false";
+        }
     }
 }

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

@@ -143,6 +143,8 @@ namespace OnlineEditorsExampleMVC.Helpers
                 requestStream.Write(bytes, 0, bytes.Length);  // and write the serialized body object to it
             }
 
+            DocManagerHelper.VerifySSL();
+
             string dataResponse;
             using (var response = request.GetResponse())
             using (var stream = response.GetResponseStream())  // get the response stream

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

@@ -16,12 +16,12 @@
  *
  */
 
-using System;
+using JWT;
+using JWT.Algorithms;
+using JWT.Builder;
+using JWT.Serializers;
 using System.Collections.Generic;
-using System.Security.Cryptography;
-using System.Text;
 using System.Web.Configuration;
-using System.Web.Script.Serialization;
 
 namespace OnlineEditorsExampleMVC.Helpers
 {
@@ -30,31 +30,19 @@ namespace OnlineEditorsExampleMVC.Helpers
         private static readonly string Secret;
         public static readonly bool Enabled;
 
-        private static readonly JavaScriptSerializer Serializer;
-
         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
-            Serializer = new JavaScriptSerializer();  // define java script serializer
         }
 
         // encode a payload object into a token using a secret key
         public static string Encode(IDictionary<string, object> payload)
         {
-            // define the hashing algorithm and the token type
-            var header = new Dictionary<string, object>
-                {
-                    { "alg", "HS256" },
-                    { "typ", "JWT" }
-                };
-
-            // three parts of token
-            var encHeader = Base64UrlEncode(Serializer.Serialize(header));  // header
-            var encPayload = Base64UrlEncode(Serializer.Serialize(payload));  // payload
-            var hashSum = Base64UrlEncode(CalculateHash(encHeader, encPayload));  // signature
-
-            return string.Format("{0}.{1}.{2}", encHeader, encPayload, hashSum);
+            var encoder = new JwtEncoder(new HMACSHA256Algorithm(),
+                                         new JsonNetSerializer(),
+                                         new JwtBase64UrlEncoder());
+            return encoder.Encode(payload, Secret);
         }
 
         // decode a token into a payload object using a secret key
@@ -62,52 +50,11 @@ namespace OnlineEditorsExampleMVC.Helpers
         {
             if (!Enabled || string.IsNullOrEmpty(token)) return "";
 
-            var split = token.Split('.');
-            if (split.Length != 3) return "";
-
-            var hashSum = Base64UrlEncode(CalculateHash(split[0], split[1]));  // get signature
-            if (hashSum != split[2]) return "";  // and check if it is equal to the signature from the token
-            return Base64UrlDecode(split[1]);  // decode payload
-        }
-
-        // generate a hash code based on a key using the HMAC method
-        private static byte[] CalculateHash(string encHeader, string encPayload)
-        {
-            using (var hasher = new HMACSHA256(Encoding.UTF8.GetBytes(Secret)))
-            {
-                var bytes = Encoding.UTF8.GetBytes(string.Format("{0}.{1}", encHeader, encPayload));
-                return hasher.ComputeHash(bytes);
-            }
-        }
-
-        // encode a string into the base64 value
-        private static string Base64UrlEncode(string str)
-        {
-            return Base64UrlEncode(Encoding.UTF8.GetBytes(str));
-        }
-
-        // encode bytes into the base64 value
-        private static string Base64UrlEncode(byte[] bytes)
-        {
-            return Convert.ToBase64String(bytes)
-                          .TrimEnd('=').Replace('+', '-').Replace('/', '_');
-        }
-
-        // decode a base64 value into the string
-        private static string Base64UrlDecode(string payload)
-        {
-            var b64 = payload.Replace('_', '/').Replace('-', '+');
-            switch (b64.Length%4)
-            {
-                case 2:
-                    b64 += "==";
-                    break;
-                case 3:
-                    b64 += "=";
-                    break;
-            }
-            var bytes = Convert.FromBase64String(b64);
-            return Encoding.UTF8.GetString(bytes);
+            return JwtBuilder.Create()
+                    .WithAlgorithm(new HMACSHA256Algorithm())
+                    .WithSecret(Secret)
+                    .MustVerifySignature()
+                    .Decode(token);
         }
     }
 }

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

@@ -76,7 +76,9 @@ namespace OnlineEditorsExampleMVC.Helpers
 
                 if (token != null && !token.Equals(""))  // invalid signature error
                 {
-                    fileData = (Dictionary<string, object>)jss.Deserialize<Dictionary<string, object>>(token)["payload"];
+                    fileData = jss.Deserialize<Dictionary<string, object>>(token);
+                    if (fileData.ContainsKey("payload"))
+                        fileData = (Dictionary<string, object>)fileData["payload"];
                 }
                 else
                 {
@@ -95,7 +97,11 @@ namespace OnlineEditorsExampleMVC.Helpers
             }
             var downloadUri = (string)fileData["url"];
             string curExt = Path.GetExtension(fileName).ToLower();  // get current file extension
-            string downloadExt = Path.GetExtension(downloadUri).ToLower() ?? "";  // get the extension of the downloaded file
+
+            var downloadExt = fileData.ContainsKey("filetype")
+                ? "." + (string)fileData["filetype"]
+                : Path.GetExtension(downloadUri).ToLower() ?? ""; // TODO: Delete in version 7.0 or higher. Support for versions below 7.0
+
             var newFileName = fileName;
 
             // convert downloaded file to the file with the current extension if these extensions aren't equal
@@ -122,6 +128,8 @@ namespace OnlineEditorsExampleMVC.Helpers
                 }
             }
 
+            DocManagerHelper.VerifySSL();
+
             var storagePath = DocManagerHelper.StoragePath(newFileName, userAddress);  // get the file path
             var histDir = DocManagerHelper.HistoryDir(storagePath);  // get the path to the history directory
             if (!Directory.Exists(histDir)) Directory.CreateDirectory(histDir);
@@ -167,7 +175,11 @@ namespace OnlineEditorsExampleMVC.Helpers
             var downloadUri = (string)fileData["url"];
 
             string curExt = Path.GetExtension(fileName).ToLower();  // get current file extension
-            string downloadExt = Path.GetExtension(downloadUri).ToLower();  // get the extension of the downloaded file
+
+            var downloadExt = fileData.ContainsKey("filetype")
+                ? "." + (string)fileData["filetype"]
+                : Path.GetExtension(downloadUri).ToLower(); // TODO: Delete in version 7.0 or higher. Support for versions below 7.0
+
             Boolean newFileName = false;
 
             // convert downloaded file to the file with the current extension if these extensions aren't equal
@@ -193,6 +205,8 @@ namespace OnlineEditorsExampleMVC.Helpers
                 }
             }
 
+            DocManagerHelper.VerifySSL();
+            
             string forcesavePath = "";
             Boolean isSubmitForm = fileData["forcesavetype"].ToString().Equals("3");  // SubmitForm
 
@@ -235,8 +249,10 @@ namespace OnlineEditorsExampleMVC.Helpers
         }
 
         // create a command request
-        public static void commandRequest(string method, string key)
+        public static void commandRequest(string method, string key, object meta = null)
         {
+            DocManagerHelper.VerifySSL();
+
             string documentCommandUrl = WebConfigurationManager.AppSettings["files.docservice.url.site"] + WebConfigurationManager.AppSettings["files.docservice.url.command"];
 
             var request = (HttpWebRequest)WebRequest.Create(documentCommandUrl);
@@ -248,6 +264,11 @@ namespace OnlineEditorsExampleMVC.Helpers
                 { "key", key }
             };
 
+            if (meta != null) 
+            {
+                body.Add("meta", meta);
+            }
+
             // check if a secret key to generate token exists or not
             if (JwtManager.Enabled)
             {
@@ -300,6 +321,7 @@ namespace OnlineEditorsExampleMVC.Helpers
             if (string.IsNullOrEmpty(path)) throw new ArgumentException("path");  // file isn't specified
 
             var req = (HttpWebRequest)WebRequest.Create(url);
+            req.Timeout = 5000;
             using (var stream = req.GetResponse().GetResponseStream())  // get input stream of the file information from the url
             {
                 if (stream == null) throw new Exception("stream is null");

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

@@ -30,7 +30,8 @@ namespace OnlineEditorsExampleMVC.Helpers
             "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 create files from templates using data from the editor",
+            "Can see the information about all users"
         };
 
         static List<string> descr_user_2 = new List<string>()
@@ -39,7 +40,8 @@ namespace OnlineEditorsExampleMVC.Helpers
             "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",
             "This file is marked as favorite",
-            "Can create new files from the editor"
+            "Can create new files from the editor",
+            "Can see the information about users from Group2 and users who don’t belong to any group"
         };
 
         static List<string> descr_user_3 = new List<string>()
@@ -51,7 +53,8 @@ namespace OnlineEditorsExampleMVC.Helpers
             "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 create new files from the editor",
+            "Can see the information about Group2 users"
         };
 
         static List<string> descr_user_0 = new List<string>()
@@ -62,7 +65,11 @@ namespace OnlineEditorsExampleMVC.Helpers
             "Can perform all actions with comments",
             "The file favorite state is undefined",
             "Can't mention others in comments",
-            "Can't create new files from the editor"
+            "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",
+            "View file without collaboration",
         };
 
         private static List<User> users = new List<User>() {
@@ -70,10 +77,11 @@ namespace OnlineEditorsExampleMVC.Helpers
                     "uid-1",
                     "John Smith",
                     "smith@example.com",
-                    null,
+                    "",
                     null,
                     new Dictionary<string, object>(),
                     null,
+                    null,
                     new List<string>(),
                     descr_user_1,
                     true
@@ -90,6 +98,7 @@ namespace OnlineEditorsExampleMVC.Helpers
                         { "edit", new List<string>() { "group-2", "" } },
                         { "remove", new List<string>() { "group-2" } }
                     },
+                    new List<string>() { "group-2", "" },
                     true,
                     new List<string>(),
                     descr_user_2,
@@ -107,6 +116,7 @@ namespace OnlineEditorsExampleMVC.Helpers
                         { "edit", new List<string>() { "group-2" } },
                         { "remove", new List<string>() { } }
                     },
+                    new List<string>() { "group-2" },
                     false,
                     new List<string>() { "copy", "download", "print" },
                     descr_user_3,
@@ -116,9 +126,10 @@ namespace OnlineEditorsExampleMVC.Helpers
                     "uid-0",
                     null,
                     null,
-                    null,
+                    "",
                     null,
                     new Dictionary<string,object>(),
+                    new List<string>(),
                     null,
                     new List<string>(),
                     descr_user_0,
@@ -173,8 +184,9 @@ namespace OnlineEditorsExampleMVC.Helpers
         public List<string> deniedPermissions;
         public List<string> descriptions;
         public bool templates;
+        public List<string> userInfoGroups;
 
-        public User(string id, string name, string email, string group, List<string> reviewGroups, Dictionary<string, object> commentGroups, bool? favorite, List<string> deniedPermissions, List<string> descriptions, bool templates)
+        public User(string id, string name, string email, string group, List<string> reviewGroups, Dictionary<string, object> commentGroups, List<string> userInfoGroups, bool? favorite, List<string> deniedPermissions, List<string> descriptions, bool templates)
         {
             this.id = id;
             this.name = name;
@@ -186,6 +198,7 @@ namespace OnlineEditorsExampleMVC.Helpers
             this.deniedPermissions = deniedPermissions;
             this.descriptions = descriptions;
             this.templates = templates;
+            this.userInfoGroups = userInfoGroups;
         }
     }
 }

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

@@ -21,6 +21,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Web;
+using System.Web.Configuration;
 using System.Web.Mvc;
 using System.Web.Script.Serialization;
 using OnlineEditorsExampleMVC.Helpers;
@@ -32,6 +33,7 @@ namespace OnlineEditorsExampleMVC.Models
     {
         public string Mode { get; set; }  // editor mode
         public string Type { get; set; }  // editor type
+        public bool IsEnabledDirectUrl { get; set; }  // is enabled direct url
 
         // get file url for Document Server
         public string FileUri
@@ -42,7 +44,7 @@ namespace OnlineEditorsExampleMVC.Models
         // get file url for user
         public string FileUriUser
         {
-            get { return DocManagerHelper.GetFileUri(FileName, false); }
+            get { return Path.IsPathRooted(WebConfigurationManager.AppSettings["storage-path"]) ? DownloadUrl + "&dmode=emb" : DocManagerHelper.GetFileUri(FileName, false); }
         }
 
         public string FileName { get; set; }  // file name
@@ -96,6 +98,7 @@ namespace OnlineEditorsExampleMVC.Models
             var actionLink = request.GetOrDefault("actionLink", null);  // get the action link (comment or bookmark) if it exists
             var actionData = string.IsNullOrEmpty(actionLink) ? null : jss.DeserializeObject(actionLink);  // get action data for the action link
 
+            var directUrl = DocManagerHelper.GetDownloadUrl(FileName, false);
             var createUrl = DocManagerHelper.GetCreateUrl(FileUtility.GetFileType(FileName));
             var templatesImageUrl = DocManagerHelper.GetTemplateImageUrl(FileUtility.GetFileType(FileName)); // image url for templates
             var templates = new List<Dictionary<string, string>>
@@ -124,6 +127,7 @@ namespace OnlineEditorsExampleMVC.Models
                             {
                                 { "title", FileName },
                                 { "url", DownloadUrl },
+                                { "directUrl", IsEnabledDirectUrl ? directUrl : "" },
                                 { "fileType", ext.Trim('.') },
                                 { "key", Key },
                                 {
@@ -147,8 +151,10 @@ namespace OnlineEditorsExampleMVC.Models
                                             { "modifyFilter", editorsMode != "filter" },
                                             { "modifyContentControl", editorsMode != "blockcontent" },
                                             { "review", canEdit && (editorsMode == "edit" || editorsMode == "review") },
+                                            { "chat", !user.id.Equals("uid-0") },
                                             { "reviewGroups", user.reviewGroups },
-                                            { "commentGroups", user.commentGroups }
+                                            { "commentGroups", user.commentGroups },
+                                            { "userInfoGroups", user.userInfoGroups }
                                         }
                                 }
                             }
@@ -160,13 +166,18 @@ namespace OnlineEditorsExampleMVC.Models
                                 { "mode", mode },
                                 { "lang", request.Cookies.GetOrDefault("ulang", "en") },
                                 { "callbackUrl", CallbackUrl },  // absolute URL to the document storage service
+                                { "coEditing", editorsMode == "view" && user.id.Equals("uid-0") ? 
+                                    new Dictionary<string, object>{
+                                        {"mode", "strict"},
+                                        {"change", false}
+                                    } : null },
                                 { "createUrl", !user.id.Equals("uid-0") ? createUrl : null },
                                 { "templates", user.templates ? templates : null },
                                 {
                                     // the user currently viewing or editing the document
                                     "user", new Dictionary<string, object>
                                         {
-                                            { "id", user.id },
+                                            { "id", !user.id.Equals("uid-0") ? user.id : null  },
                                             { "name", user.name },
                                             { "group", user.group }
                                         }
@@ -175,9 +186,9 @@ namespace OnlineEditorsExampleMVC.Models
                                     // the parameters for the embedded document type
                                     "embedded", new Dictionary<string, object>
                                         {
-                                            { "saveUrl", FileUriUser },  // the absolute URL that will allow the document to be saved onto the user personal computer
-                                            { "embedUrl", FileUriUser },  // the absolute URL to the document serving as a source file for the document embedded into the web page
-                                            { "shareUrl", FileUriUser },  // the absolute URL that will allow other users to share this document
+                                            { "saveUrl", directUrl },  // the absolute URL that will allow the document to be saved onto the user personal computer
+                                            { "embedUrl", directUrl },  // the absolute URL to the document serving as a source file for the document embedded into the web page
+                                            { "shareUrl", directUrl },  // the absolute URL that will allow other users to share this document
                                             { "toolbarDocked", "top" }  // the place for the embedded viewer toolbar (top or bottom)
                                         }
                                 },
@@ -186,13 +197,14 @@ namespace OnlineEditorsExampleMVC.Models
                                     "customization", new Dictionary<string, object>
                                         {
                                             { "about", true },  // the About section display
+                                            { "comments", true },
                                             { "feedback", true },  // the Feedback & Support menu button display
                                             { "forcesave", false },  // adds the request for the forced file saving to the callback handler
                                             { "submitForm", submitForm },  // if the Submit form button is displayed or not
                                             {
                                                 "goback", new Dictionary<string, object>  // settings for the Open file location menu button and upper right corner button
                                                     {
-                                                        { "url", url.Action("Index", "Home") }  // the absolute URL to the website address which will be opened when clicking the Open file location menu button
+                                                        { "url", DocManagerHelper.GetServerUrl(false) }  // the absolute URL to the website address which will be opened when clicking the Open file location menu button
                                                     }
                                             }
                                         }
@@ -214,7 +226,8 @@ namespace OnlineEditorsExampleMVC.Models
 
         // get the document history
         public void GetHistory(out string history, out string historyData)
-        {
+        {            
+            var storagePath = WebConfigurationManager.AppSettings["storage-path"];
             var jss = new JavaScriptSerializer();
             var histDir = DocManagerHelper.HistoryDir(DocManagerHelper.StoragePath(FileName, null));
 
@@ -253,9 +266,31 @@ namespace OnlineEditorsExampleMVC.Models
                         }
                     }
 
+                    var ext = Path.GetExtension(FileName).ToLower();
+                    dataObj.Add("fileType", ext.Replace(".", ""));
                     dataObj.Add("key", key);
                     // write file url to the data object
-                    dataObj.Add("url", i == currentVersion ? FileUri : DocManagerHelper.GetPathUri(Directory.GetFiles(verDir, "prev.*")[0].Substring(HttpRuntime.AppDomainAppPath.Length)));
+                    string prevFileUrl;
+                    string directPrevFileUrl;
+                    if (Path.IsPathRooted(storagePath) && !string.IsNullOrEmpty(storagePath))
+                    {
+                        prevFileUrl = i == currentVersion ? DocManagerHelper.GetHistoryDownloadUrl(FileName, i.ToString(), "prev" + ext)
+                            : DocManagerHelper.GetDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""));
+                        directPrevFileUrl = i == currentVersion ? DocManagerHelper.GetHistoryDownloadUrl(FileName, i.ToString(), "prev" + ext, false)
+                            : DocManagerHelper.GetDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""), false);
+                    }
+                    else {
+                        prevFileUrl = i == currentVersion ? FileUri
+                            : DocManagerHelper.GetHistoryDownloadUrl(FileName, i.ToString(), "prev" + ext);
+                        directPrevFileUrl = i == currentVersion ? DocManagerHelper.GetHistoryDownloadUrl(FileName, i.ToString(), "prev" + ext, false)
+                            : DocManagerHelper.GetDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""), false);
+                    }
+
+                    dataObj.Add("url", prevFileUrl);
+                    if (IsEnabledDirectUrl)
+                    {
+                        dataObj.Add("directUrl", directPrevFileUrl);
+                    }
                     dataObj.Add("version", i);
                     if (i > 1)  // check if the version number is greater than 1 (the file was modified)
                     {
@@ -273,12 +308,19 @@ namespace OnlineEditorsExampleMVC.Models
                         obj.Add("user", change.Count > 0 ? change["user"] : null);
 
                         var prev = (Dictionary<string, object>)histData[(i - 2).ToString()];  // get the history data from the previous file version
-                        dataObj.Add("previous", new Dictionary<string, object>() {  // write information about previous file version to the data object
+                        dataObj.Add("previous", IsEnabledDirectUrl ? new Dictionary<string, object>() {  // write information about previous file version to the data object with direct url
+                            { "fileType", prev["fileType"] },
+                            { "key", prev["key"] },  // write key and url information about previous file version
+                            { "url", prev["url"] },
+                            { "directUrl", prev["directUrl"] },
+                        } : new Dictionary<string, object>() {  // write information about previous file version to the data object without direct url
+                            { "fileType", prev["fileType"] },
                             { "key", prev["key"] },  // write key and url information about previous file version
                             { "url", prev["url"] },
                         });
                         // write the path to the diff.zip archive with differences in this file version
-                        dataObj.Add("changesUrl", DocManagerHelper.GetPathUri(Path.Combine(DocManagerHelper.VersionDir(histDir, i - 1), "diff.zip").Substring(HttpRuntime.AppDomainAppPath.Length)));
+                        var changesUrl = DocManagerHelper.GetHistoryDownloadUrl(FileName, (i - 1).ToString(), "diff.zip");
+                        dataObj.Add("changesUrl", changesUrl);
                     }
                     if(JwtManager.Enabled)
                     {
@@ -313,6 +355,14 @@ namespace OnlineEditorsExampleMVC.Models
                 Query = "type=assets&fileName=" + HttpUtility.UrlEncode("sample.docx")
             };
 
+            var directCompareFileUrl = new UriBuilder(DocManagerHelper.GetServerUrl(false))
+            {
+                Path = HttpRuntime.AppDomainAppVirtualPath
+                    + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
+                    + "webeditor.ashx",
+                Query = "type=assets&fileName=" + HttpUtility.UrlEncode("sample.docx")
+            };
+
             // create an object with the information about the compared file
             var dataCompareFile = new Dictionary<string, object>
             {
@@ -320,6 +370,11 @@ namespace OnlineEditorsExampleMVC.Models
                 { "url", compareFileUrl.ToString() }
             };
 
+            if (IsEnabledDirectUrl)
+            {
+                dataCompareFile.Add("directUrl", directCompareFileUrl.ToString());
+            }
+
             if (JwtManager.Enabled)  // if the secret key to generate token exists
             {
                 var compareFileToken = JwtManager.Encode(dataCompareFile);  // encode the dataCompareFile object into the token
@@ -342,6 +397,13 @@ namespace OnlineEditorsExampleMVC.Models
                     + "Content\\images\\logo.png"
             };
 
+            var directMailMergeUrl = new UriBuilder(DocManagerHelper.GetServerUrl(false))
+            {
+                Path = HttpRuntime.AppDomainAppVirtualPath
+                    + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
+                    + "Content\\images\\logo.png"
+            };
+
             // create a logo config
             var logoConfig = new Dictionary<string, object>
             {
@@ -349,6 +411,11 @@ namespace OnlineEditorsExampleMVC.Models
                 { "url", mailMergeUrl.ToString()}
             };
 
+            if (IsEnabledDirectUrl)
+            {
+                logoConfig.Add("directUrl", directMailMergeUrl.ToString());
+            }
+
             if (JwtManager.Enabled)  // if the secret key to generate token exists
             {
                 var token = JwtManager.Encode(logoConfig);  // encode logoConfig into the token
@@ -373,6 +440,15 @@ namespace OnlineEditorsExampleMVC.Models
                 Query = "type=csv"
             };
 
+            var directMailMergeUrl = new UriBuilder(DocManagerHelper.GetServerUrl(false))
+            {
+                Path =
+                    HttpRuntime.AppDomainAppVirtualPath
+                    + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
+                    + "webeditor.ashx",
+                Query = "type=csv"
+            };
+
             // create a mail merge config
             var mailMergeConfig = new Dictionary<string, object>
             {
@@ -380,6 +456,11 @@ namespace OnlineEditorsExampleMVC.Models
                 { "url", mailMergeUrl.ToString()}
             };
 
+            if (IsEnabledDirectUrl)
+            {
+                mailMergeConfig.Add("directUrl", directMailMergeUrl.ToString());
+            }
+
             if (JwtManager.Enabled)  // if the secret key to generate token exists
             {
                 var mailmergeToken = JwtManager.Encode(mailMergeConfig);  // encode mailMergeConfig into the token

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

@@ -55,7 +55,7 @@ namespace OnlineEditorsExampleMVC.Models
         // spreadsheet extensions
         public static readonly List<string> ExtsSpreadsheet = new List<string>
             {
-                ".xls", ".xlsx", ".xlsm",
+                ".xls", ".xlsx", ".xlsm", ".xlsb",
                 ".xlt", ".xltx", ".xltm",
                 ".ods", ".fods", ".ots", ".csv"
             };

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

@@ -13,7 +13,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>OnlineEditorsExampleMVC</RootNamespace>
     <AssemblyName>OnlineEditorsExampleMVC</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>true</UseIISExpress>
     <IISExpressSSLPort />
@@ -43,6 +43,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="JWT, Version=9.0.0.0, Culture=neutral, PublicKeyToken=6f98bca0f40f2ecf, processorArchitecture=MSIL">
+      <HintPath>packages\JWT.9.0.3\lib\net46\JWT.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -50,49 +53,49 @@
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web.Services" />
-    <Reference Include="Antlr3.Runtime">
+    <Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
       <HintPath>packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
     </Reference>
-    <Reference Include="EntityFramework">
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Web.Infrastructure">
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="System.Net.Http.Formatting">
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Helpers">
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Http">
+    <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Http.WebHost">
+    <Reference Include="System.Web.Http.WebHost, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Mvc">
+    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Optimization">
+    <Reference Include="System.Web.Optimization, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Razor">
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages">
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages.Deployment">
+    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages.Razor">
+    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
-    <Reference Include="WebGrease">
+    <Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
     </Reference>
   </ItemGroup>
@@ -182,10 +185,12 @@
     <Content Include="assets\AUTHORS.md" />
     <Content Include="assets\LICENSE" />
     <Content Include="assets\new\new.docx" />
+    <Content Include="assets\new\new.docxf" />
     <Content Include="assets\new\new.pptx" />
     <Content Include="assets\new\new.xlsx" />
     <Content Include="assets\sample\csv.csv" />
     <Content Include="assets\sample\sample.docx" />
+    <Content Include="assets\sample\sample.docxf" />
     <Content Include="assets\sample\sample.pptx" />
     <Content Include="assets\sample\sample.xlsx" />
     <None Include="packages.config" />

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

@@ -2,22 +2,25 @@
 
 This example will help you integrate ONLYOFFICE Docs into your web application written in .Net (C# MVC).
 
-It is aimed at testing the editors. Please, do not use it for production without proper modifications. 
+**Please note**: It is intended for testing purposes and demonstrating functionality of the editors. Do NOT use this integration example on your own server without proper code modifications! In case you enabled the test example, disable it before going for production.
 
 ## Step 1. Install ONLYOFFICE Docs
 
-Download and install ONLYOFFICE Docs (packaged as Document Server). 
+Download and install ONLYOFFICE Docs (packaged as Document Server).
 
 See the detailed guide to learn how to install Document Server [for Windows](https://helpcenter.onlyoffice.com/installation/docs-developer-install-windows.aspx), [for Linux](https://helpcenter.onlyoffice.com/installation/docs-developer-install-ubuntu.aspx), or [for Docker](https://helpcenter.onlyoffice.com/server/developer-edition/docker/docker-installation.aspx).
 
 ## 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.
-You need to connnect the editors to your website. Specify path to the editors installation in the *settings.config* file:
+
+To connect the editors to your website, specify the path to the editors installation and the path to the storage folder in the *settings.config* file:
 ```
+<add key="storage-path" value=""/>
 <add key="files.docservice.url.site" value="https://documentserver/" />
 ```
-where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed.
+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.
 
 ## Step 3. Install the prerequisites
@@ -25,31 +28,41 @@ If you want to experiment with the editor configuration, modify the [parameters]
 * **Microsoft .NET Framework**: version 4.5 (download it from the [official Microsoft website](https://www.microsoft.com/en-US/download/details.aspx?id=30653));
 * **Internet Information Services**: version 7 or later.
 
+Configure the IIS components for the server to work correctly:
+1.	Open Windows features:
+
+	**Start** -> **Control Panel** -> **Programs** -> **Programs and Features** -> **Turn Windows features on or off**
+
+2. In the opened window, find **Internet Information Services** and choose all the necessary features. To do this, open the **World Wide Web Services** list and check the following components:
+* **Application Development Features**: .NET Extensibility 4.8, ASP.NET 4.8, ISAPI Extensions, ISAPI Filters,
+* **Common HTTP Features**: Default Document,
+* **Security**: Request Filtering.
+
 ## Step 4. 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**
 2. Add your website in the IIS Manager.
-	
+
 	On the **Connections** panel right-click the **Sites** node in the tree, then click **Add Website**.
 
 	![add](screenshots/add.png)
 3. In the **Add Website** dialog box specify the name of the folder with the .Net (C# MVC) project in the **Site name** box.
-	
+
 	Specify the path to the folder with your project in the **Physical Path** box.
-	
+
 	Specify the unique value used only for this website in the **Port** box.
-	
+
 	![sitename](screenshots/sitename.png)
 4. Check for the .NET platform version specified in IIS Manager for you website. Choose **v4.0.** version.
 	
 	**Application Pools** -> right-click the platform name -> **Set application Pool defaults** -> **.NET CLR version**
-	
+
 	![platform](screenshots/platform.png)
 5. Browse your website with the IIS Manager:
 
 	Right-click the site -> **Manage Website** -> **Browse**
-	
+
 	![browse](screenshots/browse.png)
 
 ## Step 5. Check accessibility
@@ -57,3 +70,12 @@ If you want to experiment with the editor configuration, modify the [parameters]
 In case the example and Document Server are installed on different computers, make sure that your server with the example installed has access to the Document Server with the address which you specify instead of **documentserver** in the configuration files. 
 
 Make sure that the Document Server has access to the server with the example installed with the address which you specify instead of **example.com** in the configuration files.
+
+## Important security info
+
+Please keep in mind the following security aspects when you are using test examples:
+
+* There is no protection of the storage from unauthorized access since there is no need for authorization.
+* There are no checks against parameter substitution in links, since the parameters are generated by the code according to the pre-arranged scripts.
+* There are no data checks in requests of saving the file after editing, since each test example is intended for requests only from ONLYOFFICE Document Server.
+* There are no prohibitions on using test examples from other sites, since they are intended to interact with ONLYOFFICE Document Server from another domain.

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

@@ -16,11 +16,24 @@
  *
  */
 
+var directUrl;
+
 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',
@@ -219,7 +232,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = UrlEditor + "?fileName=" + fileId;
+        var url = UrlEditor + "?fileName=" + fileId + "&directUrl=" + directUrl;
         window.open(url, "_blank");
         jq('#hiddenFileName').val("");
         jq.unblockUI();
@@ -227,7 +240,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginView:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = UrlEditor + "?editorsMode=view&fileName=" + fileId;
+        var url = UrlEditor + "?editorsMode=view&fileName=" + fileId + "&directUrl=" + directUrl;
         window.open(url, "_blank");
         jq('#hiddenFileName').val("");
         jq.unblockUI();
@@ -235,7 +248,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginEmbedded:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = UrlEditor + "?editorsType=embedded&editorsMode=embedded&fileName=" + fileId;
+        var url = UrlEditor + "?editorsType=embedded&editorsMode=embedded&fileName=" + fileId + "&directUrl=" + directUrl;
 
         jq("#mainProgress").addClass("embedded");
         jq("#beginEmbedded").addClass("disable");
@@ -289,6 +302,17 @@ if (typeof jQuery != "undefined") {
         }
     };
 
+    function getUrlVars() {
+        var vars = [], hash;
+        var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+        for (var i = 0; i < hashes.length; i++) {
+            hash = hashes[i].split('=');
+            vars.push(hash[0]);
+            vars[hash[0]] = hash[1];
+        }
+        return vars;
+    };
+
     var fileList = jq("tr.tableRow");
 
     var mouseIsOverTooltip = false;
@@ -304,7 +328,7 @@ if (typeof jQuery != "undefined") {
                 });
             }
     } else {
-        jq(".info").mouseover(function (event) {
+        jq("#info").mouseover(function (event) {
             if (fileList.length > 0) {
                 if (hideTooltipTimeout != null) {
                     clearTimeout(hideTooltipTimeout);

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

@@ -46,6 +46,7 @@
     <script type="text/javascript" language="javascript">
 
         var docEditor;
+        var config;
 
         var innerAlert = function (message, inEditor) {
             if (console && console.log)
@@ -107,10 +108,14 @@
 
         // the meta information of the document is changed via the meta command
         var onMetaChange = function (event) {
-            var favorite = !!event.data.favorite;
-            var title = document.title.replace(/^\☆/g, "");
-            document.title = (favorite ? "☆" : "") + title;
-            docEditor.setFavorite(favorite);  // change the Favorite icon state
+            if (event.data.favorite) {
+                var favorite = !!event.data.favorite;
+                var title = document.title.replace(/^\☆/g, "");
+                document.title = (favorite ? "☆" : "") + title;
+                docEditor.setFavorite(favorite);  // change the Favorite icon state
+            }
+
+            innerAlert("onMetaChange: " + JSON.stringify(event.data));
         };
 
         // the user is trying to insert an image by clicking the Image from Storage button
@@ -146,7 +151,7 @@
              };
              let xhr = new XMLHttpRequest();
              xhr.open("POST", "webeditor.ashx?type=saveas");
-             xhr.setRequestHeader( 'Content-Type', 'application/json');
+             xhr.setRequestHeader('Content-Type', 'application/json');
              xhr.send(JSON.stringify(data));
              xhr.onload = function () {
                  innerAlert(xhr.responseText);
@@ -154,7 +159,26 @@
              }
          };
 
-        var config = <%= Model.GetDocConfig(Request, Url) %>;
+         var onRequestRename = function(event) { //  the user is trying to rename file by clicking Rename... button
+            innerAlert("onRequestRename: " + JSON.stringify(event.data));
+
+            var newfilename = event.data;
+            var data = {
+                newfilename: newfilename,
+                dockey: config.document.key,
+                ext: config.document.fileType
+            };
+
+            let xhr = new XMLHttpRequest();
+            xhr.open("POST", "webeditor.ashx?type=rename");
+            xhr.setRequestHeader('Content-Type', 'application/json');
+            xhr.send(JSON.stringify(data));
+            xhr.onload = function () {
+                innerAlert(xhr.responseText);
+            }
+        };
+
+        config = <%= Model.GetDocConfig(Request, Url) %>;
 
         config.width = "100%";
         config.height = "100%";
@@ -174,42 +198,49 @@
 
         <% string hist, histData; %>
         <% Model.GetHistory(out hist, out histData); %>
-        <% if (!string.IsNullOrEmpty(hist) && !string.IsNullOrEmpty(histData))
-        { %>
-        // the user is trying to show the document version history
-        config.events['onRequestHistory'] = function () {
-            docEditor.refreshHistory(<%= hist %>);  // show the document version history
-        };
-        // the user is trying to click the specific document version in the document version history
-        config.events['onRequestHistoryData'] = function (event) {
-            var ver = event.data;
-            var histData = <%= histData %>;
-            docEditor.setHistoryData(histData[ver - 1]);  // send the link to the document for viewing the version history
-        };
-        // the user is trying to go back to the document from viewing the document version history
-        config.events['onRequestHistoryClose '] = function () {
-            document.location.reload();
-        };
-        <% } %>
 
         <% string usersForMentions; %>
         <% Model.GetUsersMentions(Request, out usersForMentions); %>
-        <% if (!string.IsNullOrEmpty(usersForMentions))
-        // add mentions for not anonymous users
-        { %>
-        config.events['onRequestUsers'] = function () {
-            docEditor.setUsers({  // set a list of users to mention in the comments
-                "users": <%= usersForMentions%>
-            });
-        };
-        // the user is mentioned in a comment
-        config.events['onRequestSendNotify'] = function (event) {
-            event.data.actionLink = replaceActionLink(location.href, event.data.actionLink);
-            var data = JSON.stringify(event.data);
-            innerAlert("onRequestSendNotify: " + data);
-        };
-        <% } %>
-        
+
+        if (config.editorConfig.user.id) {
+            <% if (!string.IsNullOrEmpty(hist) && !string.IsNullOrEmpty(histData))
+            { %>
+                // the user is trying to show the document version history
+                config.events['onRequestHistory'] = function () {
+                    docEditor.refreshHistory(<%= hist %>);  // show the document version history
+                };
+                // the user is trying to click the specific document version in the document version history
+                config.events['onRequestHistoryData'] = function (event) {
+                    var ver = event.data;
+                    var histData = <%= histData %>;
+                    docEditor.setHistoryData(histData[ver - 1]);  // send the link to the document for viewing the version history
+                };
+                // the user is trying to go back to the document from viewing the document version history
+                config.events['onRequestHistoryClose '] = function () {
+                    document.location.reload();
+                };
+            <% } %>
+
+            // add mentions for not anonymous users
+            <% if (!string.IsNullOrEmpty(usersForMentions))
+            { %>
+                config.events['onRequestUsers'] = function () {
+                    docEditor.setUsers({  // set a list of users to mention in the comments
+                        "users": <%= usersForMentions %>
+                    });
+                };
+            <% } %>
+
+            // the user is mentioned in a comment
+            config.events['onRequestSendNotify'] = function (event) {
+                event.data.actionLink = replaceActionLink(location.href, JSON.stringify(event.data.actionLink));
+                var data = JSON.stringify(event.data);
+                innerAlert("onRequestSendNotify: " + data);
+            };
+            // prevent file renaming for anonymous users
+            config.events['onRequestRename'] = onRequestRename;
+        }
+
         if (config.editorConfig.createUrl) {
             config.events.onRequestSaveAs = onRequestSaveAs;
         };

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

@@ -4,6 +4,7 @@
 <%@ Import Namespace="System.Web.Configuration" %>
 <%@ Import Namespace="OnlineEditorsExampleMVC.Helpers" %>
 <%@ Import Namespace="OnlineEditorsExampleMVC.Models" %>
+<%@ Import Namespace="System.Collections.Generic" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -69,7 +70,7 @@
                                             <a class="try-editor form" data-type="docxf">Form template</a>
                                         </li>
                                     </ul>
-                                    <label class="create-sample">
+                                    <label class="side-option">
                                         <input id="createSample" class="checkbox" type="checkbox" />With sample content
                                     </label>
                                 </div>
@@ -85,11 +86,11 @@
                                     <tr>
                                         <td valign="middle">
                                             <span class="select-user">Username</span>
-                                             <img class="info" src="content/images/info.svg" />
+                                             <img id="info" src="content/images/info.svg" />
                                              <select class="select-user" id="user">
                                             <% foreach (User user in Users.getAllUsers())
                                                { %>
-                                                    <option value=<%= user.id %> ><%= user.name.IsEmpty() ? "Anonymous" : user.name %></option>
+                                                    <option value="<%= user.id %>"><%= user.name.IsEmpty() ? "Anonymous" : user.name %></option>
                                                  <% } %>
                                              </select>
                                         </td>
@@ -98,40 +99,22 @@
                                         <td valign="middle">
                                             <span class="select-user">Language editors interface</span>
                                             <select class="select-user" id="language">
-                                                <option value="en">English</option>
-                                                <option value="be">Belarusian</option>
-                                                <option value="bg">Bulgarian</option>
-                                                <option value="ca">Catalan</option>
-                                                <option value="zh">Chinese</option>
-                                                <option value="cs">Czech</option>
-                                                <option value="da">Danish</option>
-                                                <option value="nl">Dutch</option>
-                                                <option value="fi">Finnish</option>
-                                                <option value="fr">French</option>
-                                                <option value="de">German</option>
-                                                <option value="el">Greek</option>
-                                                <option value="hu">Hungarian</option>
-                                                <option value="id">Indonesian</option>
-                                                <option value="it">Italian</option>
-                                                <option value="ja">Japanese</option>
-                                                <option value="ko">Korean</option>
-                                                <option value="lv">Latvian</option>
-                                                <option value="lo">Lao</option>
-                                                <option value="nb">Norwegian</option>
-                                                <option value="pl">Polish</option>
-                                                <option value="pt">Portuguese</option>
-                                                <option value="ro">Romanian</option>
-                                                <option value="ru">Russian</option>
-                                                <option value="sk">Slovak</option>
-                                                <option value="sl">Slovenian</option>
-                                                <option value="sv">Swedish</option>
-                                                <option value="es">Spanish</option>
-                                                <option value="tr">Turkish</option>
-                                                <option value="uk">Ukrainian</option>
-                                                <option value="vi">Vietnamese</option>
+                                                <% Dictionary<string, string> languages = DocManagerHelper.GetLanguages(); 
+                                                foreach (var lang in languages)
+                                                    { %>
+                                                        <option value="<%= lang.Key %>"><%= lang.Value %></option>
+                                                    <% } %>
                                             </select>
                                         </td>
                                     </tr>
+                                    <tr>
+                                        <td valign="middle">
+                                            <label class="side-option">
+                                                <input id="directUrl" type="checkbox" class="checkbox" />Try opening on client
+                                                <img id="directUrlInfo" class="info info-tooltip" data-id="directUrlInfo" data-tooltip="Some files can be opened in the user's browser without connecting to the document server." src="content/images/info.svg" />
+                                            </label>
+                                        </td>
+                                    </tr>
                                 </tbody>
                             </table>
                         </div>
@@ -139,12 +122,13 @@
                     <td class="section">
                         <div class="main-panel">
                             <% var storedFiles = DocManagerHelper.GetStoredFiles(); %>
-                            <div id="portal-info"  style="display: <%= storedFiles.Any() ? "none" : "block" %>">
+                            <div id="portal-info"  style="display: <%= storedFiles.Any() ? "none" : "table-cell" %>">
                                 <span class="portal-name">ONLYOFFICE Document Editors – Welcome!</span>
                                 <span class="portal-descr">
                                     Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors.
                                     <br /> You may upload your own documents for testing using the "<b>Upload file</b>" button and <b>selecting</b> the necessary files on your PC.
                                 </span>
+                                <span class="portal-descr">Please do NOT use this integration example on your own server without proper code modifications, it is intended for testing purposes only. In case you enabled this test example, disable it before going for production.</span>
                                 <span class="portal-descr">You can open the same document using different users in different Web browser sessions, so you can check out multi-user editing functions.</span>
                                 <% foreach (User user in Users.getAllUsers())
                                   { %>
@@ -180,54 +164,52 @@
                                             <tbody>
                                             <% foreach (var storedFile in storedFiles)
                                                {
-                                                    var editUrl = "doceditor.aspx?fileID=" + HttpUtility.UrlEncode(storedFile.Name);
+                                                            var isEnabledDirectUrl = DocManagerHelper.GetDirectUrl();
+                                                            var editUrl = "doceditor.aspx?fileID=" + HttpUtility.UrlEncode(storedFile.Name);
                                                             var docType = FileUtility.GetFileType(storedFile.Name).ToString().ToLower();
                                                             var ext = Path.GetExtension(storedFile.Name).ToLower();
                                                             var canEdit = DocManagerHelper.EditedExts.Contains(ext);
                                                             var isFillFormDoc = DocManagerHelper.FillFormExts.Contains(ext);
                                                         %>
 
-                                                            <tr class="tableRow" title="<%= storedFile.Name %> [<%= DocManagerHelper.GetFileVersion(storedFile.Name, HttpContext.Current.Request.UserHostAddress) %>]">
+                                                            <tr class="tableRow" title="<%= storedFile.Name %> [<%= DocManagerHelper.GetFileVersion(storedFile.Name, HttpContext.Current.Request.UserHostAddress.Replace(':', '_')) %>]">
                                                                 <td class="contentCells">
-                                                                    <a class="stored-edit <%= docType %>" href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name }) %>" target="_blank">
+                                                                    <a class="stored-edit <%= docType %>" href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                         <span><%= storedFile.Name %></span>
                                                                     </a>
                                                                 </td>
                                                                 <% if (canEdit) { %>
                                                                     <td class="contentCells contentCells-icon">
-                                                                        <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "edit" }) %>" target="_blank">
+                                                                        <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "edit", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                             <img src="content/images/desktop.svg" alt="Open in editor for full size screens" title="Open in editor for full size screens"/>
                                                                         </a>
                                                                     </td>
                                                                     <td class="contentCells contentCells-icon">
-                                                                        <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "mobile", editorsMode = "edit" }) %>" target="_blank">
+                                                                        <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "mobile", editorsMode = "edit", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                             <img src="content/images/mobile.svg" alt="Open in editor for mobile devices" title="Open in editor for mobile devices"/>
                                                                         </a>
                                                                     </td>
                                                                     <td class="contentCells contentCells-icon">
-                                                                        <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "comment" }) %>" target="_blank">
+                                                                        <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "comment", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                             <img src="content/images/comment.svg" alt="Open in editor for comment" title="Open in editor for comment"/>
                                                                         </a>
                                                                     </td>
                                                                     <% if (docType == "word") { %>
                                                                         <td class="contentCells contentCells-icon">
-                                                                            <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "review" }) %>" target="_blank">
+                                                                            <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "review", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                                 <img src="content/images/review.svg" alt="Open in editor for review" title="Open in editor for review"/>
                                                                             </a>
                                                                         </td>
                                                                     <% } else if (docType == "cell") { %>
                                                                         <td class="contentCells contentCells-icon">
-                                                                            <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "filter" }) %>" target="_blank">
+                                                                            <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "filter", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                                 <img src="content/images/filter.svg" alt="Open in editor without access to change the filter" title="Open in editor without access to change the filter" />
                                                                             </a>
                                                                          </td>
                                                                     <% } %>
-                                                                    <% if (docType != "word" && docType != "cell") { %>
-                                                                        <td class="contentCells contentCells-icon contentCellsEmpty"></td>
-                                                                    <% } %>
                                                                     <% if (docType == "word") { %>
                                                                         <td class="contentCells contentCells-icon">
-                                                                            <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "blockcontent" }) %>" target="_blank">
+                                                                            <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "blockcontent", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                                 <img src="content/images/block-content.svg" alt="Open in editor without content control modification" title="Open in editor without content control modification"/>
                                                                             </a>
                                                                         </td>
@@ -239,7 +221,7 @@
                                                                     <% } %>
                                                                     <% if (isFillFormDoc) { %>
                                                                         <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
-                                                                            <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "fillForms" }) %>" target="_blank">
+                                                                            <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "fillForms", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                                 <img src="content/images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
                                                                             </a>
                                                                         </td>
@@ -249,7 +231,7 @@
                                                                 <% } else if (isFillFormDoc) { %>
                                                                     <td class="contentCells contentCells-icon "></td>
                                                                     <td class="contentCells contentCells-icon">
-                                                                       <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "mobile", editorsMode = "fillForms" }) %>" target="_blank">
+                                                                       <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "mobile", editorsMode = "fillForms", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                            <img src="content/images/mobile-fill-forms.svg" alt="Open in editor for filling in forms for mobile devices" title="Open in editor for filling in forms for mobile devices"/>
                                                                        </a>
                                                                     </td>
@@ -257,7 +239,7 @@
                                                                     <td class="contentCells contentCells-icon "></td>
                                                                     <td class="contentCells contentCells-icon "></td>
                                                                     <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
-                                                                       <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "fillForms" }) %>" target="_blank">
+                                                                       <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "fillForms", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                            <img src="content/images/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
                                                                        </a>
                                                                     </td>
@@ -265,17 +247,17 @@
                                                                     <td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>
                                                                 <% } %>
                                                                 <td class="contentCells contentCells-icon firstContentCellViewers">
-                                                                    <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "view" }) %>" target="_blank">
+                                                                    <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "desktop", editorsMode = "view", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                         <img src="content/images/desktop.svg" alt="Open in viewer for full size screens" title="Open in viewer for full size screens"/>
                                                                     </a>
                                                                 </td>
                                                                 <td class="contentCells contentCells-icon">
-                                                                    <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "mobile", editorsMode = "view" }) %>" target="_blank">
+                                                                    <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "mobile", editorsMode = "view", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                         <img src="content/images/mobile.svg" alt="Open in viewer for mobile devices" title="Open in viewer for mobile devices"/>
                                                                     </a>
                                                                 </td>
                                                                 <td class="contentCells contentCells-icon contentCells-shift">
-                                                                    <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "embedded", editorsMode = "embedded" }) %>" target="_blank">
+                                                                    <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile.Name, editorsType = "embedded", editorsMode = "embedded", directUrl = isEnabledDirectUrl }) %>" target="_blank">
                                                                         <img src="content/images/embeded.svg" alt="Open in embedded mode" title="Open in embedded mode"/>
                                                                     </a>
                                                                 </td>
@@ -328,10 +310,8 @@
             <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 />
-            <br />
             <span class="progress-descr">Note the speed of all operations depends on your connection quality and server location.</span>
             <br />
-            <br />
             <div class="error-message">
                 <b>Upload error: </b><span></span>
                 <br />
@@ -340,10 +320,12 @@
         </div>
         <iframe id="embeddedView" src="" height="345px" width="432px" frameborder="0" scrolling="no" allowtransparency></iframe>
         <br />
-        <div id="beginEdit" class="button orange disable">Edit</div>
-        <div id="beginView" class="button gray disable">View</div>
-        <div id="beginEmbedded" class="button gray disable">Embedded view</div>
-        <div id="cancelEdit" class="button gray">Cancel</div>
+        <div class="buttonsMobile">
+            <div id="beginEdit" class="button orange disable">Edit</div>
+            <div id="beginView" class="button gray disable">View</div>
+            <div id="beginEmbedded" class="button gray disable">Embedded view</div>
+            <div id="cancelEdit" class="button gray">Cancel</div>
+        </div>
     </div>
 
     <span id="loadScripts" data-docs="<%= WebConfigurationManager.AppSettings["files.docservice.url.site"] + WebConfigurationManager.AppSettings["files.docservice.url.preloader"] %>"></span>

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

@@ -26,11 +26,11 @@
   </system.web>
   <system.webServer>
     <validation validateIntegratedModeConfiguration="false" />
-	<httpProtocol>
-		<customHeaders>
-			<add name="Access-Control-Allow-Origin" value="*" />
-		</customHeaders>
-	</httpProtocol>
+    <httpProtocol>
+      <customHeaders>
+        <add name="Access-Control-Allow-Origin" value="*" />
+      </customHeaders>
+    </httpProtocol>
     <handlers>
       <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
       <remove name="OPTIONSVerbHandler" />
@@ -39,20 +39,28 @@
     </handlers>
     <security>
       <requestFiltering>
-        <requestLimits maxAllowedContentLength="52428800"/>
+        <requestLimits maxAllowedContentLength="52428800" />
       </requestFiltering>
     </security>
   </system.webServer>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
         <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
@@ -63,7 +71,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-  <entityFramework>
-    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
-  </entityFramework>
 </configuration>

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

@@ -19,6 +19,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
 using System.Linq;
 using System.Net;
 using System.Web;
@@ -46,6 +47,9 @@ namespace OnlineEditorsExampleMVC
                 case "download":
                     Download(context);
                     break;
+                case "downloadhistory":
+                    DownloadHistory(context);
+                    break;
                 case "convert":
                     Convert(context);
                     break;
@@ -67,6 +71,9 @@ namespace OnlineEditorsExampleMVC
                 case "saveas":
                     SaveAs(context);
                     break;
+                case "rename":
+                    Rename(context);
+                    break;
             }
         }
 
@@ -110,6 +117,8 @@ namespace OnlineEditorsExampleMVC
                 
                 var req = (HttpWebRequest)WebRequest.Create(fileUrl);
     
+                DocManagerHelper.VerifySSL();
+
                 using (var stream = req.GetResponse().GetResponseStream())
                 {
                     
@@ -148,6 +157,8 @@ namespace OnlineEditorsExampleMVC
             context.Response.ContentType = "text/plain";
             try
             {
+                DocManagerHelper.VerifySSL();
+                
                 var httpPostedFile = context.Request.Files[0];
                 string fileName;
 
@@ -247,6 +258,8 @@ namespace OnlineEditorsExampleMVC
 
                     var req = (HttpWebRequest)WebRequest.Create(newFileUri);
 
+                    DocManagerHelper.VerifySSL();
+
                     using (var stream = req.GetResponse().GetResponseStream())  // get response stream of the converting file
                     {
                         if (stream == null) throw new Exception("Stream is null");
@@ -300,7 +313,7 @@ namespace OnlineEditorsExampleMVC
             var userAddress = context.Request["userAddress"];
             var fileName = Path.GetFileName(context.Request["fileName"]);
             var status = (TrackerStatus) (int) fileData["status"];  // get status from the request body
-            var saved = 1;  // editing
+            var saved = 0;
             switch (status)
             {
                 case TrackerStatus.Editing:
@@ -357,7 +370,7 @@ namespace OnlineEditorsExampleMVC
                     return;
             }
 
-            context.Response.Write("{\"error\":0}");
+            context.Response.Write("{\"error\":" + saved + "}");
         }
 
         // remove a file
@@ -443,10 +456,12 @@ namespace OnlineEditorsExampleMVC
         {
             try
             {
-                var fileName = Path.GetFileName(context.Request["fileName"]);
+                var fileName = Path.IsPathRooted(WebConfigurationManager.AppSettings["storage-path"]) ? context.Request["fileName"] 
+                    : Path.GetFileName(context.Request["fileName"]);
                 var userAddress = context.Request["userAddress"];
+                var isEmbedded = context.Request["dmode"];
 
-                if (JwtManager.Enabled)
+                if (JwtManager.Enabled && isEmbedded == null)
                 {
                     string JWTheader = WebConfigurationManager.AppSettings["files.docservice.header"].Equals("") ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
 
@@ -492,5 +507,88 @@ namespace OnlineEditorsExampleMVC
         {
             get { return false; }
         }
+
+        // download a history file
+        private static void DownloadHistory(HttpContext context)
+        {
+            try
+            {
+                var fileName = Path.GetFileName(context.Request["fileName"]);
+                var userAddress = Path.GetFileName(context.Request["userAddress"]);
+                var version = System.Convert.ToInt32(context.Request["ver"]);
+                var file = Path.GetFileName(context.Request["file"]);
+
+                if (JwtManager.Enabled)
+                {
+                    string JWTheader = WebConfigurationManager.AppSettings["files.docservice.header"].Equals("") ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
+
+                    if (context.Request.Headers.AllKeys.Contains(JWTheader, StringComparer.InvariantCultureIgnoreCase))
+                    {
+                        var headerToken = context.Request.Headers.Get(JWTheader).Substring("Bearer ".Length);
+                        string token = JwtManager.Decode(headerToken);
+
+                        if (token == null || token.Equals(""))
+                        {
+                            context.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                            context.Response.Write("JWT validation failed");
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        context.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                        context.Response.Write("JWT validation failed");
+                        return;
+                    }
+                }
+                var histPath = DocManagerHelper.HistoryDir(DocManagerHelper.StoragePath(fileName, userAddress));
+                var filePath = Path.Combine(DocManagerHelper.VersionDir(histPath, version), file);  // get the path to document version
+
+                download(filePath, context);
+            }
+            catch (Exception)
+            {
+                context.Response.Write("{ \"error\": \"File not found!\"}");
+            }
+        }
+
+        // rename a file
+        private static void Rename(HttpContext context)
+        {
+            // read request body
+            context.Response.ContentType = "text/plain";
+            string fileData;
+            try
+            {
+                using (var receiveStream = context.Request.InputStream)
+                using (var readStream = new StreamReader(receiveStream))
+                {
+                    fileData = readStream.ReadToEnd();
+                    if (string.IsNullOrEmpty(fileData)) context.Response.Write("{\"error\":\"Request stream is empty\"}");
+                }
+            }
+            catch (Exception e)
+            {
+                throw new HttpException((int)HttpStatusCode.BadRequest, e.Message);
+            }
+
+            var jss = new JavaScriptSerializer();
+            var body = jss.Deserialize<Dictionary<string, object>>(fileData);
+            var newFileName = (string) body["newfilename"];
+            var docKey = (string) body["dockey"];
+
+            var origExt = '.' + (string) body["ext"];
+            var curExt = Path.GetExtension(newFileName).ToLower();
+
+            if (string.Compare(origExt, curExt, true) != 0)
+            {
+                newFileName += origExt;
+            }
+            var meta =  new Dictionary<string, object>() {
+                { "title", newFileName }
+            };
+            TrackManager.commandRequest("meta", docKey, meta);
+            context.Response.Write("{ \"result\": \"OK\"}");
+        }
     }
 }

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

@@ -24,11 +24,15 @@ jQuery.UI     - jQuery UI is an open source library of interface components —
 License:        MIT
 License File:   jQuery.UI.license
 
+JWT           - JWT (JSON Web Token) Implementation for .NET (Public Domain) (https://github.com/jwt-dotnet/jwt/)
+License:        MIT
+License File:   JWT.license
+
 Microsoft.Web.Infrastructure - This package contains the Microsoft.Web.Infrastructure assembly that lets you dynamically register HTTP modules at run time. (https://www.microsoft.com/web/webpi/eula/aspnetmvc3update-eula.htm)
 License:        MS-EULA License
 License File:   Microsoft.Web.Infrastructure.license
 
-Newtonsoft.Json - Json.NET is a popular high-performance JSON framework for .NET (https://licenses.nuget.org/MIT)
+Newtonsoft.Json - Json.NET is a popular high-performance JSON framework for .NET (https://github.com/JamesNK/Newtonsoft.Json)
 License:        MIT
 License File:   Newtonsoft.Json.license
 

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

@@ -0,0 +1,21 @@
+# Public Domain
+
+Written by John Sheehan (http://john-sheehan.com)
+
+This work is public domain.
+
+The person who associated a work with this deed has dedicated the work to the public domain by waiving all of his or her rights to the work worldwide under copyright law, including all related and neighboring rights, to the extent allowed by law.
+
+For more information, please visit: http://creativecommons.org/publicdomain/zero/1.0/
+
+# MIT
+
+Copyright (c) 2019 Jwt.Net Maintainers and Contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please visit: https://opensource.org/licenses/MIT

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

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Antlr" version="3.5.0.2" targetFramework="net45" />
-  <package id="EntityFramework" version="6.4.4" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net45" />
-  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net45" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net45" />
-  <package id="WebGrease" version="1.6.0" targetFramework="net45" />
+  <package id="Antlr" version="3.5.0.2" targetFramework="net48" />
+  <package id="EntityFramework" version="6.4.4" targetFramework="net48" />
+  <package id="JWT" version="9.0.3" targetFramework="net48" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net48" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net48" />
+  <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net48" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net48" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net48" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net48" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" />
+  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net48" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
+  <package id="WebGrease" version="1.6.0" targetFramework="net48" />
 </packages>

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

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

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

@@ -19,3 +19,11 @@ License File:   jQuery.iframe-transport.license
 jQuery.UI     - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
 License:        MIT
 License File:   jQuery.UI.license
+
+JWT           - JWT (JSON Web Token) Implementation for .NET (Public Domain) (https://github.com/jwt-dotnet/jwt/)
+License:        MIT
+License File:   JWT.license
+
+Newtonsoft.Json - Json.NET is a popular high-performance JSON framework for .NET (https://github.com/JamesNK/Newtonsoft.Json)
+License:        MIT
+License File:   Newtonsoft.Json.license

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

@@ -87,10 +87,6 @@
 }
 
 @media (max-width: 1008px) {
-    #portal-info {
-        width: 65vw;
-    }
-
     .left-panel {
         margin-left: 0;
     }
@@ -128,6 +124,10 @@
         height: 80px;
     }
 
+    .main {
+        height: calc(100% - 128px); 
+    }
+
     .main-panel {
         left: 0;
         padding: 48px 18px 24px;
@@ -312,6 +312,9 @@
     .tableRow td:first-child {
         max-width: 17%;
     }
+    #portal-info {
+        max-width: 60vw;
+    }
 }
 
 .downloadContentCellShift:after {
@@ -363,6 +366,10 @@
         height: 80px;
     }
 
+    .main {
+        height: calc(100% - 128px); 
+    }
+    
     .copy {
         width: 100%;
         text-align: center;
@@ -436,6 +443,58 @@
         display: none;
         width: 1%;
     }
+    /* Mobile Upload*/
+    .blockUI.blockMsg.blockPage.ui-dialog.ui-widget.ui-corner-all.ui-widget-content.ui-draggable {
+        width: 344px !important;
+        box-shadow: 0px 7px 15px rgba(85, 85, 85, 0.1);
+        border-radius: 2px;
+        top: 10% !important;
+        margin-left: -172px !important;
+    }
+
+    .ui-dialog .ui-dialog-titlebar {
+        padding: 0;
+    }
+    .ui-dialog .ui-dialog-content {
+        padding: 0 !important;
+    }
+    #mainProgress {
+        margin: 24px 16px 0 !important;
+    }
+    .blockTitle {
+        padding: 10px 10px 6px 16px !important;
+        font-size: 14px !important;
+    }
+    #mainProgress .describeUpload {
+        padding: 8px 0 !important;
+    }
+    .dialog-close {
+        margin: 0 !important;
+    }
+    .step-descr{
+        line-height: 150%;
+    }
+    .step {
+        line-height: 160%;
+    }
+    .buttonsMobile{
+        display: flex;
+        flex-direction: row;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        align-items: center;
+    }
+    .button.gray{
+        margin: 0;
+    }
+    .button, .button:hover{
+        display: flex;
+        justify-content: center;
+        padding: 0 !important;
+        width: 144px;
+        height: 56px;
+        margin-bottom: 24px !important;
+    }
 }
 
 @media (max-width: 560px) and (min-width: 510px) {

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

@@ -22,6 +22,7 @@ html {
 }
 
 body {
+    display: block;
     background: #FFFFFF;
     color: #333333;
     font-family: Open Sans;
@@ -71,6 +72,7 @@ header img {
 }
 
 .main {
+    display: table;
     height: calc(100% - 112px);
     min-height: 536px;
 }
@@ -97,6 +99,10 @@ header img {
     width: 896px;
 }
 
+#portal-info {
+    max-width: 65vw;
+}
+
 .portal-name {
     color: #FF6F3D;
     font-size: 24px;
@@ -161,7 +167,7 @@ label .checkbox {
     background-image: url("images/file_docxf.svg");
 }
 
-.create-sample {
+.side-option {
     color: #666666;
     line-height: 24px;
 }
@@ -732,12 +738,9 @@ html {
     width: 30vw;
     min-width: 200px;
     max-width: 400px;
+    margin-top: 20px;
 }
 
 .user-descr > b {
     margin-left: 25px;
 }
-
-.portal-descr:nth-child(3) {
-    margin-bottom: 20px;
-}

web/documentserver-example/csharp/Default.aspx

@@ -5,12 +5,14 @@
 <%@ Import Namespace="System.Linq" %>
 <%@ Import Namespace="System.Web.Configuration" %>
 <%@ Import Namespace="OnlineEditorsExample" %>
+<%@ Import Namespace="System.Collections.Generic" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width" />
     <title>ONLYOFFICE</title>
     <!--
     *
@@ -71,7 +73,7 @@
                                                 <a class="try-editor form" data-type="docxf">Form template</a>
                                             </li>
                                         </ul>
-                                        <label class="create-sample">
+                                        <label class="side-option">
                                             <input id="createSample" class="checkbox" type="checkbox" />With sample content
                                         </label>
                                     </div>
@@ -99,40 +101,22 @@
                                             <td valign="middle">
                                                 <span class="select-user">Language editors interface</span>
                                                 <select class="select-user" id="language">
-                                                    <option value="en">English</option>
-                                                    <option value="be">Belarusian</option>
-                                                    <option value="bg">Bulgarian</option>
-                                                    <option value="ca">Catalan</option>
-                                                    <option value="zh">Chinese</option>
-                                                    <option value="cs">Czech</option>
-                                                    <option value="da">Danish</option>
-                                                    <option value="nl">Dutch</option>
-                                                    <option value="fi">Finnish</option>
-                                                    <option value="fr">French</option>
-                                                    <option value="de">German</option>
-                                                    <option value="el">Greek</option>
-                                                    <option value="hu">Hungarian</option>
-                                                    <option value="id">Indonesian</option>
-                                                    <option value="it">Italian</option>
-                                                    <option value="ja">Japanese</option>
-                                                    <option value="ko">Korean</option>
-                                                    <option value="lv">Latvian</option>
-                                                    <option value="lo">Lao</option>
-                                                    <option value="nb">Norwegian</option>
-                                                    <option value="pl">Polish</option>
-                                                    <option value="pt">Portuguese</option>
-                                                    <option value="ro">Romanian</option>
-                                                    <option value="ru">Russian</option>
-                                                    <option value="sk">Slovak</option>
-                                                    <option value="sl">Slovenian</option>
-                                                    <option value="sv">Swedish</option>
-                                                    <option value="es">Spanish</option>
-                                                    <option value="tr">Turkish</option>
-                                                    <option value="uk">Ukrainian</option>
-                                                    <option value="vi">Vietnamese</option>
+                                                    <% Dictionary<string, string> languages = GetLanguages(); 
+                                                    foreach (var lang in languages)
+                                                        { %>
+                                                            <option value="<%= lang.Key %>"><%= lang.Value %></option>
+                                                        <% } %>
                                                 </select>
                                             </td>
                                         </tr>
+                                        <tr>
+                                        <td valign="middle">
+                                            <label class="side-option">
+                                                <input id="directUrl" type="checkbox" class="checkbox" />Try opening on client
+                                                <img id="directUrlInfo" class="info info-tooltip" data-id="directUrlInfo" data-tooltip="Some files can be opened in the user's browser without connecting to the document server." src="app_themes/images/info.svg" />
+                                            </label>
+                                        </td>
+                                    </tr>
                                     </tbody>
                                 </table>
                             </div>
@@ -140,12 +124,13 @@
                         <td class="section">
                         <% var storedFiles = GetStoredFiles(); %>
                             <div class="main-panel">
-                                <div id="portal-info" style="display: <%= storedFiles.Any() ? "none" : "block" %>">
+                                <div id="portal-info" style="display: <%= storedFiles.Any() ? "none" : "table-cell" %>">
                                     <span class="portal-name">ONLYOFFICE Document Editors – Welcome!</span>
                                     <span class="portal-descr">
                                         Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors.
                                         <br /> You may upload your own documents for testing using the "<b>Upload file</b>" button and <b>selecting</b> the necessary files on your PC.
                                     </span>
+                                    <span class="portal-descr">Please do NOT use this integration example on your own server without proper code modifications, it is intended for testing purposes only. In case you enabled this test example, disable it before going for production.</span>
                                     <span class="portal-descr">You can open the same document using different users in different Web browser sessions, so you can check out multi-user editing functions.</span>
                                     <% foreach (User user in Users.getAllUsers())
                                       { %>
@@ -181,14 +166,15 @@
                                                 <tbody>
                                                 <%  foreach (var storedFile in storedFiles)
                                                     {
-                                                        var editUrl = "doceditor.aspx?fileID=" + HttpUtility.UrlEncode(storedFile.Name);
+                                                        var directUrlParam = GetDirectUrlParam();
+                                                        var editUrl = "doceditor.aspx?fileID=" + HttpUtility.UrlEncode(storedFile.Name) + directUrlParam;
                                                         var ext = Path.GetExtension(storedFile.Name).ToLower();
                                                         var docType = DocumentType(storedFile.Name);
                                                         var canEdit = EditedExts.Contains(ext);
                                                         var isFillFormDoc = FillFormsExts.Contains(ext);
                                                         %>
 
-                                                        <tr class="tableRow" title="<%= storedFile.Name %> [<%= GetFileVersion(storedFile.Name, HttpContext.Current.Request.UserHostAddress) %>]">
+                                                        <tr class="tableRow" title="<%= storedFile.Name %> [<%= GetFileVersion(storedFile.Name, HttpContext.Current.Request.UserHostAddress.Replace(':','_')) %>]">
                                                             <td class="contentCells">
                                                                 <a class="stored-edit <%= docType %>" href="<%= editUrl %>" target="_blank">
                                                                     <span><%= storedFile.Name %></span>
@@ -223,9 +209,6 @@
                                                                         </a>
                                                                     </td>
                                                                 <% } %>
-                                                                <%if (docType != "word" && docType != "cell") { %>
-                                                                    <td class="contentCells contentCells-icon contentCellsEmpty"></td>
-                                                                <% } %>
                                                                 <% if (docType == "word") { %>
                                                                     <td class="contentCells contentCells-icon">
                                                                         <a href="<%= editUrl + "&editorsType=desktop&editorsMode=blockcontent" %>" target="_blank">
@@ -329,10 +312,8 @@
                 <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 />
-                <br />
                 <span class="progress-descr">Note the speed of all operations depends on your connection quality and server location.</span>
                 <br />
-                <br />
                 <div class="error-message">
                     <b>Upload error: </b><span></span>
                     <br />
@@ -341,10 +322,12 @@
             </div>
             <iframe id="embeddedView" src="" height="345px" width="432px" frameborder="0" scrolling="no" allowtransparency></iframe>
             <br />
-            <div id="beginEdit" class="button orange disable">Edit</div>
-            <div id="beginView" class="button gray disable">View</div>
-            <div id="beginEmbedded" class="button gray disable">Embedded view</div>
-            <div id="cancelEdit" class="button gray">Cancel</div>
+            <div class="buttonsMobile">
+                <div id="beginEdit" class="button orange disable">Edit</div>
+                <div id="beginView" class="button gray disable">View</div>
+                <div id="beginEmbedded" class="button gray disable">Embedded view</div>
+                <div id="cancelEdit" class="button gray">Cancel</div>
+            </div>
         </div>
 
         <span id="loadScripts" data-docs="<%= UrlPreloadScripts %>"></span>

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

@@ -35,7 +35,7 @@ namespace OnlineEditorsExample
         // the spreadsheet extension list
         public static readonly List<string> ExtsSpreadsheet = new List<string>
             {
-                ".xls", ".xlsx", ".xlsm",
+                ".xls", ".xlsx", ".xlsm", ".xlsb",
                 ".xlt", ".xltx", ".xltm",
                 ".ods", ".fods", ".ots", ".csv"
             };
@@ -78,7 +78,9 @@ namespace OnlineEditorsExample
         {
             get
             {
-                return
+                return Path.IsPathRooted(WebConfigurationManager.AppSettings["storage-path"]) ? 
+                    WebConfigurationManager.AppSettings["storage-path"] + "/"
+                    :
                     HttpRuntime.AppDomainAppVirtualPath
                     + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
                     + WebConfigurationManager.AppSettings["storage-path"]
@@ -144,18 +146,52 @@ namespace OnlineEditorsExample
         // get the storage path of the given file
         public static string StoragePath(string fileName, string userAddress)
         {
-            var directory = HttpRuntime.AppDomainAppPath + WebConfigurationManager.AppSettings["storage-path"] + CurUserHostAddress(userAddress) + "\\";
+            var directory = "";
+            if (Path.IsPathRooted(WebConfigurationManager.AppSettings["storage-path"]))
+            {
+                directory = WebConfigurationManager.AppSettings["storage-path"] + "\\";
+            }
+            else
+            {
+                directory = HttpRuntime.AppDomainAppPath + WebConfigurationManager.AppSettings["storage-path"] + CurUserHostAddress(userAddress) + "\\";
+            }
+
             if (!Directory.Exists(directory))
             {
                 Directory.CreateDirectory(directory);  // if the file directory doesn't exist, make it
             }
-            return directory + Path.GetFileName(fileName);
+            return directory + (fileName.Contains("\\") ? fileName : Path.GetFileName(fileName));
+        }
+
+        // get the path to the history file version
+        public static string HistoryPath(string fileName, string userAddress, string version, string file)
+        {
+            var directory = "";
+            if (Path.IsPathRooted(WebConfigurationManager.AppSettings["storage-path"]))
+            {
+                directory = WebConfigurationManager.AppSettings["storage-path"] + "\\";
+            }
+            else
+            {
+                directory = HttpRuntime.AppDomainAppPath + WebConfigurationManager.AppSettings["storage-path"] + CurUserHostAddress(userAddress) + "\\";
+            }
+            var filepath = directory + Path.GetFileName(fileName) + "-hist" + "\\" + version + "\\" + file;
+            return filepath;
         }
 
         // get the path to the forcesaved file version
         public static string ForcesavePath(string fileName, string userAddress, Boolean create)
         {
-            var directory = HttpRuntime.AppDomainAppPath + WebConfigurationManager.AppSettings["storage-path"] + CurUserHostAddress(userAddress) + "\\";
+            var directory = "";
+            if (Path.IsPathRooted(WebConfigurationManager.AppSettings["storage-path"]))
+            {
+                directory = WebConfigurationManager.AppSettings["storage-path"] + "\\";
+            }
+            else
+            {
+                directory = HttpRuntime.AppDomainAppPath + WebConfigurationManager.AppSettings["storage-path"] + CurUserHostAddress(userAddress) + "\\";
+            }
+            
             if (!Directory.Exists(directory))  // the directory with host address doesn't exist
             {
                 return "";
@@ -317,11 +353,7 @@ namespace OnlineEditorsExample
 
             try
             {
-                // hack. http://ubuntuforums.org/showthread.php?t=1841740
-                if (IsMono)
-                {
-                    ServicePointManager.ServerCertificateValidationCallback += (s, ce, ca, p) => true;
-                }
+                VerifySSL();
 
                 using (var stream = req.GetResponse().GetResponseStream())  // get response stream of the uploading file
                 {
@@ -384,11 +416,7 @@ namespace OnlineEditorsExample
             
             var req = (HttpWebRequest)WebRequest.Create(fileUrl);
             
-            // hack. http://ubuntuforums.org/showthread.php?t=1841740
-            if (IsMono)
-            {
-                ServicePointManager.ServerCertificateValidationCallback += (s, ce, ca, p) => true;
-            }
+            VerifySSL();
             
             using (var stream = req.GetResponse().GetResponseStream())
             {
@@ -457,7 +485,7 @@ namespace OnlineEditorsExample
                     + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
                     + "webeditor.ashx";
                 fileUrl.Query = "type=download&fileName=" + HttpUtility.UrlEncode(_fileName)
-                + "&userAddress=" + HttpUtility.UrlEncode(HttpContext.Current.Request.UserHostAddress);
+                + "&userAddress=" + HttpUtility.UrlEncode(CurUserHostAddress(HttpContext.Current.Request.UserHostAddress));
 
                 // get the url to the converted file
                 string newFileUri;
@@ -472,11 +500,7 @@ namespace OnlineEditorsExample
 
                 var req = (HttpWebRequest)WebRequest.Create(newFileUri);
 
-                // hack. http://ubuntuforums.org/showthread.php?t=1841740
-                if (IsMono)
-                {
-                    ServicePointManager.ServerCertificateValidationCallback += (s, ce, ca, p) => true;
-                }
+                VerifySSL();
 
                 using (var stream = req.GetResponse().GetResponseStream())  // get response stream of the converting file
                 {
@@ -528,7 +552,16 @@ namespace OnlineEditorsExample
         // get all the stored files from the folder
         protected static List<FileInfo> GetStoredFiles()
         {
-            var directory = HttpRuntime.AppDomainAppPath + WebConfigurationManager.AppSettings["storage-path"] + CurUserHostAddress(null) + "\\";
+            var directory = "";
+            if (Path.IsPathRooted(WebConfigurationManager.AppSettings["storage-path"]))
+            {
+                directory = WebConfigurationManager.AppSettings["storage-path"] + "\\";
+            }
+            else
+            {
+                directory = HttpRuntime.AppDomainAppPath + WebConfigurationManager.AppSettings["storage-path"] + CurUserHostAddress(null) + "\\";
+            }
+            
             if (!Directory.Exists(directory)) return new List<FileInfo>();
 
             var directoryInfo = new DirectoryInfo(directory);  // read the user host directory contents
@@ -571,5 +604,33 @@ namespace OnlineEditorsExample
 
             return files;
         }
+
+        // enable certificate ignore
+        public static void VerifySSL()
+        {
+            // hack. http://ubuntuforums.org/showthread.php?t=1841740
+            if(WebConfigurationManager.AppSettings["files.docservice.verify-peer-off"].Equals("true")) {
+                ServicePointManager.ServerCertificateValidationCallback += (s, ce, ca, p) => true;
+                ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
+            }
+        }
+        
+        public static Dictionary<string, string> GetLanguages()
+        {
+            var languages = new Dictionary<string, string>();
+            String[] couples = (WebConfigurationManager.AppSettings["files.docservice.languages"] ?? "").Split('|');
+            foreach (string couple in couples)
+            {   
+                String[] tmp = couple.Split(':');
+                languages.Add(tmp[0],tmp[1]);
+            }
+            return languages;
+        }
+
+        public static string GetDirectUrlParam()
+        {
+            string isEnabledDirectUrl = HttpUtility.ParseQueryString(HttpContext.Current.Request.Url.Query).Get("directUrl");
+            return "&directUrl=" + (isEnabledDirectUrl != null ? isEnabledDirectUrl : "false");
+        }
     }
 }

web/documentserver-example/csharp/DocEditor.aspx

@@ -64,6 +64,7 @@
     <script type="text/javascript" language="javascript">
 
         var docEditor;
+        var config;
 
         var innerAlert = function (message, inEditor) {
             if (console && console.log)
@@ -125,10 +126,14 @@
 
         // the meta information of the document is changed via the meta command
         var onMetaChange = function (event) {
-            var favorite = !!event.data.favorite;
-            var title = document.title.replace(/^\☆/g, "");
-            document.title = (favorite ? "☆" : "") + title;
-            docEditor.setFavorite(favorite);  // change the Favorite icon state
+            if (event.data.favorite) {
+                var favorite = !!event.data.favorite;
+                var title = document.title.replace(/^\☆/g, "");
+                document.title = (favorite ? "☆" : "") + title;
+                docEditor.setFavorite(favorite);  // change the Favorite icon state
+            }
+
+            innerAlert("onMetaChange: " + JSON.stringify(event.data));
         };
 
         // the user is trying to insert an image by clicking the Image from Storage button
@@ -158,7 +163,7 @@
             };
             let xhr = new XMLHttpRequest();
             xhr.open("POST", "webeditor.ashx?type=saveas");
-            xhr.setRequestHeader( 'Content-Type', 'application/json');
+            xhr.setRequestHeader('Content-Type', 'application/json');
             xhr.send(JSON.stringify(data));
             xhr.onload = function () {
                 innerAlert(xhr.responseText);
@@ -166,7 +171,26 @@
             }
         };
 
-        var config = <%= DocConfig %>;
+        var onRequestRename = function(event) { //  the user is trying to rename file by clicking Rename... button
+            innerAlert("onRequestRename: " + JSON.stringify(event.data));
+
+            var newfilename = event.data;
+            var data = {
+                newfilename: newfilename,
+                dockey: config.document.key,
+                ext: config.document.fileType
+            };
+
+            let xhr = new XMLHttpRequest();
+            xhr.open("POST", "webeditor.ashx?type=rename");
+            xhr.setRequestHeader('Content-Type', 'application/json');
+            xhr.send(JSON.stringify(data));
+            xhr.onload = function () {
+                innerAlert(xhr.responseText);
+            }
+        };
+
+        config = <%= DocConfig %>;
 
         config.width = "100%";
         config.height = "100%";
@@ -184,37 +208,42 @@
             "onRequestMailMergeRecipients": onRequestMailMergeRecipients,
         };
 
-        <% if (!string.IsNullOrEmpty(History) && !string.IsNullOrEmpty(HistoryData))
-        { %>
-        config.events['onRequestHistory'] = function () {  // the user is trying to show the document version history
-            docEditor.refreshHistory(<%= History %>);  // show the document version history
-        };
-        config.events['onRequestHistoryData'] = function (event) {  // the user is trying to click the specific document version in the document version history
-            var ver = event.data;
-            var histData = <%= HistoryData %>;
-            docEditor.setHistoryData(histData[ver - 1]);  // send the link to the document for viewing the version history
-        };
-        config.events['onRequestHistoryClose '] = function () {  // the user is trying to go back to the document from viewing the document version history
-            document.location.reload();
-        };
-        <% } %>
+        if (config.editorConfig.user.id) {
+            <% if (!string.IsNullOrEmpty(History) && !string.IsNullOrEmpty(HistoryData))
+            { %>
+                config.events['onRequestHistory'] = function () {  // the user is trying to show the document version history
+                    docEditor.refreshHistory(<%= History %>);  // show the document version history
+                };
+                config.events['onRequestHistoryData'] = function (event) {  // the user is trying to click the specific document version in the document version history
+                    var ver = event.data;
+                    var histData = <%= HistoryData %>;
+                    docEditor.setHistoryData(histData[ver - 1]);  // send the link to the document for viewing the version history
+                };
+                config.events['onRequestHistoryClose '] = function () {  // the user is trying to go back to the document from viewing the document version history
+                    document.location.reload();
+                };
+            <% } %>
+
+            // add mentions for not anonymous users
+            <% if (!string.IsNullOrEmpty(UsersForMentions))
+            { %>
+                config.events['onRequestUsers'] = function () {
+                    docEditor.setUsers({  // set a list of users to mention in the comments
+                        "users": <%= UsersForMentions %>
+                    });
+                };
+            <% } %>
+
+            // the user is mentioned in a comment
+            config.events['onRequestSendNotify'] = function (event) {
+                event.data.actionLink = replaceActionLink(location.href, JSON.stringify(event.data.actionLink));
+                var data = JSON.stringify(event.data);
+                innerAlert("onRequestSendNotify: " + data);
+            };
+            // prevent file renaming for anonymous users
+            config.events['onRequestRename'] = onRequestRename;
+        }
 
-        <% if (!string.IsNullOrEmpty(UsersForMentions))
-        { %>
-        // add mentions for not anonymous users
-        config.events['onRequestUsers'] = function () {
-            docEditor.setUsers({  // set a list of users to mention in the comments
-                "users": <%= UsersForMentions %>
-        });
-        };
-        // the user is mentioned in a comment
-        config.events['onRequestSendNotify'] = function (event) {
-            event.data.actionLink = replaceActionLink(location.href, event.data.actionLink);
-            var data = JSON.stringify(event.data);
-            innerAlert("onRequestSendNotify: " + data);
-        };
-        <% } %>
-        
         if (config.editorConfig.createUrl) {
             config.events.onRequestSaveAs = onRequestSaveAs;
         };

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

@@ -41,7 +41,7 @@ namespace OnlineEditorsExample
         // get url to the original file for Document Server
         public static string FileUriUser
         {
-            get { return _Default.FileUri(FileName, false); }
+            get { return Path.IsPathRooted(WebConfigurationManager.AppSettings["storage-path"]) ? getDownloadUrl(FileName) + "&dmode=emb" : _Default.FileUri(FileName, false); }
         }
 
         protected string Key
@@ -81,7 +81,7 @@ namespace OnlineEditorsExample
                     + "webeditor.ashx";
                 callbackUrl.Query = "type=track"
                                     + "&fileName=" + HttpUtility.UrlEncode(FileName)
-                                    + "&userAddress=" + HttpUtility.UrlEncode(HttpContext.Current.Request.UserHostAddress);
+                                    + "&userAddress=" + HttpUtility.UrlEncode(_Default.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress));
                 return callbackUrl.ToString();
             }
         }
@@ -100,20 +100,18 @@ namespace OnlineEditorsExample
         }
 
         // get url to download a file
-        public static string getDownloadUrl
+        public static string getDownloadUrl(string fileName, Boolean isServer = true)
         {
-            get
-            {
-                var downloadUrl = new UriBuilder(_Default.GetServerUrl(true));
+            var userAddress = isServer ? "&userAddress=" + HttpUtility.UrlEncode(_Default.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress)) : "";
+            var downloadUrl = new UriBuilder(_Default.GetServerUrl(isServer));
                 downloadUrl.Path =
                     HttpRuntime.AppDomainAppVirtualPath
                     + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
                     + "webeditor.ashx";
                 downloadUrl.Query = "type=download"
-                                    + "&fileName=" + HttpUtility.UrlEncode(FileName)
-                                    + "&userAddress=" + HttpUtility.UrlEncode(HttpContext.Current.Request.UserHostAddress);
+                                    + "&fileName=" + HttpUtility.UrlEncode(fileName)
+                                    + userAddress;
                 return downloadUrl.ToString();
-            }
         }
 
         // loading a page
@@ -168,6 +166,7 @@ namespace OnlineEditorsExample
             var actionLink = Request.GetOrDefault("actionLink", null);  // get the action link (comment or bookmark) if it exists
             var actionData = string.IsNullOrEmpty(actionLink) ? null : jss.DeserializeObject(actionLink);  // get action data for the action link
 
+            var directUrl = getDownloadUrl(FileName, false);
             var createUrl = getCreateUrl(DocumentType, editorsType);
             var templatesImageUrl = GetTemplateImageUrl(ext); // image url for templates
             var templates = new List<Dictionary<string, string>>
@@ -195,7 +194,8 @@ namespace OnlineEditorsExample
                         "document", new Dictionary<string, object>
                             {
                                 { "title", FileName },
-                                { "url", getDownloadUrl },
+                                { "url", getDownloadUrl(FileName) },
+                                { "directUrl", IsEnabledDirectUrl() ? directUrl : "" },
                                 { "fileType", ext.Trim('.') },
                                 { "key", Key },
                                 {
@@ -219,8 +219,10 @@ namespace OnlineEditorsExample
                                             { "modifyFilter", editorsMode != "filter" },
                                             { "modifyContentControl", editorsMode != "blockcontent" },
                                             { "review", canEdit && (editorsMode == "edit" || editorsMode == "review") },
+                                            { "chat", !user.id.Equals("uid-0") },
                                             { "reviewGroups", user.reviewGroups },
-                                            { "commentGroups", user.commentGroups }
+                                            { "commentGroups", user.commentGroups },
+                                            { "userInfoGroups", user.userInfoGroups }
                                         }
                                 }
                             }
@@ -232,13 +234,18 @@ namespace OnlineEditorsExample
                                 { "mode", mode },
                                 { "lang", Request.Cookies.GetOrDefault("ulang", "en") },
                                 { "callbackUrl", CallbackUrl },  // absolute URL to the document storage service
+                                { "coEditing", editorsMode == "view" && user.id.Equals("uid-0") ? 
+                                    new Dictionary<string, object>{
+                                        {"mode", "strict"},
+                                        {"change", false}
+                                    } : null },
                                 { "createUrl", !user.id.Equals("uid-0") ? createUrl : null },
                                 { "templates", user.templates ? templates : null },
                                 {
                                     // the user currently viewing or editing the document
                                     "user", new Dictionary<string, object>
                                         {
-                                            { "id", user.id },
+                                            { "id", !user.id.Equals("uid-0") ? user.id : null },
                                             { "name",  user.name },
                                             { "group", user.group }
                                         }
@@ -247,9 +254,9 @@ namespace OnlineEditorsExample
                                     // the parameters for the embedded document type
                                     "embedded", new Dictionary<string, object>
                                         {
-                                            { "saveUrl", FileUriUser },  // the absolute URL that will allow the document to be saved onto the user personal computer
-                                            { "embedUrl", FileUriUser },  // the absolute URL to the document serving as a source file for the document embedded into the web page
-                                            { "shareUrl", FileUriUser },  // the absolute URL that will allow other users to share this document
+                                            { "saveUrl", directUrl },  // the absolute URL that will allow the document to be saved onto the user personal computer
+                                            { "embedUrl", directUrl },  // the absolute URL to the document serving as a source file for the document embedded into the web page
+                                            { "shareUrl", directUrl },  // the absolute URL that will allow other users to share this document
                                             { "toolbarDocked", "top" }  // the place for the embedded viewer toolbar (top or bottom)
                                         }
                                 },
@@ -258,6 +265,7 @@ namespace OnlineEditorsExample
                                     "customization", new Dictionary<string, object>
                                         {
                                             { "about", true },  // the About section display
+                                            { "comments", true },
                                             { "feedback", true },  // the Feedback & Support menu button display
                                             { "forcesave", false },  // adds the request for the forced file saving to the callback handler
                                             { "submitForm", submitForm },  // if the Submit form button is displayed or not
@@ -318,6 +326,7 @@ namespace OnlineEditorsExample
         // get the document history
         private void GetHistory(out Dictionary<string, object> history, out Dictionary<string, object> historyData)
         {
+            var storagePath = WebConfigurationManager.AppSettings["storage-path"];
             var jss = new JavaScriptSerializer();
             var histDir = _Default.HistoryDir(_Default.StoragePath(FileName, null));
 
@@ -355,8 +364,25 @@ namespace OnlineEditorsExample
                         }
                     }
 
+                    var ext = Path.GetExtension(FileName).ToLower();
+                    dataObj.Add("fileType", ext.Replace(".", ""));
                     dataObj.Add("key", key);
-                    dataObj.Add("url", i == currentVersion ? FileUri : MakePublicUrl(Directory.GetFiles(verDir, "prev.*")[0]));  // write file url to the data object
+                    // write file url to the data object
+                    var directPrevFileUrl = i == currentVersion ? _Default.FileUri(FileName, false) : MakePublicHistoryUrl(FileName, i.ToString(), "prev" + ext, false);
+                    var prevFileUrl = i == currentVersion ? FileUri : MakePublicHistoryUrl(FileName, i.ToString(), "prev" + ext);
+                    if (Path.IsPathRooted(storagePath))
+                    {
+                        prevFileUrl = i == currentVersion ? getDownloadUrl(FileName) : getDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""));
+                        directPrevFileUrl = i == currentVersion ? getDownloadUrl(FileName, false) : getDownloadUrl(Directory.GetFiles(verDir, "prev.*")[0].Replace(storagePath + "\\", ""), false);
+                    }
+
+                    dataObj.Add("url", prevFileUrl);  // write file url to the data object
+
+                    if (IsEnabledDirectUrl())
+                    {
+                        dataObj.Add("directUrl", directPrevFileUrl); // write direct url to the data object
+                    } 
+
                     dataObj.Add("version", i);
                     if (i > 1)  // check if the version number is greater than 1 (the file was modified)
                     {
@@ -374,12 +400,22 @@ namespace OnlineEditorsExample
                         obj.Add("user", change.Count > 0 ? change["user"] : null);
 
                         var prev = (Dictionary<string, object>)histData[(i - 2).ToString()];  // get the history data from the previous file version
-                        dataObj.Add("previous", new Dictionary<string, object>() {  // write information about previous file version to the data object
+
+                        Dictionary<string, object> dataPrev = new Dictionary<string, object>() {  // write information about previous file version to the data object
+                            { "fileType", prev["fileType"] },
                             { "key", prev["key"] },  // write key and url information about previous file version
-                            { "url", prev["url"] },
-                        });
+                            { "url", prev["url"] }
+                        };
+
+                        if (IsEnabledDirectUrl())
+                        {
+                            dataPrev.Add("directUrl", prev["directUrl"]);
+                        }
+
+                        dataObj.Add("previous", dataPrev);
                         // write the path to the diff.zip archive with differences in this file version
-                        dataObj.Add("changesUrl", MakePublicUrl(Path.Combine(_Default.VersionDir(histDir, i - 1), "diff.zip")));
+                        var changesUrl = MakePublicHistoryUrl(FileName, (i - 1).ToString(), "diff.zip");
+                        dataObj.Add("changesUrl", changesUrl);
                     }
                     if (JwtManager.Enabled)
                     {
@@ -409,6 +445,11 @@ namespace OnlineEditorsExample
                 + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
                 + "App_Themes\\images\\logo.png";
 
+            var DirectImageUrl = new UriBuilder(_Default.GetServerUrl(false));
+            DirectImageUrl.Path = HttpRuntime.AppDomainAppVirtualPath
+                + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
+                + "App_Themes\\images\\logo.png";
+
             // create a logo config
             Dictionary<string, object> logoConfig = new Dictionary<string, object>
                 {
@@ -416,6 +457,11 @@ namespace OnlineEditorsExample
                     { "url", InsertImageUrl.ToString()}
                 };
 
+            if (IsEnabledDirectUrl())
+            {
+                logoConfig.Add("directUrl", DirectImageUrl.ToString());
+            }
+
             if (JwtManager.Enabled)  // if the secret key to generate token exists
             {
                 var insImageToken = JwtManager.Encode(logoConfig);  // encode logoConfig into the token
@@ -435,6 +481,12 @@ namespace OnlineEditorsExample
                 + "webeditor.ashx";
             compareFileUrl.Query = "type=assets&fileName=" + HttpUtility.UrlEncode("sample.docx");
 
+            var DirectFileUrl = new UriBuilder(_Default.GetServerUrl(false));
+            DirectFileUrl.Path = HttpRuntime.AppDomainAppVirtualPath
+                + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
+                + "webeditor.ashx";
+            DirectFileUrl.Query = "type=assets&fileName=" + HttpUtility.UrlEncode("sample.docx");
+
             // create an object with the information about the compared file
             Dictionary<string, object> dataCompareFile = new Dictionary<string, object>
                 {
@@ -442,6 +494,11 @@ namespace OnlineEditorsExample
                     { "url", compareFileUrl.ToString() }
                 };
 
+            if (IsEnabledDirectUrl())
+            {
+                dataCompareFile.Add("directUrl", DirectFileUrl.ToString());
+            }
+
             if (JwtManager.Enabled)  // if the secret key to generate token exists
             {
                 var compareFileToken = JwtManager.Encode(dataCompareFile);  // encode the dataCompareFile object into the token
@@ -462,6 +519,13 @@ namespace OnlineEditorsExample
                     + "webeditor.ashx";
             mailmergeUrl.Query = "type=csv";
 
+            var DirectMailMergeUrl = new UriBuilder(_Default.GetServerUrl(false));
+            DirectMailMergeUrl.Path =
+                    HttpRuntime.AppDomainAppVirtualPath
+                    + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
+                    + "webeditor.ashx";
+            DirectMailMergeUrl.Query = "type=csv";
+
             // create a mail merge config
             Dictionary<string, object> mailMergeConfig = new Dictionary<string, object>
                 {
@@ -469,6 +533,11 @@ namespace OnlineEditorsExample
                     { "url", mailmergeUrl.ToString() }
                 };
 
+            if (IsEnabledDirectUrl())
+            {
+                mailMergeConfig.Add("directUrl", DirectMailMergeUrl.ToString());
+            }
+
             if (JwtManager.Enabled)  // if the secret key to generate token exists
             {
                 var mailmergeToken = JwtManager.Encode(mailMergeConfig);  // encode mailMergeConfig into the token
@@ -503,10 +572,26 @@ namespace OnlineEditorsExample
         // create the public url
         private string MakePublicUrl(string fullPath)
         {
-            var root = HttpRuntime.AppDomainAppPath + WebConfigurationManager.AppSettings["storage-path"];
+            var root = Path.IsPathRooted(WebConfigurationManager.AppSettings["storage-path"]) ? WebConfigurationManager.AppSettings["storage-path"] 
+                : HttpRuntime.AppDomainAppPath + WebConfigurationManager.AppSettings["storage-path"];
             return _Default.GetServerUrl(true) + fullPath.Substring(root.Length).Replace(Path.DirectorySeparatorChar, '/');
         }
 
+
+        // create the public history url
+        private string MakePublicHistoryUrl(string filename, string version, string file, Boolean isServer = true)
+        {
+            var userAddress = isServer ? "&userAddress=" + HttpUtility.UrlEncode(_Default.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress)) : "";
+            var fileUrl = new UriBuilder(_Default.GetServerUrl(isServer));
+            fileUrl.Path = HttpRuntime.AppDomainAppVirtualPath
+                + (HttpRuntime.AppDomainAppVirtualPath.EndsWith("/") ? "" : "/")
+                + "webeditor.ashx";
+            fileUrl.Query = "type=downloadhistory&fileName=" + HttpUtility.UrlEncode(filename)
+                + "&ver=" + version + "&file=" + file
+                + userAddress;
+            return fileUrl.ToString();
+        }
+
         // create demo document
         private static void Try(string type, string sample, HttpRequest request)
         {
@@ -554,5 +639,12 @@ namespace OnlineEditorsExample
                 { "name", uname }
             }));
         }
+
+        // get direct url flag
+        private static bool IsEnabledDirectUrl()
+        {
+            string isEnabledDirectUrl = HttpUtility.ParseQueryString(HttpContext.Current.Request.Url.Query).Get("directUrl");
+            return isEnabledDirectUrl != null ? Convert.ToBoolean(isEnabledDirectUrl) : false;
+        }
     }
 }

web/documentserver-example/csharp/DocumentConverter.cs

@@ -145,11 +145,7 @@ namespace ASC.Api.DocumentConverter
                 requestStream.Write(bytes, 0, bytes.Length);  // and write the serialized body object to it
             }
 
-            // hack. http://ubuntuforums.org/showthread.php?t=1841740
-            if (_Default.IsMono)
-            {
-                ServicePointManager.ServerCertificateValidationCallback += (s, ce, ca, p) => true;
-            }
+            _Default.VerifySSL();
 
             string dataResponse;
             using (var response = request.GetResponse())

web/documentserver-example/csharp/JwtManager.cs

@@ -16,12 +16,12 @@
  *
  */
 
-using System;
+using JWT;
+using JWT.Algorithms;
+using JWT.Builder;
+using JWT.Serializers;
 using System.Collections.Generic;
-using System.Security.Cryptography;
-using System.Text;
 using System.Web.Configuration;
-using System.Web.Script.Serialization;
 
 namespace OnlineEditorsExample
 {
@@ -30,31 +30,19 @@ namespace OnlineEditorsExample
         private static readonly string Secret;
         public static readonly bool Enabled;
 
-        private static readonly JavaScriptSerializer Serializer;
-
         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
-            Serializer = new JavaScriptSerializer();  // define java script serializer
         }
 
         // encode a payload object into a token using a secret key
         public static string Encode(IDictionary<string, object> payload)
         {
-            // define the hashing algorithm and the token type
-            var header = new Dictionary<string, object>
-                {
-                    { "alg", "HS256" },
-                    { "typ", "JWT" }
-                };
-
-            // three parts of token
-            var encHeader = Base64UrlEncode(Serializer.Serialize(header));  // header
-            var encPayload = Base64UrlEncode(Serializer.Serialize(payload));  // payload
-            var hashSum = Base64UrlEncode(CalculateHash(encHeader, encPayload));  // signature
-
-            return string.Format("{0}.{1}.{2}", encHeader, encPayload, hashSum);
+            var encoder = new JwtEncoder(new HMACSHA256Algorithm(),
+                                         new JsonNetSerializer(),
+                                         new JwtBase64UrlEncoder());
+            return encoder.Encode(payload, Secret);
         }
 
         // decode a token into a payload object using a secret key
@@ -62,52 +50,11 @@ namespace OnlineEditorsExample
         {
             if (!Enabled || string.IsNullOrEmpty(token)) return "";
 
-            var split = token.Split('.');
-            if (split.Length != 3) return "";
-
-            var hashSum = Base64UrlEncode(CalculateHash(split[0], split[1]));  // get signature
-            if (hashSum != split[2]) return "";  // and check if it is equal to the signature from the token
-            return Base64UrlDecode(split[1]);  // decode payload
-        }
-
-        // generate a hash code based on a key using the HMAC method
-        private static byte[] CalculateHash(string encHeader, string encPayload)
-        {
-            using (var hasher = new HMACSHA256(Encoding.UTF8.GetBytes(Secret)))
-            {
-                var bytes = Encoding.UTF8.GetBytes(string.Format("{0}.{1}", encHeader, encPayload));
-                return hasher.ComputeHash(bytes);
-            }
-        }
-
-        // encode a string into the base64 value
-        private static string Base64UrlEncode(string str)
-        {
-            return Base64UrlEncode(Encoding.UTF8.GetBytes(str));
-        }
-
-        // encode bytes into the base64 value
-        private static string Base64UrlEncode(byte[] bytes)
-        {
-            return Convert.ToBase64String(bytes)
-                          .TrimEnd('=').Replace('+', '-').Replace('/', '_');
-        }
-
-        // decode a base64 value into the string
-        private static string Base64UrlDecode(string payload)
-        {
-            var b64 = payload.Replace('_', '/').Replace('-', '+');
-            switch (b64.Length%4)
-            {
-                case 2:
-                    b64 += "==";
-                    break;
-                case 3:
-                    b64 += "=";
-                    break;
-            }
-            var bytes = Convert.FromBase64String(b64);
-            return Encoding.UTF8.GetString(bytes);
+            return JwtBuilder.Create()
+                    .WithAlgorithm(new HMACSHA256Algorithm())
+                    .WithSecret(Secret)
+                    .MustVerifySignature()
+                    .Decode(token);
         }
     }
 }

web/documentserver-example/csharp/OnlineEditorsExample.csproj

@@ -11,7 +11,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>OnlineEditorsExample</RootNamespace>
     <AssemblyName>OnlineEditorsExample</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
@@ -23,6 +23,8 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <TargetFrameworkProfile />
+    <Use64BitIISExpress />
+    <UseGlobalApplicationHostFile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,27 +46,33 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="JWT, Version=9.0.0.0, Culture=neutral, PublicKeyToken=6f98bca0f40f2ecf, processorArchitecture=MSIL">
+      <HintPath>packages\JWT.9.0.3\lib\net46\JWT.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Web.Infrastructure">
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Helpers">
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Razor">
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Services" />
-    <Reference Include="System.Web.WebPages">
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages.Deployment">
+    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages.Razor">
+    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
   </ItemGroup>
@@ -153,10 +161,12 @@
     <Content Include="assets\AUTHORS.md" />
     <Content Include="assets\LICENSE" />
     <Content Include="assets\new\new.docx" />
+    <Content Include="assets\new\new.docxf" />
     <Content Include="assets\new\new.pptx" />
     <Content Include="assets\new\new.xlsx" />
     <Content Include="assets\sample\csv.csv" />
     <Content Include="assets\sample\sample.docx" />
+    <Content Include="assets\sample\sample.docxf" />
     <Content Include="assets\sample\sample.pptx" />
     <Content Include="assets\sample\sample.xlsx" />
     <None Include="packages.config" />

web/documentserver-example/csharp/README.md

@@ -2,11 +2,11 @@
 
 This example will help you integrate ONLYOFFICE Docs into your web application written in .Net (C#).
 
-It is aimed at testing the editors. Please, do not use it for production without proper modifications. 
+**Please note**: It is intended for testing purposes and demonstrating functionality of the editors. Do NOT use this integration example on your own server without proper code modifications! In case you enabled the test example, disable it before going for production.
 
 ## Step 1. Install ONLYOFFICE Docs
 
-Download and install ONLYOFFICE Docs (packaged as Document Server). 
+Download and install ONLYOFFICE Docs (packaged as Document Server).
 
 See the detailed guide to learn how to install Document Server [for Windows](https://helpcenter.onlyoffice.com/installation/docs-developer-install-windows.aspx), [for Linux](https://helpcenter.onlyoffice.com/installation/docs-developer-install-ubuntu.aspx), or [for Docker](https://helpcenter.onlyoffice.com/server/developer-edition/docker/docker-installation.aspx).
 
@@ -14,11 +14,12 @@ See the detailed guide to learn how to install Document Server [for Windows](htt
 
 Download the [.Net (C#) example](https://api.onlyoffice.com/editors/demopreview) from our site.
 
-Connect the editors to your website by specifying the path to the editors installation in the *settings.config* file:
+To connect the editors to your website, specify the path to the editors installation and the path to the storage folder in the *settings.config* file:
 ```
+<add key="storage-path" value=""/>
 <add key="files.docservice.url.site" value="https://documentserver/" />
 ```
-where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed.
+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.
 
@@ -28,13 +29,23 @@ Check that your system meets the requirements:
 * **Microsoft .NET Framework**: version 4.5 (download it from the [official Microsoft website](https://www.microsoft.com/en-US/download/details.aspx?id=30653));
 * **Internet Information Services**: version 7 or later.
 
+Configure the IIS components for the server to work correctly:
+1.	Open Windows features:
+
+	**Start** -> **Control Panel** -> **Programs** -> **Programs and Features** -> **Turn Windows features on or off**
+
+2. In the opened window, find **Internet Information Services** and choose all the necessary features. To do this, open the **World Wide Web Services** list and check the following components:
+* **Application Development Features**: .NET Extensibility 4.8, ASP.NET 4.8, ISAPI Extensions, ISAPI Filters,
+* **Common HTTP Features**: Default Document,
+* **Security**: Request Filtering.
+
 ## Step 4. 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**
 
 2. Add your website in the IIS Manager.
-	
+
 	On the **Connections** panel right-click the **Sites** node in the tree, then click **Add Website**.
 
 	![add](screenshots/add.png)
@@ -46,7 +57,7 @@ Check that your system meets the requirements:
 
 	![sitename](screenshots/sitename.png)
 4. Check for the .NET platform version specified in IIS Manager for you website. Choose **v4.0.** version.
-	
+
 	**Application Pools** -> right-click the platform name -> **Set application Pool defaults** -> **.NET CLR version**
 
 	![platform](screenshots/platform.png)
@@ -61,3 +72,12 @@ Check that your system meets the requirements:
 In case the example and Document Server are installed on different computers, make sure that your server with the example installed has access to the Document Server with the address which you specify instead of **documentserver** in the configuration files.
 
 Make sure that the Document Server in its turn has access to the server with the example installed with the address which you specify instead of **example.com** in the configuration files.
+
+## Important security info
+
+Please keep in mind the following security aspects when you are using test examples:
+
+* There is no protection of the storage from unauthorized access since there is no need for authorization.
+* There are no checks against parameter substitution in links, since the parameters are generated by the code according to the pre-arranged scripts.
+* There are no data checks in requests of saving the file after editing, since each test example is intended for requests only from ONLYOFFICE Document Server.
+* There are no prohibitions on using test examples from other sites, since they are intended to interact with ONLYOFFICE Document Server from another domain.

web/documentserver-example/csharp/TrackManager.cs

@@ -78,7 +78,9 @@ namespace OnlineEditorsExample
 
                 if (token != null && !token.Equals(""))  // invalid signature error
                 {
-                    fileData = (Dictionary<string, object>)jss.Deserialize<Dictionary<string, object>>(token)["payload"];
+                    fileData = jss.Deserialize<Dictionary<string, object>>(token);
+                    if (fileData.ContainsKey("payload"))
+                        fileData = (Dictionary<string, object>)fileData["payload"];
                 }
                 else
                 {
@@ -97,7 +99,11 @@ namespace OnlineEditorsExample
             }
             var downloadUri = (string)fileData["url"];
             var curExt = Path.GetExtension(fileName).ToLower();  // get current file extension
-            var downloadExt = Path.GetExtension(downloadUri).ToLower() ?? "";  // get the extension of the downloaded file
+
+            var downloadExt = fileData.ContainsKey("filetype")
+                ? "." + (string)fileData["filetype"]
+                : Path.GetExtension(downloadUri).ToLower() ?? ""; // TODO: Delete in version 7.0 or higher. Support for versions below 7.0
+
             var newFileName = fileName;
 
             // convert downloaded file to the file with the current extension if these extensions aren't equal
@@ -124,11 +130,7 @@ namespace OnlineEditorsExample
                 }
             }
 
-            // hack. http://ubuntuforums.org/showthread.php?t=1841740
-            if (_Default.IsMono)
-            {
-                ServicePointManager.ServerCertificateValidationCallback += (s, ce, ca, p) => true;
-            }
+            _Default.VerifySSL();
 
             var storagePath = _Default.StoragePath(newFileName, userAddress);  // get the file path
             var histDir = _Default.HistoryDir(storagePath);  // get the path to the history directory
@@ -175,7 +177,11 @@ namespace OnlineEditorsExample
             var downloadUri = (string)fileData["url"];
 
             string curExt = Path.GetExtension(fileName).ToLower();  // get current file extension
-            string downloadExt = Path.GetExtension(downloadUri).ToLower();  // get the extension of the downloaded file
+
+            var downloadExt = fileData.ContainsKey("filetype")
+                ? "." + (string)fileData["filetype"]
+                : Path.GetExtension(downloadUri).ToLower(); // TODO: Delete in version 7.0 or higher. Support for versions below 7.0
+
             Boolean newFileName = false;
 
             // convert downloaded file to the file with the current extension if these extensions aren't equal
@@ -201,11 +207,7 @@ namespace OnlineEditorsExample
                 }
             }
 
-            // hack. http://ubuntuforums.org/showthread.php?t=1841740
-            if (_Default.IsMono)
-            {
-                ServicePointManager.ServerCertificateValidationCallback += (s, ce, ca, p) => true;
-            }
+            _Default.VerifySSL();
 
             string forcesavePath = "";
             Boolean isSubmitForm = fileData["forcesavetype"].ToString().Equals("3");  // SubmitForm
@@ -250,8 +252,10 @@ namespace OnlineEditorsExample
         }
 
         // create a command request
-        public static void commandRequest(string method, string key)
+        public static void commandRequest(string method, string key, object meta = null)
         {
+            _Default.VerifySSL();
+            
             string documentCommandUrl = WebConfigurationManager.AppSettings["files.docservice.url.site"] + WebConfigurationManager.AppSettings["files.docservice.url.command"];
 
             var request = (HttpWebRequest)WebRequest.Create(documentCommandUrl);
@@ -263,13 +267,18 @@ namespace OnlineEditorsExample
                 { "key", key }
             };
 
+            if (meta != null)
+            {
+                body.Add("meta", meta);
+            }
+
             // check if a secret key to generate token exists or not
             if (JwtManager.Enabled)
             {
                 var payload = new Dictionary<string, object>
-                    {
-                        { "payload", body }
-                    };
+                {
+                    { "payload", body }
+                };
 
                 var payloadToken = JwtManager.Encode(payload);  // encode a payload object into a header token
                 var bodyToken = JwtManager.Encode(body);  // encode body into a body token
@@ -315,6 +324,7 @@ namespace OnlineEditorsExample
             if (string.IsNullOrEmpty(path)) throw new ArgumentException("path");  // file isn't specified
 
             var req = (HttpWebRequest)WebRequest.Create(url);
+            req.Timeout = 5000;
             using (var stream = req.GetResponse().GetResponseStream())  // get input stream of the file information from the url
             {
                 if (stream == null) throw new Exception("stream is null");

web/documentserver-example/csharp/Users.cs

@@ -29,7 +29,8 @@ namespace OnlineEditorsExample
             "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 create files from templates using data from the editor",
+            "Can see the information about all users"
         };
 
         static List<string> descr_user_2 = new List<string>()
@@ -38,19 +39,21 @@ namespace OnlineEditorsExample
             "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",
             "This file is marked as favorite",
-            "Can create new files from the editor"
+            "Can create new files from the editor",
+            "Can see the information about users from Group2 and users who don’t belong to any group"
         };
 
         static List<string> descr_user_3 = new List<string>()
         {
             "Belongs to Group3",
             "Can review changes made by Group2 users",
-            "Can view comments left by Group2 and Group3 users. Can edit comments left 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 create new files from the editor",
+            "Can see the information about Group2 users"
         };
 
         static List<string> descr_user_0 = new List<string>()
@@ -61,7 +64,11 @@ namespace OnlineEditorsExample
             "Can perform all actions with comments",
             "The file favorite state is undefined",
             "Can't mention others in comments",
-            "Can't create new files from the editor"
+            "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",
+            "View file without collaboration",
         };
 
         private static List<User> users = new List<User>() {
@@ -69,10 +76,11 @@ namespace OnlineEditorsExample
                     "uid-1",
                     "John Smith",
                     "smith@example.com",
-                    null,
+                    "",
                     null,
                     new Dictionary<string, object>(),
                     null,
+                    null,
                     new List<string>(),
                     descr_user_1,
                     true
@@ -89,6 +97,7 @@ namespace OnlineEditorsExample
                         { "edit", new List<string>() { "group-2", "" } },
                         { "remove", new List<string>() { "group-2" } }
                     },
+                    new List<string>() { "group-2", "" },
                     true,
                     new List<string>(),
                     descr_user_2,
@@ -106,6 +115,7 @@ namespace OnlineEditorsExample
                         { "edit", new List<string>() { "group-2" } },
                         { "remove", new List<string>() { } }
                     },
+                    new List<string>() { "group-2" },
                     false,
                     new List<string>() { "copy", "download", "print" },
                     descr_user_3,
@@ -115,9 +125,10 @@ namespace OnlineEditorsExample
                     "uid-0",
                     null,
                     null,
-                    null,
+                    "",
                     null,
                     new Dictionary<string, object>(),
+                    new List<string>(),
                     null,
                     new List<string>(),
                     descr_user_0,
@@ -173,8 +184,9 @@ namespace OnlineEditorsExample
         public List<string> deniedPermissions;
         public List<string> descriptions;
         public bool templates;
+        public List<string> userInfoGroups;
 
-        public User(string id, string name, string email, string group, List<string> reviewGroups, Dictionary<string, object> commentGroups, bool? favorite, List<string> deniedPermissions, List<string> descriptions, bool templates)
+        public User(string id, string name, string email, string group, List<string> reviewGroups, Dictionary<string, object> commentGroups, List<string> userInfoGroups, bool? favorite, List<string> deniedPermissions, List<string> descriptions, bool templates)
         {
             this.id = id;
             this.name = name;
@@ -186,6 +198,7 @@ namespace OnlineEditorsExample
             this.deniedPermissions = deniedPermissions;
             this.descriptions = descriptions;
             this.templates = templates;
+            this.userInfoGroups = userInfoGroups;
         }
     }
 }

web/documentserver-example/csharp/Web.config

@@ -1,28 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <appSettings configSource="settings.config"/>
+  <appSettings configSource="settings.config" />
   <system.web>
-    <httpRuntime maxRequestLength="51200"/>
-    <compilation debug="true" targetFramework="4.5"/>
-    <authentication mode="Windows"/>
-    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
+    <httpRuntime maxRequestLength="51200" />
+    <compilation debug="true" targetFramework="4.5" />
+    <authentication mode="Windows" />
+    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID" />
   </system.web>
   <system.webServer>
-	<httpProtocol>
-		<customHeaders>
-			<add name="Access-Control-Allow-Origin" value="*" />
-		</customHeaders>
-	</httpProtocol>
+    <httpProtocol>
+      <customHeaders>
+        <add name="Access-Control-Allow-Origin" value="*" />
+      </customHeaders>
+    </httpProtocol>
     <security>
       <requestFiltering>
-        <requestLimits maxAllowedContentLength="52428800"/>
+        <requestLimits maxAllowedContentLength="52428800" />
         <denyUrlSequences>
-          <add sequence=".."/>
+          <add sequence=".." />
         </denyUrlSequences>
         <hiddenSegments>
-          <remove segment="App_Data"/>
+          <remove segment="App_Data" />
         </hiddenSegments>
       </requestFiltering>
     </security>
   </system.webServer>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>

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

@@ -44,6 +44,9 @@ namespace OnlineEditorsExample
                 case "download":
                     Download(context);
                     break;
+                case "downloadhistory":
+                    DownloadHistory(context);
+                    break;
                 case "convert":
                     Convert(context);
                     break;
@@ -65,6 +68,9 @@ namespace OnlineEditorsExample
                 case "saveas":
                     SaveAs(context);
                     break;
+                case "rename":
+                    Rename(context);
+                    break;
             }
         }
 
@@ -135,7 +141,7 @@ namespace OnlineEditorsExample
             var userAddress = context.Request["userAddress"];
             var fileName = Path.GetFileName(context.Request["fileName"]);
             var status = (TrackerStatus) (int) fileData["status"];  // get status from the request body
-            var saved = 1;  // editing
+            var saved = 0;
             switch (status)
             {
                 case TrackerStatus.Editing:
@@ -191,7 +197,7 @@ namespace OnlineEditorsExample
                     context.Response.Write("{\"error\":" + saved + "}");
                     return;
             }
-            context.Response.Write("{\"error\":0}");
+            context.Response.Write("{\"error\":" + saved + "}");
         }
 
         // remove a file
@@ -201,7 +207,7 @@ namespace OnlineEditorsExample
             try
             {
                 var fileName = Path.GetFileName(context.Request["fileName"]);
-                var path = _Default.StoragePath(fileName, HttpUtility.UrlEncode(HttpContext.Current.Request.UserHostAddress));
+                var path = _Default.StoragePath(fileName, HttpUtility.UrlEncode(_Default.CurUserHostAddress(HttpContext.Current.Request.UserHostAddress)));
                 var histDir = _Default.HistoryDir(path);
 
                 if (File.Exists(path)) File.Delete(path);  // delete file
@@ -271,10 +277,11 @@ namespace OnlineEditorsExample
         {
             try
             {
-                var fileName = Path.GetFileName(context.Request["fileName"]);
+                var fileName = Path.IsPathRooted(WebConfigurationManager.AppSettings["storage-path"]) ? context.Request["fileName"] : Path.GetFileName(context.Request["fileName"]);
                 var userAddress = Path.GetFileName(context.Request["userAddress"]);
+                var isEmbedded = context.Request["dmode"];
 
-                if (JwtManager.Enabled)
+                if (JwtManager.Enabled && isEmbedded == null)
                 {
                     string JWTheader = WebConfigurationManager.AppSettings["files.docservice.header"].Equals("") ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
 
@@ -321,5 +328,86 @@ namespace OnlineEditorsExample
         {
             get { return false; }
         }
+
+        private static void DownloadHistory(HttpContext context)
+        {
+            try
+            {
+                var fileName = Path.GetFileName(context.Request["fileName"]);
+                var userAddress = Path.GetFileName(context.Request["userAddress"]);
+                var version = Path.GetFileName(context.Request["ver"]);
+                var file = Path.GetFileName(context.Request["file"]);
+
+                if (JwtManager.Enabled)
+                {
+                    string JWTheader = WebConfigurationManager.AppSettings["files.docservice.header"].Equals("") ? "Authorization" : WebConfigurationManager.AppSettings["files.docservice.header"];
+
+                    if (context.Request.Headers.AllKeys.Contains(JWTheader, StringComparer.InvariantCultureIgnoreCase))
+                    {
+                        var headerToken = context.Request.Headers.Get(JWTheader).Substring("Bearer ".Length);
+                        string token = JwtManager.Decode(headerToken);
+
+                        if (token == null || token.Equals(""))
+                        {
+                            context.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                            context.Response.Write("JWT validation failed");
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        context.Response.StatusCode = (int)HttpStatusCode.Forbidden;
+                        context.Response.Write("JWT validation failed");
+                        return;
+                    }
+                }
+
+                var filePath = _Default.HistoryPath(fileName, userAddress, version, file);  // get the path to the force saved document version
+
+                download(filePath, context);
+            }
+            catch (Exception)
+            {
+                context.Response.Write("{ \"error\": \"File not found!\"}");
+            }
+        }
+
+        // rename a file
+        private static void Rename(HttpContext context)
+        {
+           string fileData;
+            try
+            {
+                using (var receiveStream = context.Request.InputStream)
+                using (var readStream = new StreamReader(receiveStream))
+                {
+                    fileData = readStream.ReadToEnd();
+                    if (string.IsNullOrEmpty(fileData)) return;
+                }
+            }
+            catch (Exception e)
+            {
+                throw new HttpException((int)HttpStatusCode.BadRequest, e.Message);
+            }
+
+            var jss = new JavaScriptSerializer();
+            var body = jss.Deserialize<Dictionary<string, object>>(fileData);
+            var newFileName = (string) body["newfilename"];
+            var docKey = (string) body["dockey"];
+
+            var origExt = '.' + (string) body["ext"];
+            var curExt = Path.GetExtension(newFileName).ToLower();
+
+            if (string.Compare(origExt, curExt, true) != 0)
+            {
+                newFileName += origExt;
+            }
+
+            var meta =  new Dictionary<string, object>() {
+                { "title", newFileName }
+            };
+            TrackManager.commandRequest("meta", docKey, meta);
+            context.Response.Write("{ \"result\": \"OK\"}");
+        }
     }
 }

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

@@ -19,3 +19,11 @@ License File:   jQuery.iframe-transport.license
 jQuery.UI     - jQuery UI is an open source library of interface components — interactions, full-featured widgets, and animation effects — based on the stellar jQuery javascript library . Each component is built according to jQuery's event-driven architecture (find something, manipulate it) and is themeable, making it easy for developers of any skill level to integrate and extend into their own code. (https://jquery.org/license/)
 License:        MIT
 License File:   jQuery.UI.license
+
+JWT           - JWT (JSON Web Token) Implementation for .NET (Public Domain) (https://github.com/jwt-dotnet/jwt/)
+License:        MIT
+License File:   JWT.license
+
+Newtonsoft.Json - Json.NET is a popular high-performance JSON framework for .NET (https://github.com/JamesNK/Newtonsoft.Json)
+License:        MIT
+License File:   Newtonsoft.Json.license

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

@@ -0,0 +1,21 @@
+# Public Domain
+
+Written by John Sheehan (http://john-sheehan.com)
+
+This work is public domain.
+
+The person who associated a work with this deed has dedicated the work to the public domain by waiving all of his or her rights to the work worldwide under copyright law, including all related and neighboring rights, to the extent allowed by law.
+
+For more information, please visit: http://creativecommons.org/publicdomain/zero/1.0/
+
+# MIT
+
+Copyright (c) 2019 Jwt.Net Maintainers and Contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please visit: https://opensource.org/licenses/MIT

web/documentserver-example/csharp/licenses/Newtonsoft.Json.license

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2007 James Newton-King
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

web/documentserver-example/csharp/packages.config

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net45" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
+  <package id="JWT" version="9.0.3" targetFramework="net48" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net48" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net48" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
 </packages>

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

@@ -16,11 +16,24 @@
  *
  */
 
+var directUrl;
+
 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',
@@ -219,7 +232,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = "doceditor.aspx?fileID=" + fileId;
+        var url = "doceditor.aspx?fileID=" + fileId + "&directUrl=" + directUrl;
         window.open(url, "_blank");
         jq('#hiddenFileName').val("");
         jq.unblockUI();
@@ -227,7 +240,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginView:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = "doceditor.aspx?editorsMode=view&fileID=" + fileId;
+        var url = "doceditor.aspx?editorsMode=view&fileID=" + fileId + "&directUrl=" + directUrl;
         window.open(url, "_blank");
         jq('#hiddenFileName').val("");
         jq.unblockUI();
@@ -235,7 +248,7 @@ if (typeof jQuery != "undefined") {
 
     jq(document).on("click", "#beginEmbedded:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
-        var url = "doceditor.aspx?editorsType=embedded&editorsMode=embedded&fileID=" + fileId;
+        var url = "doceditor.aspx?editorsType=embedded&editorsMode=embedded&fileID=" + fileId + "&directUrl=" + directUrl;
 
         jq("#mainProgress").addClass("embedded");
         jq("#beginEmbedded").addClass("disable");
@@ -288,6 +301,17 @@ if (typeof jQuery != "undefined") {
         }
     };
 
+    function getUrlVars() {
+        var vars = [], hash;
+        var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+        for (var i = 0; i < hashes.length; i++) {
+            hash = hashes[i].split('=');
+            vars.push(hash[0]);
+            vars[hash[0]] = hash[1];
+        }
+        return vars;
+    };
+
     var fileList = jq("tr.tableRow");
 
     var mouseIsOverTooltip = false;
@@ -303,7 +327,7 @@ if (typeof jQuery != "undefined") {
                 });
             }
     } else {
-        jq(".info").mouseover(function (event) {
+        jq("#info").mouseover(function (event) {
             if (fileList.length > 0) {
                 if (hideTooltipTimeout != null) {
                     clearTimeout(hideTooltipTimeout);

web/documentserver-example/csharp/settings.config

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

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

@@ -1,17 +1,18 @@
 ## Overview
 
 This example will help you integrate ONLYOFFICE Docs into your web application written in Java 
-with Spring Boot. 
+with Spring Boot.
 
 Spring Boot has a lot of functionality, but its most significant features are: dependency management, 
 auto-configuration, and built-in servlet containers.
 
-It is aimed at testing the editors. Please, do not use it for production without proper modifications.
+**Please note**: It is intended for testing purposes and demonstrating functionality of the editors. Do NOT use this integration example on your own server without proper code modifications! In case you enabled the test example, disable it before going for production.
+
 ## For Windows
 
 ### Step 1. Install ONLYOFFICE Docs
 
-Download and install ONLYOFFICE Docs (packaged as Document Server). 
+Download and install ONLYOFFICE Docs (packaged as Document Server).
 
 See the detailed guide to learn how to install Document Server [for Windows](https://helpcenter.onlyoffice.com/installation/docs-developer-install-windows.aspx). 
 
@@ -19,16 +20,15 @@ See the detailed guide to learn how to install Document Server [for Windows](htt
 
 Download the [Java-Spring example](https://api.onlyoffice.com/editors/demopreview) from our site.
 
-To connect the editors to your website, specify the path to the editors installation, server address and port in the *\src\main\resources\application.properties* file:
+To connect the editors to your website, specify the path to the editors installation, server port and the path to the storage folder in the *\src\main\resources\application.properties* file:
 
 ```
- server.address=address
+ files.storage=
  server.port=port
  files.docservice.url.site=https://documentserver/
 ```
 
-where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed.
-**address** is the address of the server or comment this line to use localhost, **port** is the any available port.   
+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.
 
@@ -65,11 +65,11 @@ To run the Java example code, install the Java version 11 appropriate for your O
 	```
 	echo %JAVA_HOME%
 	```
-	
+
 2. Set the **MAVEN_HOME** environment variable:
-    
+
     Unzip the downloaded archive with the maven to any directory, it will be something like this:
-    	
+
     ```
     C:\apache-maven-3.8.1
    ```
@@ -87,7 +87,7 @@ To run the Java example code, install the Java version 11 appropriate for your O
 
 	Add C:\apache-maven-3.8.1\bin to the PATH system variable:
 	In system variables, find PATH, clicks on the Edit... button. In “Edit environment variable” dialog, clicks on the New button and add this C:\apache-maven-3.8.1\bin
-	
+
 	Check if the variable created successfully by **echo** command in the **Command Prompt**:
 
 	```
@@ -112,8 +112,6 @@ To run the Java example code, install the Java version 11 appropriate for your O
      ```
      http://server.address:server.port/
      ```
-    
-
 
 ### Step 6. Check accessibility
 
@@ -151,8 +149,8 @@ See the detailed guide to learn how to install Document Server [for Linux](https
     ```
     git clone https://github.com/ONLYOFFICE/document-server-integration.git
     ```
-    
-   
+
+
 3. Change the current directory for the project directory:
 
     a) from archive
@@ -173,13 +171,13 @@ See the detailed guide to learn how to install Document Server [for Linux](https
 	Edit the following lines:
 
     ```
-    server.address=address
+    files.storage=
     server.port=port
     files.docservice.url.site=https://documentserver/
     ```
 
-	Where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed.
-	**address** is the address of the server or comment this line to use localhost, **port** is the any available port.   
+	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.
+   
 
 5. Install **Maven**:
 
@@ -192,19 +190,18 @@ See the detailed guide to learn how to install Document Server [for Linux](https
     ```
     mvn package
     ```
- 
+
  7. Start Java-Spring example:
      ```
      ./mvnw spring-boot:run
      ```
  8. Open your browser using **server.address** and **server.port**:
- 
+
      ```
      http://server.address:server.port/
      ```
   
 
-
 ### Step 3. Check accessibility
 
 In case the example and Document Server are installed on different computers, make sure that your server with the example installed has access to the Document Server with the address which you specify instead of **documentserver** in the configuration files. 
@@ -222,13 +219,12 @@ Make sure that the Document Server has access to the server with the example ins
 2. Edit the following lines:
 
    ```
-   server.address=address
+   files.storage=
    server.port=port
    files.docservice.url.site=https://documentserver/
    ```
-    
-    Where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed.
-    **address** is the address of the server or comment this line to use localhost, **port** is the any available port.   
+
+    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.
 
 3. Run the next command in the java example directory:
 
@@ -236,7 +232,16 @@ Make sure that the Document Server has access to the server with the example ins
 	docker-compose up
 	```
 4. Open your browser using **server.address** and **server.port**:
-    
+
       ```
       http://server.address:server.port/
       ```
+
+## Important security info
+
+Please keep in mind the following security aspects when you are using test examples:
+
+* There is no protection of the storage from unauthorized access since there is no need for authorization.
+* There are no checks against parameter substitution in links, since the parameters are generated by the code according to the pre-arranged scripts.
+* There are no data checks in requests of saving the file after editing, since each test example is intended for requests only from ONLYOFFICE Document Server.
+* There are no prohibitions on using test examples from other sites, since they are intended to interact with ONLYOFFICE Document Server from another domain.

web/documentserver-example/java-spring/docker-compose.yaml

@@ -7,7 +7,9 @@ services:
         image: maven:3.8.1
         working_dir: /java-spring
         volumes:
-        - .:/java-spring
+            - .:/java-spring
+        ports: 
+            - 4000:4000
         command: mvn clean spring-boot:run
             
             

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

@@ -48,7 +48,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.8.5</version>
+			<version>2.8.9</version>
 		</dependency>
 		<dependency>
 			<groupId>com.inversoft</groupId>
@@ -61,10 +61,15 @@
 			<version>1.18.20</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.13.4</version>
+		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.12.2</version>
+			<version>2.13.4.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.modelmapper</groupId>

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

@@ -40,7 +40,11 @@ public class ExampleData {
                 "Can perform all actions with comments",
                 "The file favorite state is undefined",
                 "Can't mention others in comments",
-                "Can't create new files from the editor"
+                "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",
+                "View file without collaboration"
         );
         List<String> description_user_1 = List.of(  // the description for user 1
                 "File author by default",
@@ -48,14 +52,18 @@ public class ExampleData {
                 "He can review all the changes",
                 "He can do everything with the comments",
                 "The file favorite state is undefined",
-                "Can create a file from a template with data from the editor"
+                "Can create a file from a template with data from the editor",
+                "Can see the information about all users",
+                "Can view chat"
         );
         List<String> description_user_2 = List.of(  // the description for user 2
                 "He belongs to Group2",
                 "He can review only his own changes or the changes made by the users who don’t belong to any of the groups",
                 "He can view every comment, edit his comments and the comments left by the users who don't belong to any of the groups and remove only his comments",
                 "This file is favorite",
-                "Can create a file from an editor"
+                "Can create a file from an editor",
+                "Can see the information about users from Group2 and users who don’t belong to any group",
+                "Can view chat"
         );
         List<String> description_user_3 = List.of(  // the description for user 3
                 "He belongs to Group3",
@@ -65,21 +73,28 @@ public class ExampleData {
                 "He can’t copy data from the file into the clipboard",
                 "He can’t download the file",
                 "He can’t print the file",
-                "Can create a file from an editor"
+                "Can create a file from an editor",
+                "Can see the information about Group2 users",
+                "Can view chat"
         );
         userService.createUser("John Smith", "smith@example.com",  // create user 1 with the specified parameters
-                description_user_1, null, List.of(FilterState.NULL.toString()),
+                description_user_1, "", List.of(FilterState.NULL.toString()),
                 List.of(FilterState.NULL.toString()),
                 List.of(FilterState.NULL.toString()),
-                List.of(FilterState.NULL.toString()), null);
+                List.of(FilterState.NULL.toString()),
+                List.of(FilterState.NULL.toString()),
+                null, true);
         userService.createUser("Mark Pottato", "pottato@example.com",  // create user 2 with the specified parameters
                 description_user_2, "group-2", List.of("","group-2"), List.of(FilterState.NULL.toString()),
-                List.of("group-2", ""), List.of("group-2"), true);
+                List.of("group-2", ""), List.of("group-2"), List.of("group-2", ""), true,
+                true);
         userService.createUser("Hamish Mitchell", "mitchell@example.com",  // create user 3 with the specified parameters
                 description_user_3, "group-3", List.of("group-2"), List.of("group-2", "group-3"),
-                List.of("group-2"), new ArrayList<>(), false);
+                List.of("group-2"), new ArrayList<>(), List.of("group-2"), false,
+                true);
         userService.createUser("Anonymous",null,  // create user 0 with the specified parameters
-                description_user_0,null, List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()),
-                List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()), null);
+                description_user_0,"", List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()),
+                List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()), new ArrayList<>(),null,
+                false);
     }
 }

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

@@ -30,15 +30,23 @@ import org.springframework.context.annotation.Configuration;
 
 import javax.annotation.PostConstruct;
 
+import com.onlyoffice.integration.documentserver.util.SSLUtils;
+
 @Configuration
 public class IntegrationConfiguration {
 
     @Value("${files.storage}")
     private String storageAddress;
 
+    @Value("${files.docservice.verify-peer-off}")
+    private String verifyPerrOff;
+
     @Autowired
     private FileStoragePathBuilder storagePathBuilder;
 
+    @Autowired
+    private SSLUtils ssl;
+
     @Bean
     public ModelMapper mapper(){  // create the model mapper
         ModelMapper mapper = new ModelMapper();
@@ -58,6 +66,17 @@ public class IntegrationConfiguration {
     @PostConstruct
     public void init(){  // initialize the storage path builder
         storagePathBuilder.configure(storageAddress.isBlank() ? null : storageAddress);
+        if(!verifyPerrOff.isEmpty()) {
+            try{
+                if(verifyPerrOff.equals("true")) {
+                    ssl.turnOffSslChecking(); //the certificate will be ignored
+                } else {
+                    ssl.turnOnSslChecking(); //the certificate will be verified
+                }
+            } catch(Exception e) {
+                e.printStackTrace();
+            }
+        }
     }
 
     @Bean

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

@@ -26,7 +26,6 @@ import com.onlyoffice.integration.documentserver.models.enums.Action;
 import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder;
 import com.onlyoffice.integration.entities.User;
 import com.onlyoffice.integration.dto.Mentions;
-import com.onlyoffice.integration.documentserver.models.enums.Language;
 import com.onlyoffice.integration.documentserver.models.enums.Type;
 import com.onlyoffice.integration.documentserver.models.filemodel.FileModel;
 import com.onlyoffice.integration.services.UserServices;
@@ -53,6 +52,9 @@ public class EditorController {
     @Value("${files.docservice.url.api}")
     private String docserviceApiUrl;
 
+    @Value("${files.docservice.languages}")
+    private String langs;
+
     @Autowired
     private FileStoragePathBuilder storagePathBuilder;
 
@@ -77,16 +79,25 @@ public class EditorController {
                         @RequestParam(value = "action", required = false) String actionParam,
                         @RequestParam(value = "type", required = false) String typeParam,
                         @RequestParam(value = "actionLink", required = false) String actionLink,
+                        @RequestParam(value = "directUrl", required = false, defaultValue = "false") Boolean directUrl,
                         @CookieValue(value = "uid") String uid,
                         @CookieValue(value = "ulang") String lang,
                         Model model) throws JsonProcessingException {
         Action action = Action.edit;
         Type type = Type.desktop;
-        Language language = Language.en;
+        Locale locale = new Locale("en");
 
         if(actionParam != null) action = Action.valueOf(actionParam);
         if(typeParam != null) type = Type.valueOf(typeParam);
-        if(lang != null) language = Language.valueOf(lang);
+
+        List<String> langsAndKeys = Arrays.asList(langs.split("\\|"));
+        for (String langAndKey : langsAndKeys) {
+            String[] couple = langAndKey.split(":");
+            if (couple[0].equals(lang)) {
+                String[] langAndCountry = couple[0].split("-");
+                locale = new Locale(langAndCountry[0], langAndCountry.length > 1 ? langAndCountry[1] : "");
+            }
+        }
 
         Optional<User> optionalUser = userService.findUserById(Integer.parseInt(uid));
 
@@ -101,10 +112,11 @@ public class EditorController {
                         .builder()
                         .fileName(fileName)
                         .type(type)
-                        .lang(language)
+                        .lang(locale.toLanguageTag())
                         .action(action)
                         .user(user)
                         .actionData(actionLink)
+                        .isEnableDirectUrl(directUrl)
                         .build()
         );
 
@@ -112,9 +124,9 @@ public class EditorController {
         model.addAttribute("model", fileModel);  // add file model with the default parameters to the original model
         model.addAttribute("fileHistory", historyManager.getHistory(fileModel.getDocument()));  // get file history and add it to the model
         model.addAttribute("docserviceApiUrl",docserviceSite + docserviceApiUrl);  // create the document service api URL and add it to the model
-        model.addAttribute("dataInsertImage",  getInsertImage());  // get an image and add it to the model
-        model.addAttribute("dataCompareFile",  getCompareFile());  // get a document for comparison and add it to the model
-        model.addAttribute("dataMailMergeRecipients", getMailMerge());  // get recipients data for mail merging and add it to the model
+        model.addAttribute("dataInsertImage",  getInsertImage(directUrl));  // get an image and add it to the model
+        model.addAttribute("dataCompareFile",  getCompareFile(directUrl));  // get a document for comparison and add it to the model
+        model.addAttribute("dataMailMergeRecipients", getMailMerge(directUrl));  // get recipients data for mail merging and add it to the model
         model.addAttribute("usersForMentions", getUserMentions(uid));  // get user data for mentions and add it to the model
         return "editor.html";
     }
@@ -134,10 +146,13 @@ public class EditorController {
     }
 
     @SneakyThrows
-    private String getInsertImage() {  // get an image that will be inserted into the document
+    private String getInsertImage(Boolean directUrl) {  // get an image that will be inserted into the document
         Map<String, Object> dataInsertImage = new HashMap<>();
         dataInsertImage.put("fileType", "png");
         dataInsertImage.put("url", storagePathBuilder.getServerUrl(true) + "/css/img/logo.png");
+        if (directUrl) {
+            dataInsertImage.put("directUrl", storagePathBuilder.getServerUrl(false) + "/css/img/logo.png");
+        }
 
         // check if the document token is enabled
         if(jwtManager.tokenEnabled()){
@@ -148,10 +163,13 @@ public class EditorController {
     }
 
     @SneakyThrows
-    private String getCompareFile(){  // get a document that will be compared with the current document
+    private String getCompareFile(Boolean directUrl) {  // get a document that will be compared with the current document
         Map<String, Object> dataCompareFile = new HashMap<>();
         dataCompareFile.put("fileType", "docx");
         dataCompareFile.put("url", storagePathBuilder.getServerUrl(true) + "/assets?name=sample.docx");
+        if (directUrl) {
+            dataCompareFile.put("directUrl", storagePathBuilder.getServerUrl(false) + "/assets?name=sample.docx");
+        }
 
         // check if the document token is enabled
         if(jwtManager.tokenEnabled()){
@@ -162,10 +180,13 @@ public class EditorController {
     }
 
     @SneakyThrows
-    private String getMailMerge(){
+    private String getMailMerge(Boolean directUrl) {
         Map<String, Object> dataMailMergeRecipients = new HashMap<>();  // get recipients data for mail merging
         dataMailMergeRecipients.put("fileType", "csv");
         dataMailMergeRecipients.put("url", storagePathBuilder.getServerUrl(true) + "/csv");
+        if (directUrl) {
+            dataMailMergeRecipients.put("directUrl", storagePathBuilder.getServerUrl(false) + "/csv");
+        }
 
         // check if the document token is enabled
         if(jwtManager.tokenEnabled()){

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

@@ -31,6 +31,7 @@ import com.onlyoffice.integration.services.UserServices;
 import com.onlyoffice.integration.documentserver.util.file.FileUtility;
 import com.onlyoffice.integration.documentserver.util.service.ServiceConverter;
 import com.onlyoffice.integration.documentserver.managers.document.DocumentManager;
+import com.onlyoffice.integration.documentserver.managers.callback.CallbackManager;
 import org.json.simple.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -61,6 +62,12 @@ public class FileController {
     @Value("${filesize-max}")
     private String filesizeMax;
 
+    @Value("${files.docservice.url.site}")
+    private String docserviceUrlSite;
+
+    @Value("${files.docservice.url.command}")
+    private String docserviceUrlCommand;
+
     @Autowired
     private FileUtility fileUtility;
     @Autowired
@@ -79,6 +86,8 @@ public class FileController {
     private ObjectMapper objectMapper;
     @Autowired
     private ServiceConverter serviceConverter;
+    @Autowired
+    private CallbackManager callbackManager;
 
     // create user metadata
     private String createUserMetadata(String uid, String fullFileName) {
@@ -104,6 +113,18 @@ public class FileController {
                 .body(resource);
     }
 
+    // download data from the specified history file
+    private ResponseEntity<Resource> downloadFileHistory(String fileName, String version, String file){
+        Resource resource = storageMutator.loadFileAsResourceHistory(fileName,version,file);  // load the specified file as a resource
+        String contentType = "application/octet-stream";
+
+        // create a response with the content type, header and body with the file data
+        return ResponseEntity.ok()
+                .contentType(MediaType.parseMediaType(contentType))
+                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + resource.getFilename() + "\"")
+                .body(resource);
+    }
+
     @PostMapping("/upload")
     @ResponseBody
     public String upload(@RequestParam("file") MultipartFile file,  // upload a file
@@ -143,7 +164,7 @@ public class FileController {
     public String convert(@RequestBody Converter body,  // convert a file
                           @CookieValue("uid") String uid, @CookieValue("ulang") String lang){
         String fileName = body.getFileName();  // get file name
-        String fileUri = documentManager.getDownloadUrl(fileName);  // get URL for downloading a file with the specified name
+        String fileUri = documentManager.getDownloadUrl(fileName, true);  // get URL for downloading a file with the specified name
         String filePass = body.getFilePass() != null ? body.getFilePass() : null;  // get file password if it exists
         String fileExt = fileUtility.getFileExtension(fileName);  // get file extension
         DocumentType type = fileUtility.getDocumentType(fileName);  // get document type (word, cell or slide)
@@ -202,6 +223,29 @@ public class FileController {
         }
     }
 
+    @GetMapping("/downloadhistory")
+    public ResponseEntity<Resource> downloadHistory(HttpServletRequest request,// download a file
+                                             @RequestParam("fileName") String fileName,
+                                             @RequestParam("ver") String version,
+                                             @RequestParam("file") String file){ // history file
+        try{
+            // check if a token is enabled or not
+            if(jwtManager.tokenEnabled()){
+                String header = request.getHeader(documentJwtHeader == null  // get the document JWT header
+                        || documentJwtHeader.isEmpty() ? "Authorization" : documentJwtHeader);
+                if(header != null && !header.isEmpty()){
+                    String token = header.replace("Bearer ", "");  // token is the header without the Bearer prefix
+                    jwtManager.readToken(token);  // read the token
+                }else {
+                    return null;
+                }
+            }
+            return downloadFileHistory(fileName,version,file);  // download data from the specified file
+        } catch(Exception e){
+            return null;
+        }
+    }
+
     @GetMapping(path = "${url.download}")
     public ResponseEntity<Resource> download(HttpServletRequest request,  // download a file
                                              @RequestParam("fileName") String fileName){
@@ -321,4 +365,32 @@ public class FileController {
             return "{ \"error\" : 1, \"message\" : \"" + e.getMessage() + "\"}";
         }
     }
+
+    @PostMapping("/rename")
+    @ResponseBody
+    public String rename(@RequestBody JSONObject body) {
+        String newfilename = (String) body.get("newfilename");
+        String dockey = (String) body.get("dockey");
+        String origExt = "." + (String) body.get("ext");
+        String curExt = newfilename;
+
+        if(newfilename.indexOf(".") != -1) {
+            curExt = (String) fileUtility.getFileExtension(newfilename);
+        }
+
+        if(origExt.compareTo(curExt) != 0) {
+            newfilename += origExt;
+        }
+
+        HashMap<String, String> meta = new HashMap<>();
+        meta.put("title", newfilename);
+
+        try {
+            callbackManager.commandRequest("meta", dockey, meta);
+            return "result ok";
+        } catch (Exception e) {
+            e.printStackTrace();
+            return e.getMessage();
+        }
+    }
 }

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

@@ -64,13 +64,25 @@ public class IndexController {
     @Value("${url.editor}")
     private String urlEditor;
 
+    @Value("${files.docservice.languages}")
+    private String langs;
+
     @GetMapping("${url.index}")
-    public String index(Model model){
+    public String index(@RequestParam(value = "directUrl", required = false) Boolean directUrl,
+                        Model model){
         java.io.File[] files = storageMutator.getStoredFiles();  // get all the stored files from the storage
         List<String> docTypes = new ArrayList<>();
         List<Boolean> filesEditable = new ArrayList<>();
         List<String> versions = new ArrayList<>();
         List<Boolean> isFillFormDoc = new ArrayList<>();
+        List<String> langsAndKeys = Arrays.asList(langs.split("\\|"));
+
+        Map<String, String> languages = new LinkedHashMap<>();
+
+        langsAndKeys.forEach((str) -> {
+            String[] couple = str.split(":");
+            languages.put(couple[0], couple[1]);
+        });
 
         List<User> users = userService.findAll();  // get a list of all the users
 
@@ -95,6 +107,8 @@ public class IndexController {
         model.addAttribute("datadocs", docserviceSite+docservicePreloader);
         model.addAttribute("tooltip", tooltip);
         model.addAttribute("users", users);
+        model.addAttribute("languages", languages);
+        model.addAttribute("directUrl", directUrl);
 
         return "index.html";
     }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/callbacks/implementations/EditCallback.java

@@ -39,7 +39,7 @@ public class EditCallback implements Callback {
             if (!body.getUsers().contains(user)) {  // if this user is not specified in the body
                 String key = body.getKey();  // get document key
                 try {
-                    callbackManager.commandRequest("forcesave", key);  // create a command request to forcibly save the document being edited without closing it
+                    callbackManager.commandRequest("forcesave", key, null);  // create a command request to forcibly save the document being edited without closing it
                 } catch (Exception e) {
                     e.printStackTrace();
                     result = 1;

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

@@ -19,9 +19,10 @@
 package com.onlyoffice.integration.documentserver.managers.callback;
 
 import com.onlyoffice.integration.dto.Track;
+import java.util.HashMap;
 
 public interface CallbackManager {  // specify the callback manager functions
     void processSave(Track body, String fileName);  // file saving process
-    void commandRequest(String method, String key);  // create a command request
+    void commandRequest(String method, String key, HashMap meta);  // create a command request
     void processForceSave(Track body, String fileName);  // file force saving process
 }

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

@@ -76,8 +76,15 @@ public class DefaultCallbackManager implements CallbackManager {
 
         URL uri = new URL(url);
         java.net.HttpURLConnection connection = (java.net.HttpURLConnection) uri.openConnection();
+        connection.setConnectTimeout(5000);
         InputStream stream = connection.getInputStream();  // get input stream of the file information from the URL
 
+        int statusCode = connection.getResponseCode();
+        if (statusCode != 200) {  // checking status code
+            connection.disconnect();
+            throw new RuntimeException("Document editing service returned status: " + statusCode);
+        }
+
         if (stream == null) {
             connection.disconnect();
             throw new RuntimeException("Input stream is null");
@@ -94,7 +101,10 @@ public class DefaultCallbackManager implements CallbackManager {
         String newFileName = fileName;
 
         String curExt = fileUtility.getFileExtension(fileName);  // get current file extension
-        String downloadExt = fileUtility.getFileExtension(downloadUri);  // get an extension of the downloaded file
+        String downloadExt = "." + body.getFiletype(); // get an extension of the downloaded file
+
+        // Todo [Delete in version 7.0 or higher]
+        if (downloadExt != "." + null) downloadExt = fileUtility.getFileExtension(downloadUri); // Support for versions below 7.0
 
         //TODO: Refactoring
         if (!curExt.equals(downloadExt)) {  // convert downloaded file to the file with the current extension if these extensions aren't equal
@@ -150,16 +160,20 @@ public class DefaultCallbackManager implements CallbackManager {
 
     //TODO: Replace (String method) with (Enum method)
     @SneakyThrows
-    public void commandRequest(String method, String key) {  // create a command request
+    public void commandRequest(String method, String key, HashMap meta) {  // create a command request
         String DocumentCommandUrl = docserviceUrlSite + docserviceUrlCommand;
 
         URL url = new URL(DocumentCommandUrl);
         java.net.HttpURLConnection connection = (java.net.HttpURLConnection) url.openConnection();
 
-        HashMap<String, Object> params = new HashMap<>();
+        HashMap<String, Object> params = new HashMap<String, Object>();
         params.put("c", method);
         params.put("key", key);
 
+        if (meta != null) {
+            params.put("meta", meta);
+        }
+
         String headerToken;
         if (jwtManager.tokenEnabled())  // check if a secret key to generate token exists or not
         {
@@ -212,7 +226,11 @@ public class DefaultCallbackManager implements CallbackManager {
         String downloadUri = body.getUrl();
 
         String curExt = fileUtility.getFileExtension(fileName);  // get current file extension
-        String downloadExt = fileUtility.getFileExtension(downloadUri);  // get an extension of the downloaded file
+        String downloadExt = "."+body.getFiletype();  // get an extension of the downloaded file
+
+        // Todo [Delete in version 7.0 or higher]
+        if (downloadExt != "."+null) downloadExt = fileUtility.getFileExtension(downloadUri);    // Support for versions below 7.0
+        
         Boolean newFileName = false;
 
         // convert downloaded file to the file with the current extension if these extensions aren't equal

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

@@ -45,6 +45,8 @@ public class DefaultDocumentManager implements DocumentManager {
 
     @Value("${files.storage.folder}")
     private String storageFolder;
+    @Value("${files.storage}")
+    private String filesStorage;
     @Value("${url.track}")
     private String trackUrl;
     @Value("${url.download}")
@@ -93,6 +95,9 @@ public class DefaultDocumentManager implements DocumentManager {
             String hostAddress = storagePathBuilder.getStorageLocation();  // get the storage directory
             String filePathDownload = !fileName.contains(InetAddress.getLocalHost().getHostAddress()) ? fileName
                     : fileName.substring(fileName.indexOf(InetAddress.getLocalHost().getHostAddress()) + InetAddress.getLocalHost().getHostAddress().length() + 1);
+            if (!filesStorage.isEmpty() && filePathDownload.contains(filesStorage)) {
+                filePathDownload = filePathDownload.substring(filesStorage.length() + 1);
+            }
 
             String filePath = serverPath + "/download?fileName=" + URLEncoder.encode(filePathDownload, java.nio.charset.StandardCharsets.UTF_8.toString())
                     + "&userAddress" + URLEncoder.encode(hostAddress, java.nio.charset.StandardCharsets.UTF_8.toString());
@@ -104,6 +109,27 @@ public class DefaultDocumentManager implements DocumentManager {
         }
     }
 
+    // get file URL
+    public String getHistoryFileUrl(String fileName, Integer version, String file, Boolean forDocumentServer)
+    {
+        try
+        {
+            String serverPath = storagePathBuilder.getServerUrl(forDocumentServer);  // get server URL
+            String hostAddress = storagePathBuilder.getStorageLocation();  // get the storage directory
+            String filePathDownload = !fileName.contains(InetAddress.getLocalHost().getHostAddress()) ? fileName
+                    : fileName.substring(fileName.indexOf(InetAddress.getLocalHost().getHostAddress()) + InetAddress.getLocalHost().getHostAddress().length() + 1);
+            String userAddress = forDocumentServer ? "&userAddress" + URLEncoder.encode(hostAddress, java.nio.charset.StandardCharsets.UTF_8.toString()) : "";
+            String filePath = serverPath + "/downloadhistory?fileName=" + URLEncoder.encode(filePathDownload, java.nio.charset.StandardCharsets.UTF_8.toString())
+                + "&ver=" + version + "&file="+file
+                + userAddress;
+            return filePath;
+        }
+        catch (UnsupportedEncodingException | UnknownHostException e)
+        {
+            return "";
+        }
+    }
+
     // get the callback URL
     public String getCallback(String fileName)
     {
@@ -123,15 +149,15 @@ public class DefaultDocumentManager implements DocumentManager {
     }
 
     // get URL to download a file
-    public String getDownloadUrl(String fileName) {
-        String serverPath = storagePathBuilder.getServerUrl(true);
+    public String getDownloadUrl(String fileName, Boolean isServer) {
+        String serverPath = storagePathBuilder.getServerUrl(isServer);
         String storageAddress = storagePathBuilder.getStorageLocation();
         try
         {
+            String userAddress = isServer ? "&userAddress=" + URLEncoder.encode(storageAddress, java.nio.charset.StandardCharsets.UTF_8.toString()) : "";
             String query = downloadUrl+"?fileName="
                     + URLEncoder.encode(fileName, java.nio.charset.StandardCharsets.UTF_8.toString())
-                    + "&userAddress="
-                    + URLEncoder.encode(storageAddress, java.nio.charset.StandardCharsets.UTF_8.toString());
+                    + userAddress;
 
             return serverPath + query;
         }

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

@@ -25,8 +25,9 @@ import java.util.Map;
 public interface DocumentManager {
     String getCorrectName(String fileName);  // get a file name with an index if the file with such a name already exists
     String getFileUri(String fileName, Boolean forDocumentServer);  // get file URL
+    String getHistoryFileUrl(String fileName, Integer version, String file, Boolean forDocumentServer);  // get file URL
     String getCallback(String fileName);  // get the callback URL
-    String getDownloadUrl(String fileName);  // get URL to download a file
+    String getDownloadUrl(String fileName, Boolean forDocumentServer);  // get URL to download a file
     ArrayList<Map<String, Object>> getFilesInfo();  // get file information
     ArrayList<Map<String, Object>> getFilesInfo(String fileId);  // get file information by its ID
     String versionDir(String path, Integer version, boolean historyPath);  // get the path to the file version by the history path and file version

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

@@ -87,9 +87,14 @@ public class DefaultHistoryManager implements HistoryManager {
                     obj.put("user", user);
                 }
 
+                dataObj.put("fileType", fileUtility.getFileExtension(document.getTitle()).replace(".", ""));
                 dataObj.put("key", key);
                 dataObj.put("url", i == curVer ? document.getUrl() :
-                        documentManager.getFileUri(documentManager.versionDir(histDir, i, true) + File.separator + "prev" + fileUtility.getFileExtension(document.getTitle()), true));
+                        documentManager.getHistoryFileUrl(document.getTitle(), i, "prev" + fileUtility.getFileExtension(document.getTitle()), true));
+                if (!document.getDirectUrl().equals("")) {
+                    dataObj.put("directUrl", i == curVer ? document.getDirectUrl() :
+                            documentManager.getHistoryFileUrl(document.getTitle(), i, "prev" + fileUtility.getFileExtension(document.getTitle()), false));
+                }
                 dataObj.put("version", i);
 
                 if (i > 1) {  //check if the version number is greater than 1
@@ -105,11 +110,16 @@ public class DefaultHistoryManager implements HistoryManager {
 
                     Map<String, Object> prev = (Map<String, Object>) histData.get(Integer.toString(i - 2));  // get the history data from the previous file version
                     Map<String, Object> prevInfo = new HashMap<String, Object>();
+                    prevInfo.put("fileType", prev.get("fileType"));
                     prevInfo.put("key", prev.get("key"));  // write key and URL information about previous file version
                     prevInfo.put("url", prev.get("url"));
+                    if (!document.getDirectUrl().equals("")) {
+                        prevInfo.put("directUrl", prev.get("directUrl"));
+                    }
                     dataObj.put("previous", prevInfo);  // write information about previous file version to the data object
                     // write the path to the diff.zip archive with differences in this file version
-                    dataObj.put("changesUrl", documentManager.getFileUri(documentManager.versionDir(histDir, i - 1, true) + File.separator + "diff.zip", true));
+                    Integer verdiff = i - 1;
+                    dataObj.put("changesUrl", documentManager.getHistoryFileUrl(document.getTitle(), verdiff, "diff.zip", true));
                 }
 
                 if (jwtManager.tokenEnabled()) dataObj.put("token", jwtManager.createToken(dataObj));

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Customization.java

@@ -34,7 +34,6 @@ public class Customization {  // the parameters which allow to customize the edi
     @Autowired
     private Goback goback;  // the settings for the Open file location menu button and upper right corner button
     private Boolean autosave = true;  // if the Autosave menu option is enabled or disabled
-    private Boolean chat = true;  // if the Chat menu button is displayed or hidden
     private Boolean comments = true;  // if the Comments menu button is displayed or hidden
     private Boolean compactHeader = false;  // if the additional action buttons are displayed in the upper part of the editor window header next to the logo (false) or in the toolbar (true)
     private Boolean compactToolbar = false;  // if the top toolbar type displayed is full (false) or compact (true)
@@ -44,4 +43,6 @@ public class Customization {  // the parameters which allow to customize the edi
     private Boolean hideRightMenu = false;  // if the right menu is displayed or hidden on first loading
     private Boolean hideRulers = false;  // if the editor rulers are displayed or hidden
     private Boolean submitForm = false;  // if the Submit form button is displayed or hidden
+    private Boolean about = true;
+    private Boolean feedback =true;
 }

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Goback.java

@@ -20,7 +20,6 @@ package com.onlyoffice.integration.documentserver.models.configurations;
 
 import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder;
 import lombok.Getter;
-import lombok.Setter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Scope;
@@ -30,8 +29,6 @@ import javax.annotation.PostConstruct;
 
 @Component
 @Scope("prototype")
-@Getter
-@Setter
 public class Goback {  // the settings for the Open file location menu button and upper right corner button
 
     @Autowired
@@ -39,10 +36,12 @@ public class Goback {  // the settings for the Open file location menu button an
 
     @Value("${url.index}")
     private String indexMapping;
+
+    @Getter
     private String url;  // the absolute URL to the website address which will be opened when clicking the Open file location menu button
 
     @PostConstruct
-    private void init(){
-        this.url = storagePathBuilder.getServerUrl(false)+indexMapping;
+    private void init() {
+        this.url = storagePathBuilder.getServerUrl(false) + indexMapping;
     }
 }

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

@@ -25,6 +25,7 @@ public enum Action {
     embedded,
     filter,
     comment,
+    chat,
     fillForms,
     blockcontent
 }

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

@@ -1,53 +0,0 @@
-/**
- *
- * (c) Copyright Ascensio System SIA 2021
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.onlyoffice.integration.documentserver.models.enums;
-
-public enum Language {
-    en,
-    de,
-    ru,
-    pl,
-    be,
-    bg,
-    ca,
-    zh,
-    cs,
-    da,
-    nl,
-    fi,
-    fr,
-    el,
-    hu,
-    id,
-    it,
-    ja,
-    ko,
-    lv,
-    lo,
-    nb,
-    pt,
-    ro,
-    sk,
-    sl,
-    sv,
-    es,
-    tr,
-    uk,
-    vi
-}

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

@@ -39,4 +39,5 @@ public class Document {  // the parameters pertaining to the document (title, ur
     private String urlUser;  // the absolute URL that will allow the document to be saved onto the user personal computer
     private String title;  // the desired file name for the viewed or edited document which will also be used as file name when the document is downloaded
     private String url;  // the absolute URL where the source viewed or edited document is stored
+    private String directUrl;
 }

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

@@ -20,7 +20,6 @@ package com.onlyoffice.integration.documentserver.models.filemodel;
 
 import com.onlyoffice.integration.documentserver.models.configurations.Customization;
 import com.onlyoffice.integration.documentserver.models.configurations.Embedded;
-import com.onlyoffice.integration.documentserver.models.enums.Language;
 import com.onlyoffice.integration.documentserver.models.enums.Mode;
 import lombok.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,12 +37,13 @@ import java.util.List;
 public class EditorConfig {  // the parameters pertaining to the editor interface: opening mode (viewer or editor), interface language, additional buttons, etc.
     private HashMap<String, Object> actionLink = null;  // the data which contains the information about the action in the document that will be scrolled to
     private String callbackUrl;  // the absolute URL to the document storage service
+    private HashMap<String, Object> coEditing = null;
     private String createUrl;  // the absolute URL of the document where it will be created and available after creation
     @Autowired
     private Customization customization;  // the parameters which allow to customize the editor interface so that it looked like your other products (if there are any) and change the presence or absence of the additional buttons, links, change logos and editor owner details
     @Autowired
     private Embedded embedded;  // the parameters which allow to change the settings which define the behavior of the buttons in the embedded mode
-    private Language lang;  // the editor interface language
+    private String lang;  // the editor interface language
     private Mode mode;  // the editor opening mode
     @Autowired
     private User user;  // the user currently viewing or editing the document

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

@@ -43,8 +43,11 @@ public class Permission extends AbstractModel {  // the permission for the docum
     private Boolean modifyFilter = true;  // if the filter can applied globally (true) affecting all the other users, or locally (false)
     private Boolean modifyContentControl = true;  // if the content control settings can be changed
     private Boolean review = true;  // if the document can be reviewed or not
+    private Boolean chat = true;  // if a chat can be used
     @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = SerializerFilter.class)
     private List<String> reviewGroups;  // the groups whose changes the user can accept/reject
     @Autowired
     private CommentGroup commentGroups;  //  the groups whose comments the user can edit, remove and/or view
+    @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = SerializerFilter.class)
+    private List<String> userInfoGroups;
 }

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

@@ -16,6 +16,7 @@ public interface FileStorageMutator {
     boolean writeToFile(String pathName, String payload);  // write the payload to the file
     boolean moveFile(Path source, Path destination);  // move a file to the specified destination
     Resource loadFileAsResource(String fileName);  // load file as a resource
+    Resource loadFileAsResourceHistory(String fileName,String version,String file);  // load file as a resource
     File[] getStoredFiles();  // get a collection of all the stored files
     void createMeta(String fileName, String uid, String uname);  // create the file meta information
     boolean createOrUpdateFile(Path path, InputStream stream);  // create or update a file

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

@@ -85,10 +85,18 @@ public class LocalFileStorage implements FileStorageMutator, FileStoragePathBuil
     // get the storage directory
     public String getStorageLocation(){
         String serverPath = System.getProperty("user.dir");  // get the path to the server
-        String directory = serverPath  // create the storage directory
-                + File.separator + storageFolder
-                + File.separator + this.storageAddress
-                + File.separator;
+        String directory;  // create the storage directory
+        if (Paths.get(this.storageAddress).isAbsolute()) {
+            directory = this.storageAddress + File.separator;
+        } else {
+            directory = serverPath
+                    + File.separator + storageFolder
+                    + File.separator + this.storageAddress
+                    + File.separator;
+        }
+        if (!Files.exists(Paths.get(directory))) {
+            createDirectory(Paths.get(directory));
+        }
 
         return directory;
     }
@@ -238,6 +246,20 @@ public class LocalFileStorage implements FileStorageMutator, FileStoragePathBuil
         return null;
     }
 
+    public Resource loadFileAsResourceHistory(String fileName,String version,String file){
+
+        String fileLocation = getStorageLocation() + fileName + "-hist" + File.separator + version + File.separator + file;  // get it by the file name
+
+        try {
+            Path filePath = Paths.get(fileLocation);  // get the path to the file location
+            Resource resource = new UrlResource(filePath.toUri());  // convert the file path to URL
+            if(resource.exists()) return resource;
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
     // get a collection of all the stored files
     public File[] getStoredFiles()
     {

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

@@ -0,0 +1,59 @@
+package com.onlyoffice.integration.documentserver.util;
+
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.X509Certificate;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+import org.springframework.stereotype.Component;
+/**
+ * Disables and enables certificate and host-name checking in
+ * HttpsURLConnection, the default JVM implementation of the HTTPS/TLS protocol.
+ * Has no effect on implementations such as Apache Http Client, Ok Http.
+*/
+@Component
+public final class SSLUtils {
+
+    private final HostnameVerifier jvmHostnameVerifier = HttpsURLConnection.getDefaultHostnameVerifier();
+
+    private final HostnameVerifier trivialHostnameVerifier = new HostnameVerifier() {
+        public boolean verify(String hostname, SSLSession sslSession) {
+            return true;
+        }
+    };
+
+    private final TrustManager[] UNQUESTIONING_TRUST_MANAGER = new TrustManager[] { new X509TrustManager() {
+        public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+            return null;
+        }
+
+        public void checkClientTrusted(X509Certificate[] certs, String authType) {
+        }
+
+        public void checkServerTrusted(X509Certificate[] certs, String authType) {
+        }
+    } };
+
+    public void turnOffSslChecking() throws NoSuchAlgorithmException, KeyManagementException {
+        HttpsURLConnection.setDefaultHostnameVerifier(trivialHostnameVerifier);
+        // Install the all-trusting trust manager
+        SSLContext sc = SSLContext.getInstance("SSL");
+        sc.init(null, UNQUESTIONING_TRUST_MANAGER, null);
+        HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+    }
+
+    public void turnOnSslChecking() throws KeyManagementException, NoSuchAlgorithmException {
+        HttpsURLConnection.setDefaultHostnameVerifier(jvmHostnameVerifier);
+        // Return it to the initial state (discovered by reflection, now hardcoded)
+        SSLContext sc = SSLContext.getInstance("SSL");
+        sc.init(null, null, null);
+        HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+    }
+
+}

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/util/file/DefaultFileUtility.java

@@ -59,7 +59,7 @@ public class DefaultFileUtility implements FileUtility {
 
     // spreadsheet extensions
     private List<String> ExtsSpreadsheet = Arrays.asList(
-                            ".xls", ".xlsx", ".xlsm",
+                            ".xls", ".xlsx", ".xlsm", ".xlsb",
                             ".xlt", ".xltx", ".xltm",
                             ".ods", ".fods", ".ots", ".csv");
 

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

@@ -95,6 +95,13 @@ public class DefaultServiceConverter implements ServiceConverter
             }
 
             connection.connect();
+
+            int statusCode = connection.getResponseCode();
+            if (statusCode != 200) {  // checking status code
+                connection.disconnect();
+                throw new RuntimeException("Convertation service returned status: " + statusCode);
+            }
+
             try (OutputStream os = connection.getOutputStream()) {
                 os.write(bodyByte);  // write bytes to the output stream
                 os.flush();  // force write data to the output stream that can be cached in the current thread

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

@@ -38,6 +38,7 @@ public class Permission extends AbstractEntity {
     private Boolean modifyFilter = true;
     private Boolean modifyContentControl = true;
     private Boolean review = true;
+    private Boolean chat = true;
     private Boolean templates=true;
     @ManyToMany
     private List<Group> reviewGroups;
@@ -47,4 +48,6 @@ public class Permission extends AbstractEntity {
     private List<Group> commentsEditGroups;
     @ManyToMany
     private List<Group> commentsRemoveGroups;
+    @ManyToMany
+    private List<Group> userInfoGroups;
 }

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

@@ -54,5 +54,6 @@ public class PermissionsMapper extends AbstractMapper<Permission, com.onlyoffice
                         source.getCommentsRemoveGroups().stream().map(g -> g.getName()).collect(Collectors.toList())
                 )
         );
+        destination.setUserInfoGroups(source.getUserInfoGroups().stream().map(g -> g.getName()).collect(Collectors.toList()));
     }
 }

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

@@ -36,13 +36,17 @@ public class PermissionServices {
     public Permission createPermission(List<Group> reviewGroups,
                                        List<Group> commentViewGroups,
                                        List<Group> commentEditGroups,
-                                       List<Group> commentRemoveGroups){
+                                       List<Group> commentRemoveGroups,
+                                       List<Group> userInfoGroups,
+                                       Boolean chat){
 
         Permission permission = new Permission();
         permission.setReviewGroups(reviewGroups);  // define the groups whose changes the user can accept/reject
         permission.setCommentsViewGroups(commentViewGroups);  // defines the groups whose comments the user can view
         permission.setCommentsEditGroups(commentEditGroups);  // defines the groups whose comments the user can edit
         permission.setCommentsRemoveGroups(commentRemoveGroups);  // defines the groups whose comments the user can remove
+        permission.setUserInfoGroups(userInfoGroups);
+        permission.setChat(chat);
 
         permissionRepository.save(permission);  // save new permissions
 

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

@@ -56,7 +56,9 @@ public class UserServices {
                            List<String> reviewGroups,
                            List<String> viewGroups,
                            List<String> editGroups,
-                           List<String> removeGroups, Boolean favoriteDoc){
+                           List<String> removeGroups, 
+                           List<String> userInfoGroups, Boolean favoriteDoc,
+                           Boolean chat){
         User newUser = new User();
         newUser.setName(name);  // set the user name
         newUser.setEmail(email);  // set the user email
@@ -68,9 +70,10 @@ public class UserServices {
         List<Group> commentGroupsView = groupServices.createGroups(viewGroups);  // defines the groups whose comments the user can view
         List<Group> commentGroupsEdit = groupServices.createGroups(editGroups);  // defines the groups whose comments the user can edit
         List<Group> commentGroupsRemove = groupServices.createGroups(removeGroups);  // defines the groups whose comments the user can remove
+        List<Group> usInfoGroups = groupServices.createGroups(userInfoGroups);
 
         Permission permission = permissionService
-                .createPermission(groupsReview, commentGroupsView, commentGroupsEdit, commentGroupsRemove);  // specify permissions for the current user
+                .createPermission(groupsReview, commentGroupsView, commentGroupsEdit, commentGroupsRemove, usInfoGroups, chat);  // specify permissions for the current user
         newUser.setPermissions(permission);
 
         userRepository.save(newUser); // save a new user

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

@@ -53,8 +53,9 @@ public class DefaultDocumentConfigurer implements DocumentConfigurer<DefaultDocu
         Permission permission = wrapper.getPermission();  // get the permission parameter from the document wrapper
 
         document.setTitle(fileName);  // set the title to the document config
-        document.setUrl(documentManager.getDownloadUrl(fileName));  // set the URL to download a file to the document config
+        document.setUrl(documentManager.getDownloadUrl(fileName, true));  // set the URL to download a file to the document config
         document.setUrlUser(documentManager.getFileUri(fileName, false));  // set the file URL to the document config
+        document.setDirectUrl(wrapper.getIsEnableDirectUrl() ? documentManager.getDownloadUrl(fileName, false) : "");
         document.setFileType(fileUtility.getFileExtension(fileName).replace(".",""));  // set the file type to the document config
         document.getInfo().setFavorite(wrapper.getFavorite());  // set the favorite parameter to the document config
 

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

@@ -82,10 +82,14 @@ public class DefaultEditorConfigConfigurer implements EditorConfigConfigurer<Def
         config.setLang(wrapper.getLang());  // set the language to the editorConfig
         Boolean canEdit = wrapper.getCanEdit();  // check if the file of the specified type can be edited or not
         Action action = wrapper.getAction();  // get the action parameter from the editorConfig wrapper
+        config.setCoEditing(action.equals(Action.view) && userIsAnon ? new HashMap<String, Object>()  {{ 
+            put("mode", "strict");
+            put("change", false);
+        }} : null);
 
         defaultCustomizationConfigurer.configure(config.getCustomization(), DefaultCustomizationWrapper.builder()  // define the customization configurer
                 .action(action)
-                .user(wrapper.getUser())
+                .user(userIsAnon ? null : wrapper.getUser())
                 .build());
         config.setMode(canEdit && !action.equals(Action.view) ? Mode.edit : Mode.view);
         config.setUser(mapper.toModel(wrapper.getUser()));

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

@@ -37,7 +37,7 @@ public class DefaultEmbeddedConfigurer implements EmbeddedConfigurer<DefaultEmbe
 
     public void configure(Embedded embedded, DefaultEmbeddedWrapper wrapper){  // define the embedded configurer
         if(wrapper.getType().equals(Type.embedded)) {  // check if the type from the embedded wrapper is embedded
-            String url = documentManager.getFileUri(wrapper.getFileName(), false);  // get file URL of the specified file
+            String url = documentManager.getDownloadUrl(wrapper.getFileName(), false);  // get file URL of the specified file
             embedded.setEmbedUrl(url);  // set the embedURL parameter to the embedded config (the absolute URL to the document serving as a source file for the document embedded into the web page)
             embedded.setSaveUrl(url);  // set the saveURL parameter to the embedded config (the absolute URL that will allow the document to be saved onto the user personal computer)
             embedded.setShareUrl(url);  // set the shareURL parameter to the embedded config (the absolute URL that will allow other users to share this document)

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

@@ -80,6 +80,7 @@ public class DefaultFileConfigurer implements FileConfigurer<DefaultFileWrapper>
                     .fileName(fileName)
                     .permission(updatePermissions(userPermissions, action, canEdit))
                     .favorite(wrapper.getUser().getFavorite())
+                    .isEnableDirectUrl(wrapper.getIsEnableDirectUrl())
                     .build();
 
             defaultDocumentConfigurer.configure(fileModel.getDocument(), documentWrapper);  // define the document configurer

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

@@ -28,4 +28,5 @@ public class DefaultDocumentWrapper {
     private Permission permission;
     private String fileName;
     private Boolean favorite;
+    private Boolean isEnableDirectUrl;
 }

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

@@ -20,7 +20,6 @@ package com.onlyoffice.integration.services.configurers.wrappers;
 
 import com.onlyoffice.integration.documentserver.models.enums.Action;
 import com.onlyoffice.integration.entities.User;
-import com.onlyoffice.integration.documentserver.models.enums.Language;
 import com.onlyoffice.integration.documentserver.models.enums.Type;
 import lombok.Builder;
 import lombok.Getter;
@@ -33,8 +32,9 @@ public class DefaultFileWrapper {
     private String fileName;
     private Type type;
     private User user;
-    private Language lang;
+    private String lang;
     private Action action;
     private String actionData;
     private Boolean canEdit;
+    private Boolean isEnableDirectUrl;
 }

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

@@ -1,6 +1,6 @@
-server.version=1.1.0
+server.version=1.4.0
 
-server.address=127.0.0.1
+server.address=
 server.port=4000
 
 filesize-max=5242880
@@ -11,7 +11,7 @@ files.storage.folder=documents
 files.docservice.fillforms-docs=.oform|.docx
 files.docservice.viewed-docs=.pdf|.djvu|.xps|.oxps
 files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.txt|.docxf
-files.docservice.convert-docs=.docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2
+files.docservice.convert-docs=.docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xlsb|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsx|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.xml|.epub|.fb2
 files.docservice.timeout=120000
 files.docservice.history.postfix=-hist
 
@@ -25,6 +25,10 @@ files.docservice.url.example=
 files.docservice.secret=
 files.docservice.header=Authorization
 
+files.docservice.verify-peer-off=true
+
+files.docservice.languages=en:English|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (People's Republic of China)|zh-TW:Chinese (Traditional, Taiwan)|cs:Czech|da:Danish|nl:Dutch|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lv:Latvian|lo:Lao|ms:Malay (Malaysia)|nb:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese
+
 spring.datasource.url=jdbc:h2:mem:usersdb
 spring.datasource.driverClassName=org.h2.Driver
 spring.datasource.username=sa

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

@@ -129,6 +129,10 @@
         height: 80px;
     }
 
+    .main {
+        height: calc(100% - 128px); 
+    }
+
     .left-panel {
         width: 90%;
     }
@@ -367,6 +371,10 @@
         height: 80px;
     }
 
+    .main {
+        height: calc(100% - 128px); 
+    }
+    
     .copy {
         width: 100%;
         text-align: center;
@@ -440,6 +448,58 @@
         display: none;
         width: 1%;
     }
+    /* Mobile Upload*/
+    .blockUI.blockMsg.blockPage.ui-dialog.ui-widget.ui-corner-all.ui-widget-content.ui-draggable {
+        width: 344px !important;
+        box-shadow: 0px 7px 15px rgba(85, 85, 85, 0.1);
+        border-radius: 2px;
+        top: 10% !important;
+        margin-left: -172px !important;
+    }
+
+    .ui-dialog .ui-dialog-titlebar {
+        padding: 0;
+    }
+    .ui-dialog .ui-dialog-content {
+        padding: 0 !important;
+    }
+    #mainProgress {
+        margin: 24px 16px 0 !important;
+    }
+    .blockTitle {
+        padding: 10px 10px 6px 16px !important;
+        font-size: 14px !important;
+    }
+    #mainProgress .describeUpload {
+        padding: 8px 0 !important;
+    }
+    .dialog-close {
+        margin: 0 !important;
+    }
+    .step-descr{
+        line-height: 150%;
+    }
+    .step {
+        line-height: 160%;
+    }
+    .buttonsMobile{
+        display: flex;
+        flex-direction: row;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        align-items: center;
+    }
+    .button.gray{
+        margin: 0;
+    }
+    .button, .button:hover{
+        display: flex;
+        justify-content: center;
+        padding: 0 !important;
+        width: 144px;
+        height: 56px;
+        margin-bottom: 24px !important;
+    }
 }
 
 @media (max-width: 560px) and (min-width: 510px) {

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

@@ -22,7 +22,7 @@ html {
 }
 
 body {
-    display: inline-table;
+    display: block;
     background: #FFFFFF;
     color: #333333;
     font-family: Open Sans;
@@ -72,6 +72,7 @@ header img {
 }
 
 .main{
+    display: table;
     height: calc(100% - 112px);
     min-height: 536px;
 }
@@ -98,6 +99,10 @@ header img {
     width: 896px;
 }
 
+#portal-info {
+    max-width: 65vw;
+}
+
 .portal-name {
     color: #FF6F3D;
     font-size: 24px;
@@ -162,7 +167,7 @@ label .checkbox {
     background-image: url("img/file_docxf.svg");
 }
 
-.create-sample {
+.side-option {
     color: #666666;
     line-height: 24px;
 }
@@ -740,12 +745,9 @@ html {
     width: 30vw;
     min-width: 200px;
     max-width: 400px;
+    margin-top: 20px;
 }
 
 .user-descr > b {
     margin-left: 25px;
 }
-
-.portal-descr:nth-child(3) {
-    margin-bottom: 20px;
-}

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

@@ -16,11 +16,24 @@
  *
  */
 
+var directUrl;
+
 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",
@@ -228,7 +241,7 @@ if (typeof jQuery !== "undefined") {
 
     jq(document).on("click", "#beginEdit:not(.disable)", function () {
         var fileId = encodeURIComponent(jq("#hiddenFileName").val());
-        var url = UrlEditor + "?action=edit&fileName=" + fileId;
+        var url = UrlEditor + "?action=edit&fileName=" + fileId + "&directUrl=" + directUrl;
         window.open(url, "_blank");
         jq("#hiddenFileName").val("");
         jq.unblockUI();
@@ -236,7 +249,7 @@ if (typeof jQuery !== "undefined") {
 
     jq(document).on("click", "#beginView:not(.disable)", function () {
         var fileId = encodeURIComponent(jq("#hiddenFileName").val());
-        var url = UrlEditor + "?action=view&fileName=" + fileId;
+        var url = UrlEditor + "?action=view&fileName=" + fileId + "&directUrl=" + directUrl;
         window.open(url, "_blank");
         jq("#hiddenFileName").val("");
         jq.unblockUI();
@@ -244,7 +257,7 @@ if (typeof jQuery !== "undefined") {
 
     jq(document).on("click", "#beginEmbedded:not(.disable)", function () {
         var fileId = encodeURIComponent(jq("#hiddenFileName").val());
-        var url = UrlEditor + "?type=embedded&action=embedded&fileName=" + fileId;
+        var url = UrlEditor + "?type=embedded&action=embedded&fileName=" + fileId + "&directUrl=" + directUrl;
 
         jq("#mainProgress").addClass("embedded");
         jq("#beginEmbedded").addClass("disable");
@@ -300,6 +313,17 @@ if (typeof jQuery !== "undefined") {
         }
     };
 
+    function getUrlVars() {
+        var vars = [], hash;
+        var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+        for (var i = 0; i < hashes.length; i++) {
+            hash = hashes[i].split('=');
+            vars.push(hash[0]);
+            vars[hash[0]] = hash[1];
+        }
+        return vars;
+    };
+
     jq("#portal-info")[0].innerHTML += jq("#portal-info")[0].attributes.tooltip.value;
 
     var fileList = jq("tr.tableRow");
@@ -317,7 +341,7 @@ if (typeof jQuery !== "undefined") {
             });
         }
     } else {
-        jq(".info").mouseover(function (event) {
+        jq("#info").mouseover(function (event) {
             if (fileList.length > 0) {
                 if (hideTooltipTimeout != null) {
                     clearTimeout(hideTooltipTimeout);

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

@@ -30,6 +30,7 @@
 
         <script th:inline="javascript">
                 var docEditor;
+                var config;
 
                 var innerAlert = function (message, inEditor) {
                     if (console && console.log)
@@ -90,10 +91,13 @@
 
                 // the meta information of the document is changed via the meta command
                 var onMetaChange = function (event) {
-                    var favorite = !!event.data.favorite;
-                    var title = document.title.replace(/^\☆/g, "");
-                    document.title = (favorite ? "☆" : "") + title;
-                    docEditor.setFavorite(favorite);
+                    if (event.data.favorite) {
+                        var favorite = !!event.data.favorite;
+                        var title = document.title.replace(/^\☆/g, "");
+                        document.title = (favorite ? "☆" : "") + title;
+                        docEditor.setFavorite(favorite);
+                    }
+                    innerAlert("onMetaChange: " + JSON.stringify(event.data));
                 };
 
 
@@ -115,7 +119,7 @@
                     docEditor.setMailMergeRecipients([[${dataMailMergeRecipients}]]);
                 };
 
-                var config = [[${model}]];
+                config = [[${model}]];
 
                 if (config.editorConfig.user.name == "Anonymous") {
                     config.editorConfig.user.name = "";
@@ -130,7 +134,7 @@
                     };
                     let xhr = new XMLHttpRequest();
                     xhr.open("POST", "saveas");
-                    xhr.setRequestHeader( 'Content-Type', 'application/json');
+                    xhr.setRequestHeader('Content-Type', 'application/json');
                     xhr.send(JSON.stringify(data));
                     xhr.onload = function () {
                         innerAlert(xhr.responseText);
@@ -138,6 +142,24 @@
                     }
                 };
 
+                var onRequestRename = function(event) { //  the user is trying to rename file by clicking Rename... button
+                    innerAlert("onRequestRename: " + JSON.stringify(event.data));
+
+                    var newfilename = event.data;
+                    var data = {
+                        newfilename: newfilename,
+                        dockey: config.document.key,
+                        ext: config.document.fileType
+                    };
+                    let xhr = new XMLHttpRequest();
+                    xhr.open("POST", "rename");
+                    xhr.setRequestHeader('Content-Type', 'application/json');
+                    xhr.send(JSON.stringify(data));
+                    xhr.onload = function () {
+                        innerAlert(xhr.responseText);
+                    }
+                };
+
                 config.width = "100%";
                 config.height = "100%";
                 config.events = {
@@ -158,24 +180,23 @@
                 var historyData = histArray[1];
                 var usersForMentions = [[${usersForMentions}]];
 
-                if (hist && historyData) {
-                    // the user is trying to show the document version history
-                    config.events['onRequestHistory'] = function () {
-                        docEditor.refreshHistory(JSON.parse(hist));  // show the document version history
-                    };
-                    // the user is trying to click the specific document version in the document version history
-                    config.events['onRequestHistoryData'] = function (event) {
-                        var ver = event.data;
-                        var histData = historyData;
-                        docEditor.setHistoryData(JSON.parse(histData)[ver - 1]);  // send the link to the document for viewing the version history
-                    };
-                    // the user is trying to go back to the document from viewing the document version history
-                    config.events['onRequestHistoryClose'] = function () {
-                        document.location.reload();
-                    };
-                }
-
-                if(usersForMentions){
+                if (config.editorConfig.user.id != 4) {
+                    if (hist && historyData) {
+                        // the user is trying to show the document version history
+                        config.events['onRequestHistory'] = function () {
+                            docEditor.refreshHistory(JSON.parse(hist));  // show the document version history
+                        };
+                        // the user is trying to click the specific document version in the document version history
+                        config.events['onRequestHistoryData'] = function (event) {
+                            var ver = event.data;
+                            var histData = historyData;
+                            docEditor.setHistoryData(JSON.parse(histData)[ver - 1]);  // send the link to the document for viewing the version history
+                        };
+                        // the user is trying to go back to the document from viewing the document version history
+                        config.events['onRequestHistoryClose'] = function () {
+                            document.location.reload();
+                        };
+                    }
                     // add mentions for not anonymous users
                     config.events['onRequestUsers'] = function () {
                         docEditor.setUsers({  // set a list of users to mention in the comments
@@ -184,10 +205,12 @@
                     };
                     // the user is mentioned in a comment
                     config.events['onRequestSendNotify'] = function (event) {
-                        event.data.actionLink = replaceActionLink(location.href, event.data.actionLink);
+                        event.data.actionLink = replaceActionLink(location.href, JSON.stringify(event.data.actionLink));
                         var data = JSON.stringify(event.data);
                         innerAlert("onRequestSendNotify: " + data);
                     };
+                    // prevent file renaming for anonymous users
+                    config.events['onRequestRename'] = onRequestRename;
                 }
 
                 if (config.editorConfig.createUrl) {

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

@@ -2,6 +2,7 @@
 <html xmlns:th="http://www.thymeleaf.org">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="viewport" content="width=device-width" />
     <!--
     *
     * (c) Copyright Ascensio System SIA 2021
@@ -58,7 +59,7 @@
                                         <a class="try-editor form" data-type="docxf">Form template</a>
                                     </li>
                                 </ul>
-                                <label class="create-sample">
+                                <label class="side-option">
                                     <input id="createSample" class="checkbox" type="checkbox" />With sample content
                                 </label>
                             </div>
@@ -74,7 +75,7 @@
                                     <tr>
                                         <td valign="middle">
                                             <span class="select-user">Username</span>
-                                            <img class="info" src="css/img/info.svg"/>
+                                            <img id="info" class="info" src="css/img/info.svg"/>
                                             <select class="select-user" id="user">
                                                 <option th:each="user : ${users}"
                                                         th:value="${user.id}"
@@ -86,40 +87,20 @@
                                         <td valign="middle">
                                             <span class="select-user">Language editors interface</span>
                                             <select class="select-user" id="language">
-                                                <option value="en" selected="selected">English</option>
-                                                <option value="be">Belarusian</option>
-                                                <option value="bg">Bulgarian</option>
-                                                <option value="ca">Catalan</option>
-                                                <option value="zh">Chinese</option>
-                                                <option value="cs">Czech</option>
-                                                <option value="da">Danish</option>
-                                                <option value="nl">Dutch</option>
-                                                <option value="fi">Finnish</option>
-                                                <option value="fr">French</option>
-                                                <option value="de">German</option>
-                                                <option value="el">Greek</option>
-                                                <option value="hu">Hungarian</option>
-                                                <option value="id">Indonesian</option>
-                                                <option value="it">Italian</option>
-                                                <option value="ja">Japanese</option>
-                                                <option value="ko">Korean</option>
-                                                <option value="lv">Latvian</option>
-                                                <option value="lo">Lao</option>
-                                                <option value="nb">Norwegian</option>
-                                                <option value="pl">Polish</option>
-                                                <option value="pt">Portuguese</option>
-                                                <option value="ro">Romanian</option>
-                                                <option value="ru">Russian</option>
-                                                <option value="sk">Slovak</option>
-                                                <option value="sl">Slovenian</option>
-                                                <option value="sv">Swedish</option>
-                                                <option value="es">Spanish</option>
-                                                <option value="tr">Turkish</option>
-                                                <option value="uk">Ukrainian</option>
-                                                <option value="vi">Vietnamese</option>
+                                                <option th:each="language: ${languages}"
+                                                        th:value="${language.key}"
+                                                        th:text="${language.value}"/>
                                             </select>
                                         </td>
                                     </tr>
+                                    <tr>
+                                        <td valign="middle">
+                                            <label class="side-option">
+                                                <input id="directUrl" type="checkbox" class="checkbox" />Try opening on client
+                                                <img id="directUrlInfo" class="info info-tooltip" data-id="directUrlInfo" data-tooltip="Some files can be opened in the user's browser without connecting to the document server." src="css/img/info.svg" />
+                                            </label>
+                                        </td>
+                                    </tr>
                                 </tbody>
                             </table>
                         </div>
@@ -127,12 +108,13 @@
                 </td>
                 <td class="section">
                     <div class="main-panel">
-                        <div id="portal-info" th:attr="tooltip=${tooltip}" th:style="${not #lists.isEmpty(files)} ? 'display: none' : 'display: block' ">
+                        <div id="portal-info" th:attr="tooltip=${tooltip}" th:style="${not #lists.isEmpty(files)} ? 'display: none' : 'display: table-cell' ">
                             <span class="portal-name">ONLYOFFICE Document Editors – Welcome!</span>
                             <span class="portal-descr">
                                     Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors.
                                     <br /> You may upload your own documents for testing using the "<b>Upload file</b>" button and <b>selecting</b> the necessary files on your PC.
                                 </span>
+                                <span class="portal-descr">Please do NOT use this integration example on your own server without proper code modifications, it is intended for testing purposes only. In case you enabled this test example, disable it before going for production.</span>
                             <span class="portal-descr">You can open the same document using different users in different Web browser sessions, so you can check out multi-user editing functions.</span>
                         </div>
                         <th:block th:if="${not #lists.isEmpty(files)}">
@@ -155,46 +137,50 @@
                                         <tr th:each="file,iState : ${files}" class="tableRow" th:title="${files[iState.index].getName() + versions[iState.index]}">
                                             <td class="contentCells">
                                                 <a class="stored-edit" th:classappend="${docTypes[iState.index]}"
-                                                   th:href="@{/editor(fileName=${files[iState.index].getName()})}" target="_blank">
+                                                   th:with="directUrl=${directUrl}"
+                                                   th:href="@{/editor(fileName=${files[iState.index].getName()}, __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                 <span th:text="${files[iState.index].getName()}"></span>
                                                 </a>
                                             </td>
                                             <th:block th:if="${filesEditable[iState.index]}">
                                                 <td class="contentCells contentCells-icon">
-                                                    <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='edit')}" target="_blank">
+                                                    <a th:with="directUrl=${directUrl}"
+                                                       th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='edit', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                     <img src="css/img/desktop.svg" alt="Open in editor for full size screens" title="Open in editor for full size screens"/>
                                                     </a>
                                                 </td>
                                                 <td class="contentCells contentCells-icon">
-                                                    <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='mobile',action='edit')}" target="_blank">
+                                                    <a th:with="directUrl=${directUrl}"
+                                                       th:href="@{/editor(fileName=${files[iState.index].getName()},type='mobile',action='edit', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                     <img src="css/img/mobile.svg" alt="Open in editor for mobile devices" title="Open in editor for mobile devices"/>
                                                     </a>
                                                 </td>
                                                 <td class="contentCells contentCells-icon">
-                                                    <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='comment')}" target="_blank">
+                                                    <a th:with="directUrl=${directUrl}"
+                                                       th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='comment', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                         <img src="css/img/comment.svg" alt="Open in editor for comment" title="Open in editor for comment"/>
                                                     </a>
                                                 </td>
                                                     <div th:if="${docTypes[iState.index]} eq 'word'">
                                                         <td class="contentCells contentCells-icon">
-                                                            <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='review')}" target="_blank">
+                                                            <a th:with="directUrl=${directUrl}"
+                                                               th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='review', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                             <img src="css/img/review.svg" alt="Open in editor for review" title="Open in editor for review"/>
                                                             </a>
                                                         </td>
                                                     </div>
                                                     <div th:if="${docTypes[iState.index]} eq 'cell'">
                                                         <td class="contentCells contentCells-icon">
-                                                            <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='filter')}" target="_blank">
+                                                            <a th:with="directUrl=${directUrl}"
+                                                               th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='filter', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                             <img src="css/img/filter.svg" alt="Open in editor without access to change the filter" title="Open in editor without access to change the filter" />
                                                             </a>
                                                         </td>
                                                     </div>
-                                                <div th:if="${docTypes[iState.index]} eq 'slide'">
-                                                    <td class="contentCells contentCells-icon contentCellsEmpty"></td>
-                                                </div>
                                                     <div th:if="${docTypes[iState.index]} eq 'word'">
                                                         <td class="contentCells contentCells-icon">
-                                                            <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='blockcontent')}" target="_blank">
+                                                            <a th:with="directUrl=${directUrl}"
+                                                               th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='blockcontent', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                             <img src="css/img/block-content.svg" alt="Open in editor without content control modification" title="Open in editor without content control modification"/>
                                                             </a>
                                                         </td>
@@ -207,7 +193,8 @@
                                                     </div>
                                                     <div th:if="${isFillFormDoc[iState.index]}">
                                                         <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
-                                                            <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='fillForms')}" target="_blank">
+                                                            <a th:with="directUrl=${directUrl}"
+                                                               th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='fillForms', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                                 <img src="css/img/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
                                                             </a>
                                                         </td>
@@ -219,7 +206,8 @@
                                             <th:block th:if="${isFillFormDoc[iState.index] and not filesEditable[iState.index]}">
                                                 <td class="contentCells contentCells-icon "></td>
                                                 <td class="contentCells contentCells-icon">
-                                                    <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='mobile',action='fillForms')}" target="_blank">
+                                                    <a th:with="directUrl=${directUrl}"
+                                                       th:href="@{/editor(fileName=${files[iState.index].getName()},type='mobile',action='fillForms', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                         <img src="css/img/mobile-fill-forms.svg" alt="Open in editor for filling in forms for mobile devices" title="Open in editor for filling in forms for mobile devices" />
                                                     </a>
                                                 </td>
@@ -227,7 +215,8 @@
                                                 <td class="contentCells contentCells-icon "></td>
                                                 <td class="contentCells contentCells-icon "></td>
                                                 <td class="contentCells contentCells-shift contentCells-icon firstContentCellShift">
-                                                    <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='fillForms')}" target="_blank">
+                                                    <a th:with="directUrl=${directUrl}"
+                                                       th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='fillForms', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                         <img src="css/img/fill-forms.svg" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
                                                     </a>
                                                 </td>
@@ -236,17 +225,20 @@
                                                 <td class="contentCells contentCells-shift contentCells-icon contentCellsEmpty" colspan="6"></td>
                                             </th:block>
                                             <td class="contentCells contentCells-icon firstContentCellViewers">
-                                                <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='view')}" target="_blank">
+                                                <a th:with="directUrl=${directUrl}"
+                                                   th:href="@{/editor(fileName=${files[iState.index].getName()},type='desktop',action='view', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                 <img src="css/img/desktop.svg" alt="Open in viewer for full size screens" title="Open in viewer for full size screens"/>
                                                 </a>
                                             </td>
                                             <td class="contentCells contentCells-icon">
-                                                <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='mobile',action='view')}" target="_blank">
+                                                <a th:with="directUrl=${directUrl}"
+                                                   th:href="@{/editor(fileName=${files[iState.index].getName()},type='mobile',action='view', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                 <img src="css/img/mobile.svg" alt="Open in viewer for mobile devices" title="Open in viewer for mobile devices"/>
                                                 </a>
                                             </td>
                                             <td class="contentCells contentCells-icon contentCells-shift">
-                                                <a th:href="@{/editor(fileName=${files[iState.index].getName()},type='embedded',action='embedded')}" target="_blank">
+                                                <a th:with="directUrl=${directUrl}"
+                                                   th:href="@{/editor(fileName=${files[iState.index].getName()},type='embedded',action='embedded', __(${#strings.isEmpty(directUrl)} ? '' : ('directUrl=' + ${directUrl}))__)}" target="_blank">
                                                 <img src="css/img/embeded.svg" alt="Open in embedded mode" title="Open in embedded mode"/>
                                                 </a>
                                             </td>
@@ -298,10 +290,8 @@
             <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 />
-            <br />
             <span class="progress-descr">Note the speed of all operations depends on your connection quality and server location.</span>
             <br />
-            <br />
             <div class="error-message">
                 <b>Upload error: </b><span></span>
                 <br />
@@ -310,10 +300,12 @@
         </div>
         <iframe id="embeddedView" src="" height="345px" width="432px" frameborder="0" scrolling="no" allowtransparency></iframe>
         <br />
-        <div id="beginEdit" class="button orange disable">Edit</div>
-        <div id="beginView" class="button gray disable">View</div>
-        <div id="beginEmbedded" class="button gray disable">Embedded view</div>
-        <div id="cancelEdit" class="button gray">Cancel</div>
+        <div class="buttonsMobile">
+            <div id="beginEdit" class="button orange disable">Edit</div>
+            <div id="beginView" class="button gray disable">View</div>
+            <div id="beginEmbedded" class="button gray disable">Embedded view</div>
+            <div id="cancelEdit" class="button gray">Cancel</div>
+        </div>
     </div>
 
     <span id="loadScripts" th:attr="data-docs=${datadocs}"></span>
@@ -346,5 +338,21 @@
     <script type="text/javascript" src="scripts/jquery.dropdownToggle.js"></script>
     <script type="text/javascript" src="scripts/jscript.js"></script>
     <script type="text/javascript" src="scripts/converter.js"></script>
+    <script type="text/javascript">
+        document.addEventListener('DOMContentLoaded', function() {
+            var lang = document.cookie
+                    .split('; ')
+                    .find((row) => row.startsWith('ulang='))
+                    ?.split('=')[1];
+
+            var languages = Array.from(document.getElementById("language").options).map(e => e.value)
+
+            if (!languages.includes(lang)) {
+                lang = "en";
+            }
+
+            document.getElementById("language").value=lang;
+        });
+    </script>
 </body>
 </html>

web/documentserver-example/java/Dockerfile

@@ -0,0 +1,9 @@
+FROM maven:3.6.1-jdk-8-alpine AS MVN_BLDR
+COPY pom.xml /tmp/
+COPY src /tmp/src/
+WORKDIR /tmp/
+RUN mvn package
+
+FROM tomcat:alpine
+RUN rm -fr /usr/local/tomcat/webapps/ROOT
+COPY --from=MVN_BLDR /tmp/target/*.war $CATALINA_HOME/webapps/ROOT.war

web/documentserver-example/java/README.md

@@ -1,14 +1,14 @@
 ## Overview
 
-This example will help you integrate ONLYOFFICE Docs into your web application written in Java. 
+This example will help you integrate ONLYOFFICE Docs into your web application written in Java.
 
-It is aimed at testing the editors. Please, do not use it for production without proper modifications.
+**Please note**: It is intended for testing purposes and demonstrating functionality of the editors. Do NOT use this integration example on your own server without proper code modifications! In case you enabled the test example, disable it before going for production.
 
 ## For Windows
 
 ### Step 1. Install ONLYOFFICE Docs
 
-Download and install ONLYOFFICE Docs (packaged as Document Server). 
+Download and install ONLYOFFICE Docs (packaged as Document Server).
 
 See the detailed guide to learn how to [install Document Server for Windows](https://helpcenter.onlyoffice.com/installation/docs-developer-install-windows.aspx). 
 
@@ -16,13 +16,14 @@ See the detailed guide to learn how to [install Document Server for Windows](htt
 
 Download the [Java example](https://api.onlyoffice.com/editors/demopreview) from our site.
 
-To connect the editors to your website, specify the path to the editors installation in the *\src\main\resources\settings.properties* file:
+To connect the editors to your website, specify the path to the editors installation and the path to the storage folder in the *\src\main\resources\settings.properties* file:
 
 ```
+storage-folder = app_data
 files.docservice.url.site=https://documentserver/
 ```
 
-where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed.
+where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed and the **storage-folder** is the path where files will be created and stored. 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) in the *\src\main\webapp\editor.jsp* file.
 
@@ -96,7 +97,7 @@ To run the Java example code, install the Java version appropriate for your OS a
 2. Tomcat Web Application Manager will request the **username** and the **password:**
 
 	![author](screenshots/author.jpg)
-   
+
 
 	Specify user data in *tomcat-users.xml* file in the Apache Tomcat installation folder. Define the **manager-gui** user role, specify the **user name** and **password** values:
 
@@ -106,18 +107,22 @@ To run the Java example code, install the Java version appropriate for your OS a
 		<user username="tomcat" password="tomcat" roles="manager-gui"/>
 	</tomcat-users>
 	```
-
-3. Upload the Java project in Tomcat Web Application Manager. For that click **Choose File** in the **WAR file to deploy** section and find the *.war* file in the Java project folder, then click **Deploy**.
+3. Build the project using the following commands
+	```
+	mvn clean
+	mvn package
+	```
+4. Upload the Java project in Tomcat Web Application Manager. For that click **Choose File** in the **WAR file to deploy** section and find the *.war* file in the Java project folder, then click **Deploy**.
 
 	![upload-app](screenshots/upload-app.jpg)
 
 	![war-file](screenshots/war-file.jpg) 
 
-4. You will see the project in the **Application List**:
-	
+5. You will see the project in the **Application List**:
+
 	![manager-app](screenshots/manager-app.jpg) 
-   
-5. Click the link with the application name to run it.
+
+6. Click the link with the application name to run it.
 
 ### Step 6. Check accessibility
 
@@ -163,13 +168,17 @@ See the detailed guide to learn how to [install Document Server for Linux](https
     nano src/main/resources/settings.properties
     ```
 
-	Edit the following line:
+	Edit the following lines:
 
     ```
+    storage-folder = app_data
     files.docservice.url.site=https://documentserver/
     ```
 
-	where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed.
+	where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed and the **storage-folder** is the path where files will be created and stored. Please note that you must have read and write permissions to the folder. If you do not have them, please use the next command:
+	```
+	sudo chmod -R ugo+rw /{path}
+	```
 
 5. Install **Maven**:
 
@@ -238,13 +247,14 @@ Make sure that the Document Server has access to the server with the example ins
 	nano src/main/resources/settings.properties
 	```
 	
-2. Edit the following line:
+2. Edit the following lines:
 
 	```
+	storage-folder = app_data
 	files.docservice.url.site=https://documentserver/
 	```
 
-	where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed.
+	where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed and the **storage-folder** is the path where files will be created and stored.
 
 3. Run the next command in the Java example directory:
 
@@ -253,3 +263,12 @@ Make sure that the Document Server has access to the server with the example ins
 	```
 
 4. After it, all the *bin* files will be passed to the *./target* folder.
+
+## Important security info
+
+Please keep in mind the following security aspects when you are using test examples:
+
+* There is no protection of the storage from unauthorized access since there is no need for authorization.
+* There are no checks against parameter substitution in links, since the parameters are generated by the code according to the pre-arranged scripts.
+* There are no data checks in requests of saving the file after editing, since each test example is intended for requests only from ONLYOFFICE Document Server.
+* There are no prohibitions on using test examples from other sites, since they are intended to interact with ONLYOFFICE Document Server from another domain.

web/documentserver-example/java/docker-compose.yml

@@ -1,7 +1,9 @@
 version: '3'
 services:
-  build:
-    image: maven:3.6
-    volumes:
-      - .:/java
-    command: mvn -f /java package
+    java-intg-ex:
+        build:
+            context: ./
+            dockerfile: Dockerfile
+        ports:
+            - 8080:8080
+       

web/documentserver-example/java/pom.xml

@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.5</version>
+            <version>2.8.9</version>
         </dependency>
         <dependency>
             <groupId>com.inversoft</groupId>
@@ -45,8 +45,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>8</source>
+                    <target>8</target>
                     <compilerArguments>
                         <endorseddirs>${endorsed.dir}</endorseddirs>
                     </compilerArguments>

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

@@ -47,6 +47,7 @@ public class EditorServlet extends HttpServlet
         String fileName = FileUtility.GetFileName(request.getParameter("fileName"));
         String fileExt = request.getParameter("fileExt");
         String sample = request.getParameter("sample");
+        Boolean isEnableDirectUrl = Boolean.valueOf(request.getParameter("directUrl"));
 
         // check if there is sample data in the request
         Boolean sampleData = (sample == null || sample.isEmpty()) ? false : sample.toLowerCase().equals("true");
@@ -70,24 +71,33 @@ public class EditorServlet extends HttpServlet
         }
 
         // create file model (get all the necessary parameters from cookies)
-        FileModel file = new FileModel(fileName, cm.getCookie("ulang"), request.getParameter("actionLink"), user);
+        FileModel file = new FileModel(fileName, cm.getCookie("ulang"), request.getParameter("actionLink"), user, isEnableDirectUrl);
         // change type parameter if needed
-        file.changeType(request.getParameter("mode"), request.getParameter("type"), user);
+        file.changeType(request.getParameter("mode"), request.getParameter("type"), user, fileName);
 
         // an image that will be inserted into the document
         Map<String, Object> dataInsertImage = new HashMap<>();
         dataInsertImage.put("fileType", "png");
         dataInsertImage.put("url", DocumentManager.GetServerUrl(true) + "/css/img/logo.png");
+        if (isEnableDirectUrl) {
+            dataInsertImage.put("directUrl", DocumentManager.GetServerUrl(false) + "/css/img/logo.png");
+        }
 
         // a document that will be compared with the current document
         Map<String, Object> dataCompareFile = new HashMap<>();
         dataCompareFile.put("fileType", "docx");
         dataCompareFile.put("url", DocumentManager.GetServerUrl(true) + "/IndexServlet?type=assets&name=sample.docx");
+        if (isEnableDirectUrl) {
+            dataCompareFile.put("directUrl", DocumentManager.GetServerUrl(false) + "/IndexServlet?type=assets&name=sample.docx");
+        }
 
         // recipients data for mail merging
         Map<String, Object> dataMailMergeRecipients = new HashMap<>();
         dataMailMergeRecipients.put("fileType", "csv");
         dataMailMergeRecipients.put("url", DocumentManager.GetServerUrl(true) + "/IndexServlet?type=csv");
+        if (isEnableDirectUrl) {
+            dataMailMergeRecipients.put("directUrl", DocumentManager.GetServerUrl(false) + "/IndexServlet?type=csv");
+        }
 
         // users data for mentions
         List<Map<String, Object>> usersForMentions = Users.getUsersForMentions(user.id);

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

@@ -29,6 +29,7 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
+import helpers.*;
 
 public class GlobalServletContextListener implements ServletContextListener
 {
@@ -70,16 +71,19 @@ public class GlobalServletContextListener implements ServletContextListener
 
         SSLContext sc;
 
-        try
-        {
-            // register the all-trusting trust manager for HTTPS
-            sc = SSLContext.getInstance("SSL");
-            sc.init(null, trustAllCerts, new java.security.SecureRandom());
-            HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
-        }
-        catch (NoSuchAlgorithmException | KeyManagementException ex)
-        {
+        if(!ConfigManager.GetProperty("files.docservice.verify-peer-off").isEmpty()) {
+             try
+            {
+                // register the all-trusting trust manager for HTTPS
+                sc = SSLContext.getInstance("SSL");
+                sc.init(null, trustAllCerts, new java.security.SecureRandom());
+                HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+            }
+            catch (NoSuchAlgorithmException | KeyManagementException ex)
+            {
+            }
         }
+       
 
         // create all-trusting host name verifier
         HostnameVerifier allHostsValid = new HostnameVerifier()

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

@@ -29,6 +29,8 @@ import java.util.*;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.charset.StandardCharsets;
+
 import javax.servlet.ServletException;
 import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.annotation.WebServlet;
@@ -36,7 +38,9 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.Part;
+
 import entities.FileType;
+
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
@@ -45,6 +49,7 @@ import org.primeframework.jwt.Verifier;
 import org.primeframework.jwt.domain.JWT;
 import org.primeframework.jwt.hmac.HMACVerifier;
 
+
 @WebServlet(name = "IndexServlet", urlPatterns = {"/IndexServlet"})
 @MultipartConfig
 public class IndexServlet extends HttpServlet
@@ -72,6 +77,10 @@ public class IndexServlet extends HttpServlet
                 break;
             case "download":
                 Download(request, response, writer);
+                break;
+            case "downloadhistory":
+                DownloadHistory(request, response, writer);
+                break;
             case "convert":
                 Convert(request, response, writer);
                 break;
@@ -93,6 +102,9 @@ public class IndexServlet extends HttpServlet
             case "saveas":
                 SaveAs(request, response, writer);
                 break;
+            case "rename":
+                Rename(request, response, writer);
+                break;
         }
     }
 
@@ -222,7 +234,7 @@ public class IndexServlet extends HttpServlet
             String fileName = FileUtility.GetFileName((String) body.get("filename"));
             String lang = cm.getCookie("ulang");
             String filePass = body.get("filePass") != null ? (String) body.get("filePass") : null;
-            String fileUri = DocumentManager.GetDownloadUrl(fileName);
+            String fileUri = DocumentManager.GetDownloadUrl(fileName, true);
             String fileExt = FileUtility.GetFileExtension(fileName);
             FileType fileType = FileUtility.GetFileType(fileName);
             String internalFileExt = DocumentManager.GetInternalExtension(fileType);
@@ -317,7 +329,7 @@ public class IndexServlet extends HttpServlet
                 if (users.indexOf(user) == -1) {
                     String key = (String) body.get("key");
                     try {
-                        TrackManager.commandRequest("forcesave", key);  // create a command request with the forcesave method
+                        TrackManager.commandRequest("forcesave", key, null);  // create a command request with the forcesave method
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -430,14 +442,53 @@ public class IndexServlet extends HttpServlet
         download(filePath.toString(), response, writer);
     }
 
+    // download a file from history
+    private static void DownloadHistory(HttpServletRequest request, HttpServletResponse response, PrintWriter writer)
+    {
+        try {
+            if (DocumentManager.TokenEnabled()) {
+
+                String DocumentJwtHeader = ConfigManager.GetProperty("files.docservice.header");
+
+                String header = (String) request.getHeader(DocumentJwtHeader == null || DocumentJwtHeader.isEmpty() ? "Authorization" : DocumentJwtHeader);
+                if (header != null && !header.isEmpty()) {
+                    String token = header.startsWith("Bearer ") ? header.substring(7) : header;
+                    try {
+                        Verifier verifier = HMACVerifier.newVerifier(DocumentManager.GetTokenSecret());
+                        JWT jwt = JWT.getDecoder().decode(token, verifier);
+                    } catch (Exception e) {
+                        response.sendError(403, "JWT validation failed");
+                        return;
+                    }
+                } else {
+                    response.sendError(403, "JWT validation failed");
+                    return;
+                }
+            }
+
+            String fileName = FileUtility.GetFileName(request.getParameter("fileName"));
+            String userAddress = request.getParameter("userAddress");
+
+            String ver = request.getParameter("ver");  //  Document version
+            String file = request.getParameter("file"); //   File. If not defined, then Prev.*
+
+            String filePath = DocumentManager.HistoryPath(fileName, userAddress, ver, file);
+
+            download(filePath, response, writer);
+        } catch (Exception e) {
+            writer.write("{ \"error\": \"File not found\"}");
+        }
+    }
+
     // download a file
     private static void Download(HttpServletRequest request, HttpServletResponse response, PrintWriter writer)
     {
         try {
             String fileName = FileUtility.GetFileName(request.getParameter("fileName"));
             String userAddress = request.getParameter("userAddress");
+            String isEmbedded = request.getParameter("dmode");
 
-            if (DocumentManager.TokenEnabled()) {
+            if (DocumentManager.TokenEnabled() && isEmbedded == null) {
 
                 String DocumentJwtHeader = ConfigManager.GetProperty("files.docservice.header");
 
@@ -508,6 +559,43 @@ public class IndexServlet extends HttpServlet
         }
     }
 
+    // rename a file
+    private static void Rename(HttpServletRequest request, HttpServletResponse response, PrintWriter writer) {
+        try {
+            Scanner scanner = new Scanner(request.getInputStream());
+            scanner.useDelimiter("\\A");
+            String bodyString = scanner.hasNext() ? scanner.next() : "";
+            scanner.close();
+
+            JSONParser parser = new JSONParser();
+            JSONObject body = (JSONObject) parser.parse(bodyString);
+
+            String newfilename = (String) body.get("newfilename");
+            String dockey = (String) body.get("dockey");
+
+            String origExt = "." + (String) body.get("ext");
+            String curExt = newfilename;
+
+            if(newfilename.indexOf(".") != -1) {
+                curExt = (String) FileUtility.GetFileExtension(newfilename);
+            }
+
+            if(origExt.compareTo(curExt) != 0) {
+                newfilename += origExt;
+            }
+
+            HashMap<String, String> meta = new HashMap<>();
+            meta.put("title", newfilename);
+
+            TrackManager.commandRequest("meta", dockey, meta);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            writer.write("{ \"error\" : 1, \"message\" : \"" + e.getMessage() + "\"}");
+        }
+    }
+
+
     // process get request
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException

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

@@ -20,16 +20,14 @@ package entities;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
-import helpers.DocumentManager;
-import helpers.FileUtility;
-import helpers.ServiceConverter;
-import helpers.Users;
+import helpers.*;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 public class FileModel
@@ -42,7 +40,7 @@ public class FileModel
     public String token;
 
     // create file model
-    public FileModel(String fileName, String lang, String actionData, User user)
+    public FileModel(String fileName, String lang, String actionData, User user, Boolean isEnableDirectUrl)
     {
         if (fileName == null) fileName = "";
         fileName = fileName.trim();  // remove extra spaces in the file name
@@ -53,8 +51,8 @@ public class FileModel
         // set the document parameters
         document = new Document();
         document.title = fileName;
-        document.url = DocumentManager.GetDownloadUrl(fileName);  // get file url
-        document.urlUser = DocumentManager.GetFileUri(fileName, false);
+        document.url = DocumentManager.GetDownloadUrl(fileName, true);  // get file url
+        document.directUrl = isEnableDirectUrl ? DocumentManager.GetDownloadUrl(fileName, false) : "";  // get direct url
         document.fileType = FileUtility.GetFileExtension(fileName).replace(".", "");  // get file extension from the file name
         // generate document key
         document.key = ServiceConverter.GenerateRevisionId(DocumentManager.CurUserHostAddress(null) + "/" + fileName + "/" + Long.toString(new File(DocumentManager.StoragePath(fileName, null)).lastModified()));
@@ -80,6 +78,12 @@ public class FileModel
         // set the editor config parameters
         editorConfig = new EditorConfig(actionData);
         editorConfig.callbackUrl = DocumentManager.GetCallback(fileName);  // get callback url
+
+        editorConfig.coEditing = mode.equals("view") && user.id.equals("uid-0") ? 
+        new HashMap<String, Object>()  {{ 
+            put("mode", "strict");
+            put("change", false);
+        }} : null;
         
         if (lang != null) editorConfig.lang = lang;  // write language parameter to the config
 
@@ -87,18 +91,18 @@ public class FileModel
         editorConfig.templates = user.templates ? templates : null;
 
         // write user information to the config (id, name and group)
-        editorConfig.user.id = user.id;
+        editorConfig.user.id = !user.id.equals("uid-0") ? user.id : null;
         editorConfig.user.name = user.name;
         editorConfig.user.group = user.group;
 
         // write the absolute URL to the file location
         editorConfig.customization.goback.url = DocumentManager.GetServerUrl(false) + "/IndexServlet";
 
-        changeType(mode, type, user);
+        changeType(mode, type, user, fileName);
     }
 
     // change the document type
-    public void changeType(String _mode, String _type, User user)
+    public void changeType(String _mode, String _type, User user, String fileName)
     {
         if (_mode != null) mode = _mode;
         if (_type != null) type = _type;
@@ -119,12 +123,12 @@ public class FileModel
         // set document permissions
         document.permissions = new Permissions(mode, type, canEdit, user);
 
-        if (type.equals("embedded")) InitDesktop();  // set parameters for the embedded document
+        if (type.equals("embedded")) InitDesktop(fileName);  // set parameters for the embedded document
     }
 
-    public void InitDesktop()
+    public void InitDesktop(String fileName)
     {
-        editorConfig.InitDesktop(document.urlUser);
+        editorConfig.InitDesktop(DocumentManager.GetDownloadUrl(fileName, false) + "&dmode=emb");
     }
 
     // generate document token
@@ -167,7 +171,7 @@ public class FileModel
                     obj.put("version", i);
 
                     if (i == 1) {  // check if the version number is equal to 1
-                        String createdInfo = readFileToEnd(new File(histDir + File.separator + "createdInfo.json"));  // get file with meta data
+                        String createdInfo = readFileToEnd(new File(histDir + File.separator + "createdInfo.json")); // get file with meta data
                         JSONObject json = (JSONObject) parser.parse(createdInfo);  // and turn it into json object
 
                         // write meta information to the object (user information and creation date)
@@ -178,8 +182,12 @@ public class FileModel
                         obj.put("user", user);
                     }
 
+                    dataObj.put("fileType", FileUtility.GetFileExtension(document.title).substring(1));
                     dataObj.put("key", key);
-                    dataObj.put("url", i == curVer ? document.url : DocumentManager.GetPathUri(verDir + File.separator + "prev" + FileUtility.GetFileExtension(document.title)));
+                    dataObj.put("url", i == curVer ? document.url : DocumentManager.GetDownloadHistoryUrl(document.title, i, "prev" + FileUtility.GetFileExtension(document.title), true));
+                    if (!document.directUrl.equals("")) {
+                        dataObj.put("directUrl", i == curVer ? document.url : DocumentManager.GetDownloadHistoryUrl(document.title, i, "prev" + FileUtility.GetFileExtension(document.title), false));
+                    }
                     dataObj.put("version", i);
 
                     if (i > 1) {  //check if the version number is greater than 1
@@ -195,11 +203,14 @@ public class FileModel
 
                         Map<String, Object> prev = (Map<String, Object>) histData.get(Integer.toString(i - 2));  // get the history data from the previous file version
                         Map<String, Object> prevInfo = new HashMap<String, Object>();
+                        prevInfo.put("fileType", prev.get("fileType"));
                         prevInfo.put("key", prev.get("key"));  // write key and url information about previous file version
                         prevInfo.put("url", prev.get("url"));
                         dataObj.put("previous", prevInfo);  // write information about previous file version to the data object
                         // write the path to the diff.zip archive with differences in this file version
-                        dataObj.put("changesUrl", DocumentManager.GetPathUri(DocumentManager.VersionDir(histDir, i - 1) + File.separator + "diff.zip"));
+                        Integer verdiff = i - 1;
+                        String changesUrl = DocumentManager.GetDownloadHistoryUrl(document.title, verdiff, "diff.zip", true);
+                        dataObj.put("changesUrl", changesUrl);
                     }
 
                     if (DocumentManager.TokenEnabled())
@@ -246,7 +257,7 @@ public class FileModel
     {
         public String title;
         public String url;
-        public String urlUser;
+        public String directUrl;
         public String fileType;
         public String key;
         public Info info;
@@ -265,8 +276,11 @@ public class FileModel
         public Boolean modifyFilter;
         public Boolean modifyContentControl;
         public Boolean review;
+        public Boolean chat;
         public List<String> reviewGroups;
         public CommentGroups commentGroups;
+        public List<String> userInfoGroups;
+        //public Gson gson = new Gson();
 
         // defines what can be done with a document
         public Permissions(String mode, String type, Boolean canEdit, User user)
@@ -280,15 +294,24 @@ public class FileModel
             modifyFilter = !mode.equals("filter");
             modifyContentControl = !mode.equals("blockcontent");
             review = canEdit && (mode.equals("edit") || mode.equals("review"));
+            chat = !user.id.equals("uid-0");
             reviewGroups = user.reviewGroups;
             commentGroups = user.commentGroups;
+            userInfoGroups = user.userInfoGroups;
         }
     }
 
     // the Favorite icon state
     public class Info
     {
+        public String owner = "Me";
         public Boolean favorite;
+        public String uploaded = getDate();
+
+        private String getDate() {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("EEE MMM dd yyyy", Locale.US);
+            return simpleDateFormat.format(new Date());
+        }
     }
     // the editor config parameters
     public class EditorConfig
@@ -296,6 +319,7 @@ public class FileModel
         public HashMap<String, Object> actionLink = null;
         public String mode = "edit";
         public String callbackUrl;
+        public HashMap<String, Object> coEditing = null;
         public String lang = "en";
         public String createUrl;
         public List<Map<String, String>> templates;
@@ -338,9 +362,15 @@ public class FileModel
             public Goback goback;
             public Boolean forcesave;
             public Boolean submitForm;
+            public Boolean about;
+            public Boolean comments;
+            public Boolean feedback;
 
             public Customization()
             {
+                about = true;
+                comments = true;
+                feedback = true;
                 forcesave = false;
                 goback = new Goback();
             }

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

@@ -31,8 +31,9 @@ public class User {
     public List<String> deniedPermissions;
     public List<String> descriptions;
     public Boolean templates;
+    public List<String> userInfoGroups;
 
-    public User(String id, String name, String email, String group, List<String> reviewGroups, CommentGroups commentGroups,
+    public User(String id, String name, String email, String group, List<String> reviewGroups, CommentGroups commentGroups, List<String> userInfoGroups,
                 Boolean favorite, List<String> deniedPermissions, List<String> descriptions, Boolean templates) {
         this.id = id;
         this.name = name;
@@ -44,5 +45,6 @@ public class User {
         this.deniedPermissions = deniedPermissions;
         this.descriptions = descriptions;
         this.templates = templates;
+        this.userInfoGroups = userInfoGroups;
     }
 }

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

@@ -130,7 +130,20 @@ public class DocumentManager
         String hostAddress = CurUserHostAddress(userAddress);  // get current user host address
         String serverPath = request.getSession().getServletContext().getRealPath("");  // get the server url
         String storagePath = ConfigManager.GetProperty("storage-folder");  // get the storage directory
-        String directory = serverPath + storagePath + File.separator + hostAddress + File.separator;
+        File f = new File(storagePath);
+
+        if (f.isAbsolute()) {
+            if (!f.exists()) {
+                if (Files.isWritable(Paths.get(storagePath.substring(0, storagePath.lastIndexOf(File.separator))))) {
+                    f.mkdirs();
+                } else {
+                    throw new SecurityException("No write permission to path: " + f.toPath());
+                }
+            } else if (f.exists() && f.isFile()) {
+                throw new SecurityException("The path to the file is specified instead of the folder");
+            }
+        }
+        String directory = !f.isAbsolute() ? serverPath + storagePath + File.separator + hostAddress + File.separator : storagePath + File.separator;
 
         File file = new File(directory);
 
@@ -151,6 +164,22 @@ public class DocumentManager
         return directory + FileUtility.GetFileName(fileName);
     }
 
+    // get the path to history file
+    public static String HistoryPath(String fileName, String userAddress, String version, String file)
+    {
+        String hostAddress = CurUserHostAddress(userAddress);
+        String serverPath = request.getSession().getServletContext().getRealPath("");
+        String storagePath = ConfigManager.GetProperty("storage-folder");
+        String directory = serverPath + storagePath + File.separator + hostAddress + File.separator;
+        if (new File(storagePath).isAbsolute()) {
+            directory = FilesRootPath(userAddress);
+        }
+
+        directory = directory + fileName + "-hist" + File.separator + version + File.separator + file;
+
+        return directory;
+    }
+
     // get the path to the forcesaved file version
     public static String ForcesavePath(String fileName, String userAddress, Boolean create)
     {
@@ -320,13 +349,20 @@ public class DocumentManager
         {
             String serverPath = GetServerUrl(forDocumentServer);
             String storagePath = ConfigManager.GetProperty("storage-folder");
+            File f = new File(storagePath);
             String hostAddress = CurUserHostAddress(null);
 
             String filePath = serverPath + "/" + storagePath + "/" + hostAddress + "/" + URLEncoder.encode(fileName, java.nio.charset.StandardCharsets.UTF_8.toString()).replace("+", "%20");
+            if (f.isAbsolute() && f.isFile()) {
+                filePath = GetDownloadUrl(fileName, true);
+                if (!Files.isWritable(f.toPath())) {
+                    throw new SecurityException("No write permission to path: " + f.toPath());
+                }
+            }
 
             return filePath;
         }
-        catch (UnsupportedEncodingException e)
+        catch (Exception e)
         {
             return "";
         }
@@ -414,12 +450,31 @@ public class DocumentManager
     }
 
     // get url to download a file
-    public static String GetDownloadUrl(String fileName) {
-        String serverPath = GetServerUrl(true);
+    public static String GetDownloadUrl(String fileName, Boolean forDocumentServer) {
+        String serverPath = GetServerUrl(forDocumentServer);
         String hostAddress = CurUserHostAddress(null);
         try
         {
-            String query = "?type=download&fileName=" + URLEncoder.encode(fileName, java.nio.charset.StandardCharsets.UTF_8.toString()) + "&userAddress=" + URLEncoder.encode(hostAddress, java.nio.charset.StandardCharsets.UTF_8.toString());
+            String userAddress = forDocumentServer ? "&userAddress=" + URLEncoder.encode(hostAddress, java.nio.charset.StandardCharsets.UTF_8.toString()) : "";
+            String query = "?type=download&fileName=" + URLEncoder.encode(fileName, java.nio.charset.StandardCharsets.UTF_8.toString()) + userAddress;
+
+            return serverPath + "/IndexServlet" + query;
+        }
+        catch (UnsupportedEncodingException e)
+        {
+            return "";
+        }
+    }
+
+    // get url to download a file to History prev.*
+    public static String GetDownloadHistoryUrl(String fileName, Integer version, String file, Boolean forDocumentServer) {
+        String serverPath = GetServerUrl(forDocumentServer);
+        String hostAddress = CurUserHostAddress(null);
+        try
+        {
+            String userAddress = forDocumentServer ? "&userAddress=" + URLEncoder.encode(hostAddress, java.nio.charset.StandardCharsets.UTF_8.toString()) : "";
+            String query = "?type=downloadhistory&fileName=" + URLEncoder.encode(fileName, java.nio.charset.StandardCharsets.UTF_8.toString()) + userAddress;
+            query = query + "&ver=" + version + "&file=" + URLEncoder.encode(file, java.nio.charset.StandardCharsets.UTF_8.toString());
 
             return serverPath + "/IndexServlet" + query;
         }
@@ -515,4 +570,19 @@ public class DocumentManager
     {
         return ConfigManager.GetProperty("files.docservice.secret");
     }
+
+    // get languages
+    public static Map<String, String> GetLanguages()
+    {
+        String langs = ConfigManager.GetProperty("files.docservice.languages");
+        List<String> langsAndKeys = Arrays.asList(langs.split("\\|"));
+
+        Map<String, String> languages = new LinkedHashMap<>();
+
+        langsAndKeys.forEach((str) -> {
+            String[] couple = str.split(":");
+            languages.put(couple[0], couple[1]);
+        });
+        return languages;
+    }
 }