Fixed displaying mobile version cb5324381e

build(deps): bump debug from 2.2.0 to 2.6.9 in /web/documentserver-example/nodejs

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 ONLYOFFICE
+Copyright (c) 2019 ONLYOFFICE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Readme.md

@@ -17,11 +17,11 @@ More information on how to use these examples can be found here: [http://api.onl
 
 ## Project Information
 
-Official website: [http://www.onlyoffice.org](http://onlyoffice.org "http://www.onlyoffice.org")
+Official website: [https://www.onlyoffice.com](https://www.onlyoffice.com/?utm_source=github&utm_medium=cpc&utm_campaign=GitHubIntegrationEx)
 
 Code repository: [https://github.com/ONLYOFFICE/document-server-integration](https://github.com/ONLYOFFICE/document-server-integration "https://github.com/ONLYOFFICE/document-server-integration")
 
-SaaS version: [http://www.onlyoffice.com](http://www.onlyoffice.com "http://www.onlyoffice.com")
+ONLYOFFICE for developers: [https://www.onlyoffice.com/developer-edition.aspx](https://www.onlyoffice.com/developer-edition.aspx?utm_source=github&utm_medium=cpc&utm_campaign=GitHubIntegrationEx)
 
 ## User Feedback and Support
 

licences/3rd-Party.txt

@@ -19,4 +19,9 @@ License:        MIT, GPL
 
 4. jQuery UI - jQuery  UI is a curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library. Whether you're  building highly interactive web applications or you just need to add a date picker to a form control, jQuery UI is the perfect choice.  (http://jqueryui.com/)
 
-License:        MIT
+License:        MIT
+
+
+5. Prime JWT - Prime JWT is intended to be fast and easy to use. Prime JWT has a single external dependency on Jackson.
+
+License:        Apache-2.0

licences/prime-jwt.license

@@ -0,0 +1,201 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   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.

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -113,13 +113,14 @@ label .checkbox {
 
 .try-editor-list {
     list-style: none;
-    margin: 0;
+    margin: 0 0 16px;
     padding: 0;
 }
 .try-editor-list li {
     float: left;
-    margin: 25px;
-    width: 150px;
+    margin: 0 15px;
+    width: 100px;
+    cursor: pointer;
 }
 .try-editor {
     background-color: transparent;
@@ -143,6 +144,11 @@ label .checkbox {
     background-image: url("images/file_pptx.png");
 }
 
+.create-sample {
+    display: inline-block;
+    margin-left: 75px;
+}
+
 .button, .button:visited, .button:hover, .button:active {
     display: inline-block;
     font-weight: normal;
@@ -185,25 +191,43 @@ label .checkbox {
     border: 1px solid #E9EAEA;
 }
 
+.upload-panel {
+    border-right: 1px solid #D1D1D1;
+    float: left;
+    margin-right: 25px;
+}
+
 .file-upload {
+    background: url("images/file_upload.png") no-repeat center 0 transparent;
     cursor: pointer;
-    margin-bottom: 8px;
-    padding: 0 !important;
+    display: inline-block;
+    font-size: 14px;
+    font-weight: bold;
+    height: 45px;
+    margin: 0 40px 16px;
     overflow: hidden;
+    padding-top: 100px;
     position: relative;
+    text-align: center;
+    width: 100px;
 }
-.file-upload span {
-    line-height: 21px;
-    margin: 2px 12px;
+
+    .file-upload input {
+        cursor: pointer;
+        opacity: 0;
+        position: absolute;
+        right: 0;
+        top: 0;
+        transform: translate(555px, 60px) scale(8);
+    }
+
+.create-panel {
+    float: left;
 }
-.file-upload input {
-    cursor: pointer;
-    font-size: 23px;
-    opacity: 0;
-    position: absolute;
-    right: 0;
-    top: 0;
-    transform: translate(-300px, 0) scale(4);
+
+.upload-panel,
+.create-panel {
+    padding: 10px 0;
 }
 
 #mainProgress {
@@ -281,7 +305,54 @@ label .checkbox {
     line-height: 26px;
 }
 
+.stored-list {
+    border-top: 1px solid #D1D1D1;
+    list-style: none;
+    margin: 0;
+    padding: 0;
+}
 
+    .stored-list li {
+        border-bottom: 1px solid #D1D1D1;
+        line-height: 28px;
+        padding: 0 8px;
+    }
+
+.stored-edit {
+    background-color: transparent;
+    background-position: left center;
+    background-repeat: no-repeat;
+    display: inline-block;
+    line-height: 16px;
+    max-width: 450px;
+    margin-bottom: -6px;
+    overflow: hidden;
+    padding: 4px 0 1px 34px;
+    text-decoration: none;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+    .stored-edit.text {
+        background-image: url("images/icon_docx.png");
+    }
+
+    .stored-edit.spreadsheet {
+        background-image: url("images/icon_xlsx.png");
+    }
+
+    .stored-edit.presentation {
+        background-image: url("images/icon_pptx.png");
+    }
+
+    .stored-edit span {
+        font-size: 12px;
+        line-height: 12px;
+    }
+
+    .stored-edit:hover span {
+        text-decoration: underline;
+    }
 
 
 .blockTitle {
@@ -312,4 +383,121 @@ label .checkbox {
     -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.5);
     -webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.5);
     padding: 0 !important;
-}
+}
+
+.clearFix:after {
+    content: ".";
+    display: block;
+    height: 0;
+    clear: both;
+    visibility: hidden;
+}
+
+/*Icon table*/
+#tableRow {
+    vertical-align: top;
+}
+
+.tableRow {
+    background: transparent;
+    -moz-transition: all 0.2s ease-in-out;
+    -webkit-transition: all 0.2s ease-in-out;
+    -o-transition: all 0.2s ease-in-out;
+    -ms-transition: all 0.2s ease-in-out;
+    transition: all 0.2s ease-in-out;
+}
+
+    .tableRow:hover {
+        background-color: #ebebeb;
+    }
+
+.tableHeader {
+    background: transparent;
+    color: #333;
+    cursor: default;
+    font-family: 'Open Sans', sans-serif;
+    font-size: 13px;
+    height: 40px;
+    -khtml-user-select: none;
+    user-select: none;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+}
+
+.tableHeaderCell {
+    padding: 2px 1px 2px 5px;
+    text-align: center;
+}
+
+.tableHeaderCellFileName {
+    text-align: left;
+}
+
+.contentCells {
+    padding: 4px 1px 4px 5px;
+    font-family: 'Open Sans', sans-serif;
+    font-size: 16px;
+    border-bottom: 1px solid #e5e5e5;
+    white-space: nowrap;
+    -khtml-user-select: none;
+    user-select: none;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+}
+
+    .contentCells a {
+        text-decoration: none;
+    }
+
+.contentCells-shift {
+    padding-right: 30px;
+}
+
+.contentCells-icon {
+    width: 6%;
+}
+
+.contentCellsSmall {
+    padding: 5px 1px 5px 6px;
+    font-family: 'Open Sans', sans-serif;
+    font-size: 13px;
+    border-bottom: 1px solid #e5e5e5;
+    white-space: nowrap;
+    text-align: center;
+}
+
+.primaryRow {
+    background-color: #e9e9e9;
+}
+
+.secondaryRow {
+    background-color: #F9F9F9;
+}
+
+.select-user {
+    margin-left: 15px;
+}
+
+.user-block-table {
+    height: 100%;
+    width: 100%;
+}
+
+    .user-block-table td {
+        background-color: #F4F4F4;
+        border-bottom: 1px solid white;
+        padding: 12px 0;
+    }
+
+#user, #language {
+    width: 130px;
+}
+
+.icon-download {
+    margin-bottom: -5px;
+}
+
+.icon-delete {
+    cursor: pointer;
+    margin-bottom: -6px;
+} 

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -37,22 +37,22 @@ namespace OnlineEditorsExampleMVC.Controllers
             return View();
         }
 
-        public ActionResult Editor(string fileName, string mode)
+        public ActionResult Editor(string fileName, string editorsMode, string editorsType)
         {
-            mode = mode ?? string.Empty;
-
             var file = new FileModel
             {
-                TypeDesktop = mode != "embedded",
+                Mode = editorsMode,
+                Type = editorsType,
                 FileName = fileName
             };
 
             return View("Editor", file);
         }
 
-        public ActionResult Sample(string fileExt)
+        public ActionResult Sample(string fileExt, bool? sample)
         {
-            var fileName = DocManagerHelper.CreateDemo(fileExt);
+            var fileName = DocManagerHelper.CreateDemo(fileExt, sample ?? false);
+            DocManagerHelper.CreateMeta(fileName, Request.Cookies["uid"]?.Value, Request.Cookies["uname"]?.Value);
             Response.Redirect(Url.Action("Editor", "Home", new { fileName = fileName }));
             return null;
         }

web/documentserver-example/csharp-mvc/Global.asax.cs

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -28,11 +28,10 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Text.RegularExpressions;
 using System.Web;
-using System.Web.Caching;
 using System.Web.Configuration;
+using System.Web.Script.Serialization;
 using OnlineEditorsExampleMVC.Models;
 
 namespace OnlineEditorsExampleMVC.Helpers
@@ -84,6 +83,32 @@ namespace OnlineEditorsExampleMVC.Helpers
             return directory + fileName;
         }
 
+        public static string HistoryDir(string storagePath)
+        {
+            return storagePath += "-hist";
+        }
+
+        public static string VersionDir(string histPath, int version)
+        {
+            return Path.Combine(histPath, version.ToString());
+        }
+
+        public static string VersionDir(string fileName, string userAddress, int version)
+        {
+            return VersionDir(HistoryDir(StoragePath(fileName, userAddress)), version);
+        }
+
+        public static int GetFileVersion(string historyPath)
+        {
+            if (!Directory.Exists(historyPath)) return 0;
+            return Directory.EnumerateDirectories(historyPath).Count();
+        }
+
+        public static int GetFileVersion(string fileName, string userAddress)
+        {
+            return GetFileVersion(HistoryDir(StoragePath(fileName, userAddress)));
+        }
+
         public static string GetCorrectName(string fileName)
         {
             var baseName = Path.GetFileNameWithoutExtension(fileName);
@@ -97,9 +122,20 @@ namespace OnlineEditorsExampleMVC.Helpers
             return name;
         }
 
-        public static string CreateDemo(string fileExt)
+        public static List<string> GetStoredFiles()
         {
-            var demoName = "sample." + fileExt;
+            var directory = HttpRuntime.AppDomainAppPath + WebConfigurationManager.AppSettings["storage-path"] + CurUserHostAddress(null) + "\\";
+            if (!Directory.Exists(directory)) return new List<string>();
+
+            var directoryInfo = new DirectoryInfo(directory);
+
+            var storedFiles = directoryInfo.GetFiles("*.*", SearchOption.TopDirectoryOnly).Select(fileInfo => fileInfo.Name).ToList();
+            return storedFiles;
+        }
+
+        public static string CreateDemo(string fileExt, bool withContent)
+        {
+            var demoName = (withContent ? "sample." : "new.") + fileExt;
 
             var fileName = GetCorrectName(demoName);
 
@@ -108,6 +144,17 @@ namespace OnlineEditorsExampleMVC.Helpers
             return fileName;
         }
 
+        public static void CreateMeta(string fileName, string uid, string uname)
+        {
+            var histDir = HistoryDir(StoragePath(fileName, null));
+            Directory.CreateDirectory(histDir);
+            File.WriteAllText(Path.Combine(histDir, "createdInfo.json"), new JavaScriptSerializer().Serialize(new Dictionary<string, object> {
+                { "created", DateTime.Now.ToString() },
+                { "id", string.IsNullOrEmpty(uid) ? "uid-1" : uid },
+                { "name", string.IsNullOrEmpty(uname) ? "John Smith" : uname }
+            }));
+        }
+
         public static string GetFileUri(string fileName)
         {
             var uri = new UriBuilder(HttpContext.Current.Request.Url)
@@ -121,6 +168,18 @@ namespace OnlineEditorsExampleMVC.Helpers
             return uri.ToString();
         }
 
+        public static string GetPathUri(string path)
+        {
+            var uri = new UriBuilder(HttpContext.Current.Request.Url)
+            {
+                Path = HttpRuntime.AppDomainAppVirtualPath + "/"
+                           + path,
+                Query = ""
+            };
+
+            return uri.ToString();
+        }
+
         public static string GetCallback(string fileName)
         {
             var callbackUrl = new UriBuilder(HttpContext.Current.Request.Url)

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -25,12 +25,14 @@
 */
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Web.Configuration;
 using System.Web.Helpers;
+using System.Web.Script.Serialization;
 
 namespace OnlineEditorsExampleMVC.Helpers
 {
@@ -107,15 +109,30 @@ namespace OnlineEditorsExampleMVC.Helpers
             request.Accept = "application/json";
             request.Timeout = ConvertTimeout;
 
-            var bodyString = string.Format("{{\"async\": {0},\"filetype\": \"{1}\",\"key\": \"{2}\",\"outputtype\": \"{3}\",\"title\": \"{4}\",\"url\": \"{5}\"}}",
-                                           isAsync.ToString().ToLower(),
-                                           fromExtension.Trim('.'),
-                                           documentRevisionId,
-                                           toExtension.Trim('.'),
-                                           title,
-                                           documentUri);
+            var body = new Dictionary<string, object>() {
+                { "async", isAsync },
+                { "filetype", fromExtension.Trim('.') },
+                { "key", documentRevisionId },
+                { "outputtype", toExtension.Trim('.') },
+                { "title", title },
+                { "url", documentUri }
+            };
 
-            var bytes = Encoding.UTF8.GetBytes(bodyString);
+            if (JwtManager.Enabled)
+            {
+                var payload = new Dictionary<string, object>
+                    {
+                        { "payload", body }
+                    };
+
+                var payloadToken = JwtManager.Encode(payload);
+                var bodyToken = JwtManager.Encode(body);
+                request.Headers.Add("Authorization", "Bearer " + payloadToken);
+
+                body.Add("token", bodyToken);
+            }
+
+            var bytes = Encoding.UTF8.GetBytes(new JavaScriptSerializer().Serialize(body));
             request.ContentLength = bytes.Length;
             using (var requestStream = request.GetRequestStream())
             {

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

@@ -0,0 +1,113 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2019
+ *
+ * The MIT License (MIT)
+ *
+ * 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.
+ *
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Security.Cryptography;
+using System.Text;
+using System.Web.Configuration;
+using System.Web.Script.Serialization;
+
+namespace OnlineEditorsExampleMVC.Helpers
+{
+    public static class JwtManager
+    {
+        private static readonly string Secret;
+        public static readonly bool Enabled;
+
+        private static readonly JavaScriptSerializer Serializer;
+
+        static JwtManager()
+        {
+            Secret = WebConfigurationManager.AppSettings["files.docservice.secret"] ?? "";
+            Enabled = !string.IsNullOrEmpty(Secret);
+            Serializer = new JavaScriptSerializer();
+        }
+
+        public static string Encode(IDictionary<string, object> payload)
+        {
+            var header = new Dictionary<string, object>
+                {
+                    { "alg", "HS256" },
+                    { "typ", "JWT" }
+                };
+
+            var encHeader = Base64UrlEncode(Serializer.Serialize(header));
+            var encPayload = Base64UrlEncode(Serializer.Serialize(payload));
+            var hashSum = Base64UrlEncode(CalculateHash(encHeader, encPayload));
+
+            return string.Format("{0}.{1}.{2}", encHeader, encPayload, hashSum);
+        }
+
+        public static string Decode(string token)
+        {
+            if (!Enabled || string.IsNullOrEmpty(token)) return "";
+
+            var split = token.Split('.');
+            if (split.Length != 3) return "";
+
+            var hashSum = Base64UrlEncode(CalculateHash(split[0], split[1]));
+            if (hashSum != split[2]) return "";
+            return Base64UrlDecode(split[1]);
+        }
+
+        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);
+            }
+        }
+
+        private static string Base64UrlEncode(string str)
+        {
+            return Base64UrlEncode(Encoding.UTF8.GetBytes(str));
+        }
+
+        private static string Base64UrlEncode(byte[] bytes)
+        {
+            return Convert.ToBase64String(bytes)
+                          .TrimEnd('=').Replace('+', '-').Replace('/', '_');
+        }
+
+        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);
+        }
+    }
+}

web/documentserver-example/csharp-mvc/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 ONLYOFFICE
+Copyright (c) 2019 ONLYOFFICE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -24,13 +24,21 @@
  *
 */
 
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Web;
+using System.Web.Mvc;
+using System.Web.Script.Serialization;
 using OnlineEditorsExampleMVC.Helpers;
 
 namespace OnlineEditorsExampleMVC.Models
 {
     public class FileModel
     {
-        public bool TypeDesktop { get; set; }
+        public string Mode { get; set; }
+        public string Type { get; set; }
 
         public string FileUri
         {
@@ -46,14 +54,173 @@ namespace OnlineEditorsExampleMVC.Models
 
         public string Key
         {
-            get { return ServiceConverter.GenerateRevisionId(DocManagerHelper.CurUserHostAddress() + "/" + FileName); }
+            get { return ServiceConverter.GenerateRevisionId(DocManagerHelper.CurUserHostAddress() + "/" + FileName + "/" + File.GetLastWriteTime(DocManagerHelper.StoragePath(FileName, null)).GetHashCode()); }
         }
 
         public string CallbackUrl
         {
-            get
+            get { return DocManagerHelper.GetCallback(FileName); }
+        }
+
+        public string GetDocConfig(HttpRequest request, UrlHelper url)
+        {
+            var ext = Path.GetExtension(FileName);
+            var editorsMode = Mode ?? "edit";
+
+            var canEdit = DocManagerHelper.EditedExts.Contains(ext);
+            var mode = canEdit && editorsMode != "view" ? "edit" : "view";
+
+            var config = new Dictionary<string, object>
+                {
+                    { "type", Type ?? "desktop" },
+                    { "documentType", DocumentType },
+                    {
+                        "document", new Dictionary<string, object>
+                            {
+                                { "title", FileName },
+                                { "url", FileUri },
+                                { "fileType", ext.Trim('.') },
+                                { "key", Key },
+                                {
+                                    "info", new Dictionary<string, object>
+                                        {
+                                            { "author", "Me" },
+                                            { "created", DateTime.Now.ToShortDateString() }
+                                        }
+                                },
+                                {
+                                    "permissions", new Dictionary<string, object>
+                                        {
+                                            { "comment", editorsMode != "view" && editorsMode != "fillForms" && editorsMode != "embedded" && editorsMode != "blockcontent" },
+                                            { "download", true },
+                                            { "edit", canEdit && (editorsMode == "edit" || editorsMode == "filter") || editorsMode == "blockcontent" },
+                                            { "fillForms", editorsMode != "view" && editorsMode != "comment" && editorsMode != "embedded" && editorsMode != "blockcontent" },
+                                            { "modifyFilter", editorsMode != "filter" },
+                                            { "modifyContentControl", editorsMode != "blockcontent" },
+                                            { "review", editorsMode == "edit" || editorsMode == "review" }
+                                        }
+                                }
+                            }
+                    },
+                    {
+                        "editorConfig", new Dictionary<string, object>
+                            {
+                                { "mode", mode },
+                                { "lang", request.Cookies["ulang"]?.Value ?? "en" },
+                                { "callbackUrl", CallbackUrl },
+                                {
+                                    "user", new Dictionary<string, object>
+                                        {
+                                            { "id", request.Cookies["uid"]?.Value ?? "uid-1" },
+                                            { "name", request.Cookies["uname"]?.Value ?? "John Smith" }
+                                        }
+                                },
+                                {
+                                    "embedded", new Dictionary<string, object>
+                                        {
+                                            { "saveUrl", FileUri },
+                                            { "embedUrl", FileUri },
+                                            { "shareUrl", FileUri },
+                                            { "toolbarDocked", "top" }
+                                        }
+                                },
+                                {
+                                    "customization", new Dictionary<string, object>
+                                        {
+                                            { "about", true },
+                                            { "feedback", true },
+                                            {
+                                                "goback", new Dictionary<string, object>
+                                                    {
+                                                        { "url", url.Action("Index", "Home") }
+                                                    }
+                                            }
+                                        }
+                                }
+                            }
+                    }
+                };
+
+            if (JwtManager.Enabled)
             {
-                return DocManagerHelper.GetCallback(FileName);
+                var token = JwtManager.Encode(config);
+                config.Add("token", token);
+            }
+
+            return new JavaScriptSerializer().Serialize(config);
+        }
+
+        public void GetHistory(out string history, out string historyData)
+        {
+            var jss = new JavaScriptSerializer();
+            var histDir = DocManagerHelper.HistoryDir(DocManagerHelper.StoragePath(FileName, null));
+
+            history = null;
+            historyData = null;
+
+            if (DocManagerHelper.GetFileVersion(histDir) > 0)
+            {
+                var currentVersion = DocManagerHelper.GetFileVersion(histDir);
+                var hist = new List<Dictionary<string, object>>();
+                var histData = new Dictionary<string, object>();
+
+                for (var i = 0; i <= currentVersion; i++)
+                {
+                    var obj = new Dictionary<string, object>();
+                    var dataObj = new Dictionary<string, object>();
+                    var verDir = DocManagerHelper.VersionDir(histDir, i + 1);
+
+                    var key = i == currentVersion ? Key : File.ReadAllText(Path.Combine(verDir, "key.txt"));
+
+                    obj.Add("key", key);
+                    obj.Add("version", i);
+
+                    if (i == 0)
+                    {
+                        var infoPath = Path.Combine(histDir, "createdInfo.json");
+
+                        if (File.Exists(infoPath))
+                        {
+                            var info = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(infoPath));
+                            obj.Add("created", info["created"]);
+                            obj.Add("user", new Dictionary<string, object>() {
+                                { "id", info["id"] },
+                                { "name", info["name"] },
+                            });
+                        }
+                    }
+
+                    dataObj.Add("key", key);
+                    dataObj.Add("url", i == currentVersion ? FileUri : DocManagerHelper.GetPathUri(Directory.GetFiles(verDir, "prev.*")[0].Substring(HttpRuntime.AppDomainAppPath.Length)));
+                    dataObj.Add("version", i);
+                    if (i > 0)
+                    {
+                        var changes = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(Path.Combine(DocManagerHelper.VersionDir(histDir, i), "changes.json")));
+                        var change = ((Dictionary<string, object>)((ArrayList)changes["changes"])[0]);
+
+                        obj.Add("changes", changes["changes"]);
+                        obj.Add("serverVersion", changes["serverVersion"]);
+                        obj.Add("created", change["created"]);
+                        obj.Add("user", change["user"]);
+
+                        var prev = (Dictionary<string, object>)histData[(i - 1).ToString()];
+                        dataObj.Add("previous", new Dictionary<string, object>() {
+                            { "key", prev["key"] },
+                            { "url", prev["url"] },
+                        });
+                        dataObj.Add("changesUrl", DocManagerHelper.GetPathUri(Path.Combine(DocManagerHelper.VersionDir(histDir, i), "diff.zip").Substring(HttpRuntime.AppDomainAppPath.Length)));
+                    }
+
+                    hist.Add(obj);
+                    histData.Add(i.ToString(), dataObj);
+                }
+
+                history = jss.Serialize(new Dictionary<string, object>()
+                {
+                    { "currentVersion", currentVersion },
+                    { "history", hist }
+                });
+                historyData = jss.Serialize(histData);
             }
         }
     }

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *

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

@@ -136,6 +136,7 @@
     </Compile>
     <Compile Include="Helpers\DocManagerHelper.cs" />
     <Compile Include="Helpers\DocumentConverter.cs" />
+    <Compile Include="Helpers\JwtManager.cs" />
     <Compile Include="Models\FileModel.cs" />
     <Compile Include="Models\FileUtility.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -146,15 +147,26 @@
   <ItemGroup>
     <Content Include="Content\editor.css" />
     <Content Include="Content\images\alert.png" />
+    <Content Include="Content\images\block-content-24.png" />
     <Content Include="Content\images\close.png" />
+    <Content Include="Content\images\comment-24.png" />
     <Content Include="Content\images\corner.png" />
+    <Content Include="Content\images\delete-24.png" />
+    <Content Include="Content\images\desktop-24.png" />
     <Content Include="Content\images\done.png" />
+    <Content Include="Content\images\download-24.png" />
+    <Content Include="Content\images\embeded-24.png" />
     <Content Include="Content\images\file_docx.png" />
     <Content Include="Content\images\file_pptx.png" />
+    <Content Include="Content\images\file_upload.png" />
     <Content Include="Content\images\file_xlsx.png" />
+    <Content Include="Content\images\fill-forms-24.png" />
+    <Content Include="Content\images\filter-24.png" />
     <Content Include="Content\images\loader16.gif" />
     <Content Include="Content\images\logo.png" />
+    <Content Include="Content\images\mobile-24.png" />
     <Content Include="Content\images\question_small.png" />
+    <Content Include="Content\images\review-24.png" />
     <Content Include="Content\jquery-ui.css" />
     <Content Include="Content\stylesheet.css" />
     <Content Include="favicon.ico" />

web/documentserver-example/csharp-mvc/Properties/AssemblyInfo.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Ascensio System SIA")]
 [assembly: AssemblyProduct("OnlineEditorsExampleMVC")]
-[assembly: AssemblyCopyright("Ascensio System SIA 2018")]
+[assembly: AssemblyCopyright("Ascensio System SIA 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -70,6 +70,8 @@ if (typeof jQuery != "undefined") {
                 checkConvert();
             }
         });
+
+        initSelectors();
     });
     
     var timer = null;
@@ -91,11 +93,6 @@ if (typeof jQuery != "undefined") {
             return;
         }
 
-        if (jq("#checkOriginalFormat").is(":checked")) {
-            loadScripts();
-            return;
-        }
-
         timer = setTimeout(function () {
             var requestAddress = UrlConverter
                 + "&filename=" + encodeURIComponent(jq("#hiddenFileName").val());
@@ -162,6 +159,34 @@ if (typeof jQuery != "undefined") {
         }
     };
 
+    var initSelectors = function () {
+        var userSel = jq("#user");
+        var langSel = jq("#language");
+
+        function getCookie(name) {
+            let matches = document.cookie.match(new RegExp(
+                "(?:^|; )" + name.replace(/([\.$?*|{}\(\)\[\]\\\/\+^])/g, '\\$1') + "=([^;]*)"
+            ));
+            return matches ? decodeURIComponent(matches[1]) : null;
+        }
+        function setCookie(name, value) {
+            document.cookie = name + "=" + value + "; expires=" + new Date(Date.now() + 1000 * 60 * 60 * 24 * 7).toUTCString(); //week
+        }
+
+        var userId = getCookie("uid");
+        if (userId) userSel.val(userId);
+        var langId = getCookie("ulang");
+        if (langId) langSel.val(langId);
+
+        userSel.on("change", function () {
+            setCookie("uid", userSel.val());
+            setCookie("uname", userSel.find("option:selected").text())
+        });
+        langSel.on("change", function () {
+            setCookie("ulang", langSel.val());
+        });
+    };
+
     jq(document).on("click", "#beginEdit:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
         var url = UrlEditor + "?fileName=" + fileId;
@@ -194,6 +219,33 @@ if (typeof jQuery != "undefined") {
         jq.unblockUI();
     });
 
+    jq(document).on("click", ".try-editor", function (e) {
+        var url = jq(".try-editor-list")[0].attributes["data-link"].value;
+        url += "?fileExt=" + e.target.attributes["data-type"].value;
+        if (jq("#createSample").is(":checked")) {
+            url += "&sample=true";
+        }
+        var w = window.open(url, "_blank");
+        w.onload = function () {
+            window.location.reload();
+        }
+    });
+
+    jq(document).on("click", ".delete-file", function () {
+        var requestAddress = "webeditor.ashx"
+            + "?type=remove"
+            + "&filename=" + encodeURIComponent(jq(this).attr("data-filename"));
+
+        jq.ajax({
+            async: true,
+            contentType: "text/xml",
+            url: requestAddress,
+            complete: function (data) {
+                document.location.reload();
+            }
+        });
+    });
+
     jq.dropdownToggle({
         switcherSelector: ".question",
         dropdownID: "hint"

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

@@ -1,6 +1,6 @@
 <!--*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -35,7 +35,9 @@
 <head runat="server">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
     <link rel="icon" href="~/favicon.ico" type="image/x-icon" />
     <title><%= Model.FileName + " - ONLYOFFICE" %></title>
     
@@ -53,15 +55,13 @@
     <script type="text/javascript" language="javascript">
 
         var docEditor;
-        var fileName = "<%= Model.FileName %>";
-        var fileType = "<%= Path.GetExtension(Model.FileName).Trim('.') %>";
 
         var innerAlert = function (message) {
             if (console && console.log)
                 console.log(message);
         };
 
-        var onReady = function () {
+        var onAppReady = function () {
             innerAlert("Document editor ready");
         };
 
@@ -83,66 +83,38 @@
             location.reload(true);
         };
 
+        var config = <%= Model.GetDocConfig(Request, Url) %>;
+
+        config.width = "100%";
+        config.height = "100%";
+
+        config.events = {
+            'onAppReady': onAppReady,
+            'onDocumentStateChange': onDocumentStateChange,
+            'onRequestEditRights': onRequestEditRights,
+            'onError': onError,
+            'onOutdatedVersion': onOutdatedVersion,
+        };
+
+        <% string hist, histData; %>
+        <% Model.GetHistory(out hist, out histData); %>
+        <% if (!string.IsNullOrEmpty(hist) && !string.IsNullOrEmpty(histData))
+        { %>
+        config.events['onRequestHistory'] = function () {
+            docEditor.refreshHistory(<%= hist %>);
+        };
+        config.events['onRequestHistoryData'] = function (event) {
+            var ver = event.data;
+            var histData = <%= histData %>;
+            docEditor.setHistoryData(histData[ver]);
+        };
+        config.events['onRequestHistoryClose '] = function () {
+            document.location.reload();
+        };
+        <% } %>
+
         var сonnectEditor = function () {
-
-            docEditor = new DocsAPI.DocEditor("iframeEditor",
-                {
-                    width: "100%",
-                    height: "100%",
-
-                    type: '<%= Request["mode"] != "embedded" ? "desktop" : "embedded" %>',
-                    documentType: "<%= Model.DocumentType %>",
-                    document: {
-                        title: fileName,
-                        url: "<%= Model.FileUri %>",
-                        fileType: fileType,
-                        key: "<%= Model.Key %>",
-
-                        info: {
-                            author: "Me",
-                            created: "<%= DateTime.Now.ToShortDateString() %>",
-                        },
-
-                        permissions: {
-                            edit: "<%= DocManagerHelper.EditedExts.Contains(Path.GetExtension(Model.FileName)) %>" == "True",
-                            download: true,
-                        }
-                    },
-                    editorConfig: {
-                        mode: '<%= DocManagerHelper.EditedExts.Contains(Path.GetExtension(Model.FileName)) && Request["mode"] != "view" ? "edit" : "view" %>',
-
-                        lang: "en",
-
-                        callbackUrl: "<%= Model.CallbackUrl %>",
-
-                        user: {
-                            id: "<%= DocManagerHelper.CurUserHostAddress() %>",
-                            name: "John Smith",
-                        },
-
-                        embedded: {
-                            saveUrl: "<%= Model.FileUri %>",
-                            embedUrl: "<%= Model.FileUri %>",
-                            shareUrl: "<%= Model.FileUri %>",
-                            toolbarDocked: "top",
-                        },
-
-                        customization: {
-                            about: true,
-                            feedback: true,
-                            goback: {
-                                url: "<%= Url.Action("Index", "Home") %>",
-                            },
-                        },
-                    },
-                    events: {
-                        'onReady': onReady,
-                        'onDocumentStateChange': onDocumentStateChange,
-                        'onRequestEditRights': onRequestEditRights,
-                        'onError': onError,
-                        'onOutdatedVersion': onOutdatedVersion,
-                    }
-                });
+            docEditor = new DocsAPI.DocEditor("iframeEditor", config);
         };
 
         if (window.addEventListener) {

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

@@ -1,6 +1,6 @@
 <!--*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -28,6 +28,7 @@
 
 <%@ Import Namespace="System.Web.Configuration" %>
 <%@ Import Namespace="OnlineEditorsExampleMVC.Helpers" %>
+<%@ Import Namespace="OnlineEditorsExampleMVC.Models" %>
 
 <!DOCTYPE html>
 
@@ -50,26 +51,181 @@
         <span class="portal-name">ONLYOFFICE Document Editors</span>
         <br />
         <br />
-        <span class="portal-descr">Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors. You may upload your own documents for testing using the "Choose file" button and selecting the necessary files on your PC.</span>
+        <span class="portal-descr">Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors. You may upload your own documents for testing using the "Upload file" button and selecting the necessary files on your PC.</span>
 
-        <div class="file-upload button gray">
-            <span>Choose file</span>
-            <input type="file" id="fileupload" name="files[]" data-url="<%= Url.Content("~/webeditor.ashx?type=upload") %>" />
+        <table class="user-block-table" cellspacing="0" cellpadding="0">
+            <tbody>
+                <tr>
+                    <td width="30%" valign="middle">
+                        <span class="select-user">Username:</span>
+                        <select class="select-user" id="user">
+                            <option value="uid-1">Jonn Smith</option>
+                            <option value="uid-2">Mark Pottato</option>
+                            <option value="uid-3">Hamish Mitchell</option>
+                        </select>
+                    </td>
+                    <td width="70%" valign="middle">Select user name before opening the document; you can open the same document using different users in different Web browser sessions, so you can check out multi-user editing functions.</td>
+                </tr>
+                <tr>
+                    <td width="30%" valign="middle">
+                        <select class="select-user" id="language">
+                            <option value="en">English</option>
+                            <option value="bg">Bulgarian</option>
+                            <option value="zh">Chinese</option>
+                            <option value="cs">Czech</option>
+                            <option value="nl">Dutch</option>
+                            <option value="fr">French</option>
+                            <option value="de">German</option>
+                            <option value="hu">Hungarian</option>
+                            <option value="it">Italian</option>
+                            <option value="ja">Japanese</option>
+                            <option value="ko">Korean</option>
+                            <option value="lv">Latvian</option>
+                            <option value="pl">Polish</option>
+                            <option value="pt">Portuguese</option>
+                            <option value="ru">Russian</option>
+                            <option value="sk">Slovak</option>
+                            <option value="sl">Slovenian</option>
+                            <option value="es">Spanish</option>
+                            <option value="tr">Turkish</option>
+                            <option value="uk">Ukrainian</option>
+                            <option value="vi">Vietnamese</option>
+                        </select>
+                    </td>
+                    <td width="70%" valign="middle">Choose the language for ONLYOFFICE™ editors interface.</td>
+                </tr>
+            </tbody>
+        </table>
+        <br />
+        <br />
+
+
+        <div class="help-block">
+            <span class="try-descr">Upload your file or create new file</span>
+            <br />
+            <br />
+            <div class="clearFix">
+                <div class="upload-panel clearFix">
+                    <a class="file-upload">
+                        Upload
+                        <br />
+                        File
+                        <input type="file" id="fileupload" name="files[]" data-url="<%= Url.Content("~/webeditor.ashx?type=upload") %>" />
+                    </a>
+                </div>
+                <div class="create-panel">
+                    <ul class="try-editor-list clearFix" data-link="<%= Url.Action("sample", "Home") %>">
+                        <li><a class="try-editor document" data-type="docx">Create<br />Document</a></li>
+                        <li><a class="try-editor spreadsheet" data-type="xlsx">Create<br />Spreadsheet</a></li>
+                        <li><a class="try-editor presentation" data-type="pptx">Create<br />Presentation</a></li>
+                    </ul>
+                    <label class="create-sample">
+                        <input id="createSample" class="checkbox" type="checkbox" />
+                        Create a file filled with sample content
+                    </label>
+                </div>
+            </div>
         </div>
-        <label class="save-original">
-            <input type="checkbox" id="checkOriginalFormat" class="checkbox" />Save document in original format
-        </label>
-        <span class="question"></span>
-        <br />
-        <br />
-        <br />
-        <span class="try-descr">You are also enabled to view and edit documents pre-uploaded to the portal.</span>
 
-        <ul class="try-editor-list">
-            <li><a class="try-editor document" href="<%= Url.Action("sample", "Home", new { fileExt = "docx" }) %>" target="_blank">Create<br />Sample Document</a></li>
-            <li><a class="try-editor spreadsheet" href="<%= Url.Action("sample", "Home", new { fileExt = "xlsx" }) %>" target="_blank">Create<br />Sample Spreadsheet</a></li>
-            <li><a class="try-editor presentation" href="<%= Url.Action("sample", "Home", new { fileExt = "pptx" }) %>" target="_blank">Create<br />Sample Presentation</a></li>
-        </ul>
+        <% var storedFiles = DocManagerHelper.GetStoredFiles();
+            if (storedFiles.Any())
+            { %>
+        <div class="help-block">
+            <span>Your documents</span>
+            <br />
+            <br />
+            <div class="stored-list">
+                <table width="100%" cellspacing="0" cellpadding="0">
+                    <thead>
+                        <tr class="tableHeader">
+                            <td class="tableHeaderCell tableHeaderCellFileName">Filename</td>
+                            <td colspan="6" class="tableHeaderCell contentCells-shift">Editors</td>
+                            <td colspan="3" class="tableHeaderCell">Viewers</td>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <% foreach (var storedFile in storedFiles)
+                            { %>
+                            <%
+                                var editUrl = "doceditor.aspx?fileID=" + HttpUtility.UrlEncode(storedFile);
+                                var docType = FileUtility.GetFileType(storedFile).ToString().ToLower();
+                            %>
+                            <tr class="tableRow" title="<%= storedFile %>">
+                                <td class="contentCells">
+                                    <a class="stored-edit <%= docType %>" href="<%= Url.Action("Editor", "Home", new { fileName = storedFile }) %>" target="_blank">
+                                        <span title="<%= storedFile %>"><%= storedFile %></span>
+                                    </a>
+                                    <a href="<%= Url.Content(DocManagerHelper.CurUserHostAddress() + "/" + storedFile) %>">
+                                        <img class="icon-download" src="content/images/download-24.png" alt="Download" title="Download" />
+                                    </a>
+                                    <a class="delete-file" data-filename="<%= storedFile %>">
+                                        <img class="icon-delete" src="content/images/delete-24.png" alt="Delete" title="Delete" />
+                                    </a>
+                                </td>
+
+                                <td class="contentCells contentCells-icon">
+                                    <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile, editorsType = "desktop", editorsMode = "edit" }) %>" target="_blank">
+                                        <img src="content/images/desktop-24.png" 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, editorsType = "mobile", editorsMode = "edit" }) %>" target="_blank">
+                                        <img src="content/images/mobile-24.png" alt="Open in editor for mobile devices" title="Open in editor for mobile devices"/>
+                                    </a>
+                                </td>
+                                <td class="contentCells contentCells-icon">
+                                    <% if (docType == "text") { %>
+                                        <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile, editorsType = "desktop", editorsMode = "review" }) %>" target="_blank">
+                                            <img src="content/images/review-24.png" alt="Open in editor for review" title="Open in editor for review"/>
+                                        </a>
+                                    <% } else if (docType == "spreadsheet") { %>
+                                        <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile, editorsType = "desktop", editorsMode = "filter" }) %>" target="_blank">
+                                            <img src="content/images/filter-24.png" alt="Open in editor without access to change the filter" title="Open in editor without access to change the filter" />
+                                        </a>
+                                    <% } %>
+                                </td>
+                                <td class="contentCells contentCells-icon">
+                                    <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile, editorsType = "desktop", editorsMode = "comment" }) %>" target="_blank">
+                                        <img src="content/images/comment-24.png" alt="Open in editor for comment" title="Open in editor for comment"/>
+                                    </a>
+                                </td>
+                                <td class="contentCells contentCells-icon">
+                                    <% if (docType == "text") { %>
+                                        <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile, editorsType = "desktop", editorsMode = "fillForms" }) %>" target="_blank">
+                                            <img src="content/images/fill-forms-24.png" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                        </a>
+                                    <% } %>
+                                </td>
+                                <td class="contentCells contentCells-shift contentCells-icon">
+                                    <% if (docType == "text") { %>
+                                        <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile, editorsType = "desktop", editorsMode = "blockcontent" }) %>" target="_blank">
+                                            <img src="content/images/block-content-24.png" alt="Open in editor without content control modification" title="Open in editor without content control modification"/>
+                                        </a>
+                                    <% } %>
+                                </td>
+
+                                <td class="contentCells contentCells-icon">
+                                    <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile, editorsType = "desktop", editorsMode = "view" }) %>" target="_blank">
+                                        <img src="content/images/desktop-24.png" 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, editorsType = "mobile", editorsMode = "view" }) %>" target="_blank">
+                                        <img src="content/images/mobile-24.png" alt="Open in viewer for mobile devices" title="Open in viewer for mobile devices"/>
+                                    </a>
+                                </td>
+                                <td class="contentCells contentCells-icon">
+                                    <a href="<%= Url.Action("Editor", "Home", new { fileName = storedFile, editorsType = "embedded", editorsMode = "embedded" }) %>" target="_blank">
+                                        <img src="content/images/embeded-24.png" alt="Open in embedded mode" title="Open in embedded mode"/>
+                                    </a>
+                                </td>
+                            </tr>
+                        <% } %>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+        <% } %>
 
         <br />
         <br />

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -27,8 +27,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Web;
+using System.Web.Configuration;
 using System.Web.Script.Serialization;
 using System.Web.Services;
 using OnlineEditorsExampleMVC.Helpers;
@@ -53,6 +55,9 @@ namespace OnlineEditorsExampleMVC
                 case "track":
                     Track(context);
                     break;
+                case "remove":
+                    Remove(context);
+                    break;
             }
         }
 
@@ -90,6 +95,7 @@ namespace OnlineEditorsExampleMVC
 
                 var savedFileName = DocManagerHelper.StoragePath(fileName);
                 httpPostedFile.SaveAs(savedFileName);
+                DocManagerHelper.CreateMeta(fileName, context.Request.Cookies["uid"]?.Value, context.Request.Cookies["uname"]?.Value);
 
                 context.Response.Write("{ \"filename\": \"" + fileName + "\"}");
             }
@@ -143,8 +149,9 @@ namespace OnlineEditorsExampleMVC
                         }
                     }
 
-                    File.Delete(DocManagerHelper.StoragePath(fileName));
+                    Remove(fileName);
                     fileName = correctName;
+                    DocManagerHelper.CreateMeta(fileName, context.Request.Cookies["uid"]?.Value, context.Request.Cookies["uname"]?.Value);
                 }
 
                 context.Response.Write("{ \"filename\" : \"" + fileName + "\"}");
@@ -169,8 +176,6 @@ namespace OnlineEditorsExampleMVC
             var userAddress = context.Request["userAddress"];
             var fileName = context.Request["fileName"];
 
-            var storagePath = DocManagerHelper.StoragePath(fileName, userAddress);
-
             string body;
             try
             {
@@ -188,6 +193,24 @@ namespace OnlineEditorsExampleMVC
             var jss = new JavaScriptSerializer();
             if (string.IsNullOrEmpty(body)) return;
             var fileData = jss.Deserialize<Dictionary<string, object>>(body);
+
+            if (JwtManager.Enabled)
+            {
+                if (fileData.ContainsKey("token"))
+                {
+                    fileData = jss.Deserialize<Dictionary<string, object>>(JwtManager.Decode(fileData["token"].ToString()));
+                }
+                else if (context.Request.Headers.AllKeys.Contains("Authorization", StringComparer.InvariantCultureIgnoreCase))
+                {
+                    var headerToken = context.Request.Headers.Get("Authorization").Substring("Bearer ".Length);
+                    fileData = (Dictionary<string, object>)jss.Deserialize<Dictionary<string, object>>(JwtManager.Decode(headerToken))["payload"];
+                }
+                else
+                {
+                    throw new Exception("Expected JWT");
+                }
+            }
+
             var status = (TrackerStatus) (int) fileData["status"];
 
             switch (status)
@@ -196,26 +219,32 @@ namespace OnlineEditorsExampleMVC
                 case TrackerStatus.Corrupted:
                     var downloadUri = (string) fileData["url"];
 
-                    var req = (HttpWebRequest) WebRequest.Create(downloadUri);
-
                     var saved = 1;
                     try
                     {
-                        using (var stream = req.GetResponse().GetResponseStream())
-                        {
-                            if (stream == null) throw new Exception("stream is null");
-                            const int bufferSize = 4096;
+                        var storagePath = DocManagerHelper.StoragePath(fileName, userAddress);
+                        var histDir = DocManagerHelper.HistoryDir(storagePath);
+                        var versionDir = DocManagerHelper.VersionDir(histDir, DocManagerHelper.GetFileVersion(histDir) + 1);
 
-                            using (var fs = File.Open(storagePath, FileMode.Create))
-                            {
-                                var buffer = new byte[bufferSize];
-                                int readed;
-                                while ((readed = stream.Read(buffer, 0, bufferSize)) != 0)
-                                {
-                                    fs.Write(buffer, 0, readed);
-                                }
-                            }
+                        if (!Directory.Exists(versionDir)) Directory.CreateDirectory(versionDir);
+
+                        File.Copy(storagePath, Path.Combine(versionDir, "prev" + Path.GetExtension(fileName)));
+
+                        DownloadToFile(downloadUri, DocManagerHelper.StoragePath(fileName, userAddress));
+                        DownloadToFile((string)fileData["changesurl"], Path.Combine(versionDir, "diff.zip"));
+
+                        var hist = fileData.ContainsKey("changeshistory") ? (string)fileData["changeshistory"] : null;
+                        if (string.IsNullOrEmpty(hist) && fileData.ContainsKey("history"))
+                        {
+                            hist = jss.Serialize(fileData["history"]);
                         }
+
+                        if (!string.IsNullOrEmpty(hist))
+                        {
+                            File.WriteAllText(Path.Combine(versionDir, "changes.json"), hist);
+                        }
+
+                        File.WriteAllText(Path.Combine(versionDir, "key.txt"), (string)fileData["key"]);
                     }
                     catch (Exception)
                     {
@@ -227,6 +256,54 @@ namespace OnlineEditorsExampleMVC
             context.Response.Write("{\"error\":0}");
         }
 
+        private static void Remove(HttpContext context)
+        {
+            context.Response.ContentType = "text/plain";
+            try
+            {
+                var fileName = context.Request["fileName"];
+                Remove(fileName);
+
+                context.Response.Write("{ \"success\": true }");
+            }
+            catch (Exception e)
+            {
+                context.Response.Write("{ \"error\": \"" + e.Message + "\"}");
+            }
+        }
+
+        private static void Remove(string fileName)
+        {
+            var path = DocManagerHelper.StoragePath(fileName, null);
+            var histDir = DocManagerHelper.HistoryDir(path);
+
+            if (File.Exists(path)) File.Delete(path);
+            if (Directory.Exists(histDir)) Directory.Delete(histDir, true);
+        }
+
+        private static void DownloadToFile(string url, string path)
+        {
+            if (string.IsNullOrEmpty(url)) throw new ArgumentException("url");
+            if (string.IsNullOrEmpty(path)) throw new ArgumentException("path");
+
+            var req = (HttpWebRequest)WebRequest.Create(url);
+            using (var stream = req.GetResponse().GetResponseStream())
+            {
+                if (stream == null) throw new Exception("stream is null");
+                const int bufferSize = 4096;
+
+                using (var fs = File.Open(path, FileMode.Create))
+                {
+                    var buffer = new byte[bufferSize];
+                    int readed;
+                    while ((readed = stream.Read(buffer, 0, bufferSize)) != 0)
+                    {
+                        fs.Write(buffer, 0, readed);
+                    }
+                }
+            }
+        }
+
         public bool IsReusable
         {
             get { return false; }

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

@@ -10,9 +10,10 @@
   <add key="filesize-max" value="5242880"/>
 
   <add key="files.docservice.viewed-docs" value=".pdf|.djvu|.xps"/>
-  <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.ppsx|.txt"/>
-  <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|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.epub"/>
+  <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.txt"/>
+  <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|.epub"/>
   <add key="files.docservice.timeout" value="120000" />
+  <add key="files.docservice.secret" value="" />
 
   <add key="files.docservice.url.converter" value="https://documentserver/ConvertService.ashx"/>
   <add key="files.docservice.url.api" value="https://documentserver/web-apps/apps/api/documents/api.js"/>

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -112,14 +112,17 @@ label .checkbox {
 
 .try-editor-list {
     list-style: none;
-    margin: 0;
+    margin: 0 0 16px;
     padding: 0;
 }
-.try-editor-list li {
-    float: left;
-    margin: 25px;
-    width: 150px;
-}
+
+    .try-editor-list li {
+        float: left;
+        margin: 0 15px;
+        width: 100px;
+        cursor: pointer;
+    }
+
 .try-editor {
     background-color: transparent;
     background-position: center 0;
@@ -142,6 +145,11 @@ label .checkbox {
     background-image: url("images/file_pptx.png");
 }
 
+.create-sample {
+    display: inline-block;
+    margin-left: 75px;
+}
+
 .button, .button:visited, .button:hover, .button:active {
     display: inline-block;
     font-weight: normal;
@@ -184,25 +192,43 @@ label .checkbox {
     border: 1px solid #E9EAEA;
 }
 
+.upload-panel {
+    border-right: 1px solid #D1D1D1;
+    float: left;
+    margin-right: 25px;
+}
+
 .file-upload {
+    background: url("images/file_upload.png") no-repeat center 0 transparent;
     cursor: pointer;
-    margin-bottom: 8px;
-    padding: 0 !important;
+    display: inline-block;
+    font-size: 14px;
+    font-weight: bold;
+    height: 45px;
+    margin: 0 40px 16px;
     overflow: hidden;
+    padding-top: 100px;
     position: relative;
+    text-align: center;
+    width: 100px;
 }
-.file-upload span {
-    line-height: 21px;
-    margin: 2px 12px;
+
+    .file-upload input {
+        cursor: pointer;
+        opacity: 0;
+        position: absolute;
+        right: 0;
+        top: 0;
+        transform: translate(555px, 60px) scale(8);
+    }
+
+.create-panel {
+    float: left;
 }
-.file-upload input {
-    cursor: pointer;
-    font-size: 23px;
-    opacity: 0;
-    position: absolute;
-    right: 0;
-    top: 0;
-    transform: translate(-300px, 0) scale(4);
+
+.upload-panel,
+.create-panel {
+    padding: 10px 0;
 }
 
 #mainProgress {
@@ -320,16 +346,6 @@ label .checkbox {
 .stored-edit:hover span {
     text-decoration: underline;
 }
-.stored-download {
-    color: #787878;
-    float: right;
-    text-decoration: none;
-}
-.stored-download:hover {
-    color: #787878;
-    text-decoration: underline;
-}
-
 
 
 .blockTitle {
@@ -369,3 +385,112 @@ label .checkbox {
     clear: both;
     visibility: hidden;
 }
+
+/*Icon table*/
+#tableRow {
+    vertical-align: top;
+}
+
+.tableRow {
+    background: transparent;
+    -moz-transition: all 0.2s ease-in-out;
+    -webkit-transition: all 0.2s ease-in-out;
+    -o-transition: all 0.2s ease-in-out;
+    -ms-transition: all 0.2s ease-in-out;
+    transition: all 0.2s ease-in-out;
+}
+
+    .tableRow:hover {
+        background-color: #ebebeb;
+    }
+
+.tableHeader {
+    background: transparent;
+    color: #333;
+    cursor: default;
+    font-family: 'Open Sans', sans-serif;
+    font-size: 13px;
+    height: 40px;
+    -khtml-user-select: none;
+    user-select: none;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+}
+
+.tableHeaderCell {
+    padding: 2px 1px 2px 5px;
+    text-align: center;
+}
+
+.tableHeaderCellFileName {
+    text-align: left;
+}
+
+.contentCells {
+    padding: 4px 1px 4px 5px;
+    font-family: 'Open Sans', sans-serif;
+    font-size: 16px;
+    border-bottom: 1px solid #e5e5e5;
+    white-space: nowrap;
+    -khtml-user-select: none;
+    user-select: none;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+}
+
+    .contentCells a {
+        text-decoration: none;
+    }
+
+    .contentCells-shift {
+        padding-right: 30px;
+    }
+
+.contentCells-icon {
+    width: 6%;
+}
+
+.contentCellsSmall {
+    padding: 5px 1px 5px 6px;
+    font-family: 'Open Sans', sans-serif;
+    font-size: 13px;
+    border-bottom: 1px solid #e5e5e5;
+    white-space: nowrap;
+    text-align: center;
+}
+
+.primaryRow {
+    background-color: #e9e9e9;
+}
+
+.secondaryRow {
+    background-color: #F9F9F9;
+}
+
+.select-user {
+    margin-left: 15px;
+}
+
+.user-block-table {
+    height: 100%;
+    width: 100%;
+}
+
+    .user-block-table td {
+        background-color: #F4F4F4;
+        border-bottom: 1px solid white;
+        padding: 12px 0;
+    }
+
+#user, #language {
+    width: 130px;
+}
+
+.icon-download {
+    margin-bottom: -5px;
+}
+
+.icon-delete {
+    cursor: pointer;
+    margin-bottom: -6px;
+}

web/documentserver-example/csharp/Default.aspx

@@ -46,25 +46,81 @@
             <span class="portal-name">ONLYOFFICE Document Editors</span>
             <br />
             <br />
-            <span class="portal-descr">Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors. You may upload your own documents for testing using the "Choose file" button and selecting the necessary files on your PC.</span>
+            <span class="portal-descr">Get started with a demo-sample of ONLYOFFICE Document Editors, the first html5-based editors. You may upload your own documents for testing using the "Upload file" button and selecting the necessary files on your PC.</span>
 
-            <div class="file-upload button gray">
-                <span>Choose file</span>
-                <input type="file" id="fileupload" name="files[]" data-url="webeditor.ashx?type=upload" />
+            <table class="user-block-table" cellspacing="0" cellpadding="0">
+                <tbody>
+                    <tr>
+                        <td width="30%" valign="middle">
+                            <span class="select-user">Username:</span>
+                            <select class="select-user" id="user">
+                                <option value="uid-1">Jonn Smith</option>
+                                <option value="uid-2">Mark Pottato</option>
+                                <option value="uid-3">Hamish Mitchell</option>
+                            </select>
+                        </td>
+                        <td width="70%" valign="middle">Select user name before opening the document; you can open the same document using different users in different Web browser sessions, so you can check out multi-user editing functions.</td>
+                    </tr>
+                    <tr>
+                        <td width="30%" valign="middle">
+                            <select class="select-user" id="language">
+                                <option value="en">English</option>
+                                <option value="bg">Bulgarian</option>
+                                <option value="zh">Chinese</option>
+                                <option value="cs">Czech</option>
+                                <option value="nl">Dutch</option>
+                                <option value="fr">French</option>
+                                <option value="de">German</option>
+                                <option value="hu">Hungarian</option>
+                                <option value="it">Italian</option>
+                                <option value="ja">Japanese</option>
+                                <option value="ko">Korean</option>
+                                <option value="lv">Latvian</option>
+                                <option value="pl">Polish</option>
+                                <option value="pt">Portuguese</option>
+                                <option value="ru">Russian</option>
+                                <option value="sk">Slovak</option>
+                                <option value="sl">Slovenian</option>
+                                <option value="es">Spanish</option>
+                                <option value="tr">Turkish</option>
+                                <option value="uk">Ukrainian</option>
+                                <option value="vi">Vietnamese</option>
+                            </select>
+                        </td>
+                        <td width="70%" valign="middle">Choose the language for ONLYOFFICE™ editors interface.</td>
+                    </tr>
+                </tbody>
+            </table>
+            <br />
+            <br />
+
+            <div class="help-block">
+                <span class="try-descr">Upload your file or create new file</span>
+                <br />
+                <br />
+                <div class="clearFix">
+                    <div class="upload-panel clearFix">
+                        <a class="file-upload">
+                            Upload
+                            <br />
+                            File
+                            <input type="file" id="fileupload" name="files[]" data-url="webeditor.ashx?type=upload" />
+                        </a>
+                    </div>
+                    <div class="create-panel">
+                        <ul class="try-editor-list clearFix">
+                            <li><a class="try-editor document" data-type="document">Create<br />Document</a></li>
+                            <li><a class="try-editor spreadsheet" data-type="spreadsheet">Create<br />Spreadsheet</a></li>
+                            <li><a class="try-editor presentation" data-type="presentation">Create<br />Presentation</a></li>
+                        </ul>
+                        <label class="create-sample">
+                            <input id="createSample" class="checkbox" type="checkbox" />
+                            Create a file filled with sample content
+                        </label>
+                    </div>
+                </div>
             </div>
-            <label class="save-original">
-                <input type="checkbox" id="checkOriginalFormat" class="checkbox" />Save document in original format
-            </label>
-            <span class="question"></span>
-            <br />
-            <br />
-            <br />
-            <span class="try-descr">You are also enabled to view and edit documents pre-uploaded to the portal.</span>
-            <ul class="try-editor-list">
-                <li><a class="try-editor document" href="doceditor.aspx?type=document" target="_blank">Create<br />Sample Document</a></li>
-                <li><a class="try-editor spreadsheet" href="doceditor.aspx?type=spreadsheet" target="_blank">Create<br />Sample Spreadsheet</a></li>
-                <li><a class="try-editor presentation" href="doceditor.aspx?type=presentation" target="_blank">Create<br />Sample Presentation</a></li>
-            </ul>
+
 
             <% var storedFiles = GetStoredFiles();
                if (storedFiles.Any())
@@ -73,17 +129,96 @@
                 <span>Your documents</span>
                 <br />
                 <br />
-                <ul class="stored-list">
-                    <% foreach (var storedFile in storedFiles)
-                       { %>
-                    <li class="clearFix">
-                        <a class="stored-edit <%= DocumentType(storedFile) %>" href="doceditor.aspx?fileID=<%= HttpUtility.UrlEncode(storedFile) %>" target="_blank">
-                            <span title="<%= storedFile %>"><%= storedFile %></span>
-                        </a>
-                        <a class="stored-download" href="<%= VirtualPath + WebConfigurationManager.AppSettings["storage-path"] + storedFile %>">Download</a>
-                    </li>
-                    <% } %>
-                </ul>
+                <div class="stored-list">
+                    <table width="100%" cellspacing="0" cellpadding="0">
+                        <thead>
+                            <tr class="tableHeader">
+                                <td class="tableHeaderCell tableHeaderCellFileName">Filename</td>
+                                <td colspan="6" class="tableHeaderCell contentCells-shift">Editors</td>
+                                <td colspan="3" class="tableHeaderCell">Viewers</td>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <% foreach (var storedFile in storedFiles)
+                               { %>
+                                <%
+                                    var editUrl = "doceditor.aspx?fileID=" + HttpUtility.UrlEncode(storedFile);
+                                    var docType = DocumentType(storedFile);
+                                %>
+                                <tr class="tableRow" title="<%= storedFile %>">
+                                    <td class="contentCells">
+                                        <a class="stored-edit <%= docType %>" href="<%= editUrl %>" target="_blank">
+                                            <span title="<%= storedFile %>"><%= storedFile %></span>
+                                        </a>
+                                        <a href="<%= VirtualPath + WebConfigurationManager.AppSettings["storage-path"] + storedFile %>">
+                                            <img class="icon-download" src="app_themes/images/download-24.png" alt="Download" title="Download" />
+                                        </a>
+                                        <a class="delete-file" data-filename="<%= storedFile %>">
+                                            <img class="icon-delete" src="app_themes/images/delete-24.png" alt="Delete" title="Delete" />
+                                        </a>
+                                    </td>
+
+                                    <td class="contentCells contentCells-icon">
+                                        <a href="<%= editUrl + "&editorsType=desktop&editorsMode=edit" %>" target="_blank">
+                                            <img src="app_themes/images/desktop-24.png" 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="<%= editUrl + "&editorsType=mobile&editorsMode=edit" %>" target="_blank">
+                                            <img src="app_themes/images/mobile-24.png" alt="Open in editor for mobile devices" title="Open in editor for mobile devices"/>
+                                        </a>
+                                    </td>
+                                    <td class="contentCells contentCells-icon">
+                                        <% if (docType == "text") { %>
+                                            <a href="<%= editUrl + "&editorsType=desktop&editorsMode=review" %>" target="_blank">
+                                                <img src="app_themes/images/review-24.png" alt="Open in editor for review" title="Open in editor for review"/>
+                                            </a>
+                                        <% } else if (docType == "spreadsheet") { %>
+                                            <a href="<%= editUrl + "&editorsType=desktop&editorsMode=filter" %>" target="_blank">
+                                                <img src="app_themes/images/filter-24.png" alt="Open in editor without access to change the filter" title="Open in editor without access to change the filter" />
+                                            </a>
+                                        <% } %>
+                                    </td>
+                                    <td class="contentCells contentCells-icon">
+                                        <a href="<%= editUrl + "&editorsType=desktop&editorsMode=comment" %>" target="_blank">
+                                            <img src="app_themes/images/comment-24.png" alt="Open in editor for comment" title="Open in editor for comment"/>
+                                        </a>
+                                    </td>
+                                    <td class="contentCells contentCells-icon">
+                                        <% if (docType == "text") { %>
+                                            <a href="<%= editUrl + "&editorsType=desktop&editorsMode=fillForms" %>" target="_blank">
+                                                <img src="app_themes/images/fill-forms-24.png" alt="Open in editor for filling in forms" title="Open in editor for filling in forms"/>
+                                            </a>
+                                        <% } %>
+                                    </td>
+                                    <td class="contentCells contentCells-icon contentCells-shift">
+                                        <% if (docType == "text") { %>
+                                            <a href="<%= editUrl + "&editorsType=desktop&editorsMode=blockcontent" %>" target="_blank">
+                                                <img src="app_themes/images/block-content-24.png" alt="Open in editor without content control modification" title="Open in editor without content control modification"/>
+                                            </a>
+                                        <% } %>
+                                    </td>
+
+                                    <td class="contentCells contentCells-icon">
+                                        <a href="<%= editUrl + "&editorsType=desktop&editorsMode=view" %>" target="_blank">
+                                            <img src="app_themes/images/desktop-24.png" 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="<%= editUrl + "&editorsType=mobile&editorsMode=view" %>" target="_blank">
+                                            <img src="app_themes/images/mobile-24.png" alt="Open in viewer for mobile devices" title="Open in viewer for mobile devices"/>
+                                        </a>
+                                    </td>
+                                    <td class="contentCells contentCells-icon">
+                                        <a href="<%= editUrl + "&editorsType=embedded&editorsMode=embedded" %>" target="_blank">
+                                            <img src="app_themes/images/embeded-24.png" alt="Open in embedded mode" title="Open in embedded mode"/>
+                                        </a>
+                                    </td>
+                                </tr>
+                            <% } %>
+                        </tbody>
+                    </table>
+                </div>
             </div>
             <% } %>
 
@@ -156,10 +291,7 @@
             <br />
             <div id="beginEmbedded" class="button disable">Embedded view</div>
             <div id="beginView" class="button disable">View</div>
-            <% if (EditMode)
-               { %>
             <div id="beginEdit" class="button disable">Edit</div>
-            <% } %>
             <div id="cancelEdit" class="button gray">Cancel</div>
         </div>
 

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -31,8 +31,8 @@ using System.Linq;
 using System.Net;
 using System.Text.RegularExpressions;
 using System.Web;
-using System.Web.Caching;
 using System.Web.Configuration;
+using System.Web.Script.Serialization;
 using System.Web.UI;
 using ASC.Api.DocumentConverter;
 
@@ -102,12 +102,10 @@ namespace OnlineEditorsExample
         }
 
         private static bool? _ismono;
+
         public static bool IsMono
         {
-            get
-            {
-                return _ismono.HasValue ? _ismono.Value : (_ismono = (bool?)(Type.GetType("Mono.Runtime") != null)).Value;
-            }
+            get { return _ismono.HasValue ? _ismono.Value : (_ismono = (bool?)(Type.GetType("Mono.Runtime") != null)).Value; }
         }
 
         private static long MaxFileSize
@@ -140,11 +138,6 @@ namespace OnlineEditorsExample
             get { return (WebConfigurationManager.AppSettings["files.docservice.convert-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); }
         }
 
-        public static bool EditMode
-        {
-            get { return (WebConfigurationManager.AppSettings["mode"] ?? "") != "view"; }
-        }
-
         private static string _fileName;
 
         public static string CurUserHostAddress(string userAddress)
@@ -162,6 +155,32 @@ namespace OnlineEditorsExample
             return directory + fileName;
         }
 
+        public static string HistoryDir(string storagePath)
+        {
+            return storagePath += "-hist";
+        }
+
+        public static string VersionDir(string histPath, int version)
+        {
+            return Path.Combine(histPath, version.ToString());
+        }
+
+        public static string VersionDir(string fileName, string userAddress, int version)
+        {
+            return VersionDir(HistoryDir(StoragePath(fileName, userAddress)), version);
+        }
+
+        public static int GetFileVersion(string historyPath)
+        {
+            if (!Directory.Exists(historyPath)) return 0;
+            return Directory.EnumerateDirectories(historyPath).Count();
+        }
+
+        public static int GetFileVersion(string fileName, string userAddress)
+        {
+            return GetFileVersion(HistoryDir(StoragePath(fileName, userAddress)));
+        }
+
         public static string FileUri(string fileName)
         {
             var uri = Host;
@@ -218,10 +237,18 @@ namespace OnlineEditorsExample
             var savedFileName = StoragePath(_fileName, null);
             httpPostedFile.SaveAs(savedFileName);
 
+            var histDir = HistoryDir(savedFileName);
+            Directory.CreateDirectory(histDir);
+            File.WriteAllText(Path.Combine(histDir, "createdInfo.json"), new JavaScriptSerializer().Serialize(new Dictionary<string, object> {
+                { "created", DateTime.Now.ToString() },
+                { "id", context.Request.Cookies["uid"]?.Value ?? "uid-1" },
+                { "name", context.Request.Cookies["uname"]?.Value ?? "John Smith" }
+            }));
+
             return _fileName;
         }
 
-        public static string DoUpload(string fileUri)
+        public static string DoUpload(string fileUri, HttpRequest request)
         {
             _fileName = GetCorrectName(Path.GetFileName(fileUri));
 
@@ -256,6 +283,14 @@ namespace OnlineEditorsExample
                         }
                     }
                 }
+
+                var histDir = HistoryDir(StoragePath(_fileName, null));
+                Directory.CreateDirectory(histDir);
+                File.WriteAllText(Path.Combine(histDir, "createdInfo.json"), new JavaScriptSerializer().Serialize(new Dictionary<string, object> {
+                    { "created", DateTime.Now.ToString() },
+                    { "id", request.Cookies["uid"]?.Value ?? "uid-1" },
+                    { "name", request.Cookies["uname"]?.Value ?? "John Smith" }
+                }));
             }
             catch (Exception)
             {
@@ -309,8 +344,19 @@ namespace OnlineEditorsExample
                     }
                 }
 
-                File.Delete(StoragePath(_fileName, null));
+                var storagePath = StoragePath(_fileName, null);
+                var histDir = HistoryDir(storagePath);
+                File.Delete(storagePath);
+                if (Directory.Exists(histDir)) Directory.Delete(histDir, true);
+
                 _fileName = fileName;
+                histDir = HistoryDir(StoragePath(_fileName, null));
+                Directory.CreateDirectory(histDir);
+                File.WriteAllText(Path.Combine(histDir, "createdInfo.json"), new JavaScriptSerializer().Serialize(new Dictionary<string, object> {
+                    { "created", DateTime.Now.ToString() },
+                    { "id", context.Request.Cookies["uid"]?.Value ?? "uid-1" },
+                    { "name", context.Request.Cookies["uname"]?.Value ?? "John Smith" }
+                }));
             }
 
             return "{ \"filename\" : \"" + _fileName + "\"}";

web/documentserver-example/csharp/DocEditor.aspx

@@ -8,6 +8,9 @@
 <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, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, minimal-ui" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
     <link rel="icon" href="~/favicon.ico" type="image/x-icon" />
     <title>ONLYOFFICE</title>
 
@@ -45,15 +48,13 @@
     <script type="text/javascript" language="javascript">
 
         var docEditor;
-        var fileName = "<%= FileName %>";
-        var fileType = "<%= Path.GetExtension(FileName).Trim('.') %>";
 
         var innerAlert = function (message) {
             if (console && console.log)
                 console.log(message);
         };
 
-        var onReady = function () {
+        var onAppReady = function () {
             innerAlert("Document editor ready");
         };
 
@@ -75,66 +76,36 @@
             location.reload(true);
         };
 
+        var config = <%= DocConfig %>;
+
+        config.width = "100%";
+        config.height = "100%";
+
+        config.events = {
+            'onAppReady': onAppReady,
+            'onDocumentStateChange': onDocumentStateChange,
+            'onRequestEditRights': onRequestEditRights,
+            'onError': onError,
+            'onOutdatedVersion': onOutdatedVersion,
+        };
+
+        <% if (!string.IsNullOrEmpty(History) && !string.IsNullOrEmpty(HistoryData))
+        { %>
+        config.events['onRequestHistory'] = function () {
+            docEditor.refreshHistory(<%= History %>);
+        };
+        config.events['onRequestHistoryData'] = function (event) {
+            var ver = event.data;
+            var histData = <%= HistoryData %>;
+            docEditor.setHistoryData(histData[ver]);
+        };
+        config.events['onRequestHistoryClose '] = function () {
+            document.location.reload();
+        };
+        <% } %>
+
         var сonnectEditor = function () {
-
-            docEditor = new DocsAPI.DocEditor("iframeEditor",
-                {
-                    width: "100%",
-                    height: "100%",
-
-                    type: '<%= Request["action"] != "embedded" ? "desktop" : "embedded" %>',
-                    documentType: "<%=_Default.DocumentType(FileName) %>",
-                    document: {
-                        title: fileName,
-                        url: "<%= FileUri %>",
-                        fileType: fileType,
-                        key: "<%= Key %>",
-
-                        info: {
-                            author: "Me",
-                            created: "<%= DateTime.Now.ToShortDateString() %>",
-                        },
-
-                        permissions: {
-                            edit: "<%= _Default.EditedExts.Contains(Path.GetExtension(FileName)) %>" == "True",
-                            download: true,
-                        }
-                    },
-                    editorConfig: {
-                        mode: '<%= _Default.EditMode && _Default.EditedExts.Contains(Path.GetExtension(FileName)) && Request["action"] != "view" ? "edit" : "view" %>',
-
-                        lang: "en",
-
-                        callbackUrl: "<%= CallbackUrl %>",
-
-                        user: {
-                            id: "<%= _Default.CurUserHostAddress(null) %>",
-                            name: "John Smith",
-                        },
-
-                        embedded: {
-                            saveUrl: "<%= FileUri %>",
-                            embedUrl: "<%= FileUri %>",
-                            shareUrl: "<%= FileUri %>",
-                            toolbarDocked: "top",
-                        },
-
-                        customization: {
-                            about: true,
-                            feedback: true,
-                            goback: {
-                                url: "<%= _Default.Host %>default.aspx",
-                            },
-                        },
-                    },
-                    events: {
-                        'onReady': onReady,
-                        'onDocumentStateChange': onDocumentStateChange,
-                        'onRequestEditRights': onRequestEditRights,
-                        'onError': onError,
-                        'onOutdatedVersion': onOutdatedVersion,
-                    }
-                });
+            docEditor = new DocsAPI.DocEditor("iframeEditor", config);
         };
 
         if (window.addEventListener) {

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -25,9 +25,12 @@
 */
 
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using System.IO;
 using System.Web;
 using System.Web.Configuration;
+using System.Web.Script.Serialization;
 using System.Web.UI;
 using ASC.Api.DocumentConverter;
 
@@ -44,7 +47,12 @@ namespace OnlineEditorsExample
 
         protected string Key
         {
-            get { return ServiceConverter.GenerateRevisionId(_Default.CurUserHostAddress(null) + "/" + Path.GetFileName(FileUri) + "/" + File.GetLastWriteTime(_Default.StoragePath(FileName, null)).GetHashCode()); }
+            get
+            {
+                return ServiceConverter.GenerateRevisionId(_Default.CurUserHostAddress(null)
+                                                           + "/" + Path.GetFileName(FileUri)
+                                                           + "/" + File.GetLastWriteTime(_Default.StoragePath(FileName, null)).GetHashCode());
+            }
         }
 
         protected string DocServiceApiUri
@@ -52,6 +60,10 @@ namespace OnlineEditorsExample
             get { return WebConfigurationManager.AppSettings["files.docservice.url.api"] ?? string.Empty; }
         }
 
+        protected string DocConfig { get; private set; }
+        protected string History { get; private set; }
+        protected string HistoryData { get; private set; }
+
         public static string CallbackUrl
         {
             get
@@ -73,7 +85,7 @@ namespace OnlineEditorsExample
             var externalUrl = Request["fileUrl"];
             if (!string.IsNullOrEmpty(externalUrl))
             {
-                FileName = _Default.DoUpload(externalUrl);
+                FileName = _Default.DoUpload(externalUrl, Request);
             }
             else
             {
@@ -83,12 +95,190 @@ namespace OnlineEditorsExample
             var type = Request["type"];
             if (!string.IsNullOrEmpty(type))
             {
-                Try(type);
+                Try(type, Request["sample"], Request);
                 Response.Redirect("doceditor.aspx?fileID=" + HttpUtility.UrlEncode(FileName));
             }
+
+            var ext = Path.GetExtension(FileName);
+
+            var editorsMode = Request["editorsMode"] ?? "edit";
+
+            var canEdit = _Default.EditedExts.Contains(ext);
+            var mode = canEdit && editorsMode != "view" ? "edit" : "view";
+
+            var config = new Dictionary<string, object>
+                {
+                    { "type", Request["editorsType"] ?? "desktop" },
+                    { "documentType", _Default.DocumentType(FileName) },
+                    {
+                        "document", new Dictionary<string, object>
+                            {
+                                { "title", FileName },
+                                { "url", FileUri },
+                                { "fileType", ext.Trim('.') },
+                                { "key", Key },
+                                {
+                                    "info", new Dictionary<string, object>
+                                        {
+                                            { "author", "Me" },
+                                            { "created", DateTime.Now.ToShortDateString() }
+                                        }
+                                },
+                                {
+                                    "permissions", new Dictionary<string, object>
+                                        {
+                                            { "comment", editorsMode != "view" && editorsMode != "fillForms" && editorsMode != "embedded" && editorsMode != "blockcontent"},
+                                            { "download", true },
+                                            { "edit", canEdit && (editorsMode == "edit" || editorsMode == "filter") || editorsMode == "blockcontent" },
+                                            { "fillForms", editorsMode != "view" && editorsMode != "comment" && editorsMode != "embedded" && editorsMode != "blockcontent" },
+                                            { "modifyFilter", editorsMode != "filter" },
+                                            { "modifyContentControl", editorsMode != "blockcontent" },
+                                            { "review", editorsMode == "edit" || editorsMode == "review" }
+                                        }
+                                }
+                            }
+                    },
+                    {
+                        "editorConfig", new Dictionary<string, object>
+                            {
+                                { "mode", mode },
+                                { "lang", Request.Cookies["ulang"]?.Value ?? "en" },
+                                { "callbackUrl", CallbackUrl },
+                                {
+                                    "user", new Dictionary<string, object>
+                                        {
+                                            { "id", Request.Cookies["uid"]?.Value ?? "uid-1" },
+                                            { "name", Request.Cookies["uname"]?.Value ?? "John Smith" }
+                                        }
+                                },
+                                {
+                                    "embedded", new Dictionary<string, object>
+                                        {
+                                            { "saveUrl", FileUri },
+                                            { "embedUrl", FileUri },
+                                            { "shareUrl", FileUri },
+                                            { "toolbarDocked", "top" }
+                                        }
+                                },
+                                {
+                                    "customization", new Dictionary<string, object>
+                                        {
+                                            { "about", true },
+                                            { "feedback", true },
+                                            {
+                                                "goback", new Dictionary<string, object>
+                                                    {
+                                                        { "url", _Default.Host + "default.aspx" }
+                                                    }
+                                            }
+                                        }
+                                }
+                            }
+                    }
+                };
+
+            if (JwtManager.Enabled)
+            {
+                var token = JwtManager.Encode(config);
+                config.Add("token", token);
+            }
+
+            var jss = new JavaScriptSerializer();
+
+            DocConfig = jss.Serialize(config);
+
+            try
+            {
+                GetHistory(out var hist, out var histData);
+                if (hist != null && histData != null)
+                {
+                    History = jss.Serialize(hist);
+                    HistoryData = jss.Serialize(histData);
+                }
+            }
+            catch { }
+        }
+
+        private void GetHistory(out Dictionary<string, object> history, out Dictionary<string, object> historyData)
+        {
+            var jss = new JavaScriptSerializer();
+            var histDir = _Default.HistoryDir(_Default.StoragePath(FileName, null));
+
+            history = null;
+            historyData = null;
+
+            if (_Default.GetFileVersion(histDir) > 0)
+            {
+                var currentVersion = _Default.GetFileVersion(histDir);
+                var hist = new List<Dictionary<string, object>>();
+                var histData = new Dictionary<string, object>();
+
+                for (var i = 0; i <= currentVersion; i++)
+                {
+                    var obj = new Dictionary<string, object>();
+                    var dataObj = new Dictionary<string, object>();
+                    var verDir = _Default.VersionDir(histDir, i + 1);
+
+                    var key = i == currentVersion ? Key : File.ReadAllText(Path.Combine(verDir, "key.txt"));
+
+                    obj.Add("key", key);
+                    obj.Add("version", i);
+
+                    if (i == 0)
+                    {
+                        var infoPath = Path.Combine(histDir, "createdInfo.json");
+
+                        if (File.Exists(infoPath)) {
+                            var info = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(infoPath));
+                            obj.Add("created", info["created"]);
+                            obj.Add("user", new Dictionary<string, object>() {
+                                { "id", info["id"] },
+                                { "name", info["name"] },
+                            });
+                        }
+                    }
+
+                    dataObj.Add("key", key);
+                    dataObj.Add("url", i == currentVersion ? FileUri : MakePublicUrl(Directory.GetFiles(verDir, "prev.*")[0]));
+                    dataObj.Add("version", i);
+                    if (i > 0)
+                    {
+                        var changes = jss.Deserialize<Dictionary<string, object>>(File.ReadAllText(Path.Combine(_Default.VersionDir(histDir, i), "changes.json")));
+                        var change = ((Dictionary<string, object>)((ArrayList)changes["changes"])[0]);
+
+                        obj.Add("changes", changes["changes"]);
+                        obj.Add("serverVersion", changes["serverVersion"]);
+                        obj.Add("created", change["created"]);
+                        obj.Add("user", change["user"]);
+
+                        var prev = (Dictionary<string, object>)histData[(i - 1).ToString()];
+                        dataObj.Add("previous", new Dictionary<string, object>() {
+                            { "key", prev["key"] },
+                            { "url", prev["url"] },
+                        });
+                        dataObj.Add("changesUrl", MakePublicUrl(Path.Combine(_Default.VersionDir(histDir, i), "diff.zip")));
+                    }
+
+                    hist.Add(obj);
+                    histData.Add(i.ToString(), dataObj);
+                }
+
+                history = new Dictionary<string, object>()
+                {
+                    { "currentVersion", currentVersion },
+                    { "history", hist }
+                };
+                historyData = histData;
+            }
         }
 
-        private static void Try(string type)
+        private string MakePublicUrl(string fullPath)
+        {
+            var root = HttpRuntime.AppDomainAppPath + WebConfigurationManager.AppSettings["storage-path"];
+            return _Default.Host + fullPath.Substring(root.Length).Replace(Path.DirectorySeparatorChar, '/');
+        }
+
+        private static void Try(string type, string sample, HttpRequest request)
         {
             string ext;
             switch (type)
@@ -105,10 +295,19 @@ namespace OnlineEditorsExample
                 default:
                     return;
             }
-            var demoName = "demo" + ext;
+            var demoName = (string.IsNullOrEmpty(sample) ? "new" : "demo") + ext;
             FileName = _Default.GetCorrectName(demoName);
 
-            File.Copy(HttpRuntime.AppDomainAppPath + "app_data/" + demoName, _Default.StoragePath(FileName, null));
+            var filePath = _Default.StoragePath(FileName, null);
+            File.Copy(HttpRuntime.AppDomainAppPath + "app_data/" + demoName, filePath);
+
+            var histDir = _Default.HistoryDir(filePath);
+            Directory.CreateDirectory(histDir);
+            File.WriteAllText(Path.Combine(histDir, "createdInfo.json"), new JavaScriptSerializer().Serialize(new Dictionary<string, object> {
+                { "created", DateTime.Now.ToString() },
+                { "id", request.Cookies["uid"]?.Value ?? "uid-1" },
+                { "name", request.Cookies["uname"]?.Value ?? "John Smith" }
+            }));
         }
     }
 }

web/documentserver-example/csharp/DocumentConverter.cs

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -24,14 +24,16 @@
  *
 */
 
+using OnlineEditorsExample;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Web.Configuration;
 using System.Web.Helpers;
-using OnlineEditorsExample;
+using System.Web.Script.Serialization;
 
 namespace ASC.Api.DocumentConverter
 {
@@ -108,15 +110,30 @@ namespace ASC.Api.DocumentConverter
             request.Accept = "application/json";
             request.Timeout = ConvertTimeout;
 
-            var bodyString = string.Format("{{\"async\": {0},\"filetype\": \"{1}\",\"key\": \"{2}\",\"outputtype\": \"{3}\",\"title\": \"{4}\",\"url\": \"{5}\"}}",
-                                           isAsync.ToString().ToLower(),
-                                           fromExtension.Trim('.'),
-                                           documentRevisionId,
-                                           toExtension.Trim('.'),
-                                           title,
-                                           documentUri);
+            var body = new Dictionary<string, object>() {
+                { "async", isAsync },
+                { "filetype", fromExtension.Trim('.') },
+                { "key", documentRevisionId },
+                { "outputtype", toExtension.Trim('.') },
+                { "title", title },
+                { "url", documentUri }
+            };
 
-            var bytes = Encoding.UTF8.GetBytes(bodyString);
+            if (JwtManager.Enabled)
+            {
+                var payload = new Dictionary<string, object>
+                    {
+                        { "payload", body }
+                    };
+
+                var payloadToken =  JwtManager.Encode(payload);
+                var bodyToken = JwtManager.Encode(body);
+                request.Headers.Add("Authorization", "Bearer " + payloadToken);
+
+                body.Add("token", bodyToken);
+            }
+
+            var bytes = Encoding.UTF8.GetBytes(new JavaScriptSerializer().Serialize(body));
             request.ContentLength = bytes.Length;
             using (var requestStream = request.GetRequestStream())
             {

web/documentserver-example/csharp/JwtManager.cs

@@ -0,0 +1,113 @@
+/*
+ *
+ * (c) Copyright Ascensio System SIA 2019
+ *
+ * The MIT License (MIT)
+ *
+ * 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.
+ *
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Security.Cryptography;
+using System.Text;
+using System.Web.Configuration;
+using System.Web.Script.Serialization;
+
+namespace OnlineEditorsExample
+{
+    public static class JwtManager
+    {
+        private static readonly string Secret;
+        public static readonly bool Enabled;
+
+        private static readonly JavaScriptSerializer Serializer;
+
+        static JwtManager()
+        {
+            Secret = WebConfigurationManager.AppSettings["files.docservice.secret"] ?? "";
+            Enabled = !string.IsNullOrEmpty(Secret);
+            Serializer = new JavaScriptSerializer();
+        }
+
+        public static string Encode(IDictionary<string, object> payload)
+        {
+            var header = new Dictionary<string, object>
+                {
+                    { "alg", "HS256" },
+                    { "typ", "JWT" }
+                };
+
+            var encHeader = Base64UrlEncode(Serializer.Serialize(header));
+            var encPayload = Base64UrlEncode(Serializer.Serialize(payload));
+            var hashSum = Base64UrlEncode(CalculateHash(encHeader, encPayload));
+
+            return string.Format("{0}.{1}.{2}", encHeader, encPayload, hashSum);
+        }
+
+        public static string Decode(string token)
+        {
+            if (!Enabled || string.IsNullOrEmpty(token)) return "";
+
+            var split = token.Split('.');
+            if (split.Length != 3) return "";
+
+            var hashSum = Base64UrlEncode(CalculateHash(split[0], split[1]));
+            if (hashSum != split[2]) return "";
+            return Base64UrlDecode(split[1]);
+        }
+
+        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);
+            }
+        }
+
+        private static string Base64UrlEncode(string str)
+        {
+            return Base64UrlEncode(Encoding.UTF8.GetBytes(str));
+        }
+
+        private static string Base64UrlEncode(byte[] bytes)
+        {
+            return Convert.ToBase64String(bytes)
+                          .TrimEnd('=').Replace('+', '-').Replace('/', '_');
+        }
+
+        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);
+        }
+    }
+}

web/documentserver-example/csharp/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 ONLYOFFICE
+Copyright (c) 2019 ONLYOFFICE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

web/documentserver-example/csharp/OnlineEditorsExample.csproj

@@ -52,12 +52,23 @@
     <Reference Include="System.Web.Services" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="App_Themes\images\block-content-24.png" />
+    <Content Include="App_Themes\images\comment-24.png" />
+    <Content Include="App_Themes\images\delete-24.png" />
+    <Content Include="App_Themes\images\desktop-24.png" />
+    <Content Include="App_Themes\images\download-24.png" />
+    <Content Include="App_Themes\images\embeded-24.png" />
     <Content Include="App_Themes\images\file_docx.png" />
     <Content Include="App_Themes\images\file_pptx.png" />
+    <Content Include="App_Themes\images\file_upload.png" />
     <Content Include="App_Themes\images\file_xlsx.png" />
+    <Content Include="App_Themes\images\fill-forms-24.png" />
+    <Content Include="App_Themes\images\filter-24.png" />
     <Content Include="App_Themes\images\icon_docx.png" />
     <Content Include="App_Themes\images\icon_pptx.png" />
     <Content Include="App_Themes\images\icon_xlsx.png" />
+    <Content Include="App_Themes\images\mobile-24.png" />
+    <Content Include="App_Themes\images\review-24.png" />
     <Content Include="LICENSE.txt" />
     <Content Include="licenses\MIT-LICENSE.txt" />
     <Content Include="ReadMe.txt" />
@@ -72,6 +83,7 @@
       <DependentUpon>DocEditor.aspx</DependentUpon>
     </Compile>
     <Compile Include="DocumentConverter.cs" />
+    <Compile Include="JwtManager.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Default.aspx.cs">
       <DependentUpon>Default.aspx</DependentUpon>
@@ -116,6 +128,11 @@
     <Content Include="App_Data\demo.pptx" />
     <Content Include="App_Data\demo.xlsx" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="App_Data\new.docx" />
+    <Content Include="App_Data\new.pptx" />
+    <Content Include="App_Data\new.xlsx" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

web/documentserver-example/csharp/Properties/AssemblyInfo.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Ascensio System SIA")]
 [assembly: AssemblyProduct("OnlineEditorsExample")]
-[assembly: AssemblyCopyright("Ascensio System SIA 2018")]
+[assembly: AssemblyCopyright("Ascensio System SIA 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -24,14 +24,15 @@
  *
 */
 
+using ASC.Api.DocumentConverter;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Web;
 using System.Web.Script.Serialization;
 using System.Web.Services;
-using ASC.Api.DocumentConverter;
 
 namespace OnlineEditorsExample
 {
@@ -52,6 +53,9 @@ namespace OnlineEditorsExample
                 case "track":
                     Track(context);
                     break;
+                case "remove":
+                    Remove(context);
+                    break;
             }
         }
 
@@ -112,6 +116,24 @@ namespace OnlineEditorsExample
             var jss = new JavaScriptSerializer();
             if (string.IsNullOrEmpty(body)) return;
             var fileData = jss.Deserialize<Dictionary<string, object>>(body);
+
+            if (JwtManager.Enabled)
+            {
+                if (fileData.ContainsKey("token"))
+                {
+                    fileData = jss.Deserialize<Dictionary<string, object>>(JwtManager.Decode(fileData["token"].ToString()));
+                }
+                else if (context.Request.Headers.AllKeys.Contains("Authorization", StringComparer.InvariantCultureIgnoreCase))
+                {
+                    var headerToken = context.Request.Headers.Get("Authorization").Substring("Bearer ".Length);
+                    fileData = (Dictionary<string, object>)jss.Deserialize<Dictionary<string, object>>(JwtManager.Decode(headerToken))["payload"];
+                }
+                else
+                {
+                    throw new Exception("Expected JWT");
+                }
+            }
+
             var status = (TrackerStatus) (int) fileData["status"];
 
             switch (status)
@@ -138,8 +160,6 @@ namespace OnlineEditorsExample
                         }
                     }
 
-                    var req = (HttpWebRequest) WebRequest.Create(downloadUri);
-
                     // hack. http://ubuntuforums.org/showthread.php?t=1841740
                     if (_Default.IsMono)
                     {
@@ -149,22 +169,29 @@ namespace OnlineEditorsExample
                     var saved = 1;
                     try
                     {
-                        using (var stream = req.GetResponse().GetResponseStream())
-                        {
-                            if (stream == null) throw new Exception("stream is null");
-                            const int bufferSize = 4096;
+                        var storagePath = _Default.StoragePath(fileName, userAddress);
+                        var histDir = _Default.HistoryDir(storagePath);
+                        var versionDir = _Default.VersionDir(histDir, _Default.GetFileVersion(histDir) + 1);
 
-                            var storagePath = _Default.StoragePath(fileName, userAddress);
-                            using (var fs = File.Open(storagePath, FileMode.Create))
-                            {
-                                var buffer = new byte[bufferSize];
-                                int readed;
-                                while ((readed = stream.Read(buffer, 0, bufferSize)) != 0)
-                                {
-                                    fs.Write(buffer, 0, readed);
-                                }
-                            }
+                        if (!Directory.Exists(versionDir)) Directory.CreateDirectory(versionDir);
+
+                        File.Copy(storagePath, Path.Combine(versionDir, "prev" + curExt));
+
+                        DownloadToFile(downloadUri, _Default.StoragePath(fileName, userAddress));
+                        DownloadToFile((string)fileData["changesurl"], Path.Combine(versionDir, "diff.zip"));
+
+                        var hist = fileData.ContainsKey("changeshistory") ? (string)fileData["changeshistory"] : null;
+                        if (string.IsNullOrEmpty(hist) && fileData.ContainsKey("history"))
+                        {
+                            hist = jss.Serialize(fileData["history"]);
                         }
+
+                        if (!string.IsNullOrEmpty(hist))
+                        {
+                            File.WriteAllText(Path.Combine(versionDir, "changes.json"), hist);
+                        }
+
+                        File.WriteAllText(Path.Combine(versionDir, "key.txt"), (string)fileData["key"]);
                     }
                     catch (Exception)
                     {
@@ -176,6 +203,49 @@ namespace OnlineEditorsExample
             context.Response.Write("{\"error\":0}");
         }
 
+        private static void Remove(HttpContext context)
+        {
+            context.Response.ContentType = "text/plain";
+            try
+            {
+                var fileName = context.Request["fileName"];
+                var path = _Default.StoragePath(fileName, HttpUtility.UrlEncode(HttpContext.Current.Request.UserHostAddress));
+                var histDir = _Default.HistoryDir(path);
+
+                if (File.Exists(path)) File.Delete(path);
+                if (Directory.Exists(histDir)) Directory.Delete(histDir, true);
+
+                context.Response.Write("{ \"success\": true }");
+            }
+            catch (Exception e)
+            {
+                context.Response.Write("{ \"error\": \"" + e.Message + "\"}");
+            }
+        }
+
+        private static void DownloadToFile(string url, string path)
+        {
+            if (string.IsNullOrEmpty(url)) throw new ArgumentException("url");
+            if (string.IsNullOrEmpty(path)) throw new ArgumentException("path");
+
+            var req = (HttpWebRequest)WebRequest.Create(url);
+            using (var stream = req.GetResponse().GetResponseStream())
+            {
+                if (stream == null) throw new Exception("stream is null");
+                const int bufferSize = 4096;
+
+                using (var fs = File.Open(path, FileMode.Create))
+                {
+                    var buffer = new byte[bufferSize];
+                    int readed;
+                    while ((readed = stream.Read(buffer, 0, bufferSize)) != 0)
+                    {
+                        fs.Write(buffer, 0, readed);
+                    }
+                }
+            }
+        }
+
         public bool IsReusable
         {
             get { return false; }

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -70,6 +70,8 @@ if (typeof jQuery != "undefined") {
                 checkConvert();
             }
         });
+
+        initSelectors();
     });
 
     var timer = null;
@@ -91,11 +93,6 @@ if (typeof jQuery != "undefined") {
             return;
         }
 
-        if (jq("#checkOriginalFormat").is(":checked")) {
-            loadScripts();
-            return;
-        }
-
         timer = setTimeout(function () {
             var requestAddress = "webeditor.ashx"
                 + "?type=convert"
@@ -163,6 +160,34 @@ if (typeof jQuery != "undefined") {
         }
     };
 
+    var initSelectors = function () {
+        var userSel = jq("#user");
+        var langSel = jq("#language");
+
+        function getCookie(name) {
+            let matches = document.cookie.match(new RegExp(
+                "(?:^|; )" + name.replace(/([\.$?*|{}\(\)\[\]\\\/\+^])/g, '\\$1') + "=([^;]*)"
+            ));
+            return matches ? decodeURIComponent(matches[1]) : null;
+        }
+        function setCookie(name, value) {
+            document.cookie = name + "=" + value + "; expires=" + new Date(Date.now() + 1000 * 60 * 60 * 24 * 7).toUTCString(); //week
+        }
+
+        var userId = getCookie("uid");
+        if (userId) userSel.val(userId);
+        var langId = getCookie("ulang");
+        if (langId) langSel.val(langId);
+
+        userSel.on("change", function () {
+            setCookie("uid", userSel.val());
+            setCookie("uname", userSel.find("option:selected").text())
+        });
+        langSel.on("change", function () {
+            setCookie("ulang", langSel.val());
+        });
+    };
+
     jq(document).on("click", "#beginEdit:not(.disable)", function () {
         var fileId = encodeURIComponent(jq('#hiddenFileName').val());
         var url = "doceditor.aspx?fileID=" + fileId;
@@ -195,6 +220,32 @@ if (typeof jQuery != "undefined") {
         jq.unblockUI();
     });
 
+    jq(document).on("click", ".try-editor", function (e) {
+        var url = "doceditor.aspx?type=" + e.target.attributes["data-type"].value;
+        if (jq("#createSample").is(":checked")) {
+            url += "&sample=true";
+        }
+        var w = window.open(url, "_blank");
+        w.onload = function () {
+            window.location.reload();
+        }
+    });
+
+    jq(document).on("click", ".delete-file", function () {
+        var requestAddress = "webeditor.ashx"
+            + "?type=remove"
+            + "&filename=" + encodeURIComponent(jq(this).attr("data-filename"));
+
+        jq.ajax({
+            async: true,
+            contentType: "text/xml",
+            url: requestAddress,
+            complete: function (data) {
+                document.location.reload();
+            }
+        });
+    });
+
     jq.dropdownToggle({
         switcherSelector: ".question",
         dropdownID: "hint"

web/documentserver-example/csharp/settings.config

@@ -6,9 +6,10 @@
   <add key="storage-path" value=""/>
 
   <add key="files.docservice.viewed-docs" value=".pdf|.djvu|.xps"/>
-  <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.ppsx|.txt"/>
-  <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|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.epub"/>
+  <add key="files.docservice.edited-docs" value=".docx|.xlsx|.csv|.pptx|.txt"/>
+  <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|.epub"/>
   <add key="files.docservice.timeout" value="120000" />
+  <add key="files.docservice.secret" value="" />
 
   <add key="files.docservice.url.converter" value="https://documentserver/ConvertService.ashx"/>
   <add key="files.docservice.url.api" value="https://documentserver/web-apps/apps/api/documents/api.js"/>

web/documentserver-example/java/.project

@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>OnlineEditorsExampleJava</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
+    <name>OnlineEditorsExampleJava</name>
+    <comment></comment>
+    <projects>
+    </projects>
+    <buildSpec>
+        <buildCommand>
+            <name>org.eclipse.jdt.core.javabuilder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+        <buildCommand>
+            <name>org.eclipse.m2e.core.maven2Builder</name>
+            <arguments>
+            </arguments>
+        </buildCommand>
+    </buildSpec>
+    <natures>
+        <nature>org.eclipse.jdt.core.javanature</nature>
+        <nature>org.eclipse.m2e.core.maven2Nature</nature>
+    </natures>
 </projectDescription>

web/documentserver-example/java/3rdparty/prime-jwt.license

@@ -0,0 +1,201 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   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.

web/documentserver-example/java/Dockerfile

@@ -1,9 +0,0 @@
-FROM ubuntu:16.04
-RUN apt-get update && apt-get install -y software-properties-common \
-                                         python-software-properties
-RUN add-apt-repository -y ppa:webupd8team/java
-RUN echo "oracle-java8-installer shared/accepted-oracle-license-v1-1 select true" | debconf-set-selections
-RUN apt-get update && apt-get install -y oracle-java8-installer \
-                                         maven
-COPY . /java
-CMD mvn -f /java package

web/documentserver-example/java/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 ONLYOFFICE
+Copyright (c) 2019 ONLYOFFICE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

web/documentserver-example/java/README.md

@@ -51,11 +51,10 @@ files.docservice.url.converter=https://documentserver/ConvertService.ashx
 files.docservice.url.tempstorage=https://documentserver/ResourceService.ashx
 files.docservice.url.api=https://documentserver/web-apps/apps/api/documents/api.js
 files.docservice.url.preloader=https://documentserver/web-apps/apps/api/documents/cache-scripts.html
-
 ```
+
 Run next command in java example directory:
 ```
-docker build . -t java-example
-docker run -it -v $PWD/target:/java/target java-example
+docker-compose up
 ```
 After it, all bin files will be passed to `./target` folder

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

@@ -0,0 +1,7 @@
+version: '3'
+services:
+  build:
+    image: maven:3.6
+    volumes:
+      - .:/java
+    command: mvn -f /java package

web/documentserver-example/java/pom.xml

@@ -13,7 +13,7 @@
         <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
-    
+
     <dependencies>
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
@@ -26,6 +26,16 @@
             <version>7.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.5</version>
+        </dependency>
+        <dependency>
+            <groupId>com.inversoft</groupId>
+            <artifactId>prime-jwt</artifactId>
+            <version>1.3.1</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -24,12 +24,14 @@
  *
 */
 
-
 package controllers;
 
 import helpers.ConfigManager;
+import helpers.CookieManager;
 import helpers.DocumentManager;
 import java.io.IOException;
+import java.net.URLEncoder;
+
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
@@ -43,24 +45,23 @@ public class EditorServlet extends HttpServlet
 {
     protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
     {
-        String fileName = "";
-        if (request.getParameterMap().containsKey("fileName"))
-        {
-             fileName = request.getParameter("fileName");
-        }
+        DocumentManager.Init(request, response);
 
-        String fileExt = null;
-        if (request.getParameterMap().containsKey("fileExt"))
-        {
-             fileExt = request.getParameter("fileExt");
-        }
+        String fileName = request.getParameter("fileName");
+        String fileExt = request.getParameter("fileExt");
+        String sample = request.getParameter("sample");
+
+        Boolean sampleData = (sample == null || sample.isEmpty()) ? false : sample.toLowerCase().equals("true");
+
+        CookieManager cm = new CookieManager(request);
 
         if (fileExt != null)
         {
             try
             {
-                DocumentManager.Init(request, response);
-                fileName = DocumentManager.CreateDemo(fileExt);
+                fileName = DocumentManager.CreateDemo(fileExt, sampleData, cm.getCookie("uid"), cm.getCookie("uname"));
+                response.sendRedirect("EditorServlet?fileName=" + URLEncoder.encode(fileName, "UTF-8"));
+                return;
             }
             catch (Exception ex)
             {
@@ -68,20 +69,15 @@ public class EditorServlet extends HttpServlet
             }
         }
 
-        String mode = "";
-        if (request.getParameterMap().containsKey("mode"))
+        FileModel file = new FileModel(fileName, cm.getCookie("ulang"), cm.getCookie("uid"), cm.getCookie("uname"));
+        file.changeType(request.getParameter("mode"), request.getParameter("type"));
+
+        if (DocumentManager.TokenEnabled())
         {
-             mode = request.getParameter("mode");
+            file.BuildToken();
         }
-        Boolean desktopMode = !"embedded".equals(mode);
-        
-        FileModel file = new FileModel();
-        file.SetTypeDesktop(desktopMode);
-        file.SetFileName(fileName);
-        
+
         request.setAttribute("file", file);
-        request.setAttribute("mode", mode);
-        request.setAttribute("type", desktopMode ? "desktop" : "embedded");
         request.setAttribute("docserviceApiUrl", ConfigManager.GetProperty("files.docservice.url.api"));
         request.getRequestDispatcher("editor.jsp").forward(request, response);
     }

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -37,7 +37,7 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
- 
+
 public class GlobalServletContextListener implements ServletContextListener
 {
     @Override
@@ -88,7 +88,7 @@ public class GlobalServletContextListener implements ServletContextListener
             @Override
             public boolean verify(String hostname, SSLSession session)
             {
-              return true;
+                return true;
             }
         };
 

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -24,17 +24,20 @@
  *
 */
 
-
 package controllers;
 
+import helpers.ConfigManager;
+import helpers.CookieManager;
 import helpers.DocumentManager;
 import helpers.ServiceConverter;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
 import java.net.URL;
+import java.util.LinkedHashMap;
 import java.util.Scanner;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.MultipartConfig;
@@ -48,10 +51,14 @@ import helpers.FileUtility;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 
+import org.primeframework.jwt.domain.JWT;
+
 @WebServlet(name = "IndexServlet", urlPatterns = {"/IndexServlet"})
 @MultipartConfig
 public class IndexServlet extends HttpServlet
 {
+    private static final String DocumentJwtHeader = ConfigManager.GetProperty("files.docservice.header");
+
     protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
     {
         String action = request.getParameter("type");
@@ -64,7 +71,7 @@ public class IndexServlet extends HttpServlet
 
         DocumentManager.Init(request, response);
         PrintWriter writer = response.getWriter();
-        
+
         switch (action.toLowerCase())
         {
             case "upload":
@@ -76,6 +83,9 @@ public class IndexServlet extends HttpServlet
             case "track":
                 Track(request, response, writer);
                 break;
+            case "remove":
+                Remove(request, response, writer);
+                break;
         }
     }
 
@@ -130,10 +140,13 @@ public class IndexServlet extends HttpServlet
                 out.flush();
             }
 
+            CookieManager cm = new CookieManager(request);
+            DocumentManager.CreateMeta(fileName, cm.getCookie("uid"), cm.getCookie("uname"));
+
             writer.write("{ \"filename\": \"" + fileName + "\"}");
 
         }
-        catch (IOException | ServletException e)
+        catch (Exception e)
         {
             writer.write("{ \"error\": \"" + e.getMessage() + "\"}");
         }
@@ -156,8 +169,8 @@ public class IndexServlet extends HttpServlet
                 String key = ServiceConverter.GenerateRevisionId(fileUri);
 
                 String newFileUri = ServiceConverter.GetConvertedUri(fileUri, fileExt, internalFileExt, key, true);
-                
-                if (newFileUri == "")
+
+                if (newFileUri.isEmpty())
                 {
                     writer.write("{ \"step\" : \"0\", \"filename\" : \"" + fileName + "\"}");
                     return;
@@ -183,7 +196,7 @@ public class IndexServlet extends HttpServlet
                     {
                         out.write(bytes, 0, read);
                     }
-                    
+
                     out.flush();
                 }
 
@@ -194,6 +207,9 @@ public class IndexServlet extends HttpServlet
                 //sourceFile.delete();
 
                 fileName = correctName;
+
+                CookieManager cm = new CookieManager(request);
+                DocumentManager.CreateMeta(fileName, cm.getCookie("uid"), cm.getCookie("uname"));
             }
 
             writer.write("{ \"filename\" : \"" + fileName + "\"}");
@@ -231,7 +247,7 @@ public class IndexServlet extends HttpServlet
             writer.write("empty request.getInputStream");
             return;
         }
- 
+
         JSONParser parser = new JSONParser();
         JSONObject jsonObj;
 
@@ -246,39 +262,90 @@ public class IndexServlet extends HttpServlet
             return;
         }
 
-        long status = (long) jsonObj.get("status");
+        int status;
+        String downloadUri;
+        String changesUri;
+        String key;
+
+        if (DocumentManager.TokenEnabled())
+        {
+            String token = (String) jsonObj.get("token");
+
+            if (token == null) {
+                String header = (String) request.getHeader(DocumentJwtHeader == null || DocumentJwtHeader.isEmpty() ? "Authorization" : DocumentJwtHeader);
+                if (header != null && !header.isEmpty()) {
+                    token = header.startsWith("Bearer ") ? header.substring(7) : header;
+                }
+            }
+
+            if (token == null || token.isEmpty()) {
+                writer.write("{\"error\":1,\"message\":\"JWT expected\"}");
+                return;
+            }
+
+            JWT jwt = DocumentManager.ReadToken(token);
+            if (jwt == null)
+            {
+                writer.write("{\"error\":1,\"message\":\"JWT validation failed\"}");
+                return;
+            }
+
+            if (jwt.getObject("payload") != null) {
+                try {
+                    @SuppressWarnings("unchecked") LinkedHashMap<String, Object> payload =
+                        (LinkedHashMap<String, Object>)jwt.getObject("payload");
+
+                    jwt.claims = payload;
+                }
+                catch (Exception ex) {
+                    writer.write("{\"error\":1,\"message\":\"Wrong payload\"}");
+                    return;
+                }
+            }
+
+            status = jwt.getInteger("status");
+            downloadUri = jwt.getString("url");
+            changesUri = jwt.getString("changesurl");
+            key = jwt.getString("key");
+        }
+        else
+        {
+            status = Math.toIntExact((long) jsonObj.get("status"));
+            downloadUri = (String) jsonObj.get("url");
+            changesUri = (String) jsonObj.get("changesurl");
+            key = (String) jsonObj.get("key");
+        }
 
         int saved = 0;
         if (status == 2 || status == 3)//MustSave, Corrupted
         {
-            String downloadUri = (String) jsonObj.get("url");
-
             try
             {
-                URL url = new URL(downloadUri);
-                java.net.HttpURLConnection connection = (java.net.HttpURLConnection) url.openConnection();
-                InputStream stream = connection.getInputStream();
+                String histDir = DocumentManager.HistoryDir(storagePath);
+                String versionDir = DocumentManager.VersionDir(histDir, DocumentManager.GetFileVersion(histDir) + 1);
+                File ver = new File(versionDir);
+                File toSave = new File(storagePath);
 
-                if (stream == null)
-                {
-                    throw new Exception("Stream is null");
+                if (!ver.exists()) ver.mkdirs();
+
+                toSave.renameTo(new File(versionDir + File.separator + "prev" + FileUtility.GetFileExtension(fileName)));
+
+                downloadToFile(downloadUri, toSave);
+                downloadToFile(changesUri, new File(versionDir + File.separator + "diff.zip"));
+
+                String history = (String) jsonObj.get("changeshistory");
+                if (history == null && jsonObj.containsKey("history")) {
+                    history = ((JSONObject) jsonObj.get("history")).toJSONString();
+                }
+                if (history != null && !history.isEmpty()) {
+                    FileWriter fw = new FileWriter(new File(versionDir + File.separator + "changes.json"));
+                    fw.write(history);
+                    fw.close();
                 }
 
-                File savedFile = new File(storagePath);
-                try (FileOutputStream out = new FileOutputStream(savedFile))
-                {
-                    int read;
-                    final byte[] bytes = new byte[1024];
-                    while ((read = stream.read(bytes)) != -1)
-                    {
-                        out.write(bytes, 0, read);
-                    }
-                    
-                    out.flush();
-                }
-
-                connection.disconnect();
-
+                FileWriter fw = new FileWriter(new File(versionDir + File.separator + "key.txt"));
+                fw.write(key);
+                fw.close();
             }
             catch (Exception ex)
             {
@@ -289,6 +356,63 @@ public class IndexServlet extends HttpServlet
         writer.write("{\"error\":" + saved + "}");
     }
 
+    private static void Remove(HttpServletRequest request, HttpServletResponse response, PrintWriter writer)
+    {
+        try
+        {
+            String fileName = request.getParameter("filename");
+            String path = DocumentManager.StoragePath(fileName, null);
+
+            File f = new File(path);
+            delete(f);
+
+            File hist = new File(DocumentManager.HistoryDir(path));
+            delete(hist);
+
+            writer.write("{ \"success\": true }");
+        }
+        catch (Exception e)
+        {
+            writer.write("{ \"error\": \"" + e.getMessage() + "\"}");
+        }
+    }
+
+    private static void delete(File f) throws Exception {
+        if (f.isDirectory()) {
+            for (File c : f.listFiles())
+            delete(c);
+        }
+        if (!f.delete())
+            throw new Exception("Failed to delete file: " + f);
+    }
+
+    private static void downloadToFile(String url, File file) throws Exception {
+        if (url == null || url.isEmpty()) throw new Exception("argument url");
+        if (file == null) throw new Exception("argument path");
+
+        URL uri = new URL(url);
+        java.net.HttpURLConnection connection = (java.net.HttpURLConnection) uri.openConnection();
+        InputStream stream = connection.getInputStream();
+
+        if (stream == null)
+        {
+            throw new Exception("Stream is null");
+        }
+
+        try (FileOutputStream out = new FileOutputStream(file))
+        {
+            int read;
+            final byte[] bytes = new byte[1024];
+            while ((read = stream.read(bytes)) != -1)
+            {
+                out.write(bytes, 0, read);
+            }
+
+            out.flush();
+        }
+
+        connection.disconnect();
+    }
 
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -24,65 +24,265 @@
  *
 */
 
-
 package entities;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Scanner;
+import java.util.Set;
+
 import helpers.DocumentManager;
 import helpers.ServiceConverter;
 import helpers.FileUtility;
+import com.google.gson.Gson;
+
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
 
 public class FileModel
 {
-    private String FileName;
-    private Boolean TypeDesktop;
+    public String type = "desktop";
+    public String mode = "edit";
+    public String documentType;
+    public Document document;
+    public EditorConfig editorConfig;
+    public String token;
 
-    public String GetFileName()
+    public FileModel(String fileName, String lang, String uid, String uname)
     {
-        return FileName;
+        if (fileName == null) fileName = "";
+        fileName = fileName.trim();
+
+        documentType = FileUtility.GetFileType(fileName).toString().toLowerCase();
+
+        document = new Document();
+        document.title = fileName;
+        document.url = DocumentManager.GetFileUri(fileName);
+        document.fileType = FileUtility.GetFileExtension(fileName).replace(".", "");
+        document.key = ServiceConverter.GenerateRevisionId(DocumentManager.CurUserHostAddress(null) + "/" + fileName + "/" + Long.toString(new File(DocumentManager.StoragePath(fileName, null)).lastModified()));
+
+        editorConfig = new EditorConfig();
+        editorConfig.callbackUrl = DocumentManager.GetCallback(fileName);
+        if (lang != null) editorConfig.lang = lang;
+
+        if (uid != null) editorConfig.user.id = uid;
+        if (uname != null) editorConfig.user.name = uname;
+
+        editorConfig.customization.goback.url = DocumentManager.GetServerUrl() + "/IndexServlet";
+
+        changeType(mode, type);
     }
 
-    public void SetFileName(String fileName)
+    public void changeType(String _mode, String _type)
     {
-        this.FileName = fileName;
-    }
-    
-    public Boolean GetTypeDesktop()
-    {
-        return TypeDesktop;
+        if (_mode != null) mode = _mode;
+        if (_type != null) type = _type;
+
+        Boolean canEdit = DocumentManager.GetEditedExts().contains(FileUtility.GetFileExtension(document.title));
+
+        editorConfig.mode = canEdit && !mode.equals("view") ? "edit" : "view";
+
+        document.permissions = new Permissions(mode, type, canEdit);
+
+        if (type.equals("embedded")) InitDesktop();
     }
 
-    public void SetTypeDesktop(Boolean typeDesktop)
+    public void InitDesktop()
     {
-        this.TypeDesktop = typeDesktop;
+        editorConfig.InitDesktop(document.url);
     }
 
-    public String GetFileUri() throws Exception
+    public void BuildToken()
     {
-        return DocumentManager.GetFileUri(FileName);
+        Map<String, Object> map = new HashMap<>();
+        map.put("type", type);
+        map.put("documentType", documentType);
+        map.put("document", document);
+        map.put("editorConfig", editorConfig);
+
+        token = DocumentManager.CreateToken(map);
     }
 
-    public String CurUserHostAddress()
+    public String[] GetHistory()
     {
-        return DocumentManager.CurUserHostAddress(null);
+        JSONParser parser = new JSONParser();
+        String histDir = DocumentManager.HistoryDir(DocumentManager.StoragePath(document.title, null));
+        if (DocumentManager.GetFileVersion(histDir) > 0) {
+            Integer curVer = DocumentManager.GetFileVersion(histDir);
+
+            Set<Object> hist = new HashSet<Object>();
+            Map<String, Object> histData = new HashMap<String, Object>();
+
+            for (Integer i = 0; i <= curVer; i++) {
+                Map<String, Object> obj = new HashMap<String, Object>();
+                Map<String, Object> dataObj = new HashMap<String, Object>();
+                String verDir = DocumentManager.VersionDir(histDir, i + 1);
+
+                try {
+                    String key = null;
+
+                    key = i == curVer ? document.key : readFileToEnd(new File(verDir + File.separator + "key.txt"));
+
+                    obj.put("key", key);
+                    obj.put("version", i);
+
+                    if (i == 0) {
+                        String createdInfo = readFileToEnd(new File(histDir + File.separator + "createdInfo.json"));
+                        JSONObject json = (JSONObject) parser.parse(createdInfo);
+
+                        obj.put("created", json.get("created"));
+                        Map<String, Object> user = new HashMap<String, Object>();
+                        user.put("id", json.get("id"));
+                        user.put("name", json.get("name"));
+                        obj.put("user", user);
+                    }
+
+                    dataObj.put("key", key);
+                    dataObj.put("url", i == curVer ? document.url : DocumentManager.GetPathUri(verDir + File.separator + "prev" + FileUtility.GetFileExtension(document.title)));
+                    dataObj.put("version", i);
+
+                    if (i > 0) {
+                        JSONObject changes = (JSONObject) parser.parse(readFileToEnd(new File(DocumentManager.VersionDir(histDir, i) + File.separator + "changes.json")));
+                        JSONObject change = (JSONObject) ((JSONArray) changes.get("changes")).get(0);
+
+                        obj.put("changes", changes.get("changes"));
+                        obj.put("serverVersion", changes.get("serverVersion"));
+                        obj.put("created", change.get("created"));
+                        obj.put("user", change.get("user"));
+
+                        Map<String, Object> prev = (Map<String, Object>) histData.get(Integer.toString(i - 1));
+                        Map<String, Object> prevInfo = new HashMap<String, Object>();
+                        prevInfo.put("key", prev.get("key"));
+                        prevInfo.put("url", prev.get("url"));
+                        dataObj.put("previous", prevInfo);
+                        dataObj.put("changesUrl", DocumentManager.GetPathUri(DocumentManager.VersionDir(histDir, i) + File.separator + "diff.zip"));
+                    }
+
+                    hist.add(obj);
+                    histData.put(Integer.toString(i), dataObj);
+
+                } catch (Exception ex) { }
+            }
+
+            Map<String, Object> histObj = new HashMap<String, Object>();
+            histObj.put("currentVersion", curVer);
+            histObj.put("history", hist);
+
+            Gson gson = new Gson();
+            return new String[] { gson.toJson(histObj), gson.toJson(histData) };
+        }
+        return new String[] { "", "" };
     }
 
-    public String GetDocumentType()
-    {
-        return FileUtility.GetFileType(FileName).toString().toLowerCase();
+    private String readFileToEnd(File file) {
+        String output = "";
+        try {
+            try(FileInputStream is = new FileInputStream(file))
+            {
+                Scanner scanner = new Scanner(is);
+                scanner.useDelimiter("\\A");
+                while (scanner.hasNext()) {
+                    output += scanner.next();
+                }
+                scanner.close();
+            }
+        } catch (Exception e) { }
+        return output;
     }
 
-    public String GetKey()
+    public class Document
     {
-        return ServiceConverter.GenerateRevisionId(DocumentManager.CurUserHostAddress(null) + "/" + FileName);
+        public String title;
+        public String url;
+        public String fileType;
+        public String key;
+        public Permissions permissions;
     }
 
-    public String GetCallbackUrl()
+    public class Permissions
     {
-        return DocumentManager.GetCallback(FileName);
+        public Boolean comment;
+        public Boolean download;
+        public Boolean edit;
+        public Boolean fillForms;
+        public Boolean modifyFilter;
+        public Boolean modifyContentControl;
+        public Boolean review;
+
+        public Permissions(String mode, String type, Boolean canEdit)
+        {
+            comment = !mode.equals("view") && !mode.equals("fillForms") && !mode.equals("embedded") && !mode.equals("blockcontent");
+            download = true;
+            edit = canEdit && (mode.equals("edit") || mode.equals("filter") || mode.equals("blockcontent"));
+            fillForms = !mode.equals("view") && !mode.equals("comment") && !mode.equals("embedded") && !mode.equals("blockcontent");
+            modifyFilter = !mode.equals("filter");
+            modifyContentControl = !mode.equals("blockcontent");
+            review = mode.equals("edit") || mode.equals("review");
+        }
     }
 
-    public String GetServerUrl()
+    public class EditorConfig
     {
-        return DocumentManager.GetServerUrl();
+        public String mode = "edit";
+        public String callbackUrl;
+        public String lang = "en";
+        public User user;
+        public Customization customization;
+        public Embedded embedded;
+
+        public EditorConfig()
+        {
+            user = new User();
+            customization = new Customization();
+        }
+
+        public void InitDesktop(String url)
+        {
+            embedded = new Embedded();
+            embedded.saveUrl = url;
+            embedded.embedUrl = url;
+            embedded.shareUrl = url;
+            embedded.toolbarDocked = "top";
+        }
+
+        public class User
+        {
+            public String id = "uid-1";
+            public String name = "John Smith";
+        }
+
+        public class Customization
+        {
+            public Goback goback;
+
+            public Customization()
+            {
+                goback = new Goback();
+            }
+
+            public class Goback
+            {
+                public String url;
+            }
+        }
+
+        public class Embedded
+        {
+            public String saveUrl;
+            public String embedUrl;
+            public String shareUrl;
+            public String toolbarDocked;
+        }
+    }
+
+
+    public static String Serialize(FileModel model)
+    {
+        Gson gson = new Gson();
+        return gson.toJson(model);
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -33,12 +33,12 @@ import java.util.Properties;
 public class ConfigManager
 {
     private static Properties properties;
-    
+
     static
     {
         Init();
     }
-    
+
     private static void Init()
     {
         try
@@ -52,14 +52,16 @@ public class ConfigManager
             properties = null;
         }
     }
-    
+
     public static String GetProperty(String name)
     {
-        if(properties == null)
+        if (properties == null)
+        {
             return "";
-        
+        }
+
         String property = properties.getProperty(name);
-        
+
         return property == null ? "" : property;
     }
 }

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

@@ -0,0 +1,27 @@
+package helpers;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.HashMap;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+
+public class CookieManager {
+    private HashMap<String, String> cookiesMap;
+
+    public CookieManager(HttpServletRequest request) throws UnsupportedEncodingException {
+        cookiesMap = new HashMap<String, String>();
+
+        Cookie[] cookies = request.getCookies();
+        if (cookies != null) {
+            for (Cookie cookie : cookies) {
+                cookiesMap.putIfAbsent(cookie.getName(), URLDecoder.decode(cookie.getValue(), "UTF-8"));
+            }
+        }
+    }
+
+    public String getCookie(String name) {
+        return cookiesMap.get(name);
+    }
+}

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -27,18 +27,29 @@
 package helpers;
 
 import java.io.File;
+import java.io.FileFilter;
 import java.io.FileOutputStream;
+import java.io.FileWriter;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
 import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import entities.FileType;
 
+import org.primeframework.jwt.domain.JWT;
+import org.primeframework.jwt.hmac.HMACSigner;
+import org.primeframework.jwt.hmac.HMACVerifier;
+import org.json.simple.JSONObject;
+import org.primeframework.jwt.Signer;
+import org.primeframework.jwt.Verifier;
 
 public class DocumentManager
 {
@@ -52,7 +63,7 @@ public class DocumentManager
     public static long GetMaxFileSize()
     {
         long size;
-        
+
         try
         {
             size = Long.parseLong(ConfigManager.GetProperty("filesize-max"));
@@ -68,12 +79,12 @@ public class DocumentManager
     public static List<String> GetFileExts()
     {
         List<String> res = new ArrayList<>();
-        
+
         res.addAll(GetViewedExts());
         res.addAll(GetEditedExts());
         res.addAll(GetConvertExts());
 
-        return  res;
+        return res;
     }
 
     public static List<String> GetViewedExts()
@@ -111,32 +122,65 @@ public class DocumentManager
         return userAddress.replaceAll("[^0-9a-zA-Z.=]", "_");
     }
 
-    public static String StoragePath(String fileName, String userAddress)
+    public static String FilesRootPath(String userAddress)
     {
+        String hostAddress = CurUserHostAddress(userAddress);
         String serverPath = request.getSession().getServletContext().getRealPath("");
         String storagePath = ConfigManager.GetProperty("storage-folder");
-        String hostAddress = CurUserHostAddress(userAddress);
-        
-        String directory = serverPath + File.separator + storagePath + File.separator;
+        String directory = serverPath + storagePath + File.separator + hostAddress + File.separator;
 
         File file = new File(directory);
-        
-        if (!file.exists())
-        {
-            file.mkdir();
-        }
-        
-        directory = directory + hostAddress + File.separator;
-        file = new File(directory);
 
         if (!file.exists())
         {
-            file.mkdir();
+            file.mkdirs();
         }
 
+        return directory;
+    }
+
+    public static String StoragePath(String fileName, String userAddress)
+    {
+        String directory = FilesRootPath(userAddress);
         return directory + fileName;
     }
 
+    public static String HistoryDir(String storagePath)
+    {
+        return storagePath += "-hist";
+    }
+
+    public static String VersionDir(String histPath, Integer version)
+    {
+        return histPath + File.separator + Integer.toString(version);
+    }
+
+    public static String VersionDir(String fileName, String userAddress, Integer version)
+    {
+        return VersionDir(HistoryDir(StoragePath(fileName, userAddress)), version);
+    }
+
+    public static Integer GetFileVersion(String historyPath)
+    {
+        File dir = new File(historyPath);
+
+        if (!dir.exists()) return 0;
+
+        File[] dirs = dir.listFiles(new FileFilter() {
+            @Override
+            public boolean accept(File pathname) {
+                return pathname.isDirectory();
+            }
+        });
+
+        return dirs.length;
+    }
+
+    public static int GetFileVersion(String fileName, String userAddress)
+    {
+        return GetFileVersion(HistoryDir(StoragePath(fileName, userAddress)));
+    }
+
     public static String GetCorrectName(String fileName)
     {
         String baseName = FileUtility.GetFileNameWithoutExtension(fileName);
@@ -154,9 +198,40 @@ public class DocumentManager
         return name;
     }
 
-    public static String CreateDemo(String fileExt) throws Exception
+    public static void CreateMeta(String fileName, String uid, String uname) throws Exception
     {
-        String demoName = "sample." + fileExt;
+        String histDir = HistoryDir(StoragePath(fileName, null));
+
+        File dir = new File(histDir);
+        dir.mkdir();
+
+        JSONObject json = new JSONObject();
+        json.put("created", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        json.put("id", (uid == null || uid.isEmpty()) ? "uid-1" : uid);
+        json.put("name", (uname == null || uname.isEmpty()) ? "John Smith" : uname);
+
+        File meta = new File(histDir + File.separator + "createdInfo.json");
+        try (FileWriter writer = new FileWriter(meta)) {
+            json.writeJSONString(writer);
+        }
+    }
+
+    public static File[] GetStoredFiles(String userAddress)
+    {
+        String directory = FilesRootPath(userAddress);
+
+        File file = new File(directory);
+        return file.listFiles(new FileFilter() {
+            @Override
+            public boolean accept(File pathname) {
+                return pathname.isFile();
+            }
+        });
+    }
+
+    public static String CreateDemo(String fileExt, Boolean sample, String uid, String uname) throws Exception
+    {
+        String demoName = (sample ? "sample." : "new.") + fileExt;
         String fileName = GetCorrectName(demoName);
 
         InputStream stream = Thread.currentThread().getContextClassLoader().getResourceAsStream(demoName);
@@ -173,28 +248,42 @@ public class DocumentManager
             }
             out.flush();
         }
-        
+
+        CreateMeta(fileName, uid, uname);
+
         return fileName;
     }
 
-    public static String GetFileUri(String fileName) throws Exception
+    public static String GetFileUri(String fileName)
     {
         try
         {
             String serverPath = GetServerUrl();
             String storagePath = ConfigManager.GetProperty("storage-folder");
             String hostAddress = CurUserHostAddress(null);
-            
+
             String filePath = serverPath + "/" + storagePath + "/" + hostAddress + "/" + URLEncoder.encode(fileName, java.nio.charset.StandardCharsets.UTF_8.toString()).replace("+", "%20");
-            
+
             return filePath;
         }
         catch (UnsupportedEncodingException e)
         {
-            throw new AssertionError("UTF-8 is unknown");
+            return "";
         }
     }
 
+    public static String GetPathUri(String path)
+    {
+        String serverPath = GetServerUrl();
+        String storagePath = ConfigManager.GetProperty("storage-folder");
+        String hostAddress = CurUserHostAddress(null);
+
+        String filePath = serverPath + "/" + storagePath + "/" + hostAddress + "/" + path.replace(File.separator, "/").substring(FilesRootPath(null).length()).replace(" ", "%20");
+
+        return filePath;
+    }
+
+
     public static String GetServerUrl()
     {
         return request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath();
@@ -207,26 +296,68 @@ public class DocumentManager
         try
         {
             String query = "?type=track&fileName=" + URLEncoder.encode(fileName, java.nio.charset.StandardCharsets.UTF_8.toString()) + "&userAddress=" + URLEncoder.encode(hostAddress, java.nio.charset.StandardCharsets.UTF_8.toString());
-        
+
             return serverPath + "/IndexServlet" + query;
         }
         catch (UnsupportedEncodingException e)
         {
-            throw new AssertionError("UTF-8 is unknown");
+            return "";
         }
     }
 
     public static String GetInternalExtension(FileType fileType)
     {
-        if(fileType.equals(FileType.Text))
+        if (fileType.equals(FileType.Text))
             return ".docx";
 
-        if(fileType.equals(FileType.Spreadsheet))
+        if (fileType.equals(FileType.Spreadsheet))
             return ".xlsx";
 
-        if(fileType.equals(FileType.Presentation))
+        if (fileType.equals(FileType.Presentation))
             return ".pptx";
 
         return ".docx";
     }
+
+    public static String CreateToken(Map<String, Object> payloadClaims)
+    {
+        try
+        {
+            Signer signer = HMACSigner.newSHA256Signer(GetTokenSecret());
+            JWT jwt = new JWT();
+            for (String key : payloadClaims.keySet())
+            {
+                jwt.addClaim(key, payloadClaims.get(key));
+            }
+            return JWT.getEncoder().encode(jwt, signer);
+        }
+        catch (Exception e)
+        {
+            return "";
+        }
+    }
+
+    public static JWT ReadToken(String token)
+    {
+        try
+        {
+            Verifier verifier = HMACVerifier.newVerifier(GetTokenSecret());
+            return JWT.getDecoder().decode(token, verifier);
+        }
+        catch (Exception exception)
+        {
+            return null;
+        }
+    }
+
+    public static Boolean TokenEnabled()
+    {
+        String secret = GetTokenSecret();
+        return secret != null && !secret.isEmpty();
+    }
+
+    private static String GetTokenSecret()
+    {
+        return ConfigManager.GetProperty("files.docservice.secret");
+    }
 }

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -47,7 +47,7 @@ public class FileUtility
 
         if (ExtsSpreadsheet.contains(ext))
             return FileType.Spreadsheet;
-        
+
         if (ExtsPresentation.contains(ext))
             return FileType.Presentation;
 
@@ -55,74 +55,74 @@ public class FileUtility
     }
 
     public static List<String> ExtsDocument = Arrays.asList
-    (
-        ".doc", ".docx", ".docm",
-        ".dot", ".dotx", ".dotm",
-        ".odt", ".fodt", ".ott", ".rtf", ".txt",
-        ".html", ".htm", ".mht",
-        ".pdf", ".djvu", ".fb2", ".epub", ".xps"
-    );
+            (
+                    ".doc", ".docx", ".docm",
+                    ".dot", ".dotx", ".dotm",
+                    ".odt", ".fodt", ".ott", ".rtf", ".txt",
+                    ".html", ".htm", ".mht",
+                    ".pdf", ".djvu", ".fb2", ".epub", ".xps"
+            );
 
     public static List<String> ExtsSpreadsheet = Arrays.asList
-    (
-        ".xls", ".xlsx", ".xlsm",
-        ".xlt", ".xltx", ".xltm",
-        ".ods", ".fods", ".ots", ".csv"
-    );
+            (
+                    ".xls", ".xlsx", ".xlsm",
+                    ".xlt", ".xltx", ".xltm",
+                    ".ods", ".fods", ".ots", ".csv"
+            );
 
     public static List<String> ExtsPresentation = Arrays.asList
-    (
-        ".pps", ".ppsx", ".ppsm",
-        ".ppt", ".pptx", ".pptm",
-        ".pot", ".potx", ".potm",
-        ".odp", ".fodp", ".otp"
-    );
+            (
+                    ".pps", ".ppsx", ".ppsm",
+                    ".ppt", ".pptx", ".pptm",
+                    ".pot", ".potx", ".potm",
+                    ".odp", ".fodp", ".otp"
+            );
 
 
-    public static String GetFileName (String url)
+    public static String GetFileName(String url)
     {
-        if(url == null) return null;
+        if (url == null) return null;
 
         //for external file url
         String tempstorage = ConfigManager.GetProperty("files.docservice.url.tempstorage");
-        if(!tempstorage.isEmpty() && url.startsWith(tempstorage))
+        if (!tempstorage.isEmpty() && url.startsWith(tempstorage))
         {
             Map<String, String> params = GetUrlParams(url);
             return params == null ? null : params.get("filename");
         }
 
-        String fileName = url.substring(url.lastIndexOf('/')+1, url.length());
+        String fileName = url.substring(url.lastIndexOf('/') + 1, url.length());
         return fileName;
     }
 
-    public static String GetFileNameWithoutExtension (String url)
+    public static String GetFileNameWithoutExtension(String url)
     {
         String fileName = GetFileName(url);
-        if(fileName == null) return null;
+        if (fileName == null) return null;
         String fileNameWithoutExt = fileName.substring(0, fileName.lastIndexOf('.'));
         return fileNameWithoutExt;
     }
 
-    public static String GetFileExtension (String url)
+    public static String GetFileExtension(String url)
     {
         String fileName = GetFileName(url);
-        if(fileName == null) return null;
+        if (fileName == null) return null;
         String fileExt = fileName.substring(fileName.lastIndexOf("."));
         return fileExt.toLowerCase();
     }
 
-    public static Map<String, String> GetUrlParams (String url)
+    public static Map<String, String> GetUrlParams(String url)
     {
         try
         {
             String query = new URL(url).getQuery();
-            String[] params = query.split("&");  
-            Map<String, String> map = new HashMap<>();  
-            for (String param : params)  
-            {  
-                String name = param.split("=")[0];  
-                String value = param.split("=")[1];  
-                map.put(name, value);  
+            String[] params = query.split("&");
+            Map<String, String> map = new HashMap<>();
+            for (String param : params)
+            {
+                String name = param.split("=")[0];
+                String value = param.split("=")[1];
+                map.put(name, value);
             }
             return map;
         }

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

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *
@@ -26,17 +26,20 @@
 
 package helpers;
 
+import helpers.DocumentManager;
+import com.google.gson.Gson;
 import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.OutputStream;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.UUID;
-import java.util.concurrent.TimeoutException;
+import java.nio.charset.StandardCharsets;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
@@ -46,14 +49,25 @@ public class ServiceConverter
 {
     private static int ConvertTimeout = 120000;
     private static final String DocumentConverterUrl = ConfigManager.GetProperty("files.docservice.url.converter");
-    private static final MessageFormat ConvertParams = new MessageFormat("?url={0}&outputtype={1}&filetype={2}&title={3}&key={4}");
+    private static final String DocumentJwtHeader = ConfigManager.GetProperty("files.docservice.header");
+
+    public static class ConvertBody
+    {
+        public String url;
+        public String outputtype;
+        public String filetype;
+        public String title;
+        public String key;
+        public Boolean async;
+        public String token;
+    }
 
     static
     {
         try
         {
             int timeout = Integer.parseInt(ConfigManager.GetProperty("files.docservice.timeout"));
-            if(timeout > 0) 
+            if (timeout > 0) 
             {
                 ConvertTimeout = timeout;
             }
@@ -74,24 +88,59 @@ public class ServiceConverter
 
         documentRevisionId = GenerateRevisionId(documentRevisionId);
 
-        Object[] args = {
-                            URLEncoder.encode(documentUri, java.nio.charset.StandardCharsets.UTF_8.toString()),
-                            toExtension.replace(".", ""),
-                            fromExtension.replace(".", ""),
-                            title,
-                            documentRevisionId
-                        };
-
-        String urlToConverter = DocumentConverterUrl +  ConvertParams.format(args);
-
+        ConvertBody body = new ConvertBody();
+        body.url = documentUri;
+        body.outputtype = toExtension.replace(".", "");
+        body.filetype = fromExtension.replace(".", "");
+        body.title = title;
+        body.key = documentRevisionId;
         if (isAsync)
-            urlToConverter += "&async=true";
+            body.async = true;
 
-        URL url = new URL(urlToConverter);
+        String headerToken = "";
+        if (DocumentManager.TokenEnabled())
+        {
+            HashMap<String, Object> map = new HashMap<String, Object>();
+            map.put("url", body.url);
+            map.put("outputtype", body.outputtype);
+            map.put("filetype", body.filetype);
+            map.put("title", body.title);
+            map.put("key", body.key);
+            if (isAsync)
+                map.put("async", body.async);
+
+            String token = DocumentManager.CreateToken(map);
+            body.token = token;
+
+            Map<String, Object> payloadMap = new HashMap<String, Object>();
+            payloadMap.put("payload", map);
+            headerToken = DocumentManager.CreateToken(payloadMap);
+        }
+
+        Gson gson = new Gson();
+        String bodyString = gson.toJson(body);
+
+        byte[] bodyByte = bodyString.getBytes(StandardCharsets.UTF_8);
+
+        URL url = new URL(DocumentConverterUrl);
         java.net.HttpURLConnection connection = (java.net.HttpURLConnection) url.openConnection();
+        connection.setRequestMethod("POST");
+        connection.setDoOutput(true);
+        connection.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
+        connection.setFixedLengthStreamingMode(bodyByte.length);
         connection.setRequestProperty("Accept", "application/json");
         connection.setConnectTimeout(ConvertTimeout);
 
+        if (DocumentManager.TokenEnabled())
+        {
+            connection.setRequestProperty(DocumentJwtHeader == "" ? "Authorization" : DocumentJwtHeader, "Bearer " + headerToken);
+        }
+
+        connection.connect();
+        try (OutputStream os = connection.getOutputStream()) {
+            os.write(bodyByte);
+        }
+
         InputStream stream = connection.getInputStream();
 
         if (stream == null)
@@ -159,9 +208,9 @@ public class ServiceConverter
     {
         JSONObject jsonObj = ConvertStringToJSON(jsonString);
 
-        String error = (String) jsonObj.get("error");
-        if (error != null && error != "")
-            ProcessConvertServiceResponceError(Integer.parseInt(error));
+        Object error = jsonObj.get("error");
+        if (error != null)
+            ProcessConvertServiceResponceError(Math.toIntExact((long)error));
 
         Boolean isEndConvert = (Boolean) jsonObj.get("endConvert");
 
@@ -189,7 +238,7 @@ public class ServiceConverter
         BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
         String line = bufferedReader.readLine();
 
-        while(line != null)
+        while (line != null)
         {
             stringBuilder.append(line);
             line = bufferedReader.readLine();

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

@@ -2,11 +2,13 @@ filesize-max=5242880
 storage-folder=app_data
 
 files.docservice.viewed-docs=.pdf|.djvu|.xps
-files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.ppsx|.txt
-files.docservice.convert-docs=.docm|.dotx|.dotm|.dot|.doc|.odt|.fodt|.ott|.xlsm|.xltx|.xltm|.xlt|.xls|.ods|.fods|.ots|.pptm|.ppt|.ppsm|.pps|.potx|.potm|.pot|.odp|.fodp|.otp|.rtf|.mht|.html|.htm|.epub
+files.docservice.edited-docs=.docx|.xlsx|.csv|.pptx|.txt
+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|.epub
 files.docservice.timeout=120000
 
 files.docservice.url.converter=https://documentserver/ConvertService.ashx
 files.docservice.url.tempstorage=https://documentserver/ResourceService.ashx
 files.docservice.url.api=https://documentserver/web-apps/apps/api/documents/api.js
 files.docservice.url.preloader=https://documentserver/web-apps/apps/api/documents/cache-scripts.html
+files.docservice.secret=
+files.docservice.header=Authorization

web/documentserver-example/java/src/main/webapp/css/editor.css

@@ -1,6 +1,6 @@
 /*
  *
- * (c) Copyright Ascensio System Limited 2010-2018
+ * (c) Copyright Ascensio System SIA 2019
  *
  * The MIT License (MIT)
  *