From 0a4fcc0cdc352c15d3a30d7a135070b0aaf1a647 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <sergey.linnik@onlyoffice.com>
Date: Thu, 11 Feb 2021 08:58:38 +0300
Subject: [PATCH 1/2] nodejs: ResourceService.ashx is not used anymore

---
 .../nodejs/config/default.json                   |  1 -
 .../nodejs/helpers/fileUtility.js                | 16 +++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/web/documentserver-example/nodejs/config/default.json b/web/documentserver-example/nodejs/config/default.json
index 5331b98f..7593dffa 100644
--- a/web/documentserver-example/nodejs/config/default.json
+++ b/web/documentserver-example/nodejs/config/default.json
@@ -15,7 +15,6 @@
     "siteUrl": "https://documentserver/",
     "commandUrl": "coauthoring/CommandService.ashx",
     "converterUrl": "ConvertService.ashx",
-    "tempStorageUrl": "ResourceService.ashx",
     "apiUrl": "web-apps/apps/api/documents/api.js",
     "preloaderUrl": "web-apps/apps/api/documents/cache-scripts.html",
     "exampleUrl": null,
diff --git a/web/documentserver-example/nodejs/helpers/fileUtility.js b/web/documentserver-example/nodejs/helpers/fileUtility.js
index b8f044c9..631ab588 100644
--- a/web/documentserver-example/nodejs/helpers/fileUtility.js
+++ b/web/documentserver-example/nodejs/helpers/fileUtility.js
@@ -16,24 +16,14 @@
  *
  */
 
-var configServer = require('config').get('server');
-var siteUrl = configServer.get('siteUrl');
-var tempStorageUrl = siteUrl + configServer.get('tempStorageUrl');
-
 var fileUtility = {};
 
 fileUtility.getFileName = function (url, withoutExtension) {
     if (!url) return "";
 
-    var filename;
-
-    if (tempStorageUrl && url.indexOf(tempStorageUrl) == 0) {
-        var params = getUrlParams(url);
-        filename = params == null ? null : params["filename"];
-    } else {
-        var parts = url.toLowerCase().split("/");
-        fileName = parts.pop();
-    }
+    var parts = url.toLowerCase().split("/");
+    var fileName = parts.pop();
+    fileName = fileName.split("?")[0];
 
     if (withoutExtension) {
         var ext = fileUtility.getFileExtension(fileName);

From be82ae7078500b7281853500c9d44793df40c42f Mon Sep 17 00:00:00 2001
From: Alexandr Fedorov <aldrfedorov97@mail.ru>
Date: Thu, 11 Feb 2021 11:15:57 +0300
Subject: [PATCH 2/2] java: ResourceService.ashx is not used anymore

---
 web/documentserver-example/java/nb-configuration.xml     | 1 -
 .../java/src/main/java/helpers/FileUtility.java          | 9 +--------
 .../java/src/main/resources/settings.properties          | 1 -
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/web/documentserver-example/java/nb-configuration.xml b/web/documentserver-example/java/nb-configuration.xml
index 18ef3b93..61e80fd3 100644
--- a/web/documentserver-example/java/nb-configuration.xml
+++ b/web/documentserver-example/java/nb-configuration.xml
@@ -54,7 +54,6 @@ Any value defined here will override the pom.xml file value but is only applicab
         <word>ppsx</word>
         <word>ppt</word>
         <word>pptx</word>
-        <word>ResourceService</word>
         <word>rtf</word>
         <word>SIA</word>
         <word>teamlab</word>
diff --git a/web/documentserver-example/java/src/main/java/helpers/FileUtility.java b/web/documentserver-example/java/src/main/java/helpers/FileUtility.java
index 6871404a..f8f0e115 100644
--- a/web/documentserver-example/java/src/main/java/helpers/FileUtility.java
+++ b/web/documentserver-example/java/src/main/java/helpers/FileUtility.java
@@ -74,15 +74,8 @@ public class FileUtility
     {
         if (url == null) return "";
 
-        //for external file url
-        String tempstorage = ConfigManager.GetProperty("files.docservice.url.site") + ConfigManager.GetProperty("files.docservice.url.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());
+        fileName = fileName.split("\\?")[0];
         return fileName;
     }
 
diff --git a/web/documentserver-example/java/src/main/resources/settings.properties b/web/documentserver-example/java/src/main/resources/settings.properties
index 2779c7c7..3b831ad0 100644
--- a/web/documentserver-example/java/src/main/resources/settings.properties
+++ b/web/documentserver-example/java/src/main/resources/settings.properties
@@ -8,7 +8,6 @@ files.docservice.timeout=120000
 
 files.docservice.url.site=https://documentserver/
 files.docservice.url.converter=ConvertService.ashx
-files.docservice.url.tempstorage=ResourceService.ashx
 files.docservice.url.api=web-apps/apps/api/documents/api.js
 files.docservice.url.preloader=web-apps/apps/api/documents/cache-scripts.html
 files.docservice.url.example=