From 558c7892d315d68c4308818d7faa06b2c2f1e2c6 Mon Sep 17 00:00:00 2001 From: vanyauhalin Date: Wed, 2 Aug 2023 16:56:28 +0400 Subject: [PATCH 001/488] java: add document-formats submodule --- .gitmodules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitmodules b/.gitmodules index cf502b993..2eadc60d6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -38,3 +38,7 @@ path = web/documentserver-example/java-spring/src/main/resources/assets/document-templates url = https://github.com/ONLYOFFICE/document-templates branch = main/en +[submodule "web/documentserver-example/java/src/main/resources/assets/document-formats"] + path = web/documentserver-example/java/src/main/resources/assets/document-formats + url = https://github.com/ONLYOFFICE/document-formats + branch = master From d259cf3ff70ea34b8d9330c3c42fbe7fff5f65dc Mon Sep 17 00:00:00 2001 From: vanyauhalin Date: Thu, 3 Aug 2023 15:27:19 +0400 Subject: [PATCH 002/488] java: add format module --- .../java/src/main/java/format/Format.java | 71 ++++++ .../src/main/java/format/FormatManager.java | 220 ++++++++++++++++++ .../main/java/helpers/DocumentManager.java | 31 ++- 3 files changed, 314 insertions(+), 8 deletions(-) create mode 100644 web/documentserver-example/java/src/main/java/format/Format.java create mode 100644 web/documentserver-example/java/src/main/java/format/FormatManager.java diff --git a/web/documentserver-example/java/src/main/java/format/Format.java b/web/documentserver-example/java/src/main/java/format/Format.java new file mode 100644 index 000000000..ffdb08e66 --- /dev/null +++ b/web/documentserver-example/java/src/main/java/format/Format.java @@ -0,0 +1,71 @@ +/** + * + * (c) Copyright Ascensio System SIA 2023 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package format; + +import java.util.List; + +import entities.FileType; + +public final class Format { + private final String name; + + public String getName() { + return this.name; + } + + private final FileType type; + + public FileType getType() { + return this.type; + } + + private final List actions; + + public List getActions() { + return this.actions; + } + + private final List convert; + + public List getConvert() { + return this.convert; + } + + private final List mime; + + public List getMime() { + return this.mime; + } + + public Format(final String nameParameter, + final FileType typeParameter, + final List actionsParameter, + final List convertParameter, + final List mimeParameter) { + this.name = nameParameter; + this.type = typeParameter; + this.actions = actionsParameter; + this.convert = convertParameter; + this.mime = mimeParameter; + } + + public String extension() { + return "." + this.name; + } +} diff --git a/web/documentserver-example/java/src/main/java/format/FormatManager.java b/web/documentserver-example/java/src/main/java/format/FormatManager.java new file mode 100644 index 000000000..1ae4110b4 --- /dev/null +++ b/web/documentserver-example/java/src/main/java/format/FormatManager.java @@ -0,0 +1,220 @@ +/** + * + * (c) Copyright Ascensio System SIA 2023 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package format; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import com.google.gson.Gson; +import com.google.gson.JsonSyntaxException; + +import entities.FileType; + +public final class FormatManager { + public List fillableExtensions() throws URISyntaxException, + IOException, + JsonSyntaxException { + return this + .fillable() + .stream() + .map(format -> format.extension()) + .collect(Collectors.toList()); + } + + public List fillable() throws URISyntaxException, + IOException, + JsonSyntaxException { + return this + .all() + .stream() + .filter(format -> format.getActions().contains("fill")) + .collect(Collectors.toList()); + } + + public List viewableExtensions() throws URISyntaxException, + IOException, + JsonSyntaxException { + return this + .viewable() + .stream() + .map(format -> format.extension()) + .collect(Collectors.toList()); + } + + public List viewable() throws URISyntaxException, + IOException, + JsonSyntaxException { + return this + .all() + .stream() + .filter(format -> format.getActions().contains("view")) + .collect(Collectors.toList()); + } + + public List editableExtensions() throws URISyntaxException, + IOException, + JsonSyntaxException { + return this + .editable() + .stream() + .map(format -> format.extension()) + .collect(Collectors.toList()); + } + + public List editable() throws URISyntaxException, + IOException, + JsonSyntaxException { + return this + .all() + .stream() + .filter(format -> ( + format.getActions().contains("edit") + || format.getActions().contains("lossy-edit") + )) + .collect(Collectors.toList()); + } + + public List convertibleExtensions() throws URISyntaxException, + IOException, + JsonSyntaxException { + return this + .convertible() + .stream() + .map(format -> format.extension()) + .collect(Collectors.toList()); + } + + public List convertible() throws URISyntaxException, + IOException, + JsonSyntaxException { + return this + .all() + .stream() + .filter(format -> ( + format.getType() == FileType.Cell && format.getConvert().contains("xlsx") + || format.getType() == FileType.Slide && format.getConvert().contains("pptx") + || format.getType() == FileType.Word && format.getConvert().contains("docx") + )) + .collect(Collectors.toList()); + } + + public List spreadsheetExtensions() throws URISyntaxException, + IOException, + JsonSyntaxException { + return this + .spreadsheets() + .stream() + .map(format -> format.extension()) + .collect(Collectors.toList()); + } + + public List spreadsheets() throws URISyntaxException, + IOException, + JsonSyntaxException { + return this + .all() + .stream() + .filter(format -> format.getType() == FileType.Cell) + .collect(Collectors.toList()); + } + + public List presentationExtensions() throws URISyntaxException, + IOException, + JsonSyntaxException { + return this + .presentations() + .stream() + .map(format -> format.extension()) + .collect(Collectors.toList()); + } + + public List presentations() throws URISyntaxException, + IOException, + JsonSyntaxException { + return this + .all() + .stream() + .filter(format -> format.getType() == FileType.Slide) + .collect(Collectors.toList()); + } + + public List documentExtensions() throws URISyntaxException, + IOException, + JsonSyntaxException { + return this + .documents() + .stream() + .map(format -> format.extension()) + .collect(Collectors.toList()); + } + + public List documents() throws URISyntaxException, + IOException, + JsonSyntaxException { + return this + .all() + .stream() + .filter(format -> format.getType() == FileType.Word) + .collect(Collectors.toList()); + } + + public List allExtensions() throws URISyntaxException, + IOException, + JsonSyntaxException { + return this + .all() + .stream() + .map(format -> format.extension()) + .collect(Collectors.toList()); + } + + public List all() throws URISyntaxException, + IOException, + JsonSyntaxException { + Path path = this.file(); + List lines = Files.readAllLines(path, StandardCharsets.UTF_8); + String contents = String.join(System.lineSeparator(), lines); + Gson gson = new Gson(); + Format[] formats = gson.fromJson(contents, Format[].class); + return Arrays.asList(formats); + } + + private Path file() throws URISyntaxException { + return this + .directory() + .resolve("onlyoffice-docs-formats.json"); + } + + private Path directory() throws URISyntaxException { + URI uri = Thread + .currentThread() + .getContextClassLoader() + .getResource("assets/document-formats") + .toURI(); + return Paths.get(uri); + } +} diff --git a/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java b/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java index d4bfa66bf..4bffd9132 100755 --- a/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java +++ b/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java @@ -20,6 +20,8 @@ import entities.FileType; import entities.User; +import format.FormatManager; + import org.json.simple.JSONObject; import org.primeframework.jwt.Signer; import org.primeframework.jwt.Verifier; @@ -56,6 +58,7 @@ public final class DocumentManager { private static HttpServletRequest request; + private static FormatManager formatManager = new FormatManager(); private DocumentManager() { } @@ -89,26 +92,38 @@ public static List getFileExts() { } public static List getFillExts() { - String exts = ConfigManager.getProperty("files.docservice.fill-docs"); - return Arrays.asList(exts.split("\\|")); + try { + return DocumentManager.formatManager.fillableExtensions(); + } catch (Exception ex) { + return new ArrayList<>(); + } } // get file extensions that can be viewed public static List getViewedExts() { - String exts = ConfigManager.getProperty("files.docservice.viewed-docs"); - return Arrays.asList(exts.split("\\|")); + try { + return DocumentManager.formatManager.viewableExtensions(); + } catch (Exception ex) { + return new ArrayList<>(); + } } // get file extensions that can be edited public static List getEditedExts() { - String exts = ConfigManager.getProperty("files.docservice.edited-docs"); - return Arrays.asList(exts.split("\\|")); + try { + return DocumentManager.formatManager.editableExtensions(); + } catch (Exception ex) { + return new ArrayList<>(); + } } // get file extensions that can be converted public static List getConvertExts() { - String exts = ConfigManager.getProperty("files.docservice.convert-docs"); - return Arrays.asList(exts.split("\\|")); + try { + return DocumentManager.formatManager.convertibleExtensions(); + } catch (Exception ex) { + return new ArrayList<>(); + } } // get current user host address From fb16b88dd1027bcd1f4f48da158c8d9070a5b6ce Mon Sep 17 00:00:00 2001 From: vanyauhalin Date: Thu, 3 Aug 2023 15:27:38 +0400 Subject: [PATCH 003/488] java: replace the previous implementation of formats --- .../src/main/java/helpers/FileUtility.java | 55 +++++-------------- .../src/main/resources/settings.properties | 4 -- 2 files changed, 15 insertions(+), 44 deletions(-) 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 6a9a251d9..b353d5774 100644 --- a/web/documentserver-example/java/src/main/java/helpers/FileUtility.java +++ b/web/documentserver-example/java/src/main/java/helpers/FileUtility.java @@ -19,13 +19,14 @@ package helpers; import entities.FileType; +import format.FormatManager; + import java.net.URL; -import java.util.Arrays; import java.util.HashMap; -import java.util.List; import java.util.Map; public final class FileUtility { + private static FormatManager formatManager = new FormatManager(); private FileUtility() { } @@ -33,50 +34,24 @@ private FileUtility() { } public static FileType getFileType(final String fileName) { String ext = getFileExtension(fileName).toLowerCase(); - // word type for document extensions - if (extsDocument.contains(ext)) { - return FileType.Word; - } - - // cell type for spreadsheet extensions - if (extsSpreadsheet.contains(ext)) { - return FileType.Cell; - } - - // slide type for presentation extensions - if (extsPresentation.contains(ext)) { - return FileType.Slide; + try { + if (FileUtility.formatManager.documentExtensions().contains(ext)) { + return FileType.Word; + } + if (FileUtility.formatManager.spreadsheetExtensions().contains(ext)) { + return FileType.Cell; + } + if (FileUtility.formatManager.presentationExtensions().contains(ext)) { + return FileType.Slide; + } + } catch (Exception error) { + error.printStackTrace(); } // default file type is word return FileType.Word; } - // document extensions - private static List extsDocument = Arrays.asList( - ".doc", ".docx", ".docm", - ".dot", ".dotx", ".dotm", - ".odt", ".fodt", ".ott", ".rtf", ".txt", - ".html", ".htm", ".mht", ".xml", - ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps", ".oform" - ); - - // spreadsheet extensions - private static List extsSpreadsheet = Arrays.asList( - ".xls", ".xlsx", ".xlsm", ".xlsb", - ".xlt", ".xltx", ".xltm", - ".ods", ".fods", ".ots", ".csv" - ); - - // presentation extensions - private static List extsPresentation = Arrays.asList( - ".pps", ".ppsx", ".ppsm", - ".ppt", ".pptx", ".pptm", - ".pot", ".potx", ".potm", - ".odp", ".fodp", ".otp" - ); - - // get file name from the url public static String getFileName(final String url) { if (url == null) { diff --git a/web/documentserver-example/java/src/main/resources/settings.properties b/web/documentserver-example/java/src/main/resources/settings.properties index a020e99dc..8c8192ebe 100644 --- a/web/documentserver-example/java/src/main/resources/settings.properties +++ b/web/documentserver-example/java/src/main/resources/settings.properties @@ -3,10 +3,6 @@ version=1.6.0 filesize-max=5242880 storage-folder=app_data -files.docservice.fill-docs=.docx|.oform -files.docservice.viewed-docs=.djvu|.oxps|.pdf|.xps -files.docservice.edited-docs=.csv|.docm|.docx|.docxf|.dotm|.dotx|.epub|.fb2|.html|.odp|.ods|.odt|.otp|.ots|.ott|.potm|.potx|.ppsm|.ppsx|.pptm|.pptx|.rtf|.txt|.xlsm|.xlsx|.xltm|.xltx -files.docservice.convert-docs=.doc|.dot|.dps|.dpt|.epub|.et|.ett|.fb2|.fodp|.fods|.fodt|.htm|.html|.mht|.mhtml|.odp|.ods|.odt|.otp|.ots|.ott|.pot|.pps|.ppt|.rtf|.stw|.sxc|.sxi|.sxw|.wps|.wpt|.xls|.xlsb|.xlt|.xml files.docservice.timeout=120000 files.docservice.url.site=http://documentserver/ From 4fa9d4c9fd952f2c3830e839ae78e48a3d162c21 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Sat, 2 Sep 2023 10:46:28 +0300 Subject: [PATCH 004/488] nodejs: remove /files route (8bcc15e320a337b38219191c7045f54cf339a180) --- web/documentserver-example/nodejs/app.js | 8 -------- web/documentserver-example/nodejs/config/default.json | 6 ------ .../nodejs/config/production-linux.json | 8 +------- .../nodejs/config/production-windows.json | 9 +-------- 4 files changed, 2 insertions(+), 29 deletions(-) diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js index 0685dd32c..ba5e40ed9 100755 --- a/web/documentserver-example/nodejs/app.js +++ b/web/documentserver-example/nodejs/app.js @@ -81,14 +81,6 @@ app.use((req, res, next) => { }); app.use(express.static(path.join(__dirname, 'public'))); // public directory -// check if there are static files such as .js, .css files, images, samples and process them -if (config.has('server.static')) { - const staticContent = config.get('server.static'); - for (let i = 0; i < staticContent.length; i++) { - const staticContentElem = staticContent[i]; - app.use(staticContentElem.name, express.static(staticContentElem.path, staticContentElem.options)); - } -} app.use(favicon(`${__dirname}/public/images/favicon.ico`)); // use favicon app.use(bodyParser.json()); // connect middleware that parses json diff --git a/web/documentserver-example/nodejs/config/default.json b/web/documentserver-example/nodejs/config/default.json index 5b60d2e49..949bbee87 100644 --- a/web/documentserver-example/nodejs/config/default.json +++ b/web/documentserver-example/nodejs/config/default.json @@ -26,12 +26,6 @@ "storagePath": "/files", "maxFileSize": 1073741824, "mobileRegEx": "android|avantgo|playbook|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od|ad)|iris|kindle|lge |maemo|midp|mmp|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\\/|plucker|pocket|psp|symbian|treo|up\\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino", - "static":[ - { - "name": "/files", - "path": "./files" - } - ], "token": { "enable": false, "useforrequest": true, diff --git a/web/documentserver-example/nodejs/config/production-linux.json b/web/documentserver-example/nodejs/config/production-linux.json index 71290d52c..76d594ba6 100644 --- a/web/documentserver-example/nodejs/config/production-linux.json +++ b/web/documentserver-example/nodejs/config/production-linux.json @@ -2,12 +2,6 @@ "server": { "siteUrl": "/", "maxFileSize": 104857600, - "storageFolder": "/var/lib/onlyoffice/documentserver-example/files", - "static":[ - { - "name": "/files", - "path": "/var/lib/onlyoffice/documentserver-example/files" - } - ] + "storageFolder": "/var/lib/onlyoffice/documentserver-example/files" } } diff --git a/web/documentserver-example/nodejs/config/production-windows.json b/web/documentserver-example/nodejs/config/production-windows.json index 37956fa22..c6e79d467 100644 --- a/web/documentserver-example/nodejs/config/production-windows.json +++ b/web/documentserver-example/nodejs/config/production-windows.json @@ -1,13 +1,6 @@ { "server": { "siteUrl": "/", - "maxFileSize": 104857600, - "static":[ - { - "name": "/files", - "path": "./files", - "options": {"maxAge": "7d"} - } - ] + "maxFileSize": 104857600 } } From 52a722cf892f09428c99e18f1beb700fa93e0cdf Mon Sep 17 00:00:00 2001 From: Aleksandr Fedorov Date: Mon, 4 Sep 2023 13:10:54 +0300 Subject: [PATCH 005/488] java: added api (history, historyData) for getting history --- .../main/java/controllers/IndexServlet.java | 173 ++++++++++++++++++ .../src/main/java/entities/FileModel.java | 127 ------------- .../main/java/helpers/DocumentManager.java | 17 ++ .../java/src/main/webapp/editor.jsp | 55 ++++-- 4 files changed, 225 insertions(+), 147 deletions(-) diff --git a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java index 663ffd72c..a1a57c38a 100755 --- a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java +++ b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java @@ -62,6 +62,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Scanner; @@ -132,6 +133,12 @@ protected void processRequest(final HttpServletRequest request, case "restore": restore(request, response, writer); break; + case "history": + history(request, response, writer); + break; + case "historydata": + historyData(request, response, writer); + break; default: break; } @@ -825,6 +832,172 @@ private static void restore(final HttpServletRequest request, } } + private static void history(final HttpServletRequest request, + final HttpServletResponse response, + final PrintWriter writer) { + String fileName = FileUtility.getFileName(request.getParameter("filename")); + String path = DocumentManager.storagePath(fileName, null); + + JSONParser parser = new JSONParser(); + response.setContentType("application/json"); + + // get history directory + String histDir = DocumentManager.historyDir(path); + if (DocumentManager.getFileVersion(histDir) > 0) { + + // get current file version if it is greater than 0 + Integer curVer = DocumentManager.getFileVersion(histDir); + + List hist = new ArrayList<>(); + Map histData = new HashMap(); + + for (Integer i = 1; i <= curVer; i++) { // run through all the file versions + Map obj = new HashMap(); + String verDir = DocumentManager.versionDir(histDir, i); // get the path to the given file version + + try { + String key = null; + + // get document key + if (i == curVer) { + key = ServiceConverter.generateRevisionId( + DocumentManager.curUserHostAddress(null) + "/" + fileName + "/" + + Long.toString(new File(DocumentManager.storagePath(fileName, null)) + .lastModified())); + } else { + key = DocumentManager.readFileToEnd(new File(verDir + File.separator + "key.txt")); + } + + obj.put("key", key); + obj.put("version", i); + + if (i == 1) { // check if the version number is equal to 1 + String createdInfo = DocumentManager.readFileToEnd(new File(histDir + File.separator + + "createdInfo.json")); // get file with meta data + JSONObject json = (JSONObject) parser.parse(createdInfo); // and turn it into json object + + // write meta information to the object (user information and creation date) + obj.put("created", json.get("created")); + Map user = new HashMap(); + user.put("id", json.get("id")); + user.put("name", json.get("name")); + obj.put("user", user); + } + + if (i > 1) { //check if the version number is greater than 1 + // if so, get the path to the changes.json file + JSONObject changes = (JSONObject) parser.parse( + DocumentManager.readFileToEnd(new File(DocumentManager + .versionDir(histDir, i - 1) + File.separator + "changes.json"))); + JSONObject change = (JSONObject) ((JSONArray) changes.get("changes")).get(0); + + // write information about changes to the object + obj.put("changes", !change.isEmpty() ? changes.get("changes") : null); + obj.put("serverVersion", changes.get("serverVersion")); + obj.put("created", !change.isEmpty() ? change.get("created") : null); + obj.put("user", !change.isEmpty() ? change.get("user") : null); + } + + hist.add(obj); + } catch (Exception ex) { } + } + + // write history information about the current file version to the history object + Map histObj = new HashMap(); + histObj.put("currentVersion", curVer); + histObj.put("history", hist); + + Gson gson = new Gson(); + writer.write(gson.toJson(histObj)); + return; + } + writer.write("{}"); + } + + private static void historyData(final HttpServletRequest request, + final HttpServletResponse response, + final PrintWriter writer) { + String fileName = FileUtility.getFileName(request.getParameter("filename")); + String version = request.getParameter("version"); + String directUrl = request.getParameter("directUrl"); + String path = DocumentManager.storagePath(fileName, null); + + response.setContentType("application/json"); + // get history directory + String histDir = DocumentManager.historyDir(path); + if (DocumentManager.getFileVersion(histDir) > 0) { + // get current file version if it is greater than 0 + Integer curVer = DocumentManager.getFileVersion(histDir); + + Map histData = new HashMap(); + for (Integer i = 1; i <= curVer; i++) { // run through all the file versions + Map dataObj = new HashMap(); + String verDir = DocumentManager.versionDir(histDir, i); // get the path to the given file version + + try { + String key = null; + + // get document key + if (i == curVer) { + key = ServiceConverter.generateRevisionId( + DocumentManager.curUserHostAddress(null) + "/" + fileName + "/" + + Long.toString(new File(DocumentManager.storagePath(fileName, null)) + .lastModified())); + } else { + key = DocumentManager.readFileToEnd(new File(verDir + File.separator + "key.txt")); + } + + String fileUrl = DocumentManager.getDownloadUrl(fileName, true); + dataObj.put("fileType", FileUtility.getFileExtension(fileName).substring(1)); + dataObj.put("key", key); + dataObj.put("url", i == curVer ? fileUrl : DocumentManager + .getDownloadHistoryUrl(fileName, i, "prev" + FileUtility + .getFileExtension(fileName), true)); + if (directUrl.equals("true")) { + dataObj.put("directUrl", i == curVer ? fileUrl : DocumentManager + .getDownloadHistoryUrl(fileName, i, "prev" + FileUtility + .getFileExtension(fileName), false)); + } + + dataObj.put("version", i); + + if (i > 1) { //check if the version number is greater than 1 + + // get the history data from the previous file version + Map prev = (Map) histData.get(Integer.toString(i - 1)); + Map prevInfo = new HashMap(); + prevInfo.put("fileType", prev.get("fileType")); + + // write key and url information about previous file version + prevInfo.put("key", prev.get("key")); + prevInfo.put("url", prev.get("url")); + + // write information about previous file version to the data object + dataObj.put("previous", prevInfo); + // write the path to the diff.zip archive with differences in this file version + Integer verdiff = i - 1; + String changesUrl = DocumentManager + .getDownloadHistoryUrl(fileName, verdiff, + "diff.zip", true); + dataObj.put("changesUrl", changesUrl); + } + + if (DocumentManager.tokenEnabled()) { + dataObj.put("token", DocumentManager.createToken(dataObj)); + } + + histData.put(Integer.toString(i), dataObj); + + } catch (Exception ex) { } + } + + Gson gson = new Gson(); + writer.write(gson.toJson(histData.get(version))); + return; + } + writer.write("{}"); + } + // process get request @Override protected void doGet(final HttpServletRequest request, diff --git a/web/documentserver-example/java/src/main/java/entities/FileModel.java b/web/documentserver-example/java/src/main/java/entities/FileModel.java index 6424c4247..13e944996 100755 --- a/web/documentserver-example/java/src/main/java/entities/FileModel.java +++ b/web/documentserver-example/java/src/main/java/entities/FileModel.java @@ -23,12 +23,8 @@ import helpers.DocumentManager; import helpers.FileUtility; import helpers.ServiceConverter; -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; -import org.json.simple.parser.JSONParser; import java.io.File; -import java.io.FileInputStream; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; @@ -36,7 +32,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Scanner; public class FileModel { private String type = "desktop"; @@ -192,128 +187,6 @@ public void buildToken() { token = DocumentManager.createToken(map); } - // get document history - public String[] getHistory() { - JSONParser parser = new JSONParser(); - - // get history directory - String histDir = DocumentManager.historyDir(DocumentManager.storagePath(document.getTitle(), null)); - if (DocumentManager.getFileVersion(histDir) > 0) { - - // get current file version if it is greater than 0 - Integer curVer = DocumentManager.getFileVersion(histDir); - - List hist = new ArrayList<>(); - Map histData = new HashMap(); - - for (Integer i = 1; i <= curVer; i++) { // run through all the file versions - Map obj = new HashMap(); - Map dataObj = new HashMap(); - String verDir = DocumentManager.versionDir(histDir, i); // get the path to the given file version - - try { - String key = null; - - // get document key - key = i == curVer - ? document.getKey() : readFileToEnd(new File(verDir + File.separator + "key.txt")); - - obj.put("key", key); - obj.put("version", i); - - if (i == 1) { // check if the version number is equal to 1 - String createdInfo = readFileToEnd(new File(histDir + File.separator - + "createdInfo.json")); // get file with meta data - JSONObject json = (JSONObject) parser.parse(createdInfo); // and turn it into json object - - // write meta information to the object (user information and creation date) - obj.put("created", json.get("created")); - Map user = new HashMap(); - user.put("id", json.get("id")); - user.put("name", json.get("name")); - obj.put("user", user); - } - - dataObj.put("fileType", FileUtility.getFileExtension(document.getTitle()).substring(1)); - dataObj.put("key", key); - dataObj.put("url", i == curVer ? document.getUrl() : DocumentManager - .getDownloadHistoryUrl(document.getTitle(), i, "prev" + FileUtility - .getFileExtension(document.getTitle()), true)); - if (!document.getDirectUrl().equals("")) { - dataObj.put("directUrl", i == curVer ? document.getUrl() : DocumentManager - .getDownloadHistoryUrl(document.getTitle(), i, "prev" + FileUtility - .getFileExtension(document.getTitle()), false)); - } - dataObj.put("version", i); - - if (i > 1) { //check if the version number is greater than 1 - // if so, get the path to the changes.json file - JSONObject changes = (JSONObject) parser.parse(readFileToEnd(new File(DocumentManager - .versionDir(histDir, i - 1) + File.separator + "changes.json"))); - JSONObject change = (JSONObject) ((JSONArray) changes.get("changes")).get(0); - - // write information about changes to the object - obj.put("changes", !change.isEmpty() ? changes.get("changes") : null); - obj.put("serverVersion", changes.get("serverVersion")); - obj.put("created", !change.isEmpty() ? change.get("created") : null); - obj.put("user", !change.isEmpty() ? change.get("user") : null); - - // get the history data from the previous file version - Map prev = (Map) histData.get(Integer.toString(i - 2)); - Map prevInfo = new HashMap(); - prevInfo.put("fileType", prev.get("fileType")); - - // write key and url information about previous file version - prevInfo.put("key", prev.get("key")); - prevInfo.put("url", prev.get("url")); - - // write information about previous file version to the data object - dataObj.put("previous", prevInfo); - // write the path to the diff.zip archive with differences in this file version - Integer verdiff = i - 1; - String changesUrl = DocumentManager - .getDownloadHistoryUrl(document.getTitle(), verdiff, - "diff.zip", true); - dataObj.put("changesUrl", changesUrl); - } - - if (DocumentManager.tokenEnabled()) { - dataObj.put("token", DocumentManager.createToken(dataObj)); - } - - hist.add(obj); - histData.put(Integer.toString(i - 1), dataObj); - - } catch (Exception ex) { } - } - - // write history information about the current file version to the history object - Map histObj = new HashMap(); - histObj.put("currentVersion", curVer); - histObj.put("history", hist); - - Gson gson = new Gson(); - return new String[] {gson.toJson(histObj), gson.toJson(histData) }; - } - return new String[] {"", "" }; - } - - // read a file - private String readFileToEnd(final File file) { - String output = ""; - try { - try (FileInputStream is = new FileInputStream(file)) { - Scanner scanner = new Scanner(is); // read data from the source - scanner.useDelimiter("\\A"); - while (scanner.hasNext()) { - output += scanner.next(); - } - scanner.close(); - } - } catch (Exception e) { } - return output; - } - // the document parameters public class Document { private String title; diff --git a/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java b/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java index d4bfa66bf..2295e12bd 100755 --- a/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java +++ b/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java @@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.FileFilter; +import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.FileWriter; import java.io.IOException; @@ -50,6 +51,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Scanner; import static utils.Constants.KILOBYTE_SIZE; import static utils.Constants.MAX_FILE_SIZE; @@ -599,4 +601,19 @@ public static Map getLanguages() { }); return languages; } + + public static String readFileToEnd(final File file) { + String output = ""; + try { + try (FileInputStream is = new FileInputStream(file)) { + Scanner scanner = new Scanner(is); // read data from the source + scanner.useDelimiter("\\A"); + while (scanner.hasNext()) { + output += scanner.next(); + } + scanner.close(); + } + } catch (Exception e) { } + return output; + } } diff --git a/web/documentserver-example/java/src/main/webapp/editor.jsp b/web/documentserver-example/java/src/main/webapp/editor.jsp index 9d78046e8..c1744327f 100644 --- a/web/documentserver-example/java/src/main/webapp/editor.jsp +++ b/web/documentserver-example/java/src/main/webapp/editor.jsp @@ -193,6 +193,37 @@ } } + var onRequestHistory = function () { + var historyInfoUri = "IndexServlet?type=history&filename=" + config.document.title; + var xhr = new XMLHttpRequest(); + xhr.open("GET", historyInfoUri, false); + xhr.send(); + + if (xhr.status == 200) { + var historyInfo = JSON.parse(xhr.responseText); + docEditor.refreshHistory(historyInfo); + } + }; + + var onRequestHistoryData = function (event) { + var version = event.data; + var historyDataUri = "IndexServlet?type=historyData&filename=" + config.document.title + + "&version=" + version + + "&directUrl=" + !!config.document.directUrl; + var xhr = new XMLHttpRequest(); + xhr.open("GET", historyDataUri, false); + xhr.send(); + + if (xhr.status == 200) { + var historyData = JSON.parse(xhr.responseText); + docEditor.setHistoryData(historyData); + } + }; + + var onRequestHistoryClose = function() { + document.location.reload(); + }; + config = JSON.parse('<%= FileModel.serialize(Model) %>'); config.width = "100%"; config.height = "100%"; @@ -206,33 +237,17 @@ "onRequestInsertImage": onRequestInsertImage, "onRequestCompareFile": onRequestCompareFile, "onRequestMailMergeRecipients": onRequestMailMergeRecipients, - "onRequestRestore": onRequestRestore + "onRequestRestore": onRequestRestore, + "onRequestHistory": onRequestHistory, + "onRequestHistoryData": onRequestHistoryData, + "onRequestHistoryClose": onRequestHistoryClose }; <% - String[] histArray = Model.getHistory(); - String history = histArray[0]; - String historyData = histArray[1]; String usersForMentions = (String) request.getAttribute("usersForMentions"); %> if (config.editorConfig.user.id) { - <% if (!history.isEmpty() && !historyData.isEmpty()) { %> - // the user is trying to show the document version history - config.events['onRequestHistory'] = function () { - docEditor.refreshHistory(<%= history %>); // show the document version history - }; - // the user is trying to click the specific document version in the document version history - config.events['onRequestHistoryData'] = function (event) { - var ver = event.data; - var histData = <%= historyData %>; - docEditor.setHistoryData(histData[ver - 1]); // send the link to the document for viewing the version history - }; - // the user is trying to go back to the document from viewing the document version history - config.events['onRequestHistoryClose'] = function () { - document.location.reload(); - }; - <% } %> // add mentions for not anonymous users config.events['onRequestUsers'] = function () { docEditor.setUsers({ // set a list of users to mention in the comments From 24b9a35651876a341db737b0687d70d4dccf4050 Mon Sep 17 00:00:00 2001 From: Aleksandr Fedorov Date: Mon, 4 Sep 2023 13:08:27 +0300 Subject: [PATCH 006/488] java: changed restore version without reload page --- .../java/src/main/webapp/editor.jsp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/web/documentserver-example/java/src/main/webapp/editor.jsp b/web/documentserver-example/java/src/main/webapp/editor.jsp index c1744327f..d1323be19 100644 --- a/web/documentserver-example/java/src/main/webapp/editor.jsp +++ b/web/documentserver-example/java/src/main/webapp/editor.jsp @@ -184,12 +184,20 @@ request.open('PUT', 'IndexServlet?type=restore') request.send(JSON.stringify(payload)) request.onload = function () { - if (request.status != 200) { - response = JSON.parse(request.response) - innerAlert(response.error) - return + const response = JSON.parse(request.responseText); + if (response.success && !response.error) { + var historyInfoUri = "IndexServlet?type=history&filename=" + config.document.title; + var xhr = new XMLHttpRequest(); + xhr.open("GET", historyInfoUri, false); + xhr.send(); + + if (xhr.status == 200) { + var historyInfo = JSON.parse(xhr.responseText); + docEditor.refreshHistory(historyInfo); + } + } else { + innerAlert(response.error); } - document.location.reload() } } From a3fa30b1929e2a5aa8def73f5d0c6b31809e7537 Mon Sep 17 00:00:00 2001 From: Aleksandr Fedorov Date: Mon, 4 Sep 2023 15:19:34 +0300 Subject: [PATCH 007/488] fixed: directUrl for historyData --- .../src/main/java/controllers/IndexServlet.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java index a1a57c38a..26206d811 100755 --- a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java +++ b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java @@ -947,15 +947,16 @@ private static void historyData(final HttpServletRequest request, key = DocumentManager.readFileToEnd(new File(verDir + File.separator + "key.txt")); } - String fileUrl = DocumentManager.getDownloadUrl(fileName, true); dataObj.put("fileType", FileUtility.getFileExtension(fileName).substring(1)); dataObj.put("key", key); - dataObj.put("url", i == curVer ? fileUrl : DocumentManager - .getDownloadHistoryUrl(fileName, i, "prev" + FileUtility + dataObj.put("url", i == curVer + ? DocumentManager.getDownloadUrl(fileName, true) + : DocumentManager.getDownloadHistoryUrl(fileName, i, "prev" + FileUtility .getFileExtension(fileName), true)); if (directUrl.equals("true")) { - dataObj.put("directUrl", i == curVer ? fileUrl : DocumentManager - .getDownloadHistoryUrl(fileName, i, "prev" + FileUtility + dataObj.put("directUrl", i == curVer + ? DocumentManager.getDownloadUrl(fileName, false) + : DocumentManager.getDownloadHistoryUrl(fileName, i, "prev" + FileUtility .getFileExtension(fileName), false)); } @@ -971,6 +972,9 @@ private static void historyData(final HttpServletRequest request, // write key and url information about previous file version prevInfo.put("key", prev.get("key")); prevInfo.put("url", prev.get("url")); + if (directUrl.equals("true")) { + prevInfo.put("directUrl", prev.get("directUrl")); + } // write information about previous file version to the data object dataObj.put("previous", prevInfo); From bc5393e28cf1bfa346f9029f6875ef138fd2ec63 Mon Sep 17 00:00:00 2001 From: Aleksandr Fedorov Date: Mon, 4 Sep 2023 15:29:23 +0300 Subject: [PATCH 008/488] java-spring: added api (history, historyData) for getting history --- .../controllers/EditorController.java | 7 - .../controllers/FileController.java | 17 ++ .../history/DefaultHistoryManager.java | 151 ++++++++++++++++++ .../managers/history/HistoryManager.java | 6 +- .../src/main/resources/templates/editor.html | 54 ++++--- 5 files changed, 205 insertions(+), 30 deletions(-) diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/EditorController.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/EditorController.java index f9c24ad16..0d57f83aa 100755 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/EditorController.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/EditorController.java @@ -20,7 +20,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.onlyoffice.integration.documentserver.managers.history.HistoryManager; import com.onlyoffice.integration.documentserver.managers.jwt.JwtManager; import com.onlyoffice.integration.documentserver.models.enums.Action; import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder; @@ -73,9 +72,6 @@ public class EditorController { @Autowired private UserServices userService; - @Autowired - private HistoryManager historyManager; - @Autowired private ObjectMapper objectMapper; @@ -140,9 +136,6 @@ public String index(@RequestParam("fileName") final String fileName, // add file model with the default parameters to the original model model.addAttribute("model", fileModel); - // get file history and add it to the model - model.addAttribute("fileHistory", historyManager.getHistory(fileModel.getDocument())); - // create the document service api URL and add it to the model model.addAttribute("docserviceApiUrl", docserviceSite + docserviceApiUrl); diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java index c5259eaed..3c1eb4b63 100755 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java @@ -22,6 +22,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.onlyoffice.integration.documentserver.callbacks.CallbackHandler; +import com.onlyoffice.integration.documentserver.managers.history.HistoryManager; import com.onlyoffice.integration.documentserver.managers.jwt.JwtManager; import com.onlyoffice.integration.documentserver.storage.FileStorageMutator; import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder; @@ -114,6 +115,8 @@ public class FileController { private ServiceConverter serviceConverter; @Autowired private CallbackManager callbackManager; + @Autowired + private HistoryManager historyManager; // create user metadata private String createUserMetadata(final String uid, final String fullFileName) { @@ -538,6 +541,20 @@ public String reference(@RequestBody final JSONObject body) { } } + @GetMapping("/history") + @ResponseBody + public String history(@RequestParam("fileName") final String fileName) { + return historyManager.getHistory(fileName); + } + + @GetMapping("/historydata") + @ResponseBody + public String history(@RequestParam("fileName") final String fileName, + @RequestParam("version") final String version, + @RequestParam(value = "directUrl", defaultValue = "false") final Boolean directUrl) { + return historyManager.getHistoryData(fileName, version, directUrl); + } + @PutMapping("/restore") @ResponseBody public String restore(@RequestBody final JSONObject body) { diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/history/DefaultHistoryManager.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/history/DefaultHistoryManager.java index 2511246e2..3c7af734a 100644 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/history/DefaultHistoryManager.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/history/DefaultHistoryManager.java @@ -25,6 +25,7 @@ import com.onlyoffice.integration.documentserver.models.filemodel.Document; import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder; import com.onlyoffice.integration.documentserver.util.file.FileUtility; +import com.onlyoffice.integration.documentserver.util.service.ServiceConverter; import lombok.SneakyThrows; import org.json.simple.JSONArray; import org.json.simple.JSONObject; @@ -62,6 +63,9 @@ public class DefaultHistoryManager implements HistoryManager { @Autowired private ObjectMapper objectMapper; + @Autowired + private ServiceConverter serviceConverter; + // todo: Refactoring @SneakyThrows public String[] getHistory(final Document document) { // get document history @@ -164,6 +168,153 @@ public String[] getHistory(final Document document) { // get document history return new String[]{"", ""}; } + // todo: Refactoring + @SneakyThrows + public String getHistory(final String fileName) { // get document history + + // get history directory + String histDir = storagePathBuilder.getHistoryDir(storagePathBuilder.getFileLocation(fileName)); + Integer curVer = storagePathBuilder.getFileVersion(histDir, false); // get current file version + + if (curVer > 0) { // check if the current file version is greater than 0 + List hist = new ArrayList<>(); + + for (Integer i = 1; i <= curVer; i++) { // run through all the file versions + Map obj = new HashMap(); + String verDir = documentManager + .versionDir(histDir, i, true); // get the path to the given file version + + String key; + if (i == curVer) { + key = serviceConverter + .generateRevisionId(storagePathBuilder.getStorageLocation() + + "/" + fileName + "/" + + new File(storagePathBuilder.getFileLocation(fileName)).lastModified()); + } else { + key = readFileToEnd(new File(verDir + File.separator + "key.txt")); + } + + obj.put("key", key); + obj.put("version", i); + + if (i == 1) { // check if the version number is equal to 1 + String createdInfo = readFileToEnd(new File(histDir + + File.separator + "createdInfo.json")); // get file with meta data + JSONObject json = (JSONObject) parser.parse(createdInfo); // and turn it into json object + + // write meta information to the object (user information and creation date) + obj.put("created", json.get("created")); + Map user = new HashMap(); + user.put("id", json.get("id")); + user.put("name", json.get("name")); + obj.put("user", user); + } + + if (i > 1) { //check if the version number is greater than 1 + // if so, get the path to the changes.json file + JSONObject changes = (JSONObject) parser.parse(readFileToEnd(new File(documentManager + .versionDir(histDir, i - 1, true) + File.separator + "changes.json"))); + JSONObject change = (JSONObject) ((JSONArray) changes.get("changes")).get(0); + + // write information about changes to the object + obj.put("changes", changes.get("changes")); + obj.put("serverVersion", changes.get("serverVersion")); + obj.put("created", change.get("created")); + obj.put("user", change.get("user")); + } + + hist.add(obj); + } + + // write history information about the current file version to the history object + Map histObj = new HashMap(); + histObj.put("currentVersion", curVer); + histObj.put("history", hist); + + try { + return objectMapper.writeValueAsString(histObj); + } catch (JsonProcessingException e) { + e.printStackTrace(); + } + } + return ""; + } + + // todo: Refactoring + @SneakyThrows + public String getHistoryData(final String fileName, final String version, final Boolean directUrl) { + // get history directory + String histDir = storagePathBuilder.getHistoryDir(storagePathBuilder.getFileLocation(fileName)); + Integer curVer = storagePathBuilder.getFileVersion(histDir, false); // get current file version + + if (curVer > 0) { // check if the current file version is greater than 0 + Map histData = new HashMap<>(); + + for (Integer i = 1; i <= curVer; i++) { // run through all the file versions + Map dataObj = new HashMap(); + String verDir = documentManager + .versionDir(histDir, i, true); // get the path to the given file version + + String key; + if (i == curVer) { + key = serviceConverter + .generateRevisionId(storagePathBuilder.getStorageLocation() + + "/" + fileName + "/" + + new File(storagePathBuilder.getFileLocation(fileName)).lastModified()); + } else { + key = readFileToEnd(new File(verDir + File.separator + "key.txt")); + } + + dataObj.put("fileType", fileUtility + .getFileExtension(fileName).replace(".", "")); + dataObj.put("key", key); + dataObj.put("url", i == curVer ? documentManager.getDownloadUrl(fileName, true) + : documentManager.getHistoryFileUrl(fileName, i, "prev" + fileUtility + .getFileExtension(fileName), true)); + if (directUrl) { + dataObj.put("directUrl", i == curVer + ? documentManager.getDownloadUrl(fileName, false) + : documentManager.getHistoryFileUrl(fileName, i, "prev" + fileUtility + .getFileExtension(fileName), false)); + } + dataObj.put("version", i); + + if (i > 1) { //check if the version number is greater than 1 + // get the history data from the previous file version + Map prev = (Map) histData.get(Integer.toString(i - 1)); + Map prevInfo = new HashMap(); + prevInfo.put("fileType", prev.get("fileType")); + prevInfo.put("key", prev.get("key")); // write key and URL information about previous file version + prevInfo.put("url", prev.get("url")); + if (directUrl) { + prevInfo.put("directUrl", prev.get("directUrl")); + } + + // write information about previous file version to the data object + dataObj.put("previous", prevInfo); + // write the path to the diff.zip archive with differences in this file version + Integer verdiff = i - 1; + dataObj.put("changesUrl", documentManager + .getHistoryFileUrl(fileName, verdiff, "diff.zip", true)); + } + + if (jwtManager.tokenEnabled()) { + dataObj.put("token", jwtManager.createToken(dataObj)); + } + + histData.put(Integer.toString(i), dataObj); + } + + try { + return objectMapper.writeValueAsString(histData.get(version)); + } catch (JsonProcessingException e) { + e.printStackTrace(); + } + } + return ""; + } + + // read a file private String readFileToEnd(final File file) { String output = ""; diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/history/HistoryManager.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/history/HistoryManager.java index 2be05ff32..d3e2f62da 100644 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/history/HistoryManager.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/history/HistoryManager.java @@ -18,9 +18,9 @@ package com.onlyoffice.integration.documentserver.managers.history; -import com.onlyoffice.integration.documentserver.models.filemodel.Document; - // specify the history manager functions public interface HistoryManager { - String[] getHistory(Document document); // get document history + String getHistory(String fileName); // get document history + + String getHistoryData(String fileName, String version, Boolean directUrl); // get document history data } diff --git a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html index e74424817..ad79e85fb 100755 --- a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html +++ b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html @@ -172,6 +172,36 @@ } }; + var onRequestHistory = function () { + var xhr = new XMLHttpRequest(); + xhr.open("GET", "history?fileName=" + config.document.title, false); + xhr.send(); + + if (xhr.status == 200) { + var historyInfo = JSON.parse(xhr.responseText); + docEditor.refreshHistory(historyInfo); + } + }; + + var onRequestHistoryData = function (event) { + var version = event.data; + var historyDataUri = "historydata?fileName=" + config.document.title + + "&version=" + version + + "&directUrl=" + !!config.document.directUrl; + var xhr = new XMLHttpRequest(); + xhr.open("GET", historyDataUri, false); + xhr.send(); + + if (xhr.status == 200) { + var historyData = JSON.parse(xhr.responseText); + docEditor.setHistoryData(historyData); + } + }; + + var onRequestHistoryClose = function() { + document.location.reload(); + }; + function onRequestRestore(event) { const query = new URLSearchParams(window.location.search) const config = [[${model}]] @@ -206,31 +236,15 @@ "onRequestInsertImage": onRequestInsertImage, "onRequestCompareFile": onRequestCompareFile, "onRequestMailMergeRecipients": onRequestMailMergeRecipients, - "onRequestRestore": onRequestRestore + "onRequestRestore": onRequestRestore, + "onRequestHistory": onRequestHistory, + "onRequestHistoryData": onRequestHistoryData, + "onRequestHistoryClose": onRequestHistoryClose }; - var histArray = [[${fileHistory}]]; - var hist = histArray[0]; - var historyData = histArray[1]; var usersForMentions = [[${usersForMentions}]]; if (config.editorConfig.user.id != 4) { - if (hist && historyData) { - // the user is trying to show the document version history - config.events['onRequestHistory'] = function () { - docEditor.refreshHistory(JSON.parse(hist)); // show the document version history - }; - // the user is trying to click the specific document version in the document version history - config.events['onRequestHistoryData'] = function (event) { - var ver = event.data; - var histData = historyData; - docEditor.setHistoryData(JSON.parse(histData)[ver - 1]); // send the link to the document for viewing the version history - }; - // the user is trying to go back to the document from viewing the document version history - config.events['onRequestHistoryClose'] = function () { - document.location.reload(); - }; - } // add mentions for not anonymous users config.events['onRequestUsers'] = function () { docEditor.setUsers({ // set a list of users to mention in the comments From a56b411c9329e38cc4231d48bb711f371126bf2b Mon Sep 17 00:00:00 2001 From: Aleksandr Fedorov Date: Mon, 4 Sep 2023 15:32:15 +0300 Subject: [PATCH 009/488] java-spring: changed restore version without reload page --- .../src/main/resources/templates/editor.html | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html index ad79e85fb..32dbfd60b 100755 --- a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html +++ b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html @@ -215,12 +215,20 @@ request.setRequestHeader('Content-Type', 'application/json') request.send(JSON.stringify(payload)) request.onload = function () { - if (request.status != 200) { - response = JSON.parse(request.response) - innerAlert(response.error) - return + const response = JSON.parse(request.responseText); + if (response.success && !response.error) { + var historyInfoUri = "history?fileName=" + config.document.title; + var xhr = new XMLHttpRequest(); + xhr.open("GET", historyInfoUri, false); + xhr.send(); + + if (xhr.status == 200) { + var historyInfo = JSON.parse(xhr.responseText); + docEditor.refreshHistory(historyInfo); + } + } else { + innerAlert(response.error); } - document.location.reload() } } From 05904fd68a3b543c407835324d7f5c062df8baa8 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Tue, 5 Sep 2023 13:57:13 +0300 Subject: [PATCH 010/488] java: link to Oracle --- web/documentserver-example/java-spring/README.md | 6 +----- web/documentserver-example/java/README.md | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/web/documentserver-example/java-spring/README.md b/web/documentserver-example/java-spring/README.md index 337ee9a01..4f4a6a60b 100755 --- a/web/documentserver-example/java-spring/README.md +++ b/web/documentserver-example/java-spring/README.md @@ -128,11 +128,7 @@ See the detailed guide to learn how to install Document Server [for Linux](https ### Step 2. Install the prerequisites and run the website with the editors -1. Install **Java**: - - ``` - sudo add-apt-repository ppa:webupd8team/java sudo apt-get update sudo apt-get install oracle-java11-installer - ``` +1. Install **Java** following the instructions [here](https://docs.oracle.com/en/java/javase/20/install/installation-jdk-linux-platforms.html#GUID-737A84E4-2EFF-4D38-8E60-3E29D1B884B8). 2. Download the archive with the Java-Spring example and unpack the archive or clone git repository: diff --git a/web/documentserver-example/java/README.md b/web/documentserver-example/java/README.md index 4e2e22900..05a09a529 100644 --- a/web/documentserver-example/java/README.md +++ b/web/documentserver-example/java/README.md @@ -140,11 +140,7 @@ See the detailed guide to learn how to [install Document Server for Linux](https ### Step 2. Install the prerequisites and run the website with the editors -1. Install **Java**: - - ``` - sudo add-apt-repository ppa:webupd8team/java sudo apt-get update sudo apt-get install oracle-java8-installer - ``` +1. Install **Java** following the instructions [here](https://docs.oracle.com/en/java/javase/20/install/installation-jdk-linux-platforms.html#GUID-737A84E4-2EFF-4D38-8E60-3E29D1B884B8). 2. Download the archive with the Java example and unpack the archive: From 09f24a3b87809d7a0a4acbcdad7b4cdd8feb2fbd Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Tue, 5 Sep 2023 14:42:58 +0300 Subject: [PATCH 011/488] fix changelog --- CHANGELOG.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7658df2ab..c945cdd64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,14 +10,11 @@ - nodejs: using a repo with a list of formats - nodejs: delete file without reloading the page - nodejs: getting history by a separate request -- nodejs: restore from history -- python: restore from history -- ruby: restore from history -- php: restore from history - csharp-mvc: getting history by a separate request -- csharp-mvc: restore from history - csharp: getting history by a separate request -- csharp: restore from history +- java: getting history by a separate request +- java-spring: getting history by a separate request +- restore from history ## 1.6.0 - nodejs: setUsers for region protection From 8f14876b8156a886509cce80d7823dbe71c59403 Mon Sep 17 00:00:00 2001 From: Natalia Date: Wed, 6 Sep 2023 15:55:07 +0300 Subject: [PATCH 012/488] java and java spring: updated Docker instructions --- .../java-spring/README.md | 52 +++++++++++++++++-- web/documentserver-example/java/README.md | 40 ++++++++++++-- 2 files changed, 84 insertions(+), 8 deletions(-) diff --git a/web/documentserver-example/java-spring/README.md b/web/documentserver-example/java-spring/README.md index 4f4a6a60b..9dc3c10ef 100755 --- a/web/documentserver-example/java-spring/README.md +++ b/web/documentserver-example/java-spring/README.md @@ -206,13 +206,51 @@ Make sure that the Document Server has access to the server with the example ins ## For Docker -1. Edit the *application.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed ([installation instructions](https://helpcenter.onlyoffice.com/installation/docs-developer-install-docker.aspx)). +### Step 1. Install ONLYOFFICE Docs + +Download and install ONLYOFFICE Docs (packaged as Document Server). + +See the detailed guide to learn how to install Document Server [for Docker](https://helpcenter.onlyoffice.com/installation/docs-developer-install-docker.aspx). + +### Step 2. Install the prerequisites and run the website with the editors + +1. Install **Java** following the instructions [here](https://docs.oracle.com/en/java/javase/20/install/installation-jdk-linux-platforms.html#GUID-737A84E4-2EFF-4D38-8E60-3E29D1B884B8). + +2. Download the archive with the Java-Spring example and unpack the archive or clone git repository: + + a) archive with Java-Spring: + + ``` + wget https://api.onlyoffice.com/app_data/editor/Java%20Spring%20Example.zip + ``` + + ``` + unzip Java\ Spring\ Example.zip + ``` + b) git repository: + ``` + git clone https://github.com/ONLYOFFICE/document-server-integration.git + ``` + + +3. Change the current directory for the project directory: + + a) from archive + + ``` + cd Java\ Spring\ Example/ + ``` + b) from git repository + ``` + cd document-server-integration/web/documentserver-example/java-spring + ``` +4. Edit the *application.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed: ``` nano src/main/resources/application.properties ``` -2. Edit the following lines: +5. Edit the following lines: ``` files.storage= @@ -222,17 +260,23 @@ Make sure that the Document Server has access to the server with the example ins where the **documentserver** is the name of the server with the ONLYOFFICE Docs installed, **port** is any available port and **files.storage** is the path where files will be created and stored (in the project folder by default). You can set an absolute path. -3. Run the next command in the java example directory: +6. Run the next command in the java example directory: ``` docker-compose up ``` -4. Open your browser using **server.address** and **server.port**: +7. Open your browser using **server.address** and **server.port**: ``` http://server.address:server.port/ ``` +### Step 3. Check accessibility + +In case the example and Document Server are installed on different computers, make sure that your server with the example installed has access to the Document Server with the address which you specify instead of **documentserver** in the configuration files. + +Make sure that the Document Server has access to the server with the example installed with the address which you specify instead of **example.com** in the configuration files. + ## Important security info Please keep in mind the following security aspects when you are using test examples: diff --git a/web/documentserver-example/java/README.md b/web/documentserver-example/java/README.md index 05a09a529..708a740e0 100644 --- a/web/documentserver-example/java/README.md +++ b/web/documentserver-example/java/README.md @@ -237,13 +237,39 @@ Make sure that the Document Server has access to the server with the example ins ## For Docker -1. Edit the *settings.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed ([installation instructions](https://helpcenter.onlyoffice.com/installation/docs-developer-install-docker.aspx)). +### Step 1. Install ONLYOFFICE Docs + +Download and install ONLYOFFICE Docs (packaged as Document Server). + +See the detailed guide to learn how to install Document Server [for Docker](https://helpcenter.onlyoffice.com/installation/docs-developer-install-docker.aspx). + +### Step 2. Install the prerequisites and run the website with the editors + +1. Install **Java** following the instructions [here](https://docs.oracle.com/en/java/javase/20/install/installation-jdk-linux-platforms.html#GUID-737A84E4-2EFF-4D38-8E60-3E29D1B884B8). + +2. Download the archive with the Java example and unpack the archive: + + ``` + wget https://api.onlyoffice.com/app_data/editor/Java%20Example.zip + ``` + + ``` + unzip Java\ Example.zip + ``` + +3. Change the current directory for the project directory: + + ``` + cd Java\ Example/ + ``` + +4. Edit the *settings.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed: ``` nano src/main/resources/settings.properties ``` -2. Edit the following lines: +5. Edit the following lines: ``` storage-folder = app_data @@ -252,13 +278,19 @@ Make sure that the Document Server has access to the server with the example ins where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed and the **storage-folder** is the path where files will be created and stored. -3. Run the next command in the Java example directory: +6. Run the next command in the Java example directory: ``` docker-compose up ``` -4. After it, all the *bin* files will be passed to the *./target* folder. +7. After it, all the *bin* files will be passed to the *./target* folder. + +### Step 3. Check accessibility + +In case the example and Document Server are installed on different computers, make sure that your server with the example installed has access to the Document Server with the address which you specify instead of **documentserver** in the configuration files. + +Make sure that the Document Server has access to the server with the example installed with the address which you specify instead of **example.com** in the configuration files. ## Important security info From 651150709327ae1124f76946571ee44d2da2a62c Mon Sep 17 00:00:00 2001 From: Aleksandr Fedorov Date: Thu, 7 Sep 2023 10:23:34 +0300 Subject: [PATCH 013/488] java-spring: added dto/Restore.java --- .../controllers/FileController.java | 22 ++++++------- .../onlyoffice/integration/dto/Restore.java | 33 +++++++++++++++++++ .../src/main/resources/templates/editor.html | 4 +-- 3 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Restore.java diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java index c5259eaed..acc8a856a 100755 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java @@ -27,6 +27,7 @@ import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder; import com.onlyoffice.integration.dto.Converter; import com.onlyoffice.integration.dto.ConvertedData; +import com.onlyoffice.integration.dto.Restore; import com.onlyoffice.integration.dto.Track; import com.onlyoffice.integration.entities.User; import com.onlyoffice.integration.documentserver.models.enums.DocumentType; @@ -540,13 +541,9 @@ public String reference(@RequestBody final JSONObject body) { @PutMapping("/restore") @ResponseBody - public String restore(@RequestBody final JSONObject body) { + public String restore(@RequestBody final Restore body, @CookieValue("uid") final Integer uid) { try { - String sourceBasename = (String) body.get("fileName"); - Integer version = (Integer) body.get("version"); - String userID = (String) body.get("userId"); - - String sourceStringFile = storagePathBuilder.getFileLocation(sourceBasename); + String sourceStringFile = storagePathBuilder.getFileLocation(body.getFileName()); File sourceFile = new File(sourceStringFile); Path sourcePathFile = sourceFile.toPath(); String historyDirectory = storagePathBuilder.getHistoryDir(sourcePathFile.toString()); @@ -564,7 +561,7 @@ public String restore(@RequestBody final JSONObject body) { String bumpedKey = serviceConverter.generateRevisionId( storagePathBuilder.getStorageLocation() + "/" - + sourceBasename + + body.getFileName() + "/" + Long.toString(sourceFile.lastModified()) ); @@ -572,8 +569,7 @@ public String restore(@RequestBody final JSONObject body) { bumpedKeyFileWriter.write(bumpedKey); bumpedKeyFileWriter.close(); - Integer userInnerID = Integer.parseInt(userID.replace("uid-", "")); - User user = userService.findUserById(userInnerID).get(); + User user = userService.findUserById(uid).get(); Path bumpedChangesPathFile = Paths.get(bumpedVersionStringDirectory, "changes.json"); String bumpedChangesStringFile = bumpedChangesPathFile.toString(); @@ -596,13 +592,17 @@ public String restore(@RequestBody final JSONObject body) { bumpedChangesFileWriter.write(bumpedChangesContent); bumpedChangesFileWriter.close(); - String sourceExtension = fileUtility.getFileExtension(sourceBasename); + String sourceExtension = fileUtility.getFileExtension(body.getFileName()); String previousBasename = "prev" + sourceExtension; Path bumpedFile = Paths.get(bumpedVersionStringDirectory, previousBasename); Files.move(sourcePathFile, bumpedFile); - String recoveryVersionStringDirectory = documentManager.versionDir(historyDirectory, version, true); + String recoveryVersionStringDirectory = documentManager.versionDir( + historyDirectory, + body.getVersion(), + true + ); Path recoveryPathFile = Paths.get(recoveryVersionStringDirectory, previousBasename); String recoveryStringFile = recoveryPathFile.toString(); FileInputStream recoveryStream = new FileInputStream(recoveryStringFile); diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Restore.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Restore.java new file mode 100644 index 000000000..ddd6b1408 --- /dev/null +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Restore.java @@ -0,0 +1,33 @@ +/** + * + * (c) Copyright Ascensio System SIA 2023 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.onlyoffice.integration.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +public class Restore { + private String fileName; + private Integer version; +} diff --git a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html index e74424817..b8f9f6376 100755 --- a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html +++ b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html @@ -174,11 +174,9 @@ function onRequestRestore(event) { const query = new URLSearchParams(window.location.search) - const config = [[${model}]] const payload = { fileName: query.get('fileName'), - version: event.data.version, - userId: config.editorConfig.user.id + version: event.data.version } const request = new XMLHttpRequest() request.open('PUT', 'restore') From aa245e2aaeed75772257b20946d3f05d07d882ac Mon Sep 17 00:00:00 2001 From: Aleksandr Fedorov Date: Thu, 7 Sep 2023 10:24:18 +0300 Subject: [PATCH 014/488] java-spring: added dto/Reference.java and dto/ReferenceData.java --- .../controllers/FileController.java | 20 +++++------ .../onlyoffice/integration/dto/Reference.java | 34 +++++++++++++++++++ .../integration/dto/ReferenceData.java | 31 +++++++++++++++++ 3 files changed, 74 insertions(+), 11 deletions(-) create mode 100644 web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Reference.java create mode 100644 web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/ReferenceData.java diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java index acc8a856a..4441df186 100755 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java @@ -27,6 +27,8 @@ import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder; import com.onlyoffice.integration.dto.Converter; import com.onlyoffice.integration.dto.ConvertedData; +import com.onlyoffice.integration.dto.Reference; +import com.onlyoffice.integration.dto.ReferenceData; import com.onlyoffice.integration.dto.Restore; import com.onlyoffice.integration.dto.Track; import com.onlyoffice.integration.entities.User; @@ -75,7 +77,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.Map; import java.util.Optional; @@ -472,7 +473,7 @@ public String rename(@RequestBody final JSONObject body) { @PostMapping("/reference") @ResponseBody - public String reference(@RequestBody final JSONObject body) { + public String reference(@RequestBody final Reference body) { try { JSONParser parser = new JSONParser(); Gson gson = new GsonBuilder().disableHtmlEscaping().create(); @@ -480,12 +481,11 @@ public String reference(@RequestBody final JSONObject body) { String userAddress = ""; String fileName = ""; - if (body.containsKey("referenceData")) { - LinkedHashMap referenceDataObj = (LinkedHashMap) body.get("referenceData"); - String instanceId = (String) referenceDataObj.get("instanceId"); + if (body.getReferenceData() != null) { + ReferenceData referenceData = body.getReferenceData(); - if (instanceId.equals(storagePathBuilder.getServerUrl(false))) { - JSONObject fileKey = (JSONObject) parser.parse((String) referenceDataObj.get("fileKey")); + if (referenceData.getInstanceId().equals(storagePathBuilder.getServerUrl(false))) { + JSONObject fileKey = (JSONObject) parser.parse(referenceData.getFileKey()); userAddress = (String) fileKey.get("userAddress"); if (userAddress.equals(InetAddress.getLocalHost().getHostAddress())) { fileName = (String) fileKey.get("fileName"); @@ -496,7 +496,7 @@ public String reference(@RequestBody final JSONObject body) { if (fileName.equals("")) { try { - String path = (String) body.get("path"); + String path = (String) body.getPath(); path = fileUtility.getFileName(path); File f = new File(storagePathBuilder.getFileLocation(path)); if (f.exists()) { @@ -511,8 +511,6 @@ public String reference(@RequestBody final JSONObject body) { return "{ \"error\": \"File not found\"}"; } - boolean directUrl = (boolean) body.get("directUrl"); - HashMap fileKey = new HashMap<>(); fileKey.put("fileName", fileName); fileKey.put("userAddress", InetAddress.getLocalHost().getHostAddress()); @@ -524,7 +522,7 @@ public String reference(@RequestBody final JSONObject body) { HashMap data = new HashMap<>(); data.put("fileType", fileUtility.getFileExtension(fileName).replace(".", "")); data.put("url", documentManager.getDownloadUrl(fileName, true)); - data.put("directUrl", directUrl ? documentManager.getDownloadUrl(fileName, false) : null); + data.put("directUrl", body.getDirectUrl() ? documentManager.getDownloadUrl(fileName, false) : null); data.put("referenceData", referenceData); data.put("path", fileName); diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Reference.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Reference.java new file mode 100644 index 000000000..705d0d873 --- /dev/null +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Reference.java @@ -0,0 +1,34 @@ +/** + * + * (c) Copyright Ascensio System SIA 2023 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.onlyoffice.integration.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +public class Reference { + private Boolean directUrl; + private ReferenceData referenceData; + private String path; +} diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/ReferenceData.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/ReferenceData.java new file mode 100644 index 000000000..ecd2fdfad --- /dev/null +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/ReferenceData.java @@ -0,0 +1,31 @@ +/** + * + * (c) Copyright Ascensio System SIA 2023 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.onlyoffice.integration.dto; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ReferenceData { + private String fileKey; + private String instanceId; +} From 8c518fd109b6f1a02a20a6a6dd5c740e187019c5 Mon Sep 17 00:00:00 2001 From: Aleksandr Fedorov Date: Thu, 7 Sep 2023 10:24:53 +0300 Subject: [PATCH 015/488] java-spring: added dto/Rename.java --- .../controllers/FileController.java | 20 +++-------- .../onlyoffice/integration/dto/Rename.java | 34 +++++++++++++++++++ .../src/main/resources/templates/editor.html | 6 ++-- 3 files changed, 42 insertions(+), 18 deletions(-) create mode 100644 web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Rename.java diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java index 4441df186..8f695b0c3 100755 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java @@ -29,6 +29,7 @@ import com.onlyoffice.integration.dto.ConvertedData; import com.onlyoffice.integration.dto.Reference; import com.onlyoffice.integration.dto.ReferenceData; +import com.onlyoffice.integration.dto.Rename; import com.onlyoffice.integration.dto.Restore; import com.onlyoffice.integration.dto.Track; import com.onlyoffice.integration.entities.User; @@ -445,25 +446,14 @@ public String saveAs(@RequestBody final JSONObject body, @CookieValue("uid") fin @PostMapping("/rename") @ResponseBody - public String rename(@RequestBody final JSONObject body) { - String newfilename = (String) body.get("newfilename"); - String dockey = (String) body.get("dockey"); - String origExt = "." + (String) body.get("ext"); - String curExt = newfilename; - - if (newfilename.indexOf(".") != -1) { - curExt = (String) fileUtility.getFileExtension(newfilename); - } - - if (origExt.compareTo(curExt) != 0) { - newfilename += origExt; - } + public String rename(@RequestBody final Rename body) { + String fileName = body.getFileName(); HashMap meta = new HashMap<>(); - meta.put("title", newfilename); + meta.put("title", fileName + "." + body.getFileType()); try { - callbackManager.commandRequest("meta", dockey, meta); + callbackManager.commandRequest("meta", body.getFileKey(), meta); return "result ok"; } catch (Exception e) { e.printStackTrace(); diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Rename.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Rename.java new file mode 100644 index 000000000..71c3badb1 --- /dev/null +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Rename.java @@ -0,0 +1,34 @@ +/** + * + * (c) Copyright Ascensio System SIA 2023 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.onlyoffice.integration.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +public class Rename { + private String fileName; + private String fileKey; + private String fileType; +} diff --git a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html index b8f9f6376..87abb539b 100755 --- a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html +++ b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html @@ -147,9 +147,9 @@ var newfilename = event.data; var data = { - newfilename: newfilename, - dockey: config.document.key, - ext: config.document.fileType + fileName: newfilename, + fileKey: config.document.key, + fileType: config.document.fileType }; let xhr = new XMLHttpRequest(); xhr.open("POST", "rename"); From 95579f2376ed9bb14440187a0a34607899a10571 Mon Sep 17 00:00:00 2001 From: Aleksandr Fedorov Date: Thu, 7 Sep 2023 10:25:30 +0300 Subject: [PATCH 016/488] java-spring: added dto/SaveAs.java --- .../controllers/FileController.java | 10 +++--- .../onlyoffice/integration/dto/SaveAs.java | 33 +++++++++++++++++++ 2 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/SaveAs.java diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java index 8f695b0c3..1c4949b77 100755 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java @@ -31,6 +31,7 @@ import com.onlyoffice.integration.dto.ReferenceData; import com.onlyoffice.integration.dto.Rename; import com.onlyoffice.integration.dto.Restore; +import com.onlyoffice.integration.dto.SaveAs; import com.onlyoffice.integration.dto.Track; import com.onlyoffice.integration.entities.User; import com.onlyoffice.integration.documentserver.models.enums.DocumentType; @@ -415,19 +416,16 @@ public String track(final HttpServletRequest request, // track file changes @PostMapping("/saveas") @ResponseBody - public String saveAs(@RequestBody final JSONObject body, @CookieValue("uid") final String uid) { - String title = (String) body.get("title"); - String saveAsFileUrl = (String) body.get("url"); - + public String saveAs(@RequestBody final SaveAs body, @CookieValue("uid") final String uid) { try { - String fileName = documentManager.getCorrectName(title); + String fileName = documentManager.getCorrectName(body.getTitle()); String curExt = fileUtility.getFileExtension(fileName); if (!fileUtility.getFileExts().contains(curExt)) { return "{\"error\":\"File type is not supported\"}"; } - URL url = new URL(saveAsFileUrl); + URL url = new URL(body.getUrl()); java.net.HttpURLConnection connection = (java.net.HttpURLConnection) url.openConnection(); InputStream stream = connection.getInputStream(); diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/SaveAs.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/SaveAs.java new file mode 100644 index 000000000..cfae48cad --- /dev/null +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/SaveAs.java @@ -0,0 +1,33 @@ +/** + * + * (c) Copyright Ascensio System SIA 2023 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.onlyoffice.integration.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +public class SaveAs { + private String title; + private String url; +} From 969a8c6cfe3508b83b48c5f5f147bec1c3fd0899 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Thu, 1 Dec 2022 11:18:20 +0300 Subject: [PATCH 017/488] nodejs: link in referenceData --- CHANGELOG.md | 1 + web/documentserver-example/nodejs/app.js | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c945cdd64..103b29099 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- nodejs: link in referenceData - nodejs: onRequestSelectDocument method - nodejs: onRequestSelectSpreadsheet method - nodejs: onRequestOpen diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js index ba5e40ed9..33c30ea38 100755 --- a/web/documentserver-example/nodejs/app.js +++ b/web/documentserver-example/nodejs/app.js @@ -27,6 +27,7 @@ const jwt = require('jsonwebtoken'); const config = require('config'); const mime = require('mime'); const urllib = require('urllib'); +const urlModule = require("url"); const { emitWarning } = require('process'); const DocManager = require('./helpers/docManager'); const documentService = require('./helpers/documentService'); @@ -498,6 +499,20 @@ app.post('/reference', (req, res) => { // define a handler for renaming file } } + if (!fileName && !!req.body.link) { + if (req.body.link.indexOf(req.DocManager.curUserHostAddress()) != -1) { + result({ error: 'You do not have access to this site' }); + return; + } + + let urlObj = urlModule.parse(req.body.link, true); + fileName = urlObj.query.fileName; + if (!req.DocManager.existsSync(req.DocManager.storagePath(fileName, userAddress))) { + result({ error: 'File is not exist' }); + return; + } + } + if (!fileName && !!req.body.path) { const filePath = fileUtility.getFileName(req.body.path); From 33600df8a9a98f9c280334e46f453e9136cdc632 Mon Sep 17 00:00:00 2001 From: Natalia Date: Mon, 11 Sep 2023 18:57:19 +0300 Subject: [PATCH 018/488] added paths to the config files --- Readme.md | 4 +++- web/documentserver-example/csharp-mvc/README.md | 2 +- web/documentserver-example/java-spring/README.md | 6 +++--- web/documentserver-example/java/README.md | 6 +++--- web/documentserver-example/nodejs/README.md | 2 +- web/documentserver-example/ruby/README.md | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Readme.md b/Readme.md index c7fb0950e..680f1e265 100644 --- a/Readme.md +++ b/Readme.md @@ -11,8 +11,10 @@ You should change `http://documentserver` to your server address in these files: * [.Net (C# MVC)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/csharp-mvc) - `web/documentserver-example/csharp-mvc/web.appsettings.config` * [.Net (C#)](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/csharp) - `web/documentserver-example/csharp/settings.config` * [Java](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/java) - `web/documentserver-example/java/src/main/resources/settings.properties` +* [Java Spring](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/java-spring) - `web/documentserver-example/java-spring/src/main/resources/application.properties` * [Node.js](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/nodejs) - `web/documentserver-example/nodejs/config/default.json` -* [PHP](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/php) - `web/documentserver-example/php/config.php` +* [PHP](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/php) - `web/documentserver-example/php/config.json` +* [Python](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/python) - `web/documentserver-example/python/config.py` * [Ruby](https://github.com/ONLYOFFICE/document-server-integration/tree/master/web/documentserver-example/ruby) - `web/documentserver-example/ruby/config/application.rb` More information on how to use these examples can be found here: [http://api.onlyoffice.com/editors/demopreview](http://api.onlyoffice.com/editors/demopreview "http://api.onlyoffice.com/editors/demopreview") diff --git a/web/documentserver-example/csharp-mvc/README.md b/web/documentserver-example/csharp-mvc/README.md index 3959a2beb..0b849571a 100644 --- a/web/documentserver-example/csharp-mvc/README.md +++ b/web/documentserver-example/csharp-mvc/README.md @@ -14,7 +14,7 @@ See the detailed guide to learn how to install Document Server [for Windows](htt Download the [.Net (C# MVC) example](https://api.onlyoffice.com/editors/demopreview) from our site. -To connect the editors to your website, specify the path to the editors installation and the path to the storage folder in the *settings.config* file: +To connect the editors to your website, specify the path to the editors installation and the path to the storage folder in the *web.appsettings.config* file: ``` diff --git a/web/documentserver-example/java-spring/README.md b/web/documentserver-example/java-spring/README.md index 9dc3c10ef..2419d9949 100755 --- a/web/documentserver-example/java-spring/README.md +++ b/web/documentserver-example/java-spring/README.md @@ -20,7 +20,7 @@ See the detailed guide to learn how to install Document Server [for Windows](htt Download the [Java-Spring example](https://api.onlyoffice.com/editors/demopreview) from our site. -To connect the editors to your website, specify the path to the editors installation, server port and the path to the storage folder in the *\src\main\resources\application.properties* file: +To connect the editors to your website, specify the path to the editors installation, server port and the path to the storage folder in the *src/main/resources/application.properties* file: ``` files.storage= @@ -158,7 +158,7 @@ See the detailed guide to learn how to install Document Server [for Linux](https ``` cd document-server-integration/web/documentserver-example/java-spring ``` -4. Edit the *application.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed. +4. Edit the *src/main/resources/application.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed. ``` nano src/main/resources/application.properties @@ -244,7 +244,7 @@ See the detailed guide to learn how to install Document Server [for Docker](http ``` cd document-server-integration/web/documentserver-example/java-spring ``` -4. Edit the *application.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed: +4. Edit the *src/main/resources/application.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed: ``` nano src/main/resources/application.properties diff --git a/web/documentserver-example/java/README.md b/web/documentserver-example/java/README.md index 708a740e0..fcbdb5c74 100644 --- a/web/documentserver-example/java/README.md +++ b/web/documentserver-example/java/README.md @@ -16,7 +16,7 @@ See the detailed guide to learn how to [install Document Server for Windows](htt Download the [Java example](https://api.onlyoffice.com/editors/demopreview) from our site. -To connect the editors to your website, specify the path to the editors installation and the path to the storage folder in the *\src\main\resources\settings.properties* file: +To connect the editors to your website, specify the path to the editors installation and the path to the storage folder in the *src/main/resources/settings.properties* file: ``` storage-folder = app_data @@ -158,7 +158,7 @@ See the detailed guide to learn how to [install Document Server for Linux](https cd Java\ Example/ ``` -4. Edit the *settings.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed. +4. Edit the *src/main/resources/settings.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed. ``` nano src/main/resources/settings.properties @@ -263,7 +263,7 @@ See the detailed guide to learn how to install Document Server [for Docker](http cd Java\ Example/ ``` -4. Edit the *settings.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed: +4. Edit the *src/main/resources/settings.properties* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed: ``` nano src/main/resources/settings.properties diff --git a/web/documentserver-example/nodejs/README.md b/web/documentserver-example/nodejs/README.md index 8980e48f8..aa82d1e9e 100644 --- a/web/documentserver-example/nodejs/README.md +++ b/web/documentserver-example/nodejs/README.md @@ -110,7 +110,7 @@ See the detailed guide to learn how to [install Document Server for Linux](https npm install ``` -5. Edit the *default.json* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed. +5. Edit the *config/default.json* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed. ``` nano config/default.json diff --git a/web/documentserver-example/ruby/README.md b/web/documentserver-example/ruby/README.md index e52f97bcd..8fb99f2f2 100755 --- a/web/documentserver-example/ruby/README.md +++ b/web/documentserver-example/ruby/README.md @@ -44,7 +44,7 @@ See the detailed guide to learn how to install Document Server [for Windows](htt bundle install ``` -5. Edit the *application.rb* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed. +5. Edit the *config/application.rb* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed. ``` nano config/application.rb From ef53346f165f3e34e47cba4f9f402c20ff132ca1 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Mon, 11 Sep 2023 22:34:11 +0300 Subject: [PATCH 019/488] nodejs: fix lint (6315ccbf45b601c2ed6328d3de3fe7d767a5422a) --- web/documentserver-example/nodejs/app.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js index 33c30ea38..7eec4cea4 100755 --- a/web/documentserver-example/nodejs/app.js +++ b/web/documentserver-example/nodejs/app.js @@ -1,4 +1,4 @@ -/** +/** * * (c) Copyright Ascensio System SIA 2023 * @@ -27,7 +27,7 @@ const jwt = require('jsonwebtoken'); const config = require('config'); const mime = require('mime'); const urllib = require('urllib'); -const urlModule = require("url"); +const urlModule = require('url'); const { emitWarning } = require('process'); const DocManager = require('./helpers/docManager'); const documentService = require('./helpers/documentService'); @@ -500,12 +500,12 @@ app.post('/reference', (req, res) => { // define a handler for renaming file } if (!fileName && !!req.body.link) { - if (req.body.link.indexOf(req.DocManager.curUserHostAddress()) != -1) { + if (req.body.link.indexOf(req.DocManager.curUserHostAddress()) !== -1) { result({ error: 'You do not have access to this site' }); return; } - let urlObj = urlModule.parse(req.body.link, true); + const urlObj = urlModule.parse(req.body.link, true); fileName = urlObj.query.fileName; if (!req.DocManager.existsSync(req.DocManager.storagePath(fileName, userAddress))) { result({ error: 'File is not exist' }); From 45051d2c291f0e6494da020043781c01c561ef5f Mon Sep 17 00:00:00 2001 From: Aleksandr Fedorov Date: Tue, 12 Sep 2023 17:24:29 +0300 Subject: [PATCH 020/488] java: fixed FormatManager --- .../src/main/java/format/FormatManager.java | 158 ++++-------------- .../src/main/java/helpers/FileUtility.java | 17 +- 2 files changed, 43 insertions(+), 132 deletions(-) diff --git a/web/documentserver-example/java/src/main/java/format/FormatManager.java b/web/documentserver-example/java/src/main/java/format/FormatManager.java index 1ae4110b4..8185b2668 100644 --- a/web/documentserver-example/java/src/main/java/format/FormatManager.java +++ b/web/documentserver-example/java/src/main/java/format/FormatManager.java @@ -25,9 +25,11 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +import java.util.stream.Stream; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; @@ -35,66 +37,46 @@ import entities.FileType; public final class FormatManager { - public List fillableExtensions() throws URISyntaxException, - IOException, - JsonSyntaxException { - return this - .fillable() - .stream() - .map(format -> format.extension()) - .collect(Collectors.toList()); + + private List formats; + + public FormatManager() { + formats = this.all(); } - public List fillable() throws URISyntaxException, - IOException, - JsonSyntaxException { - return this - .all() - .stream() - .filter(format -> format.getActions().contains("fill")) - .collect(Collectors.toList()); + + public List getFormats() { + return this.formats; } - public List viewableExtensions() throws URISyntaxException, - IOException, - JsonSyntaxException { + public List getFormatsByAction(String action) { return this - .viewable() - .stream() - .map(format -> format.extension()) - .collect(Collectors.toList()); + .all() + .stream() + .filter(format -> format.getActions().contains(action)) + .collect(Collectors.toList()); } - public List viewable() throws URISyntaxException, - IOException, - JsonSyntaxException { + public List fillableExtensions() { return this - .all() + .getFormatsByAction("fill") .stream() - .filter(format -> format.getActions().contains("view")) + .map(format -> format.extension()) .collect(Collectors.toList()); } - public List editableExtensions() throws URISyntaxException, - IOException, - JsonSyntaxException { + public List viewableExtensions() { return this - .editable() + .getFormatsByAction("view") .stream() .map(format -> format.extension()) .collect(Collectors.toList()); } - public List editable() throws URISyntaxException, - IOException, - JsonSyntaxException { - return this - .all() - .stream() - .filter(format -> ( - format.getActions().contains("edit") - || format.getActions().contains("lossy-edit") - )) + public List editableExtensions() { + return Stream.of(this.getFormatsByAction("edit"), this.getFormatsByAction("edit")) + .flatMap(x -> x.stream()) + .map(format -> format.extension()) .collect(Collectors.toList()); } @@ -112,7 +94,7 @@ public List convertible() throws URISyntaxException, IOException, JsonSyntaxException { return this - .all() + .formats .stream() .filter(format -> ( format.getType() == FileType.Cell && format.getConvert().contains("xlsx") @@ -122,85 +104,19 @@ public List convertible() throws URISyntaxException, .collect(Collectors.toList()); } - public List spreadsheetExtensions() throws URISyntaxException, - IOException, - JsonSyntaxException { - return this - .spreadsheets() - .stream() - .map(format -> format.extension()) - .collect(Collectors.toList()); - } - - public List spreadsheets() throws URISyntaxException, - IOException, - JsonSyntaxException { - return this - .all() - .stream() - .filter(format -> format.getType() == FileType.Cell) - .collect(Collectors.toList()); - } - - public List presentationExtensions() throws URISyntaxException, - IOException, - JsonSyntaxException { - return this - .presentations() - .stream() - .map(format -> format.extension()) - .collect(Collectors.toList()); - } - - public List presentations() throws URISyntaxException, - IOException, - JsonSyntaxException { - return this - .all() - .stream() - .filter(format -> format.getType() == FileType.Slide) - .collect(Collectors.toList()); - } - - public List documentExtensions() throws URISyntaxException, - IOException, - JsonSyntaxException { - return this - .documents() - .stream() - .map(format -> format.extension()) - .collect(Collectors.toList()); - } - - public List documents() throws URISyntaxException, - IOException, - JsonSyntaxException { - return this - .all() - .stream() - .filter(format -> format.getType() == FileType.Word) - .collect(Collectors.toList()); - } - - public List allExtensions() throws URISyntaxException, - IOException, - JsonSyntaxException { - return this - .all() - .stream() - .map(format -> format.extension()) - .collect(Collectors.toList()); - } + private List all() { + try { + Path path = this.file(); + List lines = Files.readAllLines(path, StandardCharsets.UTF_8); + String contents = String.join(System.lineSeparator(), lines); + Gson gson = new Gson(); + Format[] formats = gson.fromJson(contents, Format[].class); + return Arrays.asList(formats); + } catch (Exception e) { + e.printStackTrace(); + } - public List all() throws URISyntaxException, - IOException, - JsonSyntaxException { - Path path = this.file(); - List lines = Files.readAllLines(path, StandardCharsets.UTF_8); - String contents = String.join(System.lineSeparator(), lines); - Gson gson = new Gson(); - Format[] formats = gson.fromJson(contents, Format[].class); - return Arrays.asList(formats); + return new ArrayList<>(); } private Path file() throws URISyntaxException { 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 b353d5774..5a70fef8a 100644 --- a/web/documentserver-example/java/src/main/java/helpers/FileUtility.java +++ b/web/documentserver-example/java/src/main/java/helpers/FileUtility.java @@ -19,10 +19,12 @@ package helpers; import entities.FileType; +import format.Format; import format.FormatManager; import java.net.URL; import java.util.HashMap; +import java.util.List; import java.util.Map; public final class FileUtility { @@ -33,19 +35,12 @@ private FileUtility() { } // get file type public static FileType getFileType(final String fileName) { String ext = getFileExtension(fileName).toLowerCase(); + List formats = FileUtility.formatManager.getFormats(); - try { - if (FileUtility.formatManager.documentExtensions().contains(ext)) { - return FileType.Word; - } - if (FileUtility.formatManager.spreadsheetExtensions().contains(ext)) { - return FileType.Cell; - } - if (FileUtility.formatManager.presentationExtensions().contains(ext)) { - return FileType.Slide; + for (Format format : formats) { + if (format.getName().equals(ext)) { + return format.getType(); } - } catch (Exception error) { - error.printStackTrace(); } // default file type is word From 5f3b0c61ebf018aa30070b94baa304ccb6e032be Mon Sep 17 00:00:00 2001 From: Aleksandr Fedorov Date: Tue, 12 Sep 2023 17:33:52 +0300 Subject: [PATCH 021/488] java: delete submodule document-formats --- .gitmodules | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 96191c4f1..52687a2de 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,10 +30,6 @@ path = web/documentserver-example/java/src/main/resources/assets/document-templates url = https://github.com/ONLYOFFICE/document-templates branch = main/en -[submodule "web/documentserver-example/java/src/main/resources/assets/document-formats"] - path = web/documentserver-example/java/src/main/resources/assets/document-formats - url = https://github.com/ONLYOFFICE/document-formats - branch = master [submodule "web/documentserver-example/ruby/assets/document-templates"] path = web/documentserver-example/ruby/assets/document-templates url = https://github.com/ONLYOFFICE/document-templates From c20687e2412f214881d69c491ed37192bc9a9845 Mon Sep 17 00:00:00 2001 From: Aleksandr Fedorov Date: Tue, 12 Sep 2023 17:34:46 +0300 Subject: [PATCH 022/488] java: added submodule document-formats --- .gitmodules | 4 ++++ .../java/src/main/resources/assets/document-formats | 1 + 2 files changed, 5 insertions(+) create mode 160000 web/documentserver-example/java/src/main/resources/assets/document-formats diff --git a/.gitmodules b/.gitmodules index 52687a2de..eb76cf450 100644 --- a/.gitmodules +++ b/.gitmodules @@ -46,3 +46,7 @@ path = web/documentserver-example/ruby/assets/document-formats url = https://github.com/ONLYOFFICE/document-formats branch = master +[submodule "web/documentserver-example/java/src/main/resources/assets/document-formats"] + path = web/documentserver-example/java/src/main/resources/assets/document-formats + url = https://github.com/ONLYOFFICE/document-formats + branch = master diff --git a/web/documentserver-example/java/src/main/resources/assets/document-formats b/web/documentserver-example/java/src/main/resources/assets/document-formats new file mode 160000 index 000000000..bf21acc76 --- /dev/null +++ b/web/documentserver-example/java/src/main/resources/assets/document-formats @@ -0,0 +1 @@ +Subproject commit bf21acc7666b9ddb64606247f5afb119952f8475 From cb21d73641ce0ea388ee8c55b6f4a387d7ecf170 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Tue, 12 Sep 2023 21:36:09 +0300 Subject: [PATCH 023/488] format to changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 103b29099..9a087d367 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ - nodejs: change reference source - php: using a repo with a list of formats - nodejs: using a repo with a list of formats +- java: using a repo with a list of formats +- python: using a repo with a list of formats +- ruby: using a repo with a list of formats - nodejs: delete file without reloading the page - nodejs: getting history by a separate request - csharp-mvc: getting history by a separate request From 0f3bb28d920ef79a68731fd0acfa7e12ae9cea20 Mon Sep 17 00:00:00 2001 From: Aleksandr Fedorov Date: Wed, 13 Sep 2023 11:17:43 +0300 Subject: [PATCH 024/488] java: added lombok dependency --- .../java/3rd-Party.license | 4 + .../java/licenses/3rd-Party.license | 4 + .../java/licenses/lombok.license | 104 ++++++++++++++++++ web/documentserver-example/java/pom.xml | 6 + 4 files changed, 118 insertions(+) create mode 100644 web/documentserver-example/java/licenses/lombok.license diff --git a/web/documentserver-example/java/3rd-Party.license b/web/documentserver-example/java/3rd-Party.license index 4d1f25a44..6780f1de7 100644 --- a/web/documentserver-example/java/3rd-Party.license +++ b/web/documentserver-example/java/3rd-Party.license @@ -27,3 +27,7 @@ License File: jQuery.UI.license Prime JWT - is intended to be fast and easy to use. Prime JWT has a single external dependency on Jackson. (https://github.com/ws-apps/prime-jwt/blob/master/LICENSE) License: Apache 2.0 License File: prime-jwt.license + +Project Lombok - Spice up your java: Automatic Resource Management, automatic generation of getters, setters, equals, hashCode and toString, and more! (https://projectlombok.org/LICENSE) +License: MIT +License File: lombok.license diff --git a/web/documentserver-example/java/licenses/3rd-Party.license b/web/documentserver-example/java/licenses/3rd-Party.license index 4d1f25a44..48d683afd 100644 --- a/web/documentserver-example/java/licenses/3rd-Party.license +++ b/web/documentserver-example/java/licenses/3rd-Party.license @@ -27,3 +27,7 @@ License File: jQuery.UI.license Prime JWT - is intended to be fast and easy to use. Prime JWT has a single external dependency on Jackson. (https://github.com/ws-apps/prime-jwt/blob/master/LICENSE) License: Apache 2.0 License File: prime-jwt.license + +Project Lombok - Spice up your java: Automatic Resource Management, automatic generation of getters, setters, equals, hashCode and toString, and more! (https://projectlombok.org/LICENSE) +License: MIT +License File: lombok.license \ No newline at end of file diff --git a/web/documentserver-example/java/licenses/lombok.license b/web/documentserver-example/java/licenses/lombok.license new file mode 100644 index 000000000..a80ced429 --- /dev/null +++ b/web/documentserver-example/java/licenses/lombok.license @@ -0,0 +1,104 @@ +Copyright (C) 2009-2021 The Project Lombok Authors. + +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. + +============================================================================== +Licenses for included components: + +org.ow2.asm:asm +org.ow2.asm:asm-analysis +org.ow2.asm:asm-commons +org.ow2.asm:asm-tree +org.ow2.asm:asm-util +ASM: a very small and fast Java bytecode manipulation framework + Copyright (c) 2000-2011 INRIA, France Telecom + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holders nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + THE POSSIBILITY OF SUCH DAMAGE. + +------------------------------------------------------------------------------ +rzwitserloot/com.zwitserloot.cmdreader + + Copyright © 2010 Reinier Zwitserloot. + + 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. + +------------------------------------------------------------------------------ + +projectlombok/lombok.patcher + + Copyright (C) 2009-2021 The Project Lombok Authors. + + 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. + +------------------------------------------------------------------------------ \ No newline at end of file diff --git a/web/documentserver-example/java/pom.xml b/web/documentserver-example/java/pom.xml index 58c555b82..448b93430 100644 --- a/web/documentserver-example/java/pom.xml +++ b/web/documentserver-example/java/pom.xml @@ -36,6 +36,12 @@ prime-jwt 1.3.1 + + org.projectlombok + lombok + 1.18.28 + provided + From 5e2f812fee1d1b90c89a1dfd33bdb4f2d79cedb7 Mon Sep 17 00:00:00 2001 From: Aleksandr Fedorov Date: Wed, 13 Sep 2023 11:24:51 +0300 Subject: [PATCH 025/488] java: refactoring Format.java, FormatManager.java, FileType.java --- .../java/src/main/java/entities/FileType.java | 15 ++++- .../java/src/main/java/format/Format.java | 54 ++++------------ .../src/main/java/format/FormatManager.java | 61 +++++++------------ .../main/java/helpers/DocumentManager.java | 45 ++++---------- .../src/main/java/helpers/FileUtility.java | 2 +- 5 files changed, 57 insertions(+), 120 deletions(-) diff --git a/web/documentserver-example/java/src/main/java/entities/FileType.java b/web/documentserver-example/java/src/main/java/entities/FileType.java index d9c90fc45..57e5710ed 100644 --- a/web/documentserver-example/java/src/main/java/entities/FileType.java +++ b/web/documentserver-example/java/src/main/java/entities/FileType.java @@ -18,8 +18,17 @@ package entities; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; + public enum FileType { - Word, - Cell, - Slide + @JsonProperty("word") + @SerializedName("word") + WORD, + @JsonProperty("cell") + @SerializedName("cell") + CELL, + @JsonProperty("slide") + @SerializedName("slide") + SLIDE } diff --git a/web/documentserver-example/java/src/main/java/format/Format.java b/web/documentserver-example/java/src/main/java/format/Format.java index ffdb08e66..3ed805ec6 100644 --- a/web/documentserver-example/java/src/main/java/format/Format.java +++ b/web/documentserver-example/java/src/main/java/format/Format.java @@ -21,51 +21,19 @@ import java.util.List; import entities.FileType; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +@Getter +@Setter +@ToString public final class Format { - private final String name; - public String getName() { - return this.name; - } + private String name; + private FileType type; + private List actions; + private List convert; + private List mime; - private final FileType type; - - public FileType getType() { - return this.type; - } - - private final List actions; - - public List getActions() { - return this.actions; - } - - private final List convert; - - public List getConvert() { - return this.convert; - } - - private final List mime; - - public List getMime() { - return this.mime; - } - - public Format(final String nameParameter, - final FileType typeParameter, - final List actionsParameter, - final List convertParameter, - final List mimeParameter) { - this.name = nameParameter; - this.type = typeParameter; - this.actions = actionsParameter; - this.convert = convertParameter; - this.mime = mimeParameter; - } - - public String extension() { - return "." + this.name; - } } diff --git a/web/documentserver-example/java/src/main/java/format/FormatManager.java b/web/documentserver-example/java/src/main/java/format/FormatManager.java index 8185b2668..8fac55a2a 100644 --- a/web/documentserver-example/java/src/main/java/format/FormatManager.java +++ b/web/documentserver-example/java/src/main/java/format/FormatManager.java @@ -18,23 +18,18 @@ package format; -import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import com.google.gson.Gson; -import com.google.gson.JsonSyntaxException; - -import entities.FileType; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; public final class FormatManager { @@ -44,12 +39,11 @@ public FormatManager() { formats = this.all(); } - public List getFormats() { return this.formats; } - public List getFormatsByAction(String action) { + public List getFormatsByAction(final String action) { return this .all() .stream() @@ -57,11 +51,19 @@ public List getFormatsByAction(String action) { .collect(Collectors.toList()); } + public List allExtensions() { + return this + .formats + .stream() + .map(format -> format.getName()) + .collect(Collectors.toList()); + } + public List fillableExtensions() { return this .getFormatsByAction("fill") .stream() - .map(format -> format.extension()) + .map(format -> format.getName()) .collect(Collectors.toList()); } @@ -69,49 +71,30 @@ public List viewableExtensions() { return this .getFormatsByAction("view") .stream() - .map(format -> format.extension()) + .map(format -> format.getName()) .collect(Collectors.toList()); } public List editableExtensions() { - return Stream.of(this.getFormatsByAction("edit"), this.getFormatsByAction("edit")) + return Stream.of(this.getFormatsByAction("edit"), this.getFormatsByAction("lossy-edit")) .flatMap(x -> x.stream()) - .map(format -> format.extension()) - .collect(Collectors.toList()); - } - - public List convertibleExtensions() throws URISyntaxException, - IOException, - JsonSyntaxException { - return this - .convertible() - .stream() - .map(format -> format.extension()) + .map(format -> format.getName()) .collect(Collectors.toList()); } - public List convertible() throws URISyntaxException, - IOException, - JsonSyntaxException { + public List autoConvertExtensions() { return this - .formats - .stream() - .filter(format -> ( - format.getType() == FileType.Cell && format.getConvert().contains("xlsx") - || format.getType() == FileType.Slide && format.getConvert().contains("pptx") - || format.getType() == FileType.Word && format.getConvert().contains("docx") - )) - .collect(Collectors.toList()); + .getFormatsByAction("auto-convert") + .stream() + .map(format -> format.getName()) + .collect(Collectors.toList()); } private List all() { try { + ObjectMapper objectMapper = new ObjectMapper(); Path path = this.file(); - List lines = Files.readAllLines(path, StandardCharsets.UTF_8); - String contents = String.join(System.lineSeparator(), lines); - Gson gson = new Gson(); - Format[] formats = gson.fromJson(contents, Format[].class); - return Arrays.asList(formats); + return objectMapper.readValue(Files.readAllBytes(path), new TypeReference>() { }); } catch (Exception e) { e.printStackTrace(); } diff --git a/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java b/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java index 0c6b4de5d..904724888 100755 --- a/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java +++ b/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java @@ -83,49 +83,26 @@ public static long getMaxFileSize() { // get all the supported file extensions public static List getFileExts() { - List res = new ArrayList<>(); - - res.addAll(getViewedExts()); - res.addAll(getEditedExts()); - res.addAll(getConvertExts()); - res.addAll(getFillExts()); - - return res; + return DocumentManager.formatManager.allExtensions(); } public static List getFillExts() { - try { - return DocumentManager.formatManager.fillableExtensions(); - } catch (Exception ex) { - return new ArrayList<>(); - } + return DocumentManager.formatManager.fillableExtensions(); } // get file extensions that can be viewed public static List getViewedExts() { - try { - return DocumentManager.formatManager.viewableExtensions(); - } catch (Exception ex) { - return new ArrayList<>(); - } + return DocumentManager.formatManager.viewableExtensions(); } // get file extensions that can be edited public static List getEditedExts() { - try { - return DocumentManager.formatManager.editableExtensions(); - } catch (Exception ex) { - return new ArrayList<>(); - } + return DocumentManager.formatManager.editableExtensions(); } // get file extensions that can be converted public static List getConvertExts() { - try { - return DocumentManager.formatManager.convertibleExtensions(); - } catch (Exception ex) { - return new ArrayList<>(); - } + return DocumentManager.formatManager.autoConvertExtensions(); } // get current user host address @@ -513,17 +490,17 @@ public static String getDownloadHistoryUrl(final String fileName, final Integer // get an editor internal extension public static String getInternalExtension(final FileType fileType) { // .docx for word file type - if (fileType.equals(FileType.Word)) { + if (fileType.equals(FileType.WORD)) { return ".docx"; } // .xlsx for cell file type - if (fileType.equals(FileType.Cell)) { + if (fileType.equals(FileType.CELL)) { return ".xlsx"; } // .pptx for slide file type - if (fileType.equals(FileType.Slide)) { + if (fileType.equals(FileType.SLIDE)) { return ".pptx"; } @@ -535,17 +512,17 @@ public static String getInternalExtension(final FileType fileType) { public static String getTemplateImageUrl(final FileType fileType) { String path = getServerUrl(true) + "/css/img/"; // for word file type - if (fileType.equals(FileType.Word)) { + if (fileType.equals(FileType.WORD)) { return path + "file_docx.svg"; } // .xlsx for cell file type - if (fileType.equals(FileType.Cell)) { + if (fileType.equals(FileType.CELL)) { return path + "file_xlsx.svg"; } // .pptx for slide file type - if (fileType.equals(FileType.Slide)) { + if (fileType.equals(FileType.SLIDE)) { return path + "file_pptx.svg"; } 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 5a70fef8a..e98446a9e 100644 --- a/web/documentserver-example/java/src/main/java/helpers/FileUtility.java +++ b/web/documentserver-example/java/src/main/java/helpers/FileUtility.java @@ -44,7 +44,7 @@ public static FileType getFileType(final String fileName) { } // default file type is word - return FileType.Word; + return FileType.WORD; } // get file name from the url From 5a63bd47c1c1951d89650ed18528c61e596deea5 Mon Sep 17 00:00:00 2001 From: Aleksandr Fedorov Date: Wed, 13 Sep 2023 11:27:06 +0300 Subject: [PATCH 026/488] java: changed getFileExtension return without dot --- .../src/main/java/controllers/IndexServlet.java | 14 +++++++------- .../java/src/main/java/entities/FileModel.java | 2 +- .../src/main/java/helpers/DocumentManager.java | 4 ++-- .../java/src/main/java/helpers/FileUtility.java | 2 +- .../src/main/java/helpers/ServiceConverter.java | 4 ++-- .../java/src/main/java/helpers/TrackManager.java | 14 +++++++------- .../java/src/main/webapp/index.jsp | 6 +++--- .../java/src/main/webapp/scripts/jscript.js | 8 ++++---- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java index 26206d811..89e01672e 100755 --- a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java +++ b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java @@ -635,7 +635,7 @@ private static void rename(final HttpServletRequest request, String newfilename = (String) body.get("newfilename"); String dockey = (String) body.get("dockey"); - String origExt = "." + (String) body.get("ext"); + String origExt = (String) body.get("ext"); String curExt = newfilename; if (newfilename.indexOf(".") != -1) { @@ -643,7 +643,7 @@ private static void rename(final HttpServletRequest request, } if (origExt.compareTo(curExt) != 0) { - newfilename += origExt; + newfilename += "." + origExt; } HashMap meta = new HashMap<>(); @@ -724,7 +724,7 @@ private static void reference(final HttpServletRequest request, referenceData.put("fileKey", gson.toJson(fileKey)); HashMap data = new HashMap<>(); - data.put("fileType", FileUtility.getFileExtension(fileName).replace(".", "")); + data.put("fileType", FileUtility.getFileExtension(fileName)); data.put("url", DocumentManager.getDownloadUrl(fileName, true)); data.put("directUrl", directUrl ? DocumentManager.getDownloadUrl(fileName, false) : null); data.put("referenceData", referenceData); @@ -805,7 +805,7 @@ private static void restore(final HttpServletRequest request, bumpedChangesFileWriter.close(); String sourceExtension = FileUtility.getFileExtension(sourceBasename); - String previousBasename = "prev" + sourceExtension; + String previousBasename = "prev." + sourceExtension; Path bumpedFile = Paths.get(bumpedVersionStringDirectory, previousBasename); Files.move(sourcePathFile, bumpedFile); @@ -947,16 +947,16 @@ private static void historyData(final HttpServletRequest request, key = DocumentManager.readFileToEnd(new File(verDir + File.separator + "key.txt")); } - dataObj.put("fileType", FileUtility.getFileExtension(fileName).substring(1)); + dataObj.put("fileType", FileUtility.getFileExtension(fileName)); dataObj.put("key", key); dataObj.put("url", i == curVer ? DocumentManager.getDownloadUrl(fileName, true) - : DocumentManager.getDownloadHistoryUrl(fileName, i, "prev" + FileUtility + : DocumentManager.getDownloadHistoryUrl(fileName, i, "prev." + FileUtility .getFileExtension(fileName), true)); if (directUrl.equals("true")) { dataObj.put("directUrl", i == curVer ? DocumentManager.getDownloadUrl(fileName, false) - : DocumentManager.getDownloadHistoryUrl(fileName, i, "prev" + FileUtility + : DocumentManager.getDownloadHistoryUrl(fileName, i, "prev." + FileUtility .getFileExtension(fileName), false)); } diff --git a/web/documentserver-example/java/src/main/java/entities/FileModel.java b/web/documentserver-example/java/src/main/java/entities/FileModel.java index 13e944996..c50c4ad3e 100755 --- a/web/documentserver-example/java/src/main/java/entities/FileModel.java +++ b/web/documentserver-example/java/src/main/java/entities/FileModel.java @@ -63,7 +63,7 @@ public FileModel(final String fileNameParam, document.setDirectUrl(isEnableDirectUrl ? DocumentManager.getDownloadUrl(fileName, false) : ""); // get file extension from the file name - document.setFileType(FileUtility.getFileExtension(fileName).replace(".", "")); + document.setFileType(FileUtility.getFileExtension(fileName)); // generate document key document.setKey(ServiceConverter .generateRevisionId(DocumentManager diff --git a/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java b/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java index 904724888..2e4d5dc13 100755 --- a/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java +++ b/web/documentserver-example/java/src/main/java/helpers/DocumentManager.java @@ -248,12 +248,12 @@ public static int getFileVersion(final String fileName, final String userAddress public static String getCorrectName(final String fileName, final String userAddress) { String baseName = FileUtility.getFileNameWithoutExtension(fileName); String ext = FileUtility.getFileExtension(fileName); - String name = baseName + ext; + String name = baseName + "." + ext; File file = new File(storagePath(name, userAddress)); for (int i = 1; file.exists(); i++) { // run through all the files with such a name in the storage directory - name = baseName + " (" + i + ")" + ext; // and add an index to the base name + name = baseName + " (" + i + ")." + ext; // and add an index to the base name file = new File(storagePath(name, userAddress)); } 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 e98446a9e..1ebc5fd4f 100644 --- a/web/documentserver-example/java/src/main/java/helpers/FileUtility.java +++ b/web/documentserver-example/java/src/main/java/helpers/FileUtility.java @@ -75,7 +75,7 @@ public static String getFileExtension(final String url) { if (fileName == null) { return null; } - String fileExt = fileName.substring(fileName.lastIndexOf(".")); + String fileExt = fileName.substring(fileName.lastIndexOf(".") + 1); return fileExt.toLowerCase(); } diff --git a/web/documentserver-example/java/src/main/java/helpers/ServiceConverter.java b/web/documentserver-example/java/src/main/java/helpers/ServiceConverter.java index de29d42ed..9c76e84f3 100644 --- a/web/documentserver-example/java/src/main/java/helpers/ServiceConverter.java +++ b/web/documentserver-example/java/src/main/java/helpers/ServiceConverter.java @@ -158,8 +158,8 @@ public static Map getConvertedData(final String documentUri, fin ConvertBody body = new ConvertBody(); body.setRegion(lang); body.setUrl(documentUri); - body.setOutputtype(toExtension.replace(".", "")); - body.setFiletype(fromExt.replace(".", "")); + body.setOutputtype(toExtension); + body.setFiletype(fromExt); body.setTitle(title); body.setKey(documentRevId); body.setPassword(filePass); diff --git a/web/documentserver-example/java/src/main/java/helpers/TrackManager.java b/web/documentserver-example/java/src/main/java/helpers/TrackManager.java index 5acddef1c..83fdae5ed 100755 --- a/web/documentserver-example/java/src/main/java/helpers/TrackManager.java +++ b/web/documentserver-example/java/src/main/java/helpers/TrackManager.java @@ -150,7 +150,7 @@ public static void processSave(final JSONObject body, String newFileName = fileName; String curExt = FileUtility.getFileExtension(fileName); // get current file extension - String downloadExt = "." + (String) body.get("filetype"); // get the extension of the downloaded file + String downloadExt = (String) body.get("filetype"); // get the extension of the downloaded file // convert downloaded file to the file with the current extension if these extensions aren't equal if (!curExt.equals(downloadExt)) { @@ -164,13 +164,13 @@ public static void processSave(final JSONObject body, // get the correct file name if it already exists newFileName = DocumentManager .getCorrectName(FileUtility - .getFileNameWithoutExtension(fileName) + downloadExt, userAddress); + .getFileNameWithoutExtension(fileName) + "." + downloadExt, userAddress); } else { downloadUri = newFileUri; } } catch (Exception e) { newFileName = DocumentManager.getCorrectName(FileUtility - .getFileNameWithoutExtension(fileName) + downloadExt, userAddress); + .getFileNameWithoutExtension(fileName) + "." + downloadExt, userAddress); } } @@ -193,7 +193,7 @@ public static void processSave(final JSONObject body, } // get the path to the previous file version and rename the last file version with it - lastVersion.renameTo(new File(versionDir + File.separator + "prev" + curExt)); + lastVersion.renameTo(new File(versionDir + File.separator + "prev." + curExt)); saveFile(byteArrayFile, toSave); // save document file @@ -236,7 +236,7 @@ public static void processForceSave(final JSONObject body, String downloadUri = (String) body.get("url"); String curExt = FileUtility.getFileExtension(fileName); // get current file extension - String downloadExt = "." + (String) body.get("filetype"); // get the extension of the downloaded file + String downloadExt = (String) body.get("filetype"); // get the extension of the downloaded file Boolean newFileName = false; @@ -265,10 +265,10 @@ public static void processForceSave(final JSONObject body, // new file if (newFileName) { fileName = DocumentManager.getCorrectName(FileUtility.getFileNameWithoutExtension(fileName) - + "-form" + downloadExt, userAddress); // get the correct file name if it already exists + + "-form." + downloadExt, userAddress); // get the correct file name if it already exists } else { fileName = DocumentManager.getCorrectName(FileUtility.getFileNameWithoutExtension(fileName) - + "-form" + curExt, userAddress); + + "-form." + curExt, userAddress); } forcesavePath = DocumentManager.storagePath(fileName, userAddress); } else { diff --git a/web/documentserver-example/java/src/main/webapp/index.jsp b/web/documentserver-example/java/src/main/webapp/index.jsp index ca1dbab6d..2a95a6f6a 100755 --- a/web/documentserver-example/java/src/main/webapp/index.jsp +++ b/web/documentserver-example/java/src/main/webapp/index.jsp @@ -367,9 +367,9 @@ From f096fd4d93e59c3497ebce774362c6f51f9639a1 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Mon, 23 Oct 2023 18:02:51 +0300 Subject: [PATCH 143/488] nodejs: fix mobile size for chrome on iOS (Fix Bug 59054) --- web/documentserver-example/nodejs/views/editor.ejs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/documentserver-example/nodejs/views/editor.ejs b/web/documentserver-example/nodejs/views/editor.ejs index 5d3ae7d86..7fccec98b 100644 --- a/web/documentserver-example/nodejs/views/editor.ejs +++ b/web/documentserver-example/nodejs/views/editor.ejs @@ -336,11 +336,18 @@ } }; + var onDocumentReady = function(){ + if (config.type === "mobile") { + document.getElementsByTagName("iframe")[0].style.height = window.innerHeight + "px"; + } + }; + config = { <%- include("config") %> }; config.events = { "onAppReady": onAppReady, + "onDocumentReady": fixSize, "onDocumentStateChange": onDocumentStateChange, "onError": onError, "onOutdatedVersion": onOutdatedVersion, From 304995c3e1331dd6d364e6106f782acbedd054f9 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Tue, 24 Oct 2023 11:23:55 +0700 Subject: [PATCH 144/488] flake8: E501 line too long (> 120 characters) --- .../python/src/utils/docManager.py | 33 +++++-- .../python/src/utils/historyManager.py | 20 ++-- .../python/src/utils/serviceConverter.py | 8 +- .../python/src/utils/trackManager.py | 37 +++++--- .../python/src/utils/users.py | 6 +- .../python/src/views/actions.py | 92 +++++++++++++------ .../python/src/views/index.py | 3 +- 7 files changed, 133 insertions(+), 66 deletions(-) diff --git a/web/documentserver-example/python/src/utils/docManager.py b/web/documentserver-example/python/src/utils/docManager.py index 6bce2312a..3bc74a582 100755 --- a/web/documentserver-example/python/src/utils/docManager.py +++ b/web/documentserver-example/python/src/utils/docManager.py @@ -205,13 +205,22 @@ def getStoredFiles(req): directory = getRootFolder(req) files = os.listdir(directory) - files.sort(key=lambda x: os.path.getmtime(os.path.join(directory, x)), reverse=True) # sort files by time of last modification + + # sort files by time of last modification + files.sort(key=lambda x: os.path.getmtime(os.path.join(directory, x)), reverse=True) fileInfos = [] for f in files: if os.path.isfile(os.path.join(directory, f)): - fileInfos.append({'isFillFormDoc': isCanFillForms(fileUtils.getFileExt(f)), 'version': historyManager.getFileVersion(historyManager.getHistoryDir(getStoragePath(f, req))), 'type': fileUtils.getFileType(f), 'title': f, 'url': getFileUri(f, True, req), 'canEdit': isCanEdit(fileUtils.getFileExt(f))}) # write information about file type, title and url + fileInfos.append({ + 'isFillFormDoc': isCanFillForms(fileUtils.getFileExt(f)), + 'version': historyManager.getFileVersion(historyManager.getHistoryDir(getStoragePath(f, req))), + 'type': fileUtils.getFileType(f), + 'title': f, + 'url': getFileUri(f, True, req), + 'canEdit': isCanEdit(fileUtils.getFileExt(f)) + }) # write information about file type, title and url return fileInfos @@ -258,11 +267,12 @@ def createSample(fileType, sample, req): sample = 'false' sampleName = 'sample' if sample == 'true' else 'new' # create sample or new template - - filename = getCorrectName(f'{sampleName}{ext}', req) # get file name with an index if such a file name already exists + # get file name with an index if such a file name already exists + filename = getCorrectName(f'{sampleName}{ext}', req) path = getStoragePath(filename, req) - - with io.open(os.path.join('assets', 'document-templates', 'sample' if sample == 'true' else 'new', f'{sampleName}{ext}'), 'rb') as stream: # create sample file of the necessary extension in the directory + # create sample file of the necessary extension in the directory + with io.open(os.path.join('assets', 'document-templates', 'sample' if sample == 'true' else 'new', + f'{sampleName}{ext}'), 'rb') as stream: createFile(stream, path, req, True) return filename @@ -282,8 +292,8 @@ def generateFileKey(filename, req): path = getStoragePath(filename, req) uri = getFileUri(filename, False, req) stat = os.stat(path) # get the directory parameters - - h = str(hash(f'{uri}_{stat.st_mtime_ns}')) # get the hash value of the file url and the date of its last modification and turn it into a string format + # get the hash value of the file url and the date of its last modification and turn it into a string format + h = str(hash(f'{uri}_{stat.st_mtime_ns}')) replaced = re.sub(r'[^0-9-.a-zA-Z_=]', '_', h) return replaced[:20] # take the first 20 characters for the key @@ -307,7 +317,9 @@ def getFilesInfo(req): stats = os.stat(os.path.join(getRootFolder(req), f.get("title"))) # get file information result.append( # write file parameters to the file object { - "version": historyManager.getFileVersion(historyManager.getHistoryDir(getStoragePath(f.get("title"), req))), + "version": historyManager.getFileVersion(historyManager.getHistoryDir( + getStoragePath(f.get("title"), req) + )), "id": generateFileKey(f.get("title"), req), "contentLength": "%.2f KB" % (stats.st_size/1024), "pureContentLength": stats.st_size, @@ -331,7 +343,8 @@ def getFilesInfo(req): def download(filePath): response = FileResponse(open(filePath, 'rb'), True) # write headers to the response object response['Content-Length'] = os.path.getsize(filePath) - response['Content-Disposition'] = "attachment;filename*=UTF-8\'\'" + urllib.parse.quote_plus(os.path.basename(filePath)) + response['Content-Disposition'] = "attachment;filename*=UTF-8\'\'" + \ + urllib.parse.quote_plus(os.path.basename(filePath)) response['Content-Type'] = magic.from_file(filePath, mime=True) response['Access-Control-Allow-Origin'] = "*" return response diff --git a/web/documentserver-example/python/src/utils/historyManager.py b/web/documentserver-example/python/src/utils/historyManager.py index 8381cb070..b39022665 100644 --- a/web/documentserver-example/python/src/utils/historyManager.py +++ b/web/documentserver-example/python/src/utils/historyManager.py @@ -188,16 +188,21 @@ def getHistoryObject(storagePath, filename, docKey, docUrl, isEnableDirectUrl, r 'id': meta['uid'], 'name': meta['uname'] } - - dataObj['url'] = docUrl if i == version else getPublicHistUri(filename, i, "prev" + fileUtils.getFileExt(filename), req) # write file url to the data object + # write file url to the data object + dataObj['url'] = docUrl if i == version else getPublicHistUri( + filename, i, "prev" + fileUtils.getFileExt(filename), req + ) if isEnableDirectUrl: - dataObj['directUrl'] = docManager.getDownloadUrl(filename, req, False) if i == version else getPublicHistUri(filename, i, "prev" + fileUtils.getFileExt(filename), req, False) # write file direct url to the data object + # write file direct url to the data object + dataObj['directUrl'] = docManager.getDownloadUrl(filename, req, False) if i == version \ + else getPublicHistUri(filename, i, "prev" + fileUtils.getFileExt(filename), req, False) if i > 1: # check if the version number is greater than 1 (the file was modified) - changes = json.loads(readFile(getChangesHistoryPath(prevVerDir))) # get the path to the changes.json file + # get the path to the changes.json file + changes = json.loads(readFile(getChangesHistoryPath(prevVerDir))) change = changes['changes'][0] - - obj['changes'] = changes['changes'] if change else None # write information about changes to the object + # write information about changes to the object + obj['changes'] = changes['changes'] if change else None obj['serverVersion'] = changes['serverVersion'] obj['created'] = change['created'] if change else None obj['user'] = change['user'] if change else None @@ -214,7 +219,8 @@ def getHistoryObject(storagePath, filename, docKey, docUrl, isEnableDirectUrl, r 'url': prev['url'] } dataObj['previous'] = prevInfo # write information about previous file version to the data object - dataObj['changesUrl'] = getPublicHistUri(filename, i - 1, "diff.zip", req) # write the path to the diff.zip archive with differences in this file version + # write the path to the diff.zip archive with differences in this file version + dataObj['changesUrl'] = getPublicHistUri(filename, i - 1, "diff.zip", req) if jwtManager.isEnabled(): dataObj['token'] = jwtManager.encode(dataObj) diff --git a/web/documentserver-example/python/src/utils/serviceConverter.py b/web/documentserver-example/python/src/utils/serviceConverter.py index 566ec339e..a533ea170 100755 --- a/web/documentserver-example/python/src/utils/serviceConverter.py +++ b/web/documentserver-example/python/src/utils/serviceConverter.py @@ -49,9 +49,11 @@ def getConvertedData(docUri, fromExt, toExt, docKey, isAsync, filePass=None, lan if (jwtManager.isEnabled() and jwtManager.useForRequest()): # check if a secret key to generate token exists or not headerToken = jwtManager.encode({'payload': payload}) # encode a payload object into a header token payload['token'] = jwtManager.encode(payload) # encode a payload object into a body token - headers[config_manager.jwt_header()] = f'Bearer {headerToken}' # add a header Authorization with a header token with Authorization prefix in it - - response = requests.post(config_manager.document_server_converter_url().geturl(), json=payload, headers=headers, verify=config_manager.ssl_verify_peer_mode_enabled(), timeout=5) # send the headers and body values to the converter and write the result to the response + # add a header Authorization with a header token with Authorization prefix in it + headers[config_manager.jwt_header()] = f'Bearer {headerToken}' + # send the headers and body values to the converter and write the result to the response + response = requests.post(config_manager.document_server_converter_url().geturl(), json=payload, headers=headers, + verify=config_manager.ssl_verify_peer_mode_enabled(), timeout=5) status_code = response.status_code if status_code != 200: # checking status code raise RuntimeError('Convertation service returned status: %s' % status_code) diff --git a/web/documentserver-example/python/src/utils/trackManager.py b/web/documentserver-example/python/src/utils/trackManager.py index 37327ada5..feb4eaaa5 100755 --- a/web/documentserver-example/python/src/utils/trackManager.py +++ b/web/documentserver-example/python/src/utils/trackManager.py @@ -66,9 +66,12 @@ def processSave(raw_body, filename, usAddr): # convert downloaded file to the file with the current extension if these extensions aren't equal if (curExt != downloadExt): try: - convertedData = serviceConverter.getConvertedData(download, downloadExt, curExt, docManager.generateRevisionId(download), False) # convert file and give url to a new file + # convert file and give url to a new file + convertedData = serviceConverter.getConvertedData(download, downloadExt, curExt, + docManager.generateRevisionId(download), False) if not convertedData: - newFilename = docManager.getCorrectName(fileUtils.getFileNameWithoutExt(filename) + downloadExt, usAddr) # get the correct file name if it already exists + newFilename = docManager.getCorrectName(fileUtils.getFileNameWithoutExt(filename) + downloadExt, + usAddr) # get the correct file name if it already exists else: download = convertedData['uri'] except Exception: @@ -86,25 +89,28 @@ def processSave(raw_body, filename, usAddr): versionDir = historyManager.getNextVersionDir(histDir) # get the path to the next file version - os.rename(docManager.getStoragePath(filename, usAddr), historyManager.getPrevFilePath(versionDir, curExt)) # get the path to the previous file version and rename the storage path with it + # get the path to the previous file version and rename the storage path with it + os.rename(docManager.getStoragePath(filename, usAddr), historyManager.getPrevFilePath(versionDir, curExt)) docManager.saveFile(data, path) # save document file dataChanges = docManager.downloadFileFromUri(changesUri) # download changes file if (dataChanges is None): raise Exception("Downloaded changes is null") - docManager.saveFile(dataChanges, historyManager.getChangesZipPath(versionDir)) # save file changes to the diff.zip archive + # save file changes to the diff.zip archive + docManager.saveFile(dataChanges, historyManager.getChangesZipPath(versionDir)) hist = None hist = body.get('changeshistory') if (not hist) & ('history' in body): hist = json.dumps(body.get('history')) if hist: - historyManager.writeFile(historyManager.getChangesHistoryPath(versionDir), hist) # write the history changes to the changes.json file - - historyManager.writeFile(historyManager.getKeyPath(versionDir), body.get('key')) # write the key value to the key.txt file - - forcesavePath = docManager.getForcesavePath(newFilename, usAddr, False) # get the path to the forcesaved file version + # write the history changes to the changes.json file + historyManager.writeFile(historyManager.getChangesHistoryPath(versionDir), hist) + # write the key value to the key.txt file + historyManager.writeFile(historyManager.getKeyPath(versionDir), body.get('key')) + # get the path to the forcesaved file version + forcesavePath = docManager.getForcesavePath(newFilename, usAddr, False) if (forcesavePath != ""): # if the forcesaved file version exists os.remove(forcesavePath) # remove it @@ -125,7 +131,9 @@ def processForceSave(body, filename, usAddr): # convert downloaded file to the file with the current extension if these extensions aren't equal if (curExt != downloadExt): try: - convertedData = serviceConverter.getConvertedData(download, downloadExt, curExt, docManager.generateRevisionId(download), False) # convert file and give url to a new file + # convert file and give url to a new file + convertedData = serviceConverter.getConvertedData(download, downloadExt, curExt, + docManager.generateRevisionId(download), False) if not convertedData: newFilename = True else: @@ -141,7 +149,8 @@ def processForceSave(body, filename, usAddr): if (isSubmitForm): if (newFilename): - filename = docManager.getCorrectName(fileUtils.getFileNameWithoutExt(filename) + "-form" + downloadExt, usAddr) # get the correct file name if it already exists + filename = docManager.getCorrectName(fileUtils.getFileNameWithoutExt(filename) + "-form" + downloadExt, + usAddr) # get the correct file name if it already exists else: filename = docManager.getCorrectName(fileUtils.getFileNameWithoutExt(filename) + "-form" + curExt, usAddr) forcesavePath = docManager.getStoragePath(filename, usAddr) @@ -174,10 +183,12 @@ def commandRequest(method, key, meta=None): if (jwtManager.isEnabled() and jwtManager.useForRequest()): # check if a secret key to generate token exists or not headerToken = jwtManager.encode({'payload': payload}) # encode a payload object into a header token - headers[config_manager.jwt_header()] = f'Bearer {headerToken}' # add a header Authorization with a header token with Authorization prefix in it + # add a header Authorization with a header token with Authorization prefix in it + headers[config_manager.jwt_header()] = f'Bearer {headerToken}' payload['token'] = jwtManager.encode(payload) # encode a payload object into a body token - response = requests.post(config_manager.document_server_command_url().geturl(), json=payload, headers=headers, verify=config_manager.ssl_verify_peer_mode_enabled()) + response = requests.post(config_manager.document_server_command_url().geturl(), json=payload, headers=headers, + verify=config_manager.ssl_verify_peer_mode_enabled()) if (meta): return response diff --git a/web/documentserver-example/python/src/utils/users.py b/web/documentserver-example/python/src/utils/users.py index d731c785a..45c12f327 100644 --- a/web/documentserver-example/python/src/utils/users.py +++ b/web/documentserver-example/python/src/utils/users.py @@ -20,7 +20,8 @@ class User: - def __init__(self, id, name, email, group, reviewGroups, commentGroups, userInfoGroups, favorite, deniedPermissions, descriptions, templates): + def __init__(self, id, name, email, group, reviewGroups, commentGroups, userInfoGroups, favorite, deniedPermissions, + descriptions, templates): self.id = id self.name = name self.email = email @@ -47,7 +48,8 @@ def __init__(self, id, name, email, group, reviewGroups, commentGroups, userInfo descr_user_2 = [ "Belongs to Group2", "Can review only his own changes or changes made by users with no group", - "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only", + ("Can view comments, edit his own comments and comments left by users with no group." + "Can remove his own comments only"), "This file is marked as favorite", "Can create new files from the editor", "Can see the information about users from Group2 and users who don’t belong to any group" diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py index 8f0093347..7e30e2900 100755 --- a/web/documentserver-example/python/src/views/actions.py +++ b/web/documentserver-example/python/src/views/actions.py @@ -39,17 +39,20 @@ def upload(request): try: fileInfo = request.FILES['uploadedFile'] - if ((fileInfo.size > config_manager.maximum_file_size()) | (fileInfo.size <= 0)): # check if the file size exceeds the maximum size allowed (5242880) + # check if the file size exceeds the maximum size allowed (5242880) + if ((fileInfo.size > config_manager.maximum_file_size()) | (fileInfo.size <= 0)): raise Exception('File size is incorrect') curExt = fileUtils.getFileExt(fileInfo.name) if not docManager.isSupportedExt(curExt): # check if the file extension is supported by the document manager raise Exception('File type is not supported') - name = docManager.getCorrectName(fileInfo.name, request) # get file name with an index if such a file name already exists + # get file name with an index if such a file name already exists + name = docManager.getCorrectName(fileInfo.name, request) path = docManager.getStoragePath(name, request) - docManager.createFile(fileInfo.file, path, request, True) # create file with meta information in the storage directory + # create file with meta information in the storage directory + docManager.createFile(fileInfo.file, path, request, True) response.setdefault('filename', name) response.setdefault('documentType', fileUtils.getFileType(name)) @@ -76,19 +79,25 @@ def convert(request): if docManager.isCanConvert(fileExt): # check if the file extension is available for converting key = docManager.generateFileKey(filename, request) # generate the file key - convertedData = serviceConverter.getConvertedData(fileUri, fileExt, newExt, key, True, filePass, lang) # get the url of the converted file + # get the url of the converted file + convertedData = serviceConverter.getConvertedData(fileUri, fileExt, newExt, key, True, filePass, lang) - if not convertedData: # if the converter url is not received, the original file name is passed to the response + # if the converter url is not received, the original file name is passed to the response + if not convertedData: response.setdefault('step', '0') response.setdefault('filename', filename) else: - correctName = docManager.getCorrectName(fileUtils.getFileNameWithoutExt(filename) + '.' + convertedData['fileType'], request) # otherwise, create a new name with the necessary extension + correctName = docManager.getCorrectName( + fileUtils.getFileNameWithoutExt(filename) + '.' + convertedData['fileType'], request + ) # otherwise, create a new name with the necessary extension path = docManager.getStoragePath(correctName, request) - docManager.downloadFileFromUri(convertedData['uri'], path, True) # save the file from the new url in the storage directory + # save the file from the new url in the storage directory + docManager.downloadFileFromUri(convertedData['uri'], path, True) docManager.removeFile(filename, request) # remove the original file response.setdefault('filename', correctName) # pass the name of the converted file to the response else: - response.setdefault('filename', filename) # if the file can't be converted, the original file name is passed to the response + # if the file can't be converted, the original file name is passed to the response + response.setdefault('filename', filename) except Exception as e: response.setdefault('error', e.args[0]) @@ -127,7 +136,8 @@ def saveAs(request): path = docManager.getStoragePath(filename, request) resp = requests.get(saveAsFileUrl, verify=config_manager.ssl_verify_peer_mode_enabled()) - if ((len(resp.content) > config_manager.maximum_file_size()) | (len(resp.content) <= 0)): # check if the file size exceeds the maximum size allowed (5242880) + # check if the file size exceeds the maximum size allowed (5242880) + if ((len(resp.content) > config_manager.maximum_file_size()) | (len(resp.content) <= 0)): response.setdefault('error', 'File size is incorrect') raise Exception('File size is incorrect') @@ -136,7 +146,8 @@ def saveAs(request): response.setdefault('error', 'File type is not supported') raise Exception('File type is not supported') - docManager.downloadFileFromUri(saveAsFileUrl, path, True) # save the file from the new url in the storage directory + # save the file from the new url in the storage directory + docManager.downloadFileFromUri(saveAsFileUrl, path, True) response.setdefault('file', filename) except Exception as e: @@ -181,18 +192,22 @@ def edit(request): fileType = fileUtils.getFileType(filename) user = users.getUserFromReq(request) # get user - edMode = request.GET.get('mode') if request.GET.get('mode') else 'edit' # get the editor mode: view/edit/review/comment/fillForms/embedded (the default mode is edit) + # get the editor mode: view/edit/review/comment/fillForms/embedded (the default mode is edit) + edMode = request.GET.get('mode') if request.GET.get('mode') else 'edit' canEdit = docManager.isCanEdit(ext) # check if the file with this extension can be edited if (((not canEdit) and edMode == 'edit') or edMode == 'fillForms') and docManager.isCanFillForms(ext): edMode = 'fillForms' canEdit = True - submitForm = edMode == 'fillForms' and user.id == 'uid-1' and False # if the Submit form button is displayed or hidden + # if the Submit form button is displayed or hidden + submitForm = edMode == 'fillForms' and user.id == 'uid-1' and False mode = 'edit' if canEdit & (edMode != 'view') else 'view' # if the file can't be edited, the mode is view types = ['desktop', 'mobile', 'embedded'] - edType = request.GET.get('type') if request.GET.get('type') in types else 'desktop' # get the editor type: embedded/mobile/desktop (the default type is desktop) - lang = request.COOKIES.get('ulang') if request.COOKIES.get('ulang') else 'en' # get the editor language (the default language is English) + # get the editor type: embedded/mobile/desktop (the default type is desktop) + edType = request.GET.get('type') if request.GET.get('type') in types else 'desktop' + # get the editor language (the default language is English) + lang = request.COOKIES.get('ulang') if request.COOKIES.get('ulang') else 'en' storagePath = docManager.getStoragePath(filename, request) meta = historyManager.getMeta(storagePath) # get the document meta data @@ -201,7 +216,8 @@ def edit(request): actionData = request.GET.get('actionLink') # get the action data that will be scrolled to (comment or bookmark) actionLink = json.loads(actionData) if actionData else None - templatesImageUrl = docManager.getTemplateImageUrl(fileType, request) # templates image url in the "From Template" section + # templates image url in the "From Template" section + templatesImageUrl = docManager.getTemplateImageUrl(fileType, request) createUrl = docManager.getCreateUrl(edType, request) templates = [ { @@ -239,12 +255,15 @@ def edit(request): 'key': docKey, 'info': infObj, 'permissions': { # the permission for the document to be edited and downloaded or not - 'comment': (edMode != 'view') & (edMode != 'fillForms') & (edMode != 'embedded') & (edMode != "blockcontent"), + 'comment': (edMode != 'view') & (edMode != 'fillForms') & (edMode != 'embedded') \ + & (edMode != "blockcontent"), 'copy': 'copy' not in user.deniedPermissions, 'download': 'download' not in user.deniedPermissions, - 'edit': canEdit & ((edMode == 'edit') | (edMode == 'view') | (edMode == 'filter') | (edMode == "blockcontent")), + 'edit': canEdit & ((edMode == 'edit') | (edMode == 'view') | (edMode == 'filter') \ + | (edMode == "blockcontent")), 'print': 'print' not in user.deniedPermissions, - 'fillForms': (edMode != 'view') & (edMode != 'comment') & (edMode != 'embedded') & (edMode != "blockcontent"), + 'fillForms': (edMode != 'view') & (edMode != 'comment') & (edMode != 'embedded') \ + & (edMode != "blockcontent"), 'modifyFilter': edMode != 'filter', 'modifyContentControl': edMode != "blockcontent", 'review': canEdit & ((edMode == 'edit') | (edMode == 'review')), @@ -256,7 +275,8 @@ def edit(request): }, 'referenceData': { 'instanceId': docManager.getServerUrl(False, request), - 'fileKey': json.dumps({'fileName': filename, 'userAddress': request.META['REMOTE_ADDR']}) if user.id != 'uid-0' else None + 'fileKey': json.dumps({'fileName': filename, + 'userAddress': request.META['REMOTE_ADDR']}) if user.id != 'uid-0' else None } }, 'editorConfig': { @@ -277,8 +297,10 @@ def edit(request): 'group': user.group }, 'embedded': { # the parameters for the embedded document type - 'saveUrl': directUrl, # the absolute URL that will allow the document to be saved onto the user personal computer - 'embedUrl': directUrl, # the absolute URL to the document serving as a source file for the document embedded into the web page + # the absolute URL that will allow the document to be saved onto the user personal computer + 'saveUrl': directUrl, + # the absolute URL to the document serving as a source file for the document embedded into the web page + 'embedUrl': directUrl, 'shareUrl': directUrl, # the absolute URL that will allow other users to share this document 'toolbarDocked': 'top' # the place for the embedded viewer toolbar (top or bottom) }, @@ -289,7 +311,9 @@ def edit(request): 'forcesave': False, # adds the request for the forced file saving to the callback handler 'submitForm': submitForm, # if the Submit form button is displayed or not 'goback': { # settings for the Open file location menu button and upper right corner button - 'url': docManager.getServerUrl(False, request) # the absolute URL to the website address which will be opened when clicking the Open file location menu button + # the absolute URL to the website address + # which will be opened when clicking the Open file location menu button + 'url': docManager.getServerUrl(False, request) } } } @@ -334,15 +358,19 @@ def edit(request): dataDocument['token'] = jwtManager.encode(dataDocument) # encode the dataDocument object into a token dataSpreadsheet['token'] = jwtManager.encode(dataSpreadsheet) # encode the dataSpreadsheet object into a token - hist = historyManager.getHistoryObject(storagePath, filename, docKey, fileUri, isEnableDirectUrl, request) # get the document history + # get the document history + hist = historyManager.getHistoryObject(storagePath, filename, docKey, fileUri, isEnableDirectUrl, request) context = { # the data that will be passed to the template 'cfg': json.dumps(edConfig), # the document config in json format - 'history': json.dumps(hist['history']) if 'history' in hist else None, # the information about the current version - 'historyData': json.dumps(hist['historyData']) if 'historyData' in hist else None, # the information about the previous document versions if they exist + # the information about the current version + 'history': json.dumps(hist['history']) if 'history' in hist else None, + # the information about the previous document versions if they exist + 'historyData': json.dumps(hist['historyData']) if 'historyData' in hist else None, 'fileType': fileType, # the file type of the document (text, spreadsheet or presentation) 'apiUrl': config_manager.document_server_api_url().geturl(), # the absolute URL to the api - 'dataInsertImage': json.dumps(dataInsertImage)[1: len(json.dumps(dataInsertImage)) - 1], # the image which will be inserted into the document + # the image which will be inserted into the document + 'dataInsertImage': json.dumps(dataInsertImage)[1: len(json.dumps(dataInsertImage)) - 1], 'dataDocument': dataDocument, # document which will be compared with the current document 'dataSpreadsheet': json.dumps(dataSpreadsheet), # recipient data for mail merging 'usersForMentions': json.dumps(usersForMentions) if user.id != 'uid-0' else None @@ -362,7 +390,8 @@ def track(request): if (body['actions'] and body['actions'][0]['type'] == 0): # finished edit user = body['actions'][0]['userid'] # the user who finished editing if (user not in body['users']): - trackManager.commandRequest('forcesave', body['key']) # create a command request with the forcasave method + # create a command request with the forcasave method + trackManager.commandRequest('forcesave', body['key']) filename = fileUtils.getFileName(request.GET['filename']) usAddr = request.GET['userAddress'] @@ -373,12 +402,14 @@ def track(request): trackManager.processForceSave(body, filename, usAddr) except Exception as e: - response.setdefault("error", 1) # set the default error value as 1 (document key is missing or no document with such key could be found) + # set the default error value as 1 (document key is missing or no document with such key could be found) + response.setdefault("error", 1) response.setdefault("message", str(e.args[0])) response.setdefault('error', 0) # if no exceptions are raised, the default error value is 0 (no errors) # the response status is 200 if the changes are saved successfully; otherwise, it is equal to 500 - return HttpResponse(json.dumps(response), content_type='application/json', status=200 if response['error'] == 0 else 500) + return HttpResponse(json.dumps(response), content_type='application/json', + status=200 if response['error'] == 0 else 500) # remove a file @@ -430,7 +461,8 @@ def download(request): if (userAddress is None): userAddress = request - filePath = docManager.getForcesavePath(fileName, userAddress, False) # get the path to the forcesaved file version + # get the path to the forcesaved file version + filePath = docManager.getForcesavePath(fileName, userAddress, False) if (filePath == ""): filePath = docManager.getStoragePath(fileName, userAddress) # get file from the storage directory response = docManager.download(filePath) # download this file diff --git a/web/documentserver-example/python/src/views/index.py b/web/documentserver-example/python/src/views/index.py index 4f6b508f5..3ef9cf3e4 100755 --- a/web/documentserver-example/python/src/views/index.py +++ b/web/documentserver-example/python/src/views/index.py @@ -47,4 +47,5 @@ def default(request): # default parameters that will be passed to the template 'fillExt': json.dumps(format_manager.fillable_extensions()), 'directUrl': str(getDirectUrlParam(request)).lower } - return render(request, 'index.html', context) # execute the "index.html" template with context data and return http response in json format + # execute the "index.html" template with context data and return http response in json format + return render(request, 'index.html', context) From feaa30bf2dbf38554e613fdc193e6bacd6e4554e Mon Sep 17 00:00:00 2001 From: sshakndr Date: Tue, 24 Oct 2023 12:36:22 +0700 Subject: [PATCH 145/488] pylint: C0325: Unnecessary parens --- .../python/src/utils/docManager.py | 4 +-- .../python/src/utils/serviceConverter.py | 2 +- .../python/src/utils/trackManager.py | 36 +++++++++---------- .../python/src/utils/users.py | 2 +- .../python/src/views/actions.py | 18 +++++----- .../python/src/views/index.py | 2 +- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/web/documentserver-example/python/src/utils/docManager.py b/web/documentserver-example/python/src/utils/docManager.py index 3bc74a582..8a122a2cb 100755 --- a/web/documentserver-example/python/src/utils/docManager.py +++ b/web/documentserver-example/python/src/utils/docManager.py @@ -187,7 +187,7 @@ def getForcesavePath(filename, req, create): return "" directory = os.path.join(directory, f'{filename}-hist') # get the path to the history of the given file - if (not os.path.exists(directory)): + if not os.path.exists(directory): if create: # if the history directory doesn't exist os.makedirs(directory) # create history directory if it doesn't exist else: # the history directory doesn't exist and we are not supposed to create it @@ -300,7 +300,7 @@ def generateFileKey(filename, req): # generate the document key value def generateRevisionId(expectedKey): - if (len(expectedKey) > 20): + if len(expectedKey) > 20: expectedKey = str(hash(expectedKey)) key = re.sub(r'[^0-9-.a-zA-Z_=]', '_', expectedKey) diff --git a/web/documentserver-example/python/src/utils/serviceConverter.py b/web/documentserver-example/python/src/utils/serviceConverter.py index a533ea170..4213abc34 100755 --- a/web/documentserver-example/python/src/utils/serviceConverter.py +++ b/web/documentserver-example/python/src/utils/serviceConverter.py @@ -43,7 +43,7 @@ def getConvertedData(docUri, fromExt, toExt, docKey, isAsync, filePass=None, lan headers = {'accept': 'application/json'} - if (isAsync): # check if the operation is asynchronous + if isAsync: # check if the operation is asynchronous payload.setdefault('async', True) # and write this information to the payload object if (jwtManager.isEnabled() and jwtManager.useForRequest()): # check if a secret key to generate token exists or not diff --git a/web/documentserver-example/python/src/utils/trackManager.py b/web/documentserver-example/python/src/utils/trackManager.py index feb4eaaa5..81e68a10a 100755 --- a/web/documentserver-example/python/src/utils/trackManager.py +++ b/web/documentserver-example/python/src/utils/trackManager.py @@ -35,16 +35,16 @@ def readBody(request): if (jwtManager.isEnabled() and jwtManager.useForRequest()): # if the secret key to generate token exists token = body.get('token') # get the document token - if (not token): # if JSON web token is not received + if not token: # if JSON web token is not received token = request.headers.get(config_manager.jwt_header()) # get it from the Authorization header if token: token = token[len('Bearer '):] # and save it without Authorization prefix - if (not token): # if the token is not received + if not token: # if the token is not received raise Exception('Expected JWT') # an error occurs body = jwtManager.decode(token) - if (body.get('payload')): # get the payload object from the request body + if body.get('payload'): # get the payload object from the request body body = body['payload'] return body @@ -54,7 +54,7 @@ def processSave(raw_body, filename, usAddr): body = resolve_process_save_body(raw_body) download = body.get('url') - if (download is None): + if download is None: raise Exception("DownloadUrl is null") changesUri = body.get('changesurl') newFilename = filename @@ -64,7 +64,7 @@ def processSave(raw_body, filename, usAddr): downloadExt = "." + body.get('filetype') # get the extension of the downloaded file # convert downloaded file to the file with the current extension if these extensions aren't equal - if (curExt != downloadExt): + if curExt != downloadExt: try: # convert file and give url to a new file convertedData = serviceConverter.getConvertedData(download, downloadExt, curExt, @@ -80,7 +80,7 @@ def processSave(raw_body, filename, usAddr): path = docManager.getStoragePath(newFilename, usAddr) # get the file path data = docManager.downloadFileFromUri(download) # download document file - if (data is None): + if data is None: raise Exception("Downloaded document is null") histDir = historyManager.getHistoryDir(path) # get the path to the history direction @@ -95,7 +95,7 @@ def processSave(raw_body, filename, usAddr): docManager.saveFile(data, path) # save document file dataChanges = docManager.downloadFileFromUri(changesUri) # download changes file - if (dataChanges is None): + if dataChanges is None: raise Exception("Downloaded changes is null") # save file changes to the diff.zip archive docManager.saveFile(dataChanges, historyManager.getChangesZipPath(versionDir)) @@ -111,7 +111,7 @@ def processSave(raw_body, filename, usAddr): historyManager.writeFile(historyManager.getKeyPath(versionDir), body.get('key')) # get the path to the forcesaved file version forcesavePath = docManager.getForcesavePath(newFilename, usAddr, False) - if (forcesavePath != ""): # if the forcesaved file version exists + if forcesavePath != "": # if the forcesaved file version exists os.remove(forcesavePath) # remove it return @@ -120,7 +120,7 @@ def processSave(raw_body, filename, usAddr): # file force saving process def processForceSave(body, filename, usAddr): download = body.get('url') - if (download is None): + if download is None: raise Exception("DownloadUrl is null") curExt = fileUtils.getFileExt(filename) # get current file extension @@ -129,7 +129,7 @@ def processForceSave(body, filename, usAddr): newFilename = False # convert downloaded file to the file with the current extension if these extensions aren't equal - if (curExt != downloadExt): + if curExt != downloadExt: try: # convert file and give url to a new file convertedData = serviceConverter.getConvertedData(download, downloadExt, curExt, @@ -142,28 +142,28 @@ def processForceSave(body, filename, usAddr): newFilename = True data = docManager.downloadFileFromUri(download) # download document file - if (data is None): + if data is None: raise Exception("Downloaded document is null") isSubmitForm = body.get('forcesavetype') == 3 # SubmitForm - if (isSubmitForm): - if (newFilename): + if isSubmitForm: + if newFilename: filename = docManager.getCorrectName(fileUtils.getFileNameWithoutExt(filename) + "-form" + downloadExt, usAddr) # get the correct file name if it already exists else: filename = docManager.getCorrectName(fileUtils.getFileNameWithoutExt(filename) + "-form" + curExt, usAddr) forcesavePath = docManager.getStoragePath(filename, usAddr) else: - if (newFilename): + if newFilename: filename = docManager.getCorrectName(fileUtils.getFileNameWithoutExt(filename) + downloadExt, usAddr) forcesavePath = docManager.getForcesavePath(filename, usAddr, False) - if (forcesavePath == ""): + if forcesavePath == "": forcesavePath = docManager.getForcesavePath(filename, usAddr, True) docManager.saveFile(download, forcesavePath) # save document file - if (isSubmitForm): + if isSubmitForm: uid = body['actions'][0]['userid'] # get the user id historyManager.createMetaData(filename, uid, "Filling Form", usAddr) # create meta data for forcesaved file return @@ -176,7 +176,7 @@ def commandRequest(method, key, meta=None): 'key': key } - if (meta): + if meta: payload['meta'] = meta headers = {'accept': 'application/json'} @@ -190,7 +190,7 @@ def commandRequest(method, key, meta=None): response = requests.post(config_manager.document_server_command_url().geturl(), json=payload, headers=headers, verify=config_manager.ssl_verify_peer_mode_enabled()) - if (meta): + if meta: return response return diff --git a/web/documentserver-example/python/src/utils/users.py b/web/documentserver-example/python/src/utils/users.py index 45c12f327..53b53b651 100644 --- a/web/documentserver-example/python/src/utils/users.py +++ b/web/documentserver-example/python/src/utils/users.py @@ -119,7 +119,7 @@ def getUserFromReq(req): uid = req.COOKIES.get('uid') for user in USERS: - if (user.id == uid): + if user.id == uid: return user return DEFAULT_USER diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py index 7e30e2900..d14415606 100755 --- a/web/documentserver-example/python/src/views/actions.py +++ b/web/documentserver-example/python/src/views/actions.py @@ -40,7 +40,7 @@ def upload(request): try: fileInfo = request.FILES['uploadedFile'] # check if the file size exceeds the maximum size allowed (5242880) - if ((fileInfo.size > config_manager.maximum_file_size()) | (fileInfo.size <= 0)): + if (fileInfo.size > config_manager.maximum_file_size()) | (fileInfo.size <= 0): raise Exception('File size is incorrect') curExt = fileUtils.getFileExt(fileInfo.name) @@ -137,7 +137,7 @@ def saveAs(request): resp = requests.get(saveAsFileUrl, verify=config_manager.ssl_verify_peer_mode_enabled()) # check if the file size exceeds the maximum size allowed (5242880) - if ((len(resp.content) > config_manager.maximum_file_size()) | (len(resp.content) <= 0)): + if (len(resp.content) > config_manager.maximum_file_size()) | (len(resp.content) <= 0): response.setdefault('error', 'File size is incorrect') raise Exception('File size is incorrect') @@ -166,7 +166,7 @@ def rename(request): origExt = '.' + body['ext'] curExt = fileUtils.getFileExt(newfilename) - if (origExt != curExt): + if origExt != curExt: newfilename += origExt dockey = body['dockey'] @@ -232,7 +232,7 @@ def edit(request): } ] - if (meta): # if the document meta data exists, + if meta: # if the document meta data exists, infObj = { # write author and creation time parameters to the information object 'owner': meta['uname'], 'uploaded': meta['created'] @@ -386,10 +386,10 @@ def track(request): body = trackManager.readBody(request) # read request body status = body['status'] # and get status from it - if (status == 1): # editing + if status == 1: # editing if (body['actions'] and body['actions'][0]['type'] == 0): # finished edit user = body['actions'][0]['userid'] # the user who finished editing - if (user not in body['users']): + if user not in body['users']: # create a command request with the forcasave method trackManager.commandRequest('forcesave', body['key']) @@ -458,12 +458,12 @@ def download(request): except Exception: return HttpResponse('JWT validation failed', status=403) - if (userAddress is None): + if userAddress is None: userAddress = request # get the path to the forcesaved file version filePath = docManager.getForcesavePath(fileName, userAddress, False) - if (filePath == ""): + if filePath == "": filePath = docManager.getStoragePath(fileName, userAddress) # get file from the storage directory response = docManager.download(filePath) # download this file return response @@ -549,7 +549,7 @@ def reference(request): 'path': fileName } - if (jwtManager.isEnabled()): + if jwtManager.isEnabled(): data['token'] = jwtManager.encode(data) return HttpResponse(json.dumps(data), content_type='application/json') diff --git a/web/documentserver-example/python/src/views/index.py b/web/documentserver-example/python/src/views/index.py index 3ef9cf3e4..bcac665bb 100755 --- a/web/documentserver-example/python/src/views/index.py +++ b/web/documentserver-example/python/src/views/index.py @@ -30,7 +30,7 @@ def getDirectUrlParam(request): - if ('directUrl' in request.GET): + if 'directUrl' in request.GET: return request.GET['directUrl'].lower() in ("true") else: return False From 8fd0cfcd47674ac258f5f7cf068d5a1f36a9a28e Mon Sep 17 00:00:00 2001 From: vanyauhalin Date: Tue, 24 Oct 2023 09:38:00 +0400 Subject: [PATCH 146/488] ruby: use bundler configuration instead of flags --- web/documentserver-example/ruby/.gitignore | 1 + web/documentserver-example/ruby/Makefile | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/web/documentserver-example/ruby/.gitignore b/web/documentserver-example/ruby/.gitignore index d3b3b04c5..96a27689f 100644 --- a/web/documentserver-example/ruby/.gitignore +++ b/web/documentserver-example/ruby/.gitignore @@ -1,3 +1,4 @@ +.bundle bin db log diff --git a/web/documentserver-example/ruby/Makefile b/web/documentserver-example/ruby/Makefile index 13bc94d69..78bb6f85f 100644 --- a/web/documentserver-example/ruby/Makefile +++ b/web/documentserver-example/ruby/Makefile @@ -22,6 +22,8 @@ help: # Show help message for each of the Makefile recipes. awk 'BEGIN {FS = ": # "}; {printf "%s: %s\n", $$1, $$2}' .PHONY: dev +dev: \ + export BUNDLE_WITH := development:doc:test dev: # Install development dependencies and initialize the project. @bundle install @bundle exec rake app:update:bin @@ -30,8 +32,10 @@ ifeq ($(SORBET_SUPPORTED),1) endif .PHONY: prod +prod: \ + export BUNDLE_WITHOUT := development:doc:test prod: # Install production dependencies. - @bundle install --without development doc test + @bundle install @bundle exec rake app:update:bin .PHONY: server-dev From b49341f64e1571feb6acc2ca6527ee90ee9697f0 Mon Sep 17 00:00:00 2001 From: vanyauhalin Date: Tue, 24 Oct 2023 09:49:09 +0400 Subject: [PATCH 147/488] ruby: pin bundler version --- web/documentserver-example/ruby/.bundler-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 web/documentserver-example/ruby/.bundler-version diff --git a/web/documentserver-example/ruby/.bundler-version b/web/documentserver-example/ruby/.bundler-version new file mode 100644 index 000000000..b0f6bf0cd --- /dev/null +++ b/web/documentserver-example/ruby/.bundler-version @@ -0,0 +1 @@ +2.4.10 From de4414fbb16fa96f1776c9a22d918dc8dd0f718b Mon Sep 17 00:00:00 2001 From: sshakndr Date: Tue, 24 Oct 2023 13:19:32 +0700 Subject: [PATCH 148/488] pylint: R1711 useless-return --- web/documentserver-example/python/src/utils/docManager.py | 2 -- .../python/src/utils/historyManager.py | 5 ----- web/documentserver-example/python/src/utils/trackManager.py | 3 --- 3 files changed, 10 deletions(-) diff --git a/web/documentserver-example/python/src/utils/docManager.py b/web/documentserver-example/python/src/utils/docManager.py index 8a122a2cb..1e912bd03 100755 --- a/web/documentserver-example/python/src/utils/docManager.py +++ b/web/documentserver-example/python/src/utils/docManager.py @@ -235,7 +235,6 @@ def createFile(stream, path, req=None, meta=False): read = stream.read(bufSize) if meta: historyManager.createMeta(path, req) # create meta data for the file if needed - return # save file @@ -243,7 +242,6 @@ def saveFile(response, path): with open(path, 'wb') as file: for chunk in response.iter_content(chunk_size=8192): file.write(chunk) - return # download file from the given url diff --git a/web/documentserver-example/python/src/utils/historyManager.py b/web/documentserver-example/python/src/utils/historyManager.py index b39022665..2cd54e072 100644 --- a/web/documentserver-example/python/src/utils/historyManager.py +++ b/web/documentserver-example/python/src/utils/historyManager.py @@ -103,8 +103,6 @@ def createMeta(storagePath, req): writeFile(path, json.dumps(obj)) - return - # create a json file with file meta data using the file name, user id, user name and user address def createMetaData(filename, uid, uname, usAddr): @@ -122,14 +120,11 @@ def createMetaData(filename, uid, uname, usAddr): writeFile(path, json.dumps(obj)) - return - # create file with a given content in it def writeFile(path, content): with io.open(path, 'w') as out: out.write(content) - return # read a file diff --git a/web/documentserver-example/python/src/utils/trackManager.py b/web/documentserver-example/python/src/utils/trackManager.py index 81e68a10a..0c398c803 100755 --- a/web/documentserver-example/python/src/utils/trackManager.py +++ b/web/documentserver-example/python/src/utils/trackManager.py @@ -114,8 +114,6 @@ def processSave(raw_body, filename, usAddr): if forcesavePath != "": # if the forcesaved file version exists os.remove(forcesavePath) # remove it - return - # file force saving process def processForceSave(body, filename, usAddr): @@ -166,7 +164,6 @@ def processForceSave(body, filename, usAddr): if isSubmitForm: uid = body['actions'][0]['userid'] # get the user id historyManager.createMetaData(filename, uid, "Filling Form", usAddr) # create meta data for forcesaved file - return # create a command request From 14025def1091f2d3da42b7bb1f3e1e2464125882 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Tue, 24 Oct 2023 13:51:44 +0700 Subject: [PATCH 149/488] pylint: W0622 redefined-builtin --- .../python/src/utils/fileUtils.py | 18 +++++++++--------- .../python/src/utils/users.py | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/web/documentserver-example/python/src/utils/fileUtils.py b/web/documentserver-example/python/src/utils/fileUtils.py index ef33890e5..0777c9500 100644 --- a/web/documentserver-example/python/src/utils/fileUtils.py +++ b/web/documentserver-example/python/src/utils/fileUtils.py @@ -24,28 +24,28 @@ # get file name from the document url -def getFileName(str): - ind = str.rfind('/') - return str[ind+1:] +def getFileName(uri): + ind = uri.rfind('/') + return uri[ind+1:] # get file name without extension from the document url -def getFileNameWithoutExt(str): - fn = getFileName(str) +def getFileNameWithoutExt(uri): + fn = getFileName(uri) ind = fn.rfind('.') return fn[:ind] # get file extension from the document url -def getFileExt(str): - fn = getFileName(str) +def getFileExt(uri): + fn = getFileName(uri) ind = fn.rfind('.') return fn[ind:].lower() # get file type -def getFileType(str): - ext = getFileExt(str) +def getFileType(uri): + ext = getFileExt(uri) if ext in format_manager.document_extensions(): return 'word' if ext in format_manager.spreadsheet_extensions(): diff --git a/web/documentserver-example/python/src/utils/users.py b/web/documentserver-example/python/src/utils/users.py index 53b53b651..0256f63e7 100644 --- a/web/documentserver-example/python/src/utils/users.py +++ b/web/documentserver-example/python/src/utils/users.py @@ -20,9 +20,9 @@ class User: - def __init__(self, id, name, email, group, reviewGroups, commentGroups, userInfoGroups, favorite, deniedPermissions, - descriptions, templates): - self.id = id + def __init__(self, uid, name, email, group, reviewGroups, commentGroups, userInfoGroups, favorite, + deniedPermissions, descriptions, templates): + self.id = uid self.name = name self.email = email self.group = group @@ -134,11 +134,11 @@ def getUsersForMentions(uid): return usersData -def find_user(id: Optional[str]) -> User: - if id is None: +def find_user(searchId: Optional[str]) -> User: + if searchId is None: return DEFAULT_USER for user in USERS: - if not user.id == id: + if not user.id == searchId: continue return user return DEFAULT_USER From b5251b0e92bc34fdf6d30714ed9ce276d5c5a279 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Mon, 23 Oct 2023 18:02:51 +0300 Subject: [PATCH 150/488] nodejs: fix mobile size for chrome on iOS (f096fd4d93e59c3497ebce774362c6f51f9639a1) --- web/documentserver-example/nodejs/views/editor.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/nodejs/views/editor.ejs b/web/documentserver-example/nodejs/views/editor.ejs index 7fccec98b..170208d9e 100644 --- a/web/documentserver-example/nodejs/views/editor.ejs +++ b/web/documentserver-example/nodejs/views/editor.ejs @@ -347,7 +347,7 @@ }; config.events = { "onAppReady": onAppReady, - "onDocumentReady": fixSize, + "onDocumentReady": onDocumentReady, "onDocumentStateChange": onDocumentStateChange, "onError": onError, "onOutdatedVersion": onOutdatedVersion, From 365898822553d864bbeb356fbd3eb744affa92c8 Mon Sep 17 00:00:00 2001 From: vanyauhalin Date: Tue, 24 Oct 2023 11:25:47 +0400 Subject: [PATCH 151/488] ruby: update readme --- web/documentserver-example/ruby/README.md | 121 +++++++++++----------- 1 file changed, 63 insertions(+), 58 deletions(-) diff --git a/web/documentserver-example/ruby/README.md b/web/documentserver-example/ruby/README.md index 8d03c31e5..44fc78a51 100755 --- a/web/documentserver-example/ruby/README.md +++ b/web/documentserver-example/ruby/README.md @@ -2,89 +2,94 @@ This example will help you integrate ONLYOFFICE Docs into your web application written on Ruby. -**Please note**: It is intended for testing purposes and demonstrating functionality of the editors. Do NOT use this integration example on your own server without proper code modifications! In case you enabled the test example, disable it before going for production. +> [!WARNING] +> It is intended for testing purposes and demonstrating functionality of the editors. **DO NOT** use this integration example on your own server without proper code modifications. In case you enabled the test example, disable it before going for production. -## Step 1. Install ONLYOFFICE Docs +## Installation -Download and install ONLYOFFICE Docs (packaged as Document Server). +The Ruby example offers various installation options, but we highly recommend using Docker for this purpose. -See the detailed guide to learn how to install Document Server [for Windows](https://helpcenter.onlyoffice.com/installation/docs-developer-install-windows.aspx), [for Linux](https://helpcenter.onlyoffice.com/installation/docs-developer-install-ubuntu.aspx), or [for Docker](https://helpcenter.onlyoffice.com/server/developer-edition/docker/docker-installation.aspx). +### Using Docker -## Step 2. Install the prerequisites and run the website with the editors +To run the example using [Docker](https://docker.com), you will need [Docker Desktop 4.17.0](https://docs.docker.com/desktop) or [Docker Engine 20.10.23](https://docs.docker.com/engine) with [Docker Compose 2.15.1](https://docs.docker.com/compose). Additionally, you might want to consider installing [GNU Make 4.4.1](https://gnu.org/software/make), although it is optional. These are the minimum versions required for the tools. -1. Install **Ruby Version Manager (RVM)** and the latest stable **Ruby** version: +Once you have everything installed, download the release archive and unarchive it. - ``` - gpg --keyserver "hkp://keys.gnupg.net" --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 - ``` +```sh +$ curl --output Ruby.Example.zip --location https://github.com/ONLYOFFICE/document-server-integration/releases/download/v1.6.0/Ruby.Example.zip +$ unzip Ruby.Example.zip +``` - ``` - \curl -sSL https://get.rvm.io | bash -s stable --ruby - ``` +Then open the example directory and [up containers](./Makefile#L46). -2. Download the archive with the Ruby example and unpack the archive: +```sh +$ cd "Ruby Example" +$ make compose-prod +``` - ``` - wget "https://api.onlyoffice.com/app_data/editor/Ruby.Example.zip" - ``` +By default, the server starts at `localhost:80`. - ``` - unzip Ruby.Example.zip - ``` +To configure the example, you can edit the environment variables in [`compose-base.yml`](./compose-base.yml). See [below](#configuration) for more information about environment variables. -3. Change the current directory for the project directory: +### On Local Machine - ``` - cd Ruby\ Example - ``` +Before diving into the example, you will need to install ONLYOFFICE Document Server (also known as Docs). See to the [detailed guide to learn how to install it](https://helpcenter.onlyoffice.com/server/developer-edition/docker/docker-installation.aspx) on Windows, Linux, or Docker. -4. Install the dependencies: +To run the example on your local machine, you will need [Ruby 3.2.2](https://ruby-lang.org) with [Bundler 2.4.10](https://bundler.io). Additionally, you might want to consider installing [GNU Make 4.4.1](https://gnu.org/software/make), although it is optional. These are the minimum versions required for the tools. - ``` - bundle install - ``` +Once you have everything installed, download the release archive and unarchive it. -5. Edit the *config/application.rb* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed. +```sh +$ curl --output Ruby.Example.zip --location https://github.com/ONLYOFFICE/document-server-integration/releases/download/v1.6.0/Ruby.Example.zip +$ unzip Ruby.Example.zip +``` - ``` - nano config/application.rb - ``` +Then open the example directory, [install dependencies](./Makefile#L33), and [start the server](./Makefile#L42). - Edit the following lines: +```sh +$ cd "Ruby Example" +$ make prod +$ make server-prod +``` - ``` - Rails.configuration.storagePath="app_data" - Rails.configuration.urlSite="https://documentserver/" - ``` +By default, the server starts at `0.0.0.0:3000`. - where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed and the **storagePath** is the path where files will be created and stored. You can set an absolute path. For example, *D:\\\\folder*. Please note that on Windows OS the double backslash must be used as a separator. +To configure the example, you can pass the environment variables before the command that starts the server. See [below](#configuration) for more information about environment variables. -6. Run the **Rails** application: - - ``` - rails server -u webrick - rails s -b 0.0.0.0 -p 80 - ``` - -7. See the result in your browser using the address: - - ``` - http://localhost - ``` - - If you want to experiment with the editor configuration, modify the [parameters](https://api.onlyoffice.com/editors/advanced) in the *views\home\editor.html.erb* file. - -## Step 3. Check accessibility +## Post Installation In case the example and Document Server are installed on different computers, make sure that your server with the example installed has access to the Document Server with the address which you specify instead of **documentserver** in the configuration files. Make sure that the Document Server has access to the server with the example installed with the address which you specify instead of **example.com** in the configuration files. -## Important security info +## Configuration + +The example is configured by changing environment variables. + +- `BINDING` \ +The address where the server should be started. \ +For example: `0.0.0.0` +- `DOCUMENT_SERVER_PRIVATE_URL` \ +The URL through which the server will communicate with Document Server. \ +For example: http://proxy:8080 +- `DOCUMENT_SERVER_PUBLIC_URL` \ +The URL through which a user will communicate with Document Server. \ +For example: http://localhost:8080 +- `EXAMPLE_URL` \ +The URL through which Document Server will communicate with the server. \ +For example: http://proxy +- `JWT_SECRET` \ +JWT authorization secret. Leave blank to disable authorization. \ +For example: `your-256-bit-secret` +- `PORT` \ +The port on which the server should be running. \ +For example: `80` + +## Security Info Please keep in mind the following security aspects when you are using test examples: -* There is no protection of the storage from unauthorized access since there is no need for authorization. -* There are no checks against parameter substitution in links, since the parameters are generated by the code according to the pre-arranged scripts. -* There are no data checks in requests of saving the file after editing, since each test example is intended for requests only from ONLYOFFICE Document Server. -* There are no prohibitions on using test examples from other sites, since they are intended to interact with ONLYOFFICE Document Server from another domain. \ No newline at end of file +- There is no protection of the storage from unauthorized access since there is no need for authorization. +- There are no checks against parameter substitution in links, since the parameters are generated by the code according to the pre-arranged scripts. +- There are no data checks in requests of saving the file after editing, since each test example is intended for requests only from ONLYOFFICE Document Server. +- There are no prohibitions on using test examples from other sites, since they are intended to interact with ONLYOFFICE Document Server from another domain. From 9c26b4e563753c5d7e77cfb76723af6b115f63a7 Mon Sep 17 00:00:00 2001 From: Kseniya Fedoruk <39296259+kseniafedoruk@users.noreply.github.com> Date: Tue, 24 Oct 2023 14:02:38 +0300 Subject: [PATCH 152/488] Update README.md --- web/documentserver-example/ruby/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/ruby/README.md b/web/documentserver-example/ruby/README.md index 44fc78a51..da1b82664 100755 --- a/web/documentserver-example/ruby/README.md +++ b/web/documentserver-example/ruby/README.md @@ -33,7 +33,7 @@ To configure the example, you can edit the environment variables in [`compose-ba ### On Local Machine -Before diving into the example, you will need to install ONLYOFFICE Document Server (also known as Docs). See to the [detailed guide to learn how to install it](https://helpcenter.onlyoffice.com/server/developer-edition/docker/docker-installation.aspx) on Windows, Linux, or Docker. +Before diving into the example, you will need to install ONLYOFFICE Document Server (also known as Docs). Check the [detailed guide to learn how to install it](https://helpcenter.onlyoffice.com/server/developer-edition/docker/docker-installation.aspx) on Windows, Linux, or Docker. To run the example on your local machine, you will need [Ruby 3.2.2](https://ruby-lang.org) with [Bundler 2.4.10](https://bundler.io). Additionally, you might want to consider installing [GNU Make 4.4.1](https://gnu.org/software/make), although it is optional. These are the minimum versions required for the tools. From ac24eb73f7f861dba80156cf7bd05afabf0b7cfa Mon Sep 17 00:00:00 2001 From: Natalia Date: Tue, 24 Oct 2023 14:56:00 +0300 Subject: [PATCH 153/488] small fixes --- web/documentserver-example/ruby/README.md | 28 ++++++++--------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/web/documentserver-example/ruby/README.md b/web/documentserver-example/ruby/README.md index da1b82664..84ad20d9d 100755 --- a/web/documentserver-example/ruby/README.md +++ b/web/documentserver-example/ruby/README.md @@ -33,7 +33,7 @@ To configure the example, you can edit the environment variables in [`compose-ba ### On Local Machine -Before diving into the example, you will need to install ONLYOFFICE Document Server (also known as Docs). Check the [detailed guide to learn how to install it](https://helpcenter.onlyoffice.com/server/developer-edition/docker/docker-installation.aspx) on Windows, Linux, or Docker. +Before diving into the example, you will need to install ONLYOFFICE Document Server (also known as Docs). Check the detailed guide to learn how to install it on [Windows](https://helpcenter.onlyoffice.com/installation/docs-developer-install-windows.aspx), [Linux](https://helpcenter.onlyoffice.com/installation/docs-developer-install-ubuntu.aspx), or [Docker](https://helpcenter.onlyoffice.com/installation/docs-developer-install-docker.aspx). To run the example on your local machine, you will need [Ruby 3.2.2](https://ruby-lang.org) with [Bundler 2.4.10](https://bundler.io). Additionally, you might want to consider installing [GNU Make 4.4.1](https://gnu.org/software/make), although it is optional. These are the minimum versions required for the tools. @@ -66,24 +66,14 @@ Make sure that the Document Server has access to the server with the example ins The example is configured by changing environment variables. -- `BINDING` \ -The address where the server should be started. \ -For example: `0.0.0.0` -- `DOCUMENT_SERVER_PRIVATE_URL` \ -The URL through which the server will communicate with Document Server. \ -For example: http://proxy:8080 -- `DOCUMENT_SERVER_PUBLIC_URL` \ -The URL through which a user will communicate with Document Server. \ -For example: http://localhost:8080 -- `EXAMPLE_URL` \ -The URL through which Document Server will communicate with the server. \ -For example: http://proxy -- `JWT_SECRET` \ -JWT authorization secret. Leave blank to disable authorization. \ -For example: `your-256-bit-secret` -- `PORT` \ -The port on which the server should be running. \ -For example: `80` +| Name | Description | Example | +| ------------- | ------------- | ------------- | +| `BINDING` | The address where the server should be started. | `0.0.0.0` | +| `DOCUMENT_SERVER_PRIVATE_URL` | The URL through which the server will communicate with Document Server. | `http://proxy:8080` | +| `DOCUMENT_SERVER_PUBLIC_URL` | The URL through which a user will communicate with Document Server. | `http://localhost:8080` | +| `EXAMPLE_URL` | The URL through which Document Server will communicate with the server. | `http://proxy` | +| `JWT_SECRET` | JWT authorization secret. Leave blank to disable authorization. | `your-256-bit-secret` | +| `PORT` | The port on which the server should be running. | `80` | ## Security Info From eaa06d1919ee92b72c945e14aa8d96871dd26879 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Tue, 24 Oct 2023 15:19:43 +0300 Subject: [PATCH 154/488] ruby: download last version --- web/documentserver-example/ruby/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/README.md b/web/documentserver-example/ruby/README.md index 84ad20d9d..c3fcfcfae 100755 --- a/web/documentserver-example/ruby/README.md +++ b/web/documentserver-example/ruby/README.md @@ -16,7 +16,7 @@ To run the example using [Docker](https://docker.com), you will need [Docker Des Once you have everything installed, download the release archive and unarchive it. ```sh -$ curl --output Ruby.Example.zip --location https://github.com/ONLYOFFICE/document-server-integration/releases/download/v1.6.0/Ruby.Example.zip +$ curl --output Ruby.Example.zip --location https://github.com/ONLYOFFICE/document-server-integration/releases/latest/download/Ruby.Example.zip $ unzip Ruby.Example.zip ``` @@ -40,7 +40,7 @@ To run the example on your local machine, you will need [Ruby 3.2.2](https://rub Once you have everything installed, download the release archive and unarchive it. ```sh -$ curl --output Ruby.Example.zip --location https://github.com/ONLYOFFICE/document-server-integration/releases/download/v1.6.0/Ruby.Example.zip +$ curl --output Ruby.Example.zip --location https://github.com/ONLYOFFICE/document-server-integration/releases/latest/download/Ruby.Example.zip $ unzip Ruby.Example.zip ``` From 687b811eefae3ab8015ac2f950c99c2ebba2a31a Mon Sep 17 00:00:00 2001 From: sshakndr Date: Wed, 25 Oct 2023 10:56:00 +0700 Subject: [PATCH 155/488] pylint: C0411 wrong-import-order --- web/documentserver-example/python/src/utils/docManager.py | 2 +- web/documentserver-example/python/src/utils/historyManager.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/python/src/utils/docManager.py b/web/documentserver-example/python/src/utils/docManager.py index 1e912bd03..be56a91d2 100755 --- a/web/documentserver-example/python/src/utils/docManager.py +++ b/web/documentserver-example/python/src/utils/docManager.py @@ -21,9 +21,9 @@ import shutil import io import re -import requests import time import urllib.parse +import requests import magic from django.conf import settings diff --git a/web/documentserver-example/python/src/utils/historyManager.py b/web/documentserver-example/python/src/utils/historyManager.py index 2cd54e072..a4838c198 100644 --- a/web/documentserver-example/python/src/utils/historyManager.py +++ b/web/documentserver-example/python/src/utils/historyManager.py @@ -20,10 +20,10 @@ import io import json -from . import users, fileUtils from datetime import datetime from src.utils import docManager from src.utils import jwtManager +from . import users, fileUtils # get the path to the history direction From 28211493bc87fce04886c679f30a42bfde4aadbf Mon Sep 17 00:00:00 2001 From: sshakndr Date: Wed, 25 Oct 2023 11:12:39 +0700 Subject: [PATCH 156/488] pylint: C0209 consider-using-f-string --- web/documentserver-example/python/src/utils/docManager.py | 4 ++-- .../python/src/utils/serviceConverter.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/documentserver-example/python/src/utils/docManager.py b/web/documentserver-example/python/src/utils/docManager.py index be56a91d2..502e8e055 100755 --- a/web/documentserver-example/python/src/utils/docManager.py +++ b/web/documentserver-example/python/src/utils/docManager.py @@ -249,7 +249,7 @@ def downloadFileFromUri(uri, path=None, withSave=False): resp = requests.get(uri, stream=True, verify=config_manager.ssl_verify_peer_mode_enabled(), timeout=5) status_code = resp.status_code if status_code != 200: # checking status code - raise RuntimeError('Document editing service returned status: %s' % status_code) + raise RuntimeError(f'Document editing service returned status: {status_code}') if withSave: if path is None: raise RuntimeError('Path for saving file is null') @@ -319,7 +319,7 @@ def getFilesInfo(req): getStoragePath(f.get("title"), req) )), "id": generateFileKey(f.get("title"), req), - "contentLength": "%.2f KB" % (stats.st_size/1024), + "contentLength": f"{(stats.st_size/1024):.2f} KB", "pureContentLength": stats.st_size, "title": f.get("title"), "updated": time.strftime("%Y-%m-%dT%X%z", time.gmtime(stats.st_mtime)) diff --git a/web/documentserver-example/python/src/utils/serviceConverter.py b/web/documentserver-example/python/src/utils/serviceConverter.py index 4213abc34..86d8c03f7 100755 --- a/web/documentserver-example/python/src/utils/serviceConverter.py +++ b/web/documentserver-example/python/src/utils/serviceConverter.py @@ -56,7 +56,7 @@ def getConvertedData(docUri, fromExt, toExt, docKey, isAsync, filePass=None, lan verify=config_manager.ssl_verify_peer_mode_enabled(), timeout=5) status_code = response.status_code if status_code != 200: # checking status code - raise RuntimeError('Convertation service returned status: %s' % status_code) + raise RuntimeError(f'Convertation service returned status: {status_code}') json = response.json() return getResponseUri(json) From 6bd081c44ddb0e13880188e41762fe094a4a7ce1 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Wed, 25 Oct 2023 11:19:19 +0700 Subject: [PATCH 157/488] pylint: R1705 no-else-return --- .../python/src/utils/docManager.py | 11 +++++------ web/documentserver-example/python/src/views/index.py | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/web/documentserver-example/python/src/utils/docManager.py b/web/documentserver-example/python/src/utils/docManager.py index 502e8e055..9766ecf0f 100755 --- a/web/documentserver-example/python/src/utils/docManager.py +++ b/web/documentserver-example/python/src/utils/docManager.py @@ -103,8 +103,8 @@ def getServerUrl(forDocumentServer, req): example_url = config_manager.example_url() if (forDocumentServer and example_url is not None): return example_url.geturl() - else: - return req.headers.get("x-forwarded-proto") or req.scheme + "://" + req.get_host() + + return req.headers.get("x-forwarded-proto") or req.scheme + "://" + req.get_host() # get file url @@ -331,10 +331,9 @@ def getFilesInfo(req): if fileId: if len(resultID) > 0: return resultID - else: - return "File not found" - else: - return result + return "File not found" + + return result # download the file diff --git a/web/documentserver-example/python/src/views/index.py b/web/documentserver-example/python/src/views/index.py index bcac665bb..337cf0470 100755 --- a/web/documentserver-example/python/src/views/index.py +++ b/web/documentserver-example/python/src/views/index.py @@ -32,8 +32,8 @@ def getDirectUrlParam(request): if 'directUrl' in request.GET: return request.GET['directUrl'].lower() in ("true") - else: - return False + + return False def default(request): # default parameters that will be passed to the template From c3b2785c3f512f091912ac92e5fedebbfa52f2e7 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Wed, 25 Oct 2023 11:29:54 +0700 Subject: [PATCH 158/488] pylint: W3101 missing-timeout --- web/documentserver-example/python/src/utils/trackManager.py | 2 +- web/documentserver-example/python/src/views/actions.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/python/src/utils/trackManager.py b/web/documentserver-example/python/src/utils/trackManager.py index 0c398c803..574daadfd 100755 --- a/web/documentserver-example/python/src/utils/trackManager.py +++ b/web/documentserver-example/python/src/utils/trackManager.py @@ -185,7 +185,7 @@ def commandRequest(method, key, meta=None): payload['token'] = jwtManager.encode(payload) # encode a payload object into a body token response = requests.post(config_manager.document_server_command_url().geturl(), json=payload, headers=headers, - verify=config_manager.ssl_verify_peer_mode_enabled()) + verify=config_manager.ssl_verify_peer_mode_enabled(), timeout=5) if meta: return response diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py index d14415606..0c31d1c73 100755 --- a/web/documentserver-example/python/src/views/actions.py +++ b/web/documentserver-example/python/src/views/actions.py @@ -134,7 +134,7 @@ def saveAs(request): filename = docManager.getCorrectName(title, request) path = docManager.getStoragePath(filename, request) - resp = requests.get(saveAsFileUrl, verify=config_manager.ssl_verify_peer_mode_enabled()) + resp = requests.get(saveAsFileUrl, verify=config_manager.ssl_verify_peer_mode_enabled(), timeout=5) # check if the file size exceeds the maximum size allowed (5242880) if (len(resp.content) > config_manager.maximum_file_size()) | (len(resp.content) <= 0): From 39f39b031615092317f6d8cf1494688e01b53154 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Wed, 25 Oct 2023 11:44:00 +0700 Subject: [PATCH 159/488] pylint: W0613 unused-argument --- web/documentserver-example/python/src/views/actions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py index 0c31d1c73..5e1a95e82 100755 --- a/web/documentserver-example/python/src/views/actions.py +++ b/web/documentserver-example/python/src/views/actions.py @@ -435,7 +435,7 @@ def files(request): # download a csv file -def csv(request): +def csv(): filePath = os.path.join('assets', 'document-templates', 'sample', "csv.csv") response = docManager.download(filePath) return response From b7212b035a7521cd744d3250bffb66172170242d Mon Sep 17 00:00:00 2001 From: sshakndr Date: Wed, 25 Oct 2023 12:42:51 +0700 Subject: [PATCH 160/488] pylint: configuration file --- web/documentserver-example/python/.pylintrc | 34 +++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 web/documentserver-example/python/.pylintrc diff --git a/web/documentserver-example/python/.pylintrc b/web/documentserver-example/python/.pylintrc new file mode 100644 index 000000000..55e1ee71c --- /dev/null +++ b/web/documentserver-example/python/.pylintrc @@ -0,0 +1,34 @@ +[MAIN] +disable=C0114, # missing-module-docstring + C0115, # missing-class-docstring + C0116, # missing-function-docstring + E0611, # no-name-in-module + R0902, # too-many-instance-attributes + R0913, # too-many-arguments + R0914, # too-many-locals + W1514, # unspecified-encoding + R1710, # inconsistent-return-statements + R1732, # consider-using-with + +[FORMAT] +max-line-length=120 + +[BASIC] +argument-naming-style=any +attr-naming-style=any +function-naming-style=any +module-naming-style=any +variable-naming-style=any + +[DESIGN] +# max-args= +# max-attributes= +max-branches=15 +# max-locals= +min-public-methods=0 + +[EXCEPTIONS] +overgeneral-exceptions = builtins.[] + +[MISCELLANEOUS] +notes = ["FIXME", "XXX"] \ No newline at end of file From c23a8ac47da58d565703beee45f165748c8134da Mon Sep 17 00:00:00 2001 From: sshakndr Date: Wed, 25 Oct 2023 12:48:34 +0700 Subject: [PATCH 161/488] python: lint workflow fix --- .github/workflows/lint-python.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint-python.yml b/.github/workflows/lint-python.yml index 3e290ec6c..f46bb540e 100644 --- a/.github/workflows/lint-python.yml +++ b/.github/workflows/lint-python.yml @@ -32,9 +32,9 @@ jobs: - name: Lint Flake8 run: | - flake8 ./**/*.py --count --select=E9,F63,F7,F82 --show-source --statistics - flake8 ./**/*.py --count --max-complexity=10 --max-line-length=79 --statistics + flake8 --count --select=E9,F63,F7,F82 --show-source --statistics + flake8 --count --max-complexity=15 --max-line-length=120 --per-file-ignores="__init__.py:F4" --statistics - name: Lint Pylint run: | - pylint ./**/*.py + pylint ./**/*.py --rcfile=.pylintrc From fdf55a0da2c7d29cf4688535e3179b4ea97440af Mon Sep 17 00:00:00 2001 From: sshakndr Date: Wed, 25 Oct 2023 13:10:12 +0700 Subject: [PATCH 162/488] python: pylint workflow import-error(E0401) ignore --- .github/workflows/lint-python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-python.yml b/.github/workflows/lint-python.yml index f46bb540e..05a3a211d 100644 --- a/.github/workflows/lint-python.yml +++ b/.github/workflows/lint-python.yml @@ -37,4 +37,4 @@ jobs: - name: Lint Pylint run: | - pylint ./**/*.py --rcfile=.pylintrc + pylint ./**/*.py --rcfile=.pylintrc --disable=import-error From 0a3785a3a4da09d8fa4a4136647d114f5f131598 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Wed, 25 Oct 2023 13:55:29 +0700 Subject: [PATCH 163/488] python: merging lint fix --- web/documentserver-example/python/src/utils/docManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/python/src/utils/docManager.py b/web/documentserver-example/python/src/utils/docManager.py index 4ee335232..cbb698fd4 100755 --- a/web/documentserver-example/python/src/utils/docManager.py +++ b/web/documentserver-example/python/src/utils/docManager.py @@ -87,7 +87,7 @@ def getTemplateImageUrl(fileType, request): # get file name with an index if such a file name already exists def getCorrectName(filename, req): maxName = 50 - basename = fileUtils.getFileNameWithoutExt(filename)[0:maxName] + ('','[...]')[len(filename) > maxName] + basename = fileUtils.getFileNameWithoutExt(filename)[0:maxName] + ('', '[...]')[len(filename) > maxName] ext = fileUtils.getFileExt(filename) name = f'{basename}{ext}' From 5f2c5cea58b8200bb7d90500dbaf2e466a48f034 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Thu, 26 Oct 2023 11:15:26 +0700 Subject: [PATCH 164/488] ruby: code refactoring --- .../ruby/app/controllers/home_controller.rb | 20 ++++++++++--------- .../ruby/app/views/home/editor.html.erb | 9 +-------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index c75f024b9..b844c7bc2 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -163,19 +163,21 @@ def historyobj if data == nil || data.empty? return "" end - fileData = JSON.parse(data) + file_data = JSON.parse(data) file = FileModel.new( - :file_name => File.basename(fileData['file_name']), - :mode => fileData['mode'], - :type => fileData['type'], - :user_ip => fileData['user_ip'], - :lang => fileData['lang'], - :user => fileData['user'], - :action_data => fileData['action_data'], - :direct_url => fileData['direct_url'] + file_name: File.basename(file_data['file_name']), + mode: file_data['mode'], + type: file_data['type'], + user_ip: file_data['user_ip'], + lang: file_data['lang'], + user: file_data['user'], + action_data: file_data['action_data'], + direct_url: file_data['direct_url'] ) history = file.get_history render json: history + rescue + render json: '{ "error": "File not found"}' end end diff --git a/web/documentserver-example/ruby/app/views/home/editor.html.erb b/web/documentserver-example/ruby/app/views/home/editor.html.erb index cc61d1ba5..e581c7708 100755 --- a/web/documentserver-example/ruby/app/views/home/editor.html.erb +++ b/web/documentserver-example/ruby/app/views/home/editor.html.erb @@ -185,14 +185,7 @@ innerAlert(response.error) return } - fileData = <%= raw @file.to_json %>; - const req = new XMLHttpRequest() - req.open("POST", '/historyobj') - req.send(JSON.stringify(fileData)) - req.onload = function () { - versionHistory = JSON.parse(req.response) - docEditor.refreshHistory(versionHistory.hist) - } + onRequestHistory() } } From e5d4be0d618617382dcd052b60a8869c21b78a83 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Thu, 26 Oct 2023 11:27:01 +0700 Subject: [PATCH 165/488] python: code refactoring --- web/documentserver-example/python/manage.py | 2 +- .../python/templates/editor.html | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/web/documentserver-example/python/manage.py b/web/documentserver-example/python/manage.py index a8093d449..910d38a46 100644 --- a/web/documentserver-example/python/manage.py +++ b/web/documentserver-example/python/manage.py @@ -65,7 +65,7 @@ def routers(): path('csv', actions.csv), path('download', actions.download), path('downloadhistory', actions.downloadhistory), - path('historyobj',actions.historyobj), + path('historyobj', actions.historyobj), path('edit', actions.edit), path('files', actions.files), path('reference', actions.reference), diff --git a/web/documentserver-example/python/templates/editor.html b/web/documentserver-example/python/templates/editor.html index 969e9cf33..a701c8c57 100755 --- a/web/documentserver-example/python/templates/editor.html +++ b/web/documentserver-example/python/templates/editor.html @@ -203,21 +203,7 @@ innerAlert(response.error) return } - data = { - fileName: query.get('filename') - } - const req = new XMLHttpRequest() - req.open("POST", '/historyobj') - req.send(JSON.stringify(data)) - req.onload = function () { - if (req.status != 200) { - response = JSON.parse(req.response) - innerAlert(response.error) - return - } - hist = JSON.parse(req.response) - docEditor.refreshHistory(hist.history) - } + onRequestHistory() } } From 0d3cda32fa33e43ee4577c67af96ff332a3c9f18 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Thu, 26 Oct 2023 11:33:38 +0700 Subject: [PATCH 166/488] php: code refactoring --- .../php/templates/docEditor.tpl | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/web/documentserver-example/php/templates/docEditor.tpl b/web/documentserver-example/php/templates/docEditor.tpl index 2508e8d0d..f5fceebe6 100644 --- a/web/documentserver-example/php/templates/docEditor.tpl +++ b/web/documentserver-example/php/templates/docEditor.tpl @@ -246,27 +246,7 @@ innerAlert(response.error) return } - const data = { - fileName: query.get('fileID') - } - const req = new XMLHttpRequest() - req.open("POST", 'objhistory') - req.setRequestHeader('Content-Type', 'application/json') - req.send(JSON.stringify(data)) - req.onload = function () { - if (req.status != 200) { - response = JSON.parse(req.response) - innerAlert(response.error) - return - } - history = JSON.parse(req.response) - docEditor.refreshHistory( - { - currentVersion: history[0].currentVersion, - history: history[0].history - } - ) - } + onRequestHistory() } } From 7825d0ae48d695360ab762f6dafd2dfb6b0e005d Mon Sep 17 00:00:00 2001 From: sshakndr Date: Thu, 26 Oct 2023 12:57:07 +0700 Subject: [PATCH 167/488] java-spring: code refactoring --- .../controllers/FileController.java | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java index 0ecbf1169..b608288a4 100755 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java @@ -152,24 +152,18 @@ private ResponseEntity downloadFile(final String fileName) { private ResponseEntity downloadSample(final String fileName) { String serverPath = System.getProperty("user.dir"); String contentType = "application/octet-stream"; - String fileLocation = serverPath - + File.separator + "src" - + File.separator + "main" - + File.separator + "resources" - + File.separator + "assets" - + File.separator + "document-templates" - + File.separator + "sample" - + File.separator + fileName; - Path filePath = Paths.get(fileLocation); // get the path to the file location + String[] fileLocation = new String[] {serverPath, "src", "main", "resources", "assets", "document-templates", + "sample", fileName}; + Path filePath = Paths.get(String.join(File.separator, fileLocation)); Resource resource; try { resource = new UrlResource(filePath.toUri()); if (resource.exists()) { - return ResponseEntity.ok() - .contentType(MediaType.parseMediaType(contentType)) - .header(HttpHeaders.CONTENT_DISPOSITION, - "attachment; filename=\"" + resource.getFilename() + "\"") - .body(resource); + return ResponseEntity.ok() + .contentType(MediaType.parseMediaType(contentType)) + .header(HttpHeaders.CONTENT_DISPOSITION, + "attachment; filename=\"" + resource.getFilename() + "\"") + .body(resource); } } catch (MalformedURLException e) { e.printStackTrace(); From b093666d90442cf66bc0004fc3a3f122fa95f6c0 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Thu, 26 Oct 2023 13:03:10 +0700 Subject: [PATCH 168/488] python: code refactoring --- web/documentserver-example/python/manage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/python/manage.py b/web/documentserver-example/python/manage.py index c9b46d737..6387e57be 100644 --- a/web/documentserver-example/python/manage.py +++ b/web/documentserver-example/python/manage.py @@ -63,7 +63,7 @@ def routers(): path('convert', actions.convert), path('create', actions.createNew), path('csv', actions.csv), - path('assets',actions.assets), + path('assets', actions.assets), path('download', actions.download), path('downloadhistory', actions.downloadhistory), path('edit', actions.edit), From bbeaea6d2ea661182a98d64db33f575c8e9db11e Mon Sep 17 00:00:00 2001 From: sshakndr Date: Thu, 26 Oct 2023 13:34:14 +0700 Subject: [PATCH 169/488] ruby: code refactoring --- .../ruby/app/controllers/home_controller.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 532b0ccf2..bc56fa4ed 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -281,14 +281,13 @@ def csv # downloading an assets file def asset file_name = File.basename(params[:fileName]) - assetPath = Rails.root.join('assets', 'document-templates', 'sample', file_name) + asset_path = Rails.root.join('assets', 'document-templates', 'sample', file_name) - # add headers to the response to specify the page parameters - response.headers['Content-Length'] = File.size(assetPath).to_s - response.headers['Content-Type'] = MimeMagic.by_path(assetPath).type + response.headers['Content-Length'] = File.size(asset_path).to_s + response.headers['Content-Type'] = MimeMagic.by_path(asset_path).type response.headers['Content-Disposition'] = "attachment;filename*=UTF-8\'\'" + ERB::Util.url_encode(file_name) - send_file assetPath, :x_sendfile => true + send_file asset_path, :x_sendfile => true end # downloading a file From 6990bc40d2371360969b47d019300388f391a4b3 Mon Sep 17 00:00:00 2001 From: vanyauhalin Date: Thu, 26 Oct 2023 12:56:28 +0400 Subject: [PATCH 170/488] python: pin python with pip versions --- web/documentserver-example/python/.pip-version | 1 + web/documentserver-example/python/.python-version | 2 +- web/documentserver-example/python/pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 web/documentserver-example/python/.pip-version diff --git a/web/documentserver-example/python/.pip-version b/web/documentserver-example/python/.pip-version new file mode 100644 index 000000000..28a21844b --- /dev/null +++ b/web/documentserver-example/python/.pip-version @@ -0,0 +1 @@ +23.1.2 diff --git a/web/documentserver-example/python/.python-version b/web/documentserver-example/python/.python-version index 2c0733315..0c7d5f5f5 100644 --- a/web/documentserver-example/python/.python-version +++ b/web/documentserver-example/python/.python-version @@ -1 +1 @@ -3.11 +3.11.4 diff --git a/web/documentserver-example/python/pyproject.toml b/web/documentserver-example/python/pyproject.toml index 6fe216b0c..dcb79a313 100644 --- a/web/documentserver-example/python/pyproject.toml +++ b/web/documentserver-example/python/pyproject.toml @@ -6,7 +6,7 @@ requires = [ [project] name = "online-editor-example" version = "1.6.0" -requires-python = ">=3.11" +requires-python = ">=3.11.4" dependencies = [ "django>=3.1.3", "django-stubs>=4.2.3", From 038b2ffc573898084f861c70372a81335026b7a0 Mon Sep 17 00:00:00 2001 From: vanyauhalin Date: Thu, 26 Oct 2023 12:59:59 +0400 Subject: [PATCH 171/488] python: delete readme.md to be able to rename it in uppercase --- web/documentserver-example/python/readme.md | 82 --------------------- 1 file changed, 82 deletions(-) delete mode 100755 web/documentserver-example/python/readme.md diff --git a/web/documentserver-example/python/readme.md b/web/documentserver-example/python/readme.md deleted file mode 100755 index 8270e52e6..000000000 --- a/web/documentserver-example/python/readme.md +++ /dev/null @@ -1,82 +0,0 @@ -## Overview - -This example will help you integrate ONLYOFFICE Docs into your web application written in Python. - -**Please note**: It is intended for testing purposes and demonstrating functionality of the editors. Do NOT use this integration example on your own server without proper code modifications! In case you enabled the test example, disable it before going for production. - -## Step 1. Install ONLYOFFICE Docs - -Download and install ONLYOFFICE Docs (packaged as Document Server). - -See the detailed guide to learn how to install Document Server [for Windows](https://helpcenter.onlyoffice.com/installation/docs-developer-install-windows.aspx?from=api_python_example), [for Linux](https://helpcenter.onlyoffice.com/installation/docs-developer-install-ubuntu.aspx?from=api_python_example), or [for Docker](https://helpcenter.onlyoffice.com/server/developer-edition/docker/docker-installation.aspx?from=api_python_example). - -## Step 2. Install the prerequisites and run the website with the editors - -1. **Python** comes preinstalled on most Linux distributions, and is available as a package on all others. Python 3.9 is required. Please proceed to [official documentation](https://docs.python.org/3/using/unix.html) if you have any troubles. - -2. Download the archive with the Python example and unpack it: - - ``` - wget "https://api.onlyoffice.com/app_data/editor/Python.Example.zip" - ``` - - ``` - unzip Python.Example.zip - ``` - -3. Change the current directory for the project directory: - - ``` - cd Python\ Example - ``` - -4. Install the dependencies: - - ``` - pip install Django==3.1.3 - pip install requests==2.25.0 - pip install pyjwt==2.6.0 - pip install python-magic - ``` - -5. Edit the *config.py* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed. And specify the name of the server on which example is installed. - - ``` - nano config.py - ``` - - Edit the following lines: - - ``` - STORAGE_PATH = 'app_data' - DOC_SERV_SITE_URL = 'https://documentserver/' - ``` - - where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed and the **STORAGE_PATH** is the path where files will be created and stored. You can set an absolute path. For example, *D:\\\\folder*. Please note that on Windows OS the double backslash must be used as a separator. - -6. Run the **Python** server: - - ``` - python manage.py runserver 0.0.0.0:8000 - ``` - -7. See the result in your browser using the address: - - ``` - http://localhost:8000 - ``` - -## Step 3. Check accessibility - -In case the example and Document Server are installed on different computers, make sure that your server with the example installed has access to the Document Server with the address which you specify instead of **documentserver** in the configuration files. - -Make sure that the Document Server has access to the server with the example installed with the address which you specify instead of **example.com** in the configuration files. - -## Important security info - -Please keep in mind the following security aspects when you are using test examples: - -* There is no protection of the storage from unauthorized access since there is no need for authorization. -* There are no checks against parameter substitution in links, since the parameters are generated by the code according to the pre-arranged scripts. -* There are no data checks in requests of saving the file after editing, since each test example is intended for requests only from ONLYOFFICE Document Server. -* There are no prohibitions on using test examples from other sites, since they are intended to interact with ONLYOFFICE Document Server from another domain. \ No newline at end of file From cd0647e0f7a16eaa5af8d82fa09ae95cd3c483ba Mon Sep 17 00:00:00 2001 From: vanyauhalin Date: Thu, 26 Oct 2023 13:00:39 +0400 Subject: [PATCH 172/488] python: update readme --- web/documentserver-example/python/README.md | 86 +++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100755 web/documentserver-example/python/README.md diff --git a/web/documentserver-example/python/README.md b/web/documentserver-example/python/README.md new file mode 100755 index 000000000..cb7ae8408 --- /dev/null +++ b/web/documentserver-example/python/README.md @@ -0,0 +1,86 @@ +## Overview + +This example will help you integrate ONLYOFFICE Docs into your web application written on Python. + +> [!WARNING] +> It is intended for testing purposes and demonstrating functionality of the editors. **DO NOT** use this integration example on your own server without proper code modifications. In case you enabled the test example, disable it before going for production. + +## Installation + +The Python example offers various installation options, but we highly recommend using Docker for this purpose. + +### Using Docker + +To run the example using [Docker](https://docker.com), you will need [Docker Desktop 4.17.0](https://docs.docker.com/desktop) or [Docker Engine 20.10.23](https://docs.docker.com/engine) with [Docker Compose 2.15.1](https://docs.docker.com/compose). Additionally, you might want to consider installing [GNU Make 4.4.1](https://gnu.org/software/make), although it is optional. These are the minimum versions required for the tools. + +Once you have everything installed, download the release archive and unarchive it. + +```sh +$ curl --output Python.Example.zip --location https://github.com/ONLYOFFICE/document-server-integration/releases/latest/download/Python.Example.zip +$ unzip Python.Example.zip +``` + +Then open the example directory and [up containers](./Makefile#L38). + +```sh +$ cd "Python Example" +$ make compose-prod +``` + +By default, the server starts at `localhost:80`. + +To configure the example, you can edit the environment variables in [`compose-base.yml`](./compose-base.yml). See [below](#configuration) for more information about environment variables. + +### On Local Machine + +Before diving into the example, you will need to install ONLYOFFICE Document Server (also known as Docs). Check the detailed guide to learn how to install it on [Windows](https://helpcenter.onlyoffice.com/installation/docs-developer-install-windows.aspx), [Linux](https://helpcenter.onlyoffice.com/installation/docs-developer-install-ubuntu.aspx), or [Docker](https://helpcenter.onlyoffice.com/installation/docs-developer-install-docker.aspx). + +To run the example on your local machine, you will need [Python 3.11.4](https://python.org) with [pip 23.1.2](https://pip.pypa.io). Additionally, you might want to consider installing [GNU Make 4.4.1](https://gnu.org/software/make), although it is optional. These are the minimum versions required for the tools. + +Once you have everything installed, download the release archive and unarchive it. + +```sh +$ curl --output Python.Example.zip --location https://github.com/ONLYOFFICE/document-server-integration/releases/latest/download/Python.Example.zip +$ unzip Python.Example.zip +``` + +Then open the example directory, [install dependencies](./Makefile#L13), and [start the server](./Makefile#L21). + +```sh +$ cd "Python Example" +$ make prod +$ make server-prod +``` + +By default, the server starts at `0.0.0.0:8000`. + +To configure the example, you can pass the environment variables before the command that starts the server. See [below](#configuration) for more information about environment variables. + +## Post Installation + +In case the example and Document Server are installed on different computers, make sure that your server with the example installed has access to the Document Server with the address which you specify instead of **documentserver** in the configuration files. + +Make sure that the Document Server has access to the server with the example installed with the address which you specify instead of **example.com** in the configuration files. + +## Configuration + +The example is configured by changing environment variables. + +| Name | Description | Example | +| ----------------------------- | ----------------------------------------------------------------------- | ----------------------- | +| `DEBUG` | Disable or enable debug mode. | `false` | +| `ADDRESS` | The address where the server should be started. | `0.0.0.0` | +| `PORT` | The port on which the server should be running. | `80` | +| `DOCUMENT_SERVER_PRIVATE_URL` | The URL through which the server will communicate with Document Server. | `http://proxy:8080` | +| `DOCUMENT_SERVER_PUBLIC_URL` | The URL through which a user will communicate with Document Server. | `http://localhost:8080` | +| `EXAMPLE_URL` | The URL through which Document Server will communicate with the server. | `http://proxy` | +| `JWT_SECRET` | JWT authorization secret. Leave blank to disable authorization. | `your-256-bit-secret` | + +## Security Info + +Please keep in mind the following security aspects when you are using test examples: + +- There is no protection of the storage from unauthorized access since there is no need for authorization. +- There are no checks against parameter substitution in links, since the parameters are generated by the code according to the pre-arranged scripts. +- There are no data checks in requests of saving the file after editing, since each test example is intended for requests only from ONLYOFFICE Document Server. +- There are no prohibitions on using test examples from other sites, since they are intended to interact with ONLYOFFICE Document Server from another domain. From 8696f26555c614e40207ef5e43a3122a7dbdf577 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Thu, 26 Oct 2023 15:23:45 +0300 Subject: [PATCH 173/488] nodejs: fix directUrl property (815b5fb) --- web/documentserver-example/nodejs/views/editor.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/nodejs/views/editor.ejs b/web/documentserver-example/nodejs/views/editor.ejs index 9ed86798a..a978eac5e 100644 --- a/web/documentserver-example/nodejs/views/editor.ejs +++ b/web/documentserver-example/nodejs/views/editor.ejs @@ -242,7 +242,7 @@ var requestReference = function(data, callback) { innerAlert(data); - event.data.directUrl = !!config.document.directUrl; + data.directUrl = !!config.document.directUrl; let xhr = new XMLHttpRequest(); xhr.open("POST", "reference"); From 5ab7261d314cf2e72d8d017981284300c4df84eb Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Fri, 20 Oct 2023 12:54:57 +0300 Subject: [PATCH 174/488] php: onRequestOpen for referenceData source file --- .../php/docker-compose.yml | 2 +- web/documentserver-example/php/src/ajax.php | 3 +- .../php/templates/docEditor.tpl | 36 ++++++++++++++++--- 3 files changed, 34 insertions(+), 7 deletions(-) diff --git a/web/documentserver-example/php/docker-compose.yml b/web/documentserver-example/php/docker-compose.yml index 1b9d75e21..9ff37c3d9 100644 --- a/web/documentserver-example/php/docker-compose.yml +++ b/web/documentserver-example/php/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: document-server: container_name: document-server - image: onlyoffice/documentserver:7.3.3.50 + image: onlyoffice/documentserver:latest expose: - "80" environment: diff --git a/web/documentserver-example/php/src/ajax.php b/web/documentserver-example/php/src/ajax.php index 1353c82bc..59fc065e1 100644 --- a/web/documentserver-example/php/src/ajax.php +++ b/web/documentserver-example/php/src/ajax.php @@ -576,7 +576,8 @@ function reference() ]), "instanceId" => serverPath(), ], - "path" => $fileName + "path" => $fileName, + "link" => serverPath() . '/editor?fileID=' . $fileName ]; if ($jwtManager->isJwtEnabled()) { diff --git a/web/documentserver-example/php/templates/docEditor.tpl b/web/documentserver-example/php/templates/docEditor.tpl index 2d1787b67..561fab980 100644 --- a/web/documentserver-example/php/templates/docEditor.tpl +++ b/web/documentserver-example/php/templates/docEditor.tpl @@ -98,18 +98,43 @@ return link; }; + var onRequestOpen = function(event) { // user open external data source + innerAlert("onRequestOpen"); + var windowName = event.data.windowName; + + requestReference(event.data, function (data) { + if (data.error) { + var winEditor = window.open("", windowName); + winEditor.close(); + innerAlert(data.error, true); + return; + } + + var link = data.link; + window.open(link, windowName); + }); + }; + var onRequestReferenceData = function(event) { // user refresh external data source - innerAlert("onRequestReferenceData: " + JSON.stringify(event.data)); + innerAlert("onRequestReferenceData"); - event.data.directUrl = !!config.document.directUrl; + requestReference(event.data, function (data) { + docEditor.setReferenceData(data); + }); + }; + + var requestReference = function(data, callback) { + innerAlert(data); + + data.directUrl = !!config.document.directUrl; let xhr = new XMLHttpRequest(); xhr.open("POST", "reference"); xhr.setRequestHeader("Content-Type", "application/json"); - xhr.send(JSON.stringify(event.data)); + xhr.send(JSON.stringify(data)); xhr.onload = function () { innerAlert(xhr.responseText); console.log(JSON.parse(xhr.responseText)); - docEditor.setReferenceData(JSON.parse(xhr.responseText)); + callback(JSON.parse(xhr.responseText)); } }; @@ -233,7 +258,8 @@ 'onRequestSelectDocument': onRequestSelectDocument, 'onRequestSelectSpreadsheet': onRequestSelectSpreadsheet, 'onRequestReferenceData': onRequestReferenceData, - 'onRequestRestore': onRequestRestore + 'onRequestRestore': onRequestRestore, + "onRequestOpen": onRequestOpen, }; {history} From 7ecec4219a1d4cb64beeff1cc3ee38adeed2c0c2 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Sat, 21 Oct 2023 14:18:08 +0300 Subject: [PATCH 175/488] csharp: onRequestOpen for referenceData source file --- .../csharp/DocEditor.aspx | 34 +++++++++++++++++-- .../csharp/WebEditor.ashx.cs | 3 +- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/web/documentserver-example/csharp/DocEditor.aspx b/web/documentserver-example/csharp/DocEditor.aspx index 4d2540589..f7c92b2b3 100644 --- a/web/documentserver-example/csharp/DocEditor.aspx +++ b/web/documentserver-example/csharp/DocEditor.aspx @@ -194,16 +194,42 @@ } }; + var onRequestOpen = function (event) { // user open external data source + innerAlert("onRequestOpen"); + var windowName = event.data.windowName; + + requestReference(event.data, function (data) { + if (data.error) { + var winEditor = window.open("", windowName); + winEditor.close(); + innerAlert(data.error, true); + return; + } + + var link = data.link; + window.open(link, windowName); + }); + }; + var onRequestReferenceData = function (event) { // user refresh external data source + innerAlert("onRequestReferenceData"); - event.data.directUrl = !!config.document.directUrl; + requestReference(event.data, function (data) { + docEditor.setReferenceData(data); + }); + }; + + var requestReference = function (data, callback) { + innerAlert(data); + + data.directUrl = !!config.document.directUrl; let xhr = new XMLHttpRequest(); xhr.open("POST", "webeditor.ashx?type=reference"); xhr.setRequestHeader("Content-Type", "application/json"); - xhr.send(JSON.stringify(event.data)); + xhr.send(JSON.stringify(data)); xhr.onload = function () { console.log(xhr.responseText); - docEditor.setReferenceData(JSON.parse(xhr.responseText)); + callback(JSON.parse(xhr.responseText)); } }; @@ -290,6 +316,8 @@ config.events['onRequestReferenceData'] = onRequestReferenceData; // prevent switch the document from the viewing into the editing mode for anonymous users config.events['onRequestEditRights'] = onRequestEditRights; + // add link to reference data source file + config.events['onRequestOpen'] = onRequestOpen; } if (config.editorConfig.createUrl) { diff --git a/web/documentserver-example/csharp/WebEditor.ashx.cs b/web/documentserver-example/csharp/WebEditor.ashx.cs index e69e36480..2b2a75929 100644 --- a/web/documentserver-example/csharp/WebEditor.ashx.cs +++ b/web/documentserver-example/csharp/WebEditor.ashx.cs @@ -665,7 +665,8 @@ private static void Reference(HttpContext context) {"instanceId", _Default.GetServerUrl(false) } } }, - { "path", fileName } + { "path", fileName }, + { "link", _Default.GetServerUrl(false) + "doceditor.aspx?fileID=" + fileName } }; if (JwtManager.Enabled) From 5b17ba41c341152d2f3ae468b8ff04a70209b7ed Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Sat, 21 Oct 2023 18:58:57 +0300 Subject: [PATCH 176/488] mvc: onRequestOpen for referenceData source file --- .../csharp-mvc/Views/Home/Editor.aspx | 32 +++++++++++++++++-- .../csharp-mvc/WebEditor.ashx.cs | 3 +- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx index 5c9ccdee9..4e2cacc2c 100644 --- a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx +++ b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx @@ -182,15 +182,39 @@ } }; + var onRequestOpen = function (event) { // user open external data source + innerAlert("onRequestOpen"); + var windowName = event.data.windowName; + requestReference(event.data, function (data) { + if (data.error) { + var winEditor = window.open("", windowName); + winEditor.close(); + innerAlert(data.error, true); + return; + } + var link = data.link; + window.open(link, windowName); + }); + }; + var onRequestReferenceData = function (event) { // user refresh external data source - event.data.directUrl = !!config.document.directUrl; + innerAlert("onRequestReferenceData"); + + requestReference(event.data, function (data) { + docEditor.setReferenceData(data); + }); + }; + + var requestReference = function (data, callback) { + innerAlert(data); + data.directUrl = !!config.document.directUrl; let xhr = new XMLHttpRequest(); xhr.open("POST", "webeditor.ashx?type=reference"); xhr.setRequestHeader("Content-Type", "application/json"); - xhr.send(JSON.stringify(event.data)); + xhr.send(JSON.stringify(data)); xhr.onload = function () { console.log(xhr.responseText); - docEditor.setReferenceData(JSON.parse(xhr.responseText)); + callback(JSON.parse(xhr.responseText)); } }; @@ -287,6 +311,8 @@ config.events['onRequestReferenceData'] = onRequestReferenceData; // prevent switch the document from the viewing into the editing mode for anonymous users config.events['onRequestEditRights'] = onRequestEditRights; + // add link to reference data source file + config.events['onRequestOpen'] = onRequestOpen; } if (config.editorConfig.createUrl) { diff --git a/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs b/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs index 8fb782551..89487893e 100644 --- a/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs +++ b/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs @@ -853,7 +853,8 @@ private static void Reference(HttpContext context) { "instanceId", DocManagerHelper.GetServerUrl(false) } } }, - { "path", fileName } + { "path", fileName }, + { "link", DocManagerHelper.GetServerUrl(false) + "Editor?fileName=" + fileName } }; if (JwtManager.Enabled) From 8d94e424217f649f68ee30ffa9c6cf9663974549 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 23 Oct 2023 15:13:40 +0300 Subject: [PATCH 177/488] python: onRequestOpen for referenceData source file --- .../python/src/views/actions.py | 3 +- .../python/templates/editor.html | 32 ++++++++++++++++--- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py index 10b6f010f..2da9be087 100755 --- a/web/documentserver-example/python/src/views/actions.py +++ b/web/documentserver-example/python/src/views/actions.py @@ -502,7 +502,8 @@ def reference(request): 'instanceId' : docManager.getServerUrl(False, request), 'fileKey' : json.dumps({'fileName' : fileName, 'userAddress': request.META['REMOTE_ADDR']}) }, - 'path' : fileName + 'path' : fileName, + 'link' : docManager.getServerUrl(False, request) + '/edit?filename=' + fileName } if (jwtManager.isEnabled()): diff --git a/web/documentserver-example/python/templates/editor.html b/web/documentserver-example/python/templates/editor.html index 722bf0d6e..f2297b516 100755 --- a/web/documentserver-example/python/templates/editor.html +++ b/web/documentserver-example/python/templates/editor.html @@ -170,18 +170,40 @@ } }; + var onRequestOpen = function (event) { // user open external data source + innerAlert("onRequestOpen"); + var windowName = event.data.windowName; + requestReference(event.data, function (data) { + if (data.error) { + var winEditor = window.open("", windowName); + winEditor.close(); + innerAlert(data.error, true); + return; + } + var link = data.link; + window.open(link, windowName); + }); + }; + var onRequestReferenceData = function(event) { // user refresh external data source - innerAlert("onRequestReferenceData: " + JSON.stringify(event.data)); + innerAlert("onRequestReferenceData"); - event.data.directUrl = !!config.document.directUrl; + requestReference(event.data, function (data) { + docEditor.setReferenceData(data); + }); + }; + + var requestReference = function (data, callback) { + innerAlert(data); + data.directUrl = !!config.document.directUrl; let xhr = new XMLHttpRequest(); xhr.open("POST", "reference"); xhr.setRequestHeader("Content-Type", "application/json"); - xhr.send(JSON.stringify(event.data)); + xhr.send(JSON.stringify(data)); xhr.onload = function () { innerAlert(xhr.responseText); console.log(JSON.parse(xhr.responseText)); - docEditor.setReferenceData(JSON.parse(xhr.responseText)); + callback(JSON.parse(xhr.responseText)); } }; @@ -265,6 +287,8 @@ // prevent switch the document from the viewing into the editing mode for anonymous users config.events['onRequestEditRights'] = onRequestEditRights; + // add link to reference data source file + config.events['onRequestOpen'] = onRequestOpen; } if (config.editorConfig.createUrl) { From 4e3f87f692fc6657bb3a82909c53b6051f891aa6 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 23 Oct 2023 19:11:32 +0300 Subject: [PATCH 178/488] java-spring: onRequestOpen for referenceData source file --- .../controllers/FileController.java | 1 + .../onlyoffice/integration/dto/Reference.java | 1 + .../src/main/resources/templates/editor.html | 36 +++++++++++++++++-- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java index 315d8b1c4..159b0eea5 100755 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java @@ -522,6 +522,7 @@ public String reference(@RequestBody final Reference body) { data.put("directUrl", body.getDirectUrl() ? documentManager.getDownloadUrl(fileName, false) : null); data.put("referenceData", referenceData); data.put("path", fileName); + data.put("link", storagePathBuilder.getServerUrl(true) + "/editor?fileName=" + fileName); if (jwtManager.tokenEnabled()) { String token = jwtManager.createToken(data); diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Reference.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Reference.java index 705d0d873..799ea7d9c 100644 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Reference.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Reference.java @@ -28,6 +28,7 @@ @AllArgsConstructor @NoArgsConstructor public class Reference { + private String windowName; private Boolean directUrl; private ReferenceData referenceData; private String path; diff --git a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html index 3694fc328..774be409c 100755 --- a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html +++ b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html @@ -166,15 +166,43 @@ } }; + var onRequestOpen = function(event) { // user open external data source + innerAlert("onRequestOpen"); + var windowName = event.data.windowName; + + requestReference(event.data, function (data) { + if (data.error) { + var winEditor = window.open("", windowName); + winEditor.close(); + innerAlert(data.error, true); + return; + } + + var link = data.link; + window.open(link, windowName); + }); + }; + var onRequestReferenceData = function(event) { // user refresh external data source - event.data.directUrl = !!config.document.directUrl; + innerAlert("onRequestReferenceData"); + + requestReference(event.data, function (data) { + docEditor.setReferenceData(data); + }); + }; + + var requestReference = function(data, callback) { + innerAlert(data); + + data.directUrl = !!config.document.directUrl; + let xhr = new XMLHttpRequest(); xhr.open("POST", "reference"); xhr.setRequestHeader("Content-Type", "application/json"); - xhr.send(JSON.stringify(event.data)); + xhr.send(JSON.stringify(data)); xhr.onload = function () { innerAlert(xhr.responseText); - docEditor.setReferenceData(JSON.parse(xhr.responseText)); + callback(JSON.parse(xhr.responseText)); } }; @@ -274,6 +302,8 @@ config.events['onRequestReferenceData'] = onRequestReferenceData; // prevent switch the document from the viewing into the editing mode for anonymous users config.events['onRequestEditRights'] = onRequestEditRights; + // add link to reference data source file + config.events['onRequestOpen'] = onRequestOpen; } if (config.editorConfig.createUrl) { From 2f87f3b7c94f4c898ef04174dd0db3d0a49ceb47 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Fri, 20 Oct 2023 13:19:29 +0300 Subject: [PATCH 179/488] nodejs: set current avatar --- web/documentserver-example/nodejs/app.js | 1 + .../nodejs/helpers/users.js | 10 ++++++++-- .../nodejs/public/images/uid-1.png | Bin 0 -> 2226 bytes .../nodejs/public/images/uid-2.png | Bin 0 -> 2199 bytes .../nodejs/views/config.ejs | 1 + 5 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 web/documentserver-example/nodejs/public/images/uid-1.png create mode 100644 web/documentserver-example/nodejs/public/images/uid-2.png diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js index 7eec4cea4..1842a79c9 100755 --- a/web/documentserver-example/nodejs/app.js +++ b/web/documentserver-example/nodejs/app.js @@ -1000,6 +1000,7 @@ app.get('/editor', (req, res) => { // define a handler for editing document curUserHostAddress: req.DocManager.curUserHostAddress(), lang, userid: userid !== 'uid-0' ? userid : null, + userImage: user.avatar ? `${req.DocManager.getServerUrl()}/images/${user.id}.png` : null, name, userGroup, reviewGroups: JSON.stringify(reviewGroups), diff --git a/web/documentserver-example/nodejs/helpers/users.js b/web/documentserver-example/nodejs/helpers/users.js index 09c8296f6..0461b9392 100644 --- a/web/documentserver-example/nodejs/helpers/users.js +++ b/web/documentserver-example/nodejs/helpers/users.js @@ -29,6 +29,7 @@ class User { deniedPermissions, descriptions, templates, + avatar, ) { this.id = id; this.name = name; @@ -41,6 +42,7 @@ class User { this.deniedPermissions = deniedPermissions; this.descriptions = descriptions; this.templates = templates; + this.avatar = avatar; } } @@ -53,6 +55,7 @@ const descrUser1 = [ 'Can create files from templates using data from the editor', 'Can see the information about all users', 'Can submit forms', + 'Has an avatar', ]; const descrUser2 = [ @@ -63,6 +66,7 @@ const descrUser2 = [ 'Can create new files from the editor', 'Can see the information about users from Group2 and users who don’t belong to any group', 'Can’t submit forms', + 'Has an avatar', ]; const descrUser3 = [ @@ -95,7 +99,7 @@ const descrUser0 = [ ]; const users = [ - new User('uid-1', 'John Smith', 'smith@example.com', null, null, {}, null, null, [], descrUser1, true), + new User('uid-1', 'John Smith', 'smith@example.com', null, null, {}, null, null, [], descrUser1, true, true), new User( 'uid-2', 'Mark Pottato', @@ -112,6 +116,7 @@ const users = [ [], descrUser2, false, + true, ), new User( 'uid-3', @@ -129,8 +134,9 @@ const users = [ ['copy', 'download', 'print'], descrUser3, false, + false, ), - new User('uid-0', null, null, null, null, {}, [], null, ['protect'], descrUser0, false), + new User('uid-0', null, null, null, null, {}, [], null, ['protect'], descrUser0, false, false), ]; // get a list of all the users diff --git a/web/documentserver-example/nodejs/public/images/uid-1.png b/web/documentserver-example/nodejs/public/images/uid-1.png new file mode 100644 index 0000000000000000000000000000000000000000..91cf9e02ce9c581fd3515f132a68945a8b1dea29 GIT binary patch literal 2226 zcmV;j2u=5iP)Px#32;bRa{vGf6951U69E94oEQKA0{~D=R7FQ{Ox)bu z)6>)9;o#oh-p$R;*45P8+1KFT-{0Tg-{0Th;Nafg-q+XH-QC^I&CSu#(bw14&CJWo z%gfW#)6&w?-rnBc-rmZ}%HQAL+S=OJ*VoO>&CSit%*@QPt*YAC*8BVS-rU;E%*@Eh z$jr>l+1c6I+1b(2(f9TB_xJbu`ueY@r=6RY`}+F(_x7csp0~2C`}_O6wz9movf

z*wfAW_Vf7j@#x~;=i=V$=;Ynq-QM2b(b3V^*x1(A*3{J0-{0TU)6><})yvDv+}zyP z*Vo(I+tSj~+1c69(9qi2+RV(%&(F`!&d$xv%@hm@BNY-K6cP~$2Mh-WI3pYy5f3I9 z7X17CG9nxu5f2y+3`{K~{QCI`1O&jFhE+BzDj5_|H!k}8{+^kbn3RzO0RgL}qC7G$ z;JT(aCL%E%7+N|ov5R;1)xxxoedN8Vk!xB#9vaT1l74q{#GZ;a9~nLaBomZdXlfNIGUgHDXCVUqm~ecxHubU!Z(x z^3c7AVpEfEVN5eD@y)n%O+eVJm+Hl_i-&{SzOg715Tu=%kbrzOD<_G2c$j8WP&_tC zHZMjkBl-6AR4^n)CLPAYzwG7Vd0bC|TuQl1#iEj#a%JS?vNI+uz#O*|wyP zZ(a8B?&iX;nRjN{ub@XOByT=9z@(U?a%1`0$y`rNbZ=~NX=m8i*Q%hO)WyP@YFELo zq_?G;aZ*IimxjBBd}mBPuat+GSXY2ZLt!v4n`d3dm4z`w5|{u006cV3PE!DoP_Ms$ zzYtLGAb)Rv&miwWPrq=VrAaEdX@4xS0&rq-LkiYNW z?~vk>3OoP+1oKHmK~y-)ebskV6G6A5`%X4wOWheClrc1};FPV)#djwzId^QWZK>?stpai>@@gCPn6#&BdMi72jM8xH#+;~Ktd)c9+{X2GOOUYz&}*f*0c7fjJU>_ znAQqSZ8*<@Ux6=~Yz~Wcv{Q_iUAv`1f4lMG#q}F%(y#(JWCnxFodxhpE9TI{#s0GN zuK>=C$c%|upLH`$R%pRgFlrK+Whu--j|jwaWzX6zS96CTzLOfxz%9hCB*ckj4Ttj` zCeW%cT-uvx7|ML~s4=TodfZI8R4UaLv9U;Sdj(_C(^1uz9%ktEch5JjkE;du+LU79fWvQN?OOY8IYrN3X@J_8fP^Q3I zMsm{EHN`g9ULnQ{@nU2VT!qAqex200Ri3O#RqWkAGT7XoyJzq3@`oevsLf7

=@QTFH*%9hw0afZChKaSVs@#Y{l6ET}z+LfFv#J1=E zo7Yg6H~fp)^7%eKJdY)aE!zt5UBTEYmni&n_y5{Al0Do|hQBy`B0yc9$83c3Jlh(4 zffdW;LYeNLzxM?U-`QPi885&dM$q~kEs)r4o3$oIpfV~xAo}L+lU%~`p(qvL#>c05c=9JzwTuWUK52JB5zEzepA!NeENbeA03PIq#?(DQb`qx;W&1f_( zhI`PKjx)Gy8C=F;A?O7PKjFIUGXZNn`NX3EYkYy&-i{19T!{D@=O)NRB1|Evy4es7 zus1PWkU8eQG1HZBAfCasCV|LLs6KUOEH=@wiO=W3@fsIcnhY|RONFy<4E`orBN6&x zrl`8;F9W_<9T8EE68OdOX6JxYYQe!n;ccmsNN}m^VgnKZJ|Cny;0>_D#5M|aVerO; zZ;NG-NfKpucXjigejM)%^7Y+zfamadgLWti2?^PlkWeg-l=S4Nt4=kHfnjV43R0B^R>?56m!4E>GrAYYa0t=A_XDsL<+3JVEoFACcnHQ3bG zm!Frh>lUc0di%90&#QNrg@qNB?O3(y%Fmboe6VZhwrwiadn=xL62AWdpl7dNzcw(i zv%LJ)Cm*kP<{3+x{gLDH53db;_Nm?HlaAy60nijp^WHMgaR2}S07*qoM6N<$g1R-5 A9RL6T literal 0 HcmV?d00001 diff --git a/web/documentserver-example/nodejs/public/images/uid-2.png b/web/documentserver-example/nodejs/public/images/uid-2.png new file mode 100644 index 0000000000000000000000000000000000000000..651b40c6b91e59c94b2752ddcbe0dac2ffe38cab GIT binary patch literal 2199 zcmV;I2x#|-P)Px#32;bRa{vGf6951U69E94oEQKA0{~D=R7FQ{Oq!vx ze}+AOW?e_fc_WbMi|LXMpNJ~|EXlJ0OxrB?IpQgB&pRoY}0h*z+hK-+` zqqU2Yq?@9&eT0{ak)w!@p@4^(hmN3uh?M3@LM|yN zB`G;IIU5fQI4?1|$=*^xJCnge>*BVWkG+?Pjd*pF zYG5-mI6592q_)mqUS?BQW6s;{h?%%NN@a0_ret-KFefTMGc#o(Xj|XN zy`74L@A&?ZaALrrl%%ArfmTf)AS=hLq4L_!gmZ5|K}Ty?T1YA*oUO(v3<^RqD}aKI zkD$I;YK%}{e3`1pTUlXjaD0)Z!B|H_UsYM4l$Nf))!ypzrmwzge44SYwY0s&p_{x zuivlFzmS)l?Zf~81k_1HK~y-)ebskZ6G<2c;6*{;?xcD?mQx@5_1-IzKtk}uAPWlt z0wj0 z_gH{gti85cPd{o`y=cjX)`Ra}TUJ(^$_FVx=e@SJx=$^(%XeF%#_kE{6p21Q@hJ(g za{<7nrq3+0dr0h&YTl`+RQMbLJTbv6A7E2c6BCmKdbu@;-K|p;ohgdonjmRVc}d%@ ze2W4v63^GGcA1+)eDYjqVx^B%iOXaqB?R7<*i}ejr`g;qHXv*tTwQaiQd)xB5IAmw z2OY$T;4-A0cG7#YY#)iagVh6-!Aimg6k#Ki2H`kC#OHgF*hvf7ZB_v9*=^5NC_}4p z!iLENSSD>NhmXlpy-*G(^fF(dFgsMKB=8EAJWyPrluBhde2n;tPQ4yl&Ce0GEUXS8 zs_G7mHZ){M`(G@l{^N)F$Huu~B({j6_N@Bq2;Dt_tR}STueG)8lXewkFTU&{RunTx?!mizG^|mQ*nD z_VzE~nKngQ7jtw3ttosxE;}yfzucT?|Jc~fj4Ecx@hB3*){tX`5bv`F+regE7Ybt< z9^__^0xsam3DxnauhHE?8hgWWZiPc}!kB;lYR$^d%FWB*i9=MXNOTdA*2P{!804^L zr;bifH&6T-oi*MX$>Rme+mD_!GlQB%-mdl7T1Rp_P>!Fcr+!yOHNy}*-ig4Yp{@)H zgR<4a);Myg&>+X*xG8@@rhjgo8sMTLWjvfT@RE~U1Jgtp-IY}T=3Dgwi8?c!7tZ5J zf)W_>wGO7ON39SZ5BB)2-zK6Yd4llp@S>vR^L&JXh8&DOeR_ou|CG}z5RBEU!)pct zlamJ-j5%##0EZ#DLNbRvyVh^?KvQhyuurI5oE$jGv7sd1{0a-gl|-W9o`ntgKy&`)5ttCD{V3@Mg+^)3TyXWZ}=IgQ_7SLPYS@L_e%_zdn?eCe% zYog08-avYTdiTA@ehIgK?Dp^d$uO66==OUXZ+-iT-`E{GpMCm?@fW`sfArx8+jlJb Z@qh8`Ye}<~)Vcrw002ovPDHLkV1jA>VwC^@ literal 0 HcmV?d00001 diff --git a/web/documentserver-example/nodejs/views/config.ejs b/web/documentserver-example/nodejs/views/config.ejs index 52c520b7e..fbfd44221 100755 --- a/web/documentserver-example/nodejs/views/config.ejs +++ b/web/documentserver-example/nodejs/views/config.ejs @@ -60,6 +60,7 @@ "user": { "group": "<%- editor.userGroup %>", "id": "<%- editor.userid %>", + "image": "<%- editor.userImage %>", "name": "<%- editor.name %>" } }, From e913cb3d2739b90c20a0d0ae4a38d51421588934 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Fri, 20 Oct 2023 13:29:31 +0300 Subject: [PATCH 180/488] nodejs: setUsers info --- web/documentserver-example/nodejs/app.js | 10 ++++++++++ web/documentserver-example/nodejs/views/editor.ejs | 3 +++ 2 files changed, 13 insertions(+) diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js index 1842a79c9..4bf86a3d9 100755 --- a/web/documentserver-example/nodejs/app.js +++ b/web/documentserver-example/nodejs/app.js @@ -930,6 +930,15 @@ app.get('/editor', (req, res) => { // define a handler for editing document const { commentGroups } = user; const { userInfoGroups } = user; + const usersInfo = []; + if (user.id !== 'uid-0') { + users.getAllUsers().forEach((userInfo) => { + const u = userInfo; + u.image = userInfo.avatar ? `${req.DocManager.getServerUrl()}/images/${userInfo.id}.png` : null; + usersInfo.push(u); + }, usersInfo); + } + if (fileExt) { // create demo document of a given extension const fName = req.DocManager.createDemo(!!req.query.sample, fileExt, userid, name, false); @@ -1034,6 +1043,7 @@ app.get('/editor', (req, res) => { // define a handler for editing document }, usersForMentions: user.id !== 'uid-0' ? users.getUsersForMentions(user.id) : null, usersForProtect: user.id !== 'uid-0' ? users.getUsersForProtect(user.id) : null, + usersInfo, }; if (cfgSignatureEnable) { diff --git a/web/documentserver-example/nodejs/views/editor.ejs b/web/documentserver-example/nodejs/views/editor.ejs index 170208d9e..2dc0718ed 100644 --- a/web/documentserver-example/nodejs/views/editor.ejs +++ b/web/documentserver-example/nodejs/views/editor.ejs @@ -198,6 +198,9 @@ case "protect": var users = <%- JSON.stringify(usersForProtect) %>; break; + case "info": + var users = <%- JSON.stringify(usersInfo) %>; + break; default: users = <%- JSON.stringify(usersForMentions) %>; } From 4bce33e3c26c6dde30cdf925eb4edfcc1bbe39dc Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Fri, 20 Oct 2023 14:18:56 +0300 Subject: [PATCH 181/488] nodejs: set required users only --- web/documentserver-example/nodejs/views/editor.ejs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/web/documentserver-example/nodejs/views/editor.ejs b/web/documentserver-example/nodejs/views/editor.ejs index 2dc0718ed..24bb951ed 100644 --- a/web/documentserver-example/nodejs/views/editor.ejs +++ b/web/documentserver-example/nodejs/views/editor.ejs @@ -199,7 +199,16 @@ var users = <%- JSON.stringify(usersForProtect) %>; break; case "info": - var users = <%- JSON.stringify(usersInfo) %>; + users = []; + var allUsers = <%- JSON.stringify(usersInfo) %>; + for (var i = 0; i < event.data.id.length; i++) { + for (var j = 0; j < allUsers.length; j++) { + if (allUsers[j].id == event.data.id[i]) { + users.push(allUsers[j]); + break; + } + } + } break; default: users = <%- JSON.stringify(usersForMentions) %>; From 438728294970bf6d4448ce74ee1cdf6dd8a24ece Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 24 Oct 2023 11:06:01 +0300 Subject: [PATCH 182/488] java: onRequestOpen for referenceData source file --- .../main/java/controllers/IndexServlet.java | 1 + .../java/src/main/webapp/editor.jsp | 34 +++++++++++++++++-- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java index c10abfdef..970db3044 100755 --- a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java +++ b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java @@ -733,6 +733,7 @@ private static void reference(final HttpServletRequest request, data.put("directUrl", directUrl ? DocumentManager.getDownloadUrl(fileName, false) : null); data.put("referenceData", referenceData); data.put("path", fileName); + data.put("link", DocumentManager.getServerUrl(false) + "/EditorServlet?fileName=" + fileName); if (DocumentManager.tokenEnabled()) { String token = DocumentManager.createToken(data); diff --git a/web/documentserver-example/java/src/main/webapp/editor.jsp b/web/documentserver-example/java/src/main/webapp/editor.jsp index e90821d62..a93dedc59 100644 --- a/web/documentserver-example/java/src/main/webapp/editor.jsp +++ b/web/documentserver-example/java/src/main/webapp/editor.jsp @@ -165,15 +165,41 @@ } }; + var onRequestOpen = function(event) { // user open external data source + innerAlert("onRequestOpen"); + var windowName = event.data.windowName; + + requestReference(event.data, function (data) { + if (data.error) { + var winEditor = window.open("", windowName); + winEditor.close(); + innerAlert(data.error, true); + return; + } + + var link = data.link; + window.open(link, windowName); + }); + }; + var onRequestReferenceData = function(event) { // user refresh external data source - event.data.directUrl = !!config.document.directUrl; + innerAlert("onRequestReferenceData"); + requestReference(event.data, function (data) { + docEditor.setReferenceData(data); + }); + }; + + var requestReference = function(data, callback) { + innerAlert(data); + data.directUrl = !!config.document.directUrl; + let xhr = new XMLHttpRequest(); xhr.open("POST", "IndexServlet?type=reference"); xhr.setRequestHeader("Content-Type", "application/json"); - xhr.send(JSON.stringify(event.data)); + xhr.send(JSON.stringify(data)); xhr.onload = function () { innerAlert(xhr.responseText); - docEditor.setReferenceData(JSON.parse(xhr.responseText)); + callback(JSON.parse(xhr.responseText)); } }; @@ -277,6 +303,8 @@ config.events['onRequestReferenceData'] = onRequestReferenceData; // prevent switch the document from the viewing into the editing mode for anonymous users config.events['onRequestEditRights'] = onRequestEditRights; + // add link to reference data source file + config.events['onRequestOpen'] = onRequestOpen; } if (config.editorConfig.createUrl) { From 67000fd0ed0e50bd581d77906f199fbd7697a31d Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Thu, 26 Oct 2023 16:32:41 +0300 Subject: [PATCH 183/488] nodejs: avatar to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0728c1e89..be5781686 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- nodejs: user avatar - trimming long name of uploading file - nodejs: link in referenceData - onRequestSelectDocument method From 73c60fba7d4185b6b2b5d354f23bd8a54585403b Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Thu, 26 Oct 2023 16:45:32 +0300 Subject: [PATCH 184/488] ruby: onRequestOpen for referenceData source file --- .../ruby/app/controllers/home_controller.rb | 3 +- .../ruby/app/views/home/editor.html.erb | 36 ++++++++++++++++--- .../ruby/compose-base.yml | 2 +- 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 5bb3bd4ed..f02ab2b1a 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -416,7 +416,8 @@ def reference :instanceId => DocumentHelper.get_server_url(false), :fileKey => {:fileName => fileName,:userAddress => DocumentHelper.cur_user_host_address(nil)}.to_json }, - :path => fileName + :path => fileName, + :link => DocumentHelper.get_server_url(false) + '/editor?fileName=' + fileName } if JwtHelper.is_enabled diff --git a/web/documentserver-example/ruby/app/views/home/editor.html.erb b/web/documentserver-example/ruby/app/views/home/editor.html.erb index 7fd218ec4..79983ebde 100755 --- a/web/documentserver-example/ruby/app/views/home/editor.html.erb +++ b/web/documentserver-example/ruby/app/views/home/editor.html.erb @@ -155,17 +155,43 @@ } }; - var onRequestReferenceData = function(event) { // user refresh external data source + var onRequestOpen = function(event) { // user open external data source + innerAlert("onRequestOpen"); + var windowName = event.data.windowName; - event.data.directUrl = !!config.document.directUrl; + requestReference(event.data, function (data) { + if (data.error) { + var winEditor = window.open("", windowName); + winEditor.close(); + innerAlert(data.error, true); + return; + } + var link = data.link; + window.open(link, windowName); + }); + }; + + var onRequestReferenceData = function(event) { // user refresh external data source + innerAlert("onRequestReferenceData"); + + requestReference(event.data, function (data) { + docEditor.setReferenceData(data); + }); + }; + + var requestReference = function(data, callback) { + innerAlert(data); + + data.directUrl = !!config.document.directUrl; let xhr = new XMLHttpRequest(); xhr.open("POST", "reference"); xhr.setRequestHeader("Content-Type", "application/json"); - xhr.send(JSON.stringify(event.data)); + xhr.send(JSON.stringify(data)); xhr.onload = function () { innerAlert(xhr.responseText); - docEditor.setReferenceData(JSON.parse(xhr.responseText)); + callback(JSON.parse(xhr.responseText)); } + }; function onRequestRestore(event) { @@ -245,6 +271,8 @@ config.events['onRequestReferenceData'] = onRequestReferenceData; // prevent switch the document from the viewing into the editing mode for anonymous users config.events['onRequestEditRights'] = onRequestEditRights; + // add link to reference data source file + config.events['onRequestOpen'] = onRequestOpen; } if (config.editorConfig.createUrl) { diff --git a/web/documentserver-example/ruby/compose-base.yml b/web/documentserver-example/ruby/compose-base.yml index a09574589..f47d78820 100644 --- a/web/documentserver-example/ruby/compose-base.yml +++ b/web/documentserver-example/ruby/compose-base.yml @@ -3,7 +3,7 @@ version: "3.8" services: document-server: container_name: document-server - image: onlyoffice/documentserver:7.3.3.50 + image: onlyoffice/documentserver:7.5 expose: - "80" environment: From 8b5a2aceb0afeadbdaa3e632f64ca37abec2fb71 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Thu, 26 Oct 2023 17:11:29 +0300 Subject: [PATCH 185/488] deleted comments that duplicate the context --- web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx | 1 - web/documentserver-example/csharp/DocEditor.aspx | 1 - .../java-spring/src/main/resources/templates/editor.html | 1 - web/documentserver-example/java/src/main/webapp/editor.jsp | 1 - web/documentserver-example/python/templates/editor.html | 1 - web/documentserver-example/ruby/app/views/home/editor.html.erb | 1 - 6 files changed, 6 deletions(-) diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx index 4e2cacc2c..dccaf5e1c 100644 --- a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx +++ b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx @@ -311,7 +311,6 @@ config.events['onRequestReferenceData'] = onRequestReferenceData; // prevent switch the document from the viewing into the editing mode for anonymous users config.events['onRequestEditRights'] = onRequestEditRights; - // add link to reference data source file config.events['onRequestOpen'] = onRequestOpen; } diff --git a/web/documentserver-example/csharp/DocEditor.aspx b/web/documentserver-example/csharp/DocEditor.aspx index f7c92b2b3..d9ca694a3 100644 --- a/web/documentserver-example/csharp/DocEditor.aspx +++ b/web/documentserver-example/csharp/DocEditor.aspx @@ -316,7 +316,6 @@ config.events['onRequestReferenceData'] = onRequestReferenceData; // prevent switch the document from the viewing into the editing mode for anonymous users config.events['onRequestEditRights'] = onRequestEditRights; - // add link to reference data source file config.events['onRequestOpen'] = onRequestOpen; } diff --git a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html index 774be409c..4aa1d3ffa 100755 --- a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html +++ b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html @@ -302,7 +302,6 @@ config.events['onRequestReferenceData'] = onRequestReferenceData; // prevent switch the document from the viewing into the editing mode for anonymous users config.events['onRequestEditRights'] = onRequestEditRights; - // add link to reference data source file config.events['onRequestOpen'] = onRequestOpen; } diff --git a/web/documentserver-example/java/src/main/webapp/editor.jsp b/web/documentserver-example/java/src/main/webapp/editor.jsp index a93dedc59..ee034a3da 100644 --- a/web/documentserver-example/java/src/main/webapp/editor.jsp +++ b/web/documentserver-example/java/src/main/webapp/editor.jsp @@ -303,7 +303,6 @@ config.events['onRequestReferenceData'] = onRequestReferenceData; // prevent switch the document from the viewing into the editing mode for anonymous users config.events['onRequestEditRights'] = onRequestEditRights; - // add link to reference data source file config.events['onRequestOpen'] = onRequestOpen; } diff --git a/web/documentserver-example/python/templates/editor.html b/web/documentserver-example/python/templates/editor.html index f2297b516..19687cf98 100755 --- a/web/documentserver-example/python/templates/editor.html +++ b/web/documentserver-example/python/templates/editor.html @@ -287,7 +287,6 @@ // prevent switch the document from the viewing into the editing mode for anonymous users config.events['onRequestEditRights'] = onRequestEditRights; - // add link to reference data source file config.events['onRequestOpen'] = onRequestOpen; } diff --git a/web/documentserver-example/ruby/app/views/home/editor.html.erb b/web/documentserver-example/ruby/app/views/home/editor.html.erb index 79983ebde..be699fe24 100755 --- a/web/documentserver-example/ruby/app/views/home/editor.html.erb +++ b/web/documentserver-example/ruby/app/views/home/editor.html.erb @@ -271,7 +271,6 @@ config.events['onRequestReferenceData'] = onRequestReferenceData; // prevent switch the document from the viewing into the editing mode for anonymous users config.events['onRequestEditRights'] = onRequestEditRights; - // add link to reference data source file config.events['onRequestOpen'] = onRequestOpen; } From 880423545fc0c1f21b004e1c8121a319809f4b72 Mon Sep 17 00:00:00 2001 From: vanyauhalin Date: Fri, 27 Oct 2023 09:16:04 +0400 Subject: [PATCH 186/488] php: update readme --- web/documentserver-example/php/README.md | 227 +++++------------------ 1 file changed, 50 insertions(+), 177 deletions(-) diff --git a/web/documentserver-example/php/README.md b/web/documentserver-example/php/README.md index 6c2572b78..d049b4596 100644 --- a/web/documentserver-example/php/README.md +++ b/web/documentserver-example/php/README.md @@ -1,212 +1,85 @@ ## Overview -This example will help you integrate ONLYOFFICE Docs into your web application written in PHP. +This example will help you integrate ONLYOFFICE Docs into your web application written on PHP. -**Please note**: It is intended for testing purposes and demonstrating functionality of the editors. Do NOT use this integration example on your own server without proper code modifications! In case you enabled the test example, disable it before going for production. +> [!WARNING] +> It is intended for testing purposes and demonstrating functionality of the editors. **DO NOT** use this integration example on your own server without proper code modifications. In case you enabled the test example, disable it before going for production. -## For Windows +## Installation -### Step 1. Install ONLYOFFICE Docs +The PHP example offers various installation options, but we highly recommend using Docker for this purpose. -Download and install ONLYOFFICE Docs (packaged as Document Server). +### Using Docker -See the detailed guide to learn how to [install Document Server for Windows](https://helpcenter.onlyoffice.com/installation/docs-developer-install-windows.aspx?from=api_php_example). +To run the example using [Docker](https://docker.com), you will need [Docker Desktop 4.17.0](https://docs.docker.com/desktop) or [Docker Engine 20.10.23](https://docs.docker.com/engine) with [Docker Compose 2.15.1](https://docs.docker.com/compose). Additionally, you might want to consider installing [GNU Make 4.4.1](https://gnu.org/software/make), although it is optional. These are the minimum versions required for the tools. -### Step 2. Download the PHP code for the editors integration - -Download the [PHP example](https://api.onlyoffice.com/editors/demopreview) from our site. - -To connect the editors to your website, specify the path to the editors installation and the path to the storage folder in the *config.json* file: +Once you have everything installed, download the release archive and unarchive it. +```sh +$ curl --output PHP.Example.zip --location https://github.com/ONLYOFFICE/document-server-integration/releases/latest/download/PHP.Example.zip +$ unzip PHP.Example.zip ``` -"storagePath" = ""; -"docServSiteUrl" = "https://documentserver/"; -``` - -where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed and the **storagePath** is the path where files will be created and stored. You can set an absolute path. For example, *D:\\\\folder*. Please note that on Windows OS the double backslash must be used as a separator. - -If you want to experiment with the editor configuration, modify the [parameters](https://api.onlyoffice.com/editors/advanced) in the *doceditor.php* file. - -### Step 3. Install the prerequisites - -You can use any web server capable of running PHP code to run the example. We will demonstrate how to run the PHP example using the **Internet Information Services (IIS)** web server. To set up and configure PHP on IIS, **PHP Manager for IIS** will be used. - -* **IIS**: version 7 or later (refer to [Microsoft official website](https://www.iis.net/learn/application-frameworks/scenario-build-a-php-website-on-iis/configuring-step-1-install-iis-and-php) to learn how to install IIS); -* **PHP** (download it from the [http://php.net](https://php.net/downloads.php) site); -* **PHP Manager for IIS** (download it from the [Microsoft open source site](https://www.iis.net/downloads/community/2018/05/php-manager-150-for-iis-10)). -* **Composer** (download it from the [Composer official website](https://getcomposer.org/download/)). - -### Step 4. IIS configuration - -1. **PHP Manager for IIS** configuration. - - After PHP Manager for IIS installation is complete, launch the **IIS Manager:** - - **Start** -> **Control Panel** -> **System and Security** -> **Administrative Tools** -> **Internet Information Services (IIS) Manager** - - and find the **PHP Manager** feature in the **Features View** in IIS. - - ![manager](screenshots/manager.png) - - You need to register the installed PHP version in IIS using PHP Manager. - - Double-click **PHP Manager** to open it, click the **Register new PHP version** task and specify the full path to the main PHP executable file location. For example: *C:\Program Files\PHP\php-cgi.exe*. - ![php-version-1](screenshots/php-version-1.jpg) +Then open the example directory and [up containers](./Makefile#L60). - After clicking **OK**, the new **PHP version** will be registered with IIS and will become active. - - ![php-version-2](screenshots/php-version-2.jpg) - -2. Configure IIS to handle PHP requests. - - For IIS to host PHP applications, you must add handler mapping that tells IIS to pass all the PHP-specific requests to the PHP application framework by using the **FastCGI** protocol. - - Double-click the **Handler Mappings** feature: - - ![handlerclick](screenshots/handlerclick.png) - - In the **Action** panel, click **Add Module Mapping**. In the **Add Module Mapping** dialog box, specify the configuration settings as follows: - - * **Request path**: *.php, - * **Module**: FastCgiModule, - * **Executable**: "C:\[Path to your PHP installation]\php-cgi.exe", - * **Name**: PHP via FastCGI. - - Click **OK**. - - ![handler-add](screenshots/handler-add.png) - - After IIS manager configuration is complete, everything is ready for running the PHP example. - -### Step 5. Run *composer install*: - - ``` - php composer.phar install - ``` +```sh +$ cd "PHP Example" +$ make compose-prod +``` -### Step 6. Run your website with the editors +By default, the server starts at `localhost:80`. -1. Add your website in the IIS Manager. +To configure the example, you can edit the environment variables in [`compose-base.yml`](./compose-base.yml). See [below](#configuration) for more information about environment variables. - On the **Connections** panel right-click the **Sites** node in the tree, then click **Add Website**. +### On Local Machine - ![add](screenshots/add.png) +Before diving into the example, you will need to install ONLYOFFICE Document Server (also known as Docs). Check the detailed guide to learn how to install it on [Windows](https://helpcenter.onlyoffice.com/installation/docs-developer-install-windows.aspx), [Linux](https://helpcenter.onlyoffice.com/installation/docs-developer-install-ubuntu.aspx), or [Docker](https://helpcenter.onlyoffice.com/installation/docs-developer-install-docker.aspx). -2. In the **Add Website** dialog box, specify the name of the folder with the PHP project in the **Site name** box. +To run the example on your local machine, you will need [PHP 8.2.11](https://php.net) with [Composer 2.6.5](https://getcomposer.org). Additionally, you might want to consider installing [GNU Make 4.4.1](https://gnu.org/software/make), although it is optional. These are the minimum versions required for the tools. - Specify the path to the folder with your project in the **Physical path** box. +Once you have everything installed, download the release archive and unarchive it. - Specify the unique value used only for this website in the **Port** box. +```sh +$ curl --output PHP.Example.zip --location https://github.com/ONLYOFFICE/document-server-integration/releases/latest/download/PHP.Example.zip +$ unzip PHP.Example.zip +``` - ![php-add](screenshots/php-add.png) +Then open the example directory, [install dependencies](./Makefile#L16), and [start the server](./Makefile#L40). -3. Browse your website with the IIS manager: +```sh +$ cd "PHP Example" +$ make prod +$ make server-prod +``` - Right-click the site -> **Manage Website** -> **Browse** +By default, the server starts at `0.0.0.0:9000`. - ![browse](screenshots/browse.png) +To configure the example, you can pass the environment variables before the command that starts the server. See [below](#configuration) for more information about environment variables. -### Step 7. Check accessibility +## Post Installation In case the example and Document Server are installed on different computers, make sure that your server with the example installed has access to the Document Server with the address which you specify instead of **documentserver** in the configuration files. Make sure that the Document Server has access to the server with the example installed with the address which you specify instead of **example.com** in the configuration files. -## For Linux +## Configuration -### Step 1. Install ONLYOFFICE Docs +The example is configured by changing environment variables. -Download and install ONLYOFFICE Docs (packaged as Document Server). - -See the detailed guide to learn how to [install Document Server for Linux](https://helpcenter.onlyoffice.com/installation/docs-developer-install-ubuntu.aspx?from=api_php_example). - -### Step 2. Install the prerequisites and run the website with the editors - -1. Install **Apache** and **PHP**: - - ``` - apt-get install -y apache2 php7.0 libapache2-mod-php7.0 - ``` - -2. Install **Composer**: - - To install composer globally, use the following command which will download and install Composer as a system-wide command named composer, under /usr/local/bin: - - ``` - curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php - sudo php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer - ``` - -3. Download the archive with the PHP example and unpack the archive: - - ``` - cd /var/www/html - ``` - - ``` - wget https://api.onlyoffice.com/app_data/editor/PHP.Example.zip - ``` - - ``` - unzip PHP.Example.zip - ``` - -4. Change the current directory for the project directory: - - ``` - cd PHP\ Example/ - ``` - -5. Edit the *config.json* configuration file. Specify the name of your local server with the ONLYOFFICE Document Server installed. - - ``` - nano config.json - ``` - - Edit the following lines: - - ``` - "storagePath" = ""; - "docServSiteUrl" = "https://documentserver/"; - ``` - - where the **documentserver** is the name of the server with the ONLYOFFICE Document Server installed and the **STORAGE_PATH** is the path where files will be created and stored. You can set an absolute path. - -6. Run *composer install*: - - ``` - php composer.phar install - ``` -7. Set permission for site: - - ``` - chown -R www-data:www-data /var/www/html - ``` - -8. Restart apache: - - ``` - service apache2 restart - ``` - -9. See the result in your browser using the address: - - ``` - http://localhost/PHP%20Example/ - ``` - -### Step 3. Check accessibility - -In case the example and Document Server are installed on different computers, make sure that your server with the example installed has access to the Document Server with the address which you specify instead of **documentserver** in the configuration files. - -Make sure that the Document Server has access to the server with the example installed with the address which you specify instead of **example.com** in the configuration files. +| Name | Description | Example | +| ----------------------------- | ----------------------------------------------------------------------- | ----------------------- | +| `ADDRESS` | The address where the server should be started. | `0.0.0.0` | +| `PORT` | The port on which the server should be running. | `80` | +| `DOCUMENT_SERVER_PRIVATE_URL` | The URL through which the server will communicate with Document Server. | `http://proxy:8080` | +| `DOCUMENT_SERVER_PUBLIC_URL` | The URL through which a user will communicate with Document Server. | `http://localhost:8080` | +| `EXAMPLE_URL` | The URL through which Document Server will communicate with the server. | `http://proxy` | +| `JWT_SECRET` | JWT authorization secret. Leave blank to disable authorization. | `your-256-bit-secret` | -## Important security info +## Security Info Please keep in mind the following security aspects when you are using test examples: -* There is no protection of the storage from unauthorized access since there is no need for authorization. -* There are no checks against parameter substitution in links, since the parameters are generated by the code according to the pre-arranged scripts. -* There are no data checks in requests of saving the file after editing, since each test example is intended for requests only from ONLYOFFICE Document Server. -* There are no prohibitions on using test examples from other sites, since they are intended to interact with ONLYOFFICE Document Server from another domain. \ No newline at end of file +- There is no protection of the storage from unauthorized access since there is no need for authorization. +- There are no checks against parameter substitution in links, since the parameters are generated by the code according to the pre-arranged scripts. +- There are no data checks in requests of saving the file after editing, since each test example is intended for requests only from ONLYOFFICE Document Server. +- There are no prohibitions on using test examples from other sites, since they are intended to interact with ONLYOFFICE Document Server from another domain. From 6aa57e3dfb6bd420c36a3aae5bfbceafd9e61f5c Mon Sep 17 00:00:00 2001 From: vanyauhalin Date: Fri, 27 Oct 2023 09:15:01 +0400 Subject: [PATCH 187/488] php: bump php version and pin composer version --- web/documentserver-example/php/.composer-version | 1 + web/documentserver-example/php/.php-version | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 web/documentserver-example/php/.composer-version diff --git a/web/documentserver-example/php/.composer-version b/web/documentserver-example/php/.composer-version new file mode 100644 index 000000000..57cf282eb --- /dev/null +++ b/web/documentserver-example/php/.composer-version @@ -0,0 +1 @@ +2.6.5 diff --git a/web/documentserver-example/php/.php-version b/web/documentserver-example/php/.php-version index dc16c14d2..770d52b60 100644 --- a/web/documentserver-example/php/.php-version +++ b/web/documentserver-example/php/.php-version @@ -1 +1 @@ -8.1.21 +8.2.11 From 36463aae8cb5f0245dc238dccd53bf7515a1e577 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Fri, 27 Oct 2023 11:28:00 +0300 Subject: [PATCH 188/488] nodejs: return external link in reference request --- web/documentserver-example/nodejs/app.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js index 4bf86a3d9..e10b0d48e 100755 --- a/web/documentserver-example/nodejs/app.js +++ b/web/documentserver-example/nodejs/app.js @@ -500,8 +500,11 @@ app.post('/reference', (req, res) => { // define a handler for renaming file } if (!fileName && !!req.body.link) { - if (req.body.link.indexOf(req.DocManager.curUserHostAddress()) !== -1) { - result({ error: 'You do not have access to this site' }); + if (req.body.link.indexOf(req.DocManager.curUserHostAddress()) === -1) { + result({ + url: req.body.link, + directUrl: req.body.link, + }); return; } From 1ab93ccb2879bf9beb89bbe067c14a1ffd6cc217 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Fri, 27 Oct 2023 11:44:46 +0300 Subject: [PATCH 189/488] nodejs: fix searching server address (969a8c6cfe3508b83b48c5f5f147bec1c3fd0899) --- web/documentserver-example/nodejs/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js index e10b0d48e..1a0378e4b 100755 --- a/web/documentserver-example/nodejs/app.js +++ b/web/documentserver-example/nodejs/app.js @@ -500,7 +500,7 @@ app.post('/reference', (req, res) => { // define a handler for renaming file } if (!fileName && !!req.body.link) { - if (req.body.link.indexOf(req.DocManager.curUserHostAddress()) === -1) { + if (req.body.link.indexOf(req.DocManager.getServerUrl()) === -1) { result({ url: req.body.link, directUrl: req.body.link, From 4f0e00b59767e332a86f9b11ad69d8197f63dc0f Mon Sep 17 00:00:00 2001 From: Natalia Date: Fri, 27 Oct 2023 11:49:12 +0300 Subject: [PATCH 190/488] fixed the file name --- web/documentserver-example/php/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/php/README.md b/web/documentserver-example/php/README.md index d049b4596..f2df1ccc2 100644 --- a/web/documentserver-example/php/README.md +++ b/web/documentserver-example/php/README.md @@ -29,7 +29,7 @@ $ make compose-prod By default, the server starts at `localhost:80`. -To configure the example, you can edit the environment variables in [`compose-base.yml`](./compose-base.yml). See [below](#configuration) for more information about environment variables. +To configure the example, you can edit the environment variables in [`docker-compose.yml`](./docker-compose.yml). See [below](#configuration) for more information about environment variables. ### On Local Machine From ace724bc212c699f4044f86b1ab7d8cc96b062e9 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Fri, 27 Oct 2023 18:03:13 +0700 Subject: [PATCH 191/488] ruby: setUsers for region protection --- CHANGELOG.md | 1 + .../ruby/app/models/file_model.rb | 5 +++++ .../ruby/app/models/users.rb | 12 +++++++++++- .../ruby/app/views/home/editor.html.erb | 17 ++++++++++++++--- 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0728c1e89..fde291818 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- ruby: setUsers for region protection - trimming long name of uploading file - nodejs: link in referenceData - onRequestSelectDocument method diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 65ce0d979..7c1129aef 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -350,6 +350,11 @@ def get_users_mentions return !@user.id.eql?("uid-0") ? Users.get_users_for_mentions(@user.id) : nil end + # get users data for protect + def get_users_protect + return !@user.id.eql?("uid-0") ? Users.get_users_for_protect(@user.id) : nil + end + # get direct url existence flag def is_enable_direct_url return @direct_url != nil && @direct_url == "true" diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index a6acbc462..e8a3cfaf7 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -91,7 +91,7 @@ class Users }, ["group-2", ""], true, [], @@descr_user_2, false), - User.new("uid-3", "Hamish Mitchell", "mitchell@example.com", + User.new("uid-3", "Hamish Mitchell", nil, "group-3", ["group-2"], { :view => ["group-3", "group-2"], :edit => ["group-2"], @@ -128,6 +128,16 @@ def get_users_for_mentions(id) # get a list of users with their names and email return usersData end + def get_users_for_protect(id) # get a list of users with their id, names and emails for protect + users_data = [] + for user in @@users do + if (!user.id.eql?(id) && user.name != nil) + users_data.push({id: user.id, name: user.name, email: user.email}) + end + end + return users_data + end + end end diff --git a/web/documentserver-example/ruby/app/views/home/editor.html.erb b/web/documentserver-example/ruby/app/views/home/editor.html.erb index 7fd218ec4..23d1b82dc 100755 --- a/web/documentserver-example/ruby/app/views/home/editor.html.erb +++ b/web/documentserver-example/ruby/app/views/home/editor.html.erb @@ -229,9 +229,20 @@ }; <% end %> // add mentions for not anonymous users - config.events['onRequestUsers'] = function () { - docEditor.setUsers({ // set a list of users to mention in the comments - "users": <%= raw @file.get_users_mentions.to_json %> + config.events['onRequestUsers'] = function (event) { + if (event && event.data){ + var c = event.data.c; + } + switch (c) { + case "protect": + var users = <%= raw @file.get_users_protect.to_json %>; + break; + default: + users = <%= raw @file.get_users_mentions.to_json %>; + } + docEditor.setUsers({ + "c": c, + "users": users, }); }; // the user is mentioned in a comment From eaf02452160a2d493dc6927b8f3bfc412592a261 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Fri, 27 Oct 2023 18:22:46 +0700 Subject: [PATCH 192/488] python: setUsers for region protection --- CHANGELOG.md | 1 + .../python/src/utils/users.py | 10 +++++++++- .../python/src/views/actions.py | 5 ++++- .../python/templates/editor.html | 19 +++++++++++++++---- 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fde291818..7b4b7ee89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- python: setUsers for region protection - ruby: setUsers for region protection - trimming long name of uploading file - nodejs: link in referenceData diff --git a/web/documentserver-example/python/src/utils/users.py b/web/documentserver-example/python/src/utils/users.py index ad84024e5..de855893c 100644 --- a/web/documentserver-example/python/src/utils/users.py +++ b/web/documentserver-example/python/src/utils/users.py @@ -90,7 +90,7 @@ def __init__(self, id, name, email, group, reviewGroups, commentGroups, userInfo }, ['group-2', ''], True, [], descr_user_2, False), - User('uid-3', 'Hamish Mitchell', 'mitchell@example.com', + User('uid-3', 'Hamish Mitchell', None, 'group-3', ['group-2'], { 'view': ["group-3", "group-2"], 'edit': ["group-2"], @@ -126,6 +126,14 @@ def getUsersForMentions(uid): usersData.append({'name':user.name, 'email':user.email}) return usersData +# get users data for protect +def getUsersForProtect(uid): + usersData = [] + for user in USERS: + if(user.id != uid and user.name != None): + usersData.append({'id': user.id, 'name': user.name, 'email': user.email}) + return usersData + def find_user(id: Optional[str]) -> User: if id is None: return DEFAULT_USER diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py index 10b6f010f..e51967361 100755 --- a/web/documentserver-example/python/src/views/actions.py +++ b/web/documentserver-example/python/src/views/actions.py @@ -322,6 +322,8 @@ def edit(request): # users data for mentions usersForMentions = users.getUsersForMentions(user.id) + # users data for protect + usersForProtect = users.getUsersForProtect(user.id) if jwtManager.isEnabled(): # if the secret key to generate token exists edConfig['token'] = jwtManager.encode(edConfig) # encode the edConfig object into a token @@ -340,7 +342,8 @@ def edit(request): 'dataInsertImage': json.dumps(dataInsertImage)[1 : len(json.dumps(dataInsertImage)) - 1], # the image which will be inserted into the document 'dataDocument': dataDocument, # document which will be compared with the current document 'dataSpreadsheet': json.dumps(dataSpreadsheet), # recipient data for mail merging - 'usersForMentions': json.dumps(usersForMentions) if user.id !='uid-0' else None + 'usersForMentions': json.dumps(usersForMentions) if user.id !='uid-0' else None, + 'usersForProtect': json.dumps(usersForProtect) if user.id !='uid-0' else None } return render(request, 'editor.html', context) # execute the "editor.html" template with context data diff --git a/web/documentserver-example/python/templates/editor.html b/web/documentserver-example/python/templates/editor.html index 722bf0d6e..e71c72ac1 100755 --- a/web/documentserver-example/python/templates/editor.html +++ b/web/documentserver-example/python/templates/editor.html @@ -248,10 +248,21 @@ {% endif %} // add mentions for not anonymous users - config.events['onRequestUsers'] = function () { - docEditor.setUsers({ // set a list of users to mention in the comments - "users": {{ usersForMentions | safe }} - }); + config.events['onRequestUsers'] = function (event) { + if (event && event.data){ + var c = event.data.c; + } + switch (c) { + case "protect": + var users = {{ usersForProtect | safe }}; + break; + default: + users = {{ usersForMentions | safe }}; + } + docEditor.setUsers({ + "c": c, + "users": users, + }) }; // the user is mentioned in a comment config.events['onRequestSendNotify'] = function (event) { From c2bb7985de31dea21855786a956b72251156a63e Mon Sep 17 00:00:00 2001 From: sshakndr Date: Fri, 27 Oct 2023 18:42:16 +0700 Subject: [PATCH 193/488] php: setUsers for region protection --- CHANGELOG.md | 1 + .../php/src/helpers/ExampleUsers.php | 24 ++++++++++++++++++- .../php/src/views/DocEditorView.php | 20 +++++++++++++--- 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b4b7ee89..a17bde498 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- php: setUsers for region protection - python: setUsers for region protection - ruby: setUsers for region protection - trimming long name of uploading file diff --git a/web/documentserver-example/php/src/helpers/ExampleUsers.php b/web/documentserver-example/php/src/helpers/ExampleUsers.php index cf1e3a0f8..87e42289e 100644 --- a/web/documentserver-example/php/src/helpers/ExampleUsers.php +++ b/web/documentserver-example/php/src/helpers/ExampleUsers.php @@ -106,7 +106,7 @@ public function __construct() new Users( "uid-3", "Hamish Mitchell", - "mitchell@example.com", + null, "group-3", ["group-2"], [ @@ -184,4 +184,26 @@ public function getUsersForMentions(?string $id): array } return $usersData; } + + /** + * Get a list of users with their names and emails for protect + * + * @param string|null $id + * + * @return array + */ + public function getUsersForProtect(?string $id): array + { + $usersData = []; + foreach ($this->users as $user) { + if ($user->id != $id && $user->name != null) { + $usersData[] = [ + "id" => $user->id, + "name" => $user->name, + "email" => $user->email, + ]; + } + } + return $usersData; + } } diff --git a/web/documentserver-example/php/src/views/DocEditorView.php b/web/documentserver-example/php/src/views/DocEditorView.php index 89f29b195..9fbbb120e 100644 --- a/web/documentserver-example/php/src/views/DocEditorView.php +++ b/web/documentserver-example/php/src/views/DocEditorView.php @@ -220,6 +220,8 @@ public function __construct($request, $tempName = "docEditor") // users data for mentions $usersForMentions = $user->id != "uid-0" ? $userList->getUsersForMentions($user->id) : null; + // users data for protect + $usersForProtect = $user->id != "uid-0" ? $userList->getUsersForProtect($user->id) : null; // check if the secret key to generate token exists if ($jwtManager->isJwtEnabled()) { @@ -249,9 +251,20 @@ public function __construct($request, $tempName = "docEditor") };"; } $historyLayout .= "// add mentions for not anonymous users - config.events['onRequestUsers'] = function () { - docEditor.setUsers({ // set a list of users to mention in the comments - \"users\": {usersForMentions} + config.events['onRequestUsers'] = function (event) { + if (event && event.data){ + var c = event.data.c; + } + switch (c) { + case \"protect\": + var users = {usersForProtect}; + break; + default: + users = {usersForMentions}; + } + docEditor.setUsers({ + \"c\": c, + \"users\": users, }); }; // the user is mentioned in a comment @@ -279,6 +292,7 @@ public function __construct($request, $tempName = "docEditor") "config" => json_encode($config), "history" => $historyLayout, "usersForMentions" => json_encode($usersForMentions), + "usersForProtect" => json_encode($usersForProtect), ]; } } From 043fb2c0cff32491bc64c7d3cb342cedee68de74 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Fri, 27 Oct 2023 16:49:54 +0300 Subject: [PATCH 194/488] returned documentserver version 7.3.3.50 to compose --- web/documentserver-example/php/docker-compose.yml | 2 +- web/documentserver-example/ruby/compose-base.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/php/docker-compose.yml b/web/documentserver-example/php/docker-compose.yml index 9ff37c3d9..1b9d75e21 100644 --- a/web/documentserver-example/php/docker-compose.yml +++ b/web/documentserver-example/php/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: document-server: container_name: document-server - image: onlyoffice/documentserver:latest + image: onlyoffice/documentserver:7.3.3.50 expose: - "80" environment: diff --git a/web/documentserver-example/ruby/compose-base.yml b/web/documentserver-example/ruby/compose-base.yml index f47d78820..a09574589 100644 --- a/web/documentserver-example/ruby/compose-base.yml +++ b/web/documentserver-example/ruby/compose-base.yml @@ -3,7 +3,7 @@ version: "3.8" services: document-server: container_name: document-server - image: onlyoffice/documentserver:7.5 + image: onlyoffice/documentserver:7.3.3.50 expose: - "80" environment: From f5016120675df63af1b33cee7689edb5d8f09781 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Mon, 30 Oct 2023 14:15:09 +0700 Subject: [PATCH 195/488] java-spring: setUsers for region protection --- CHANGELOG.md | 1 + .../onlyoffice/integration/ExampleData.java | 2 +- .../controllers/EditorController.java | 20 ++++++++++++ .../onlyoffice/integration/dto/Protect.java | 32 +++++++++++++++++++ .../src/main/resources/templates/editor.html | 18 +++++++++-- 5 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Protect.java diff --git a/CHANGELOG.md b/CHANGELOG.md index a17bde498..c77ed5f3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- java-spring: setUsers for region protection - php: setUsers for region protection - python: setUsers for region protection - ruby: setUsers for region protection diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java index 6fe3c3aea..3fe484998 100644 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java @@ -102,7 +102,7 @@ public void init() { true); // create user 3 with the specified parameters - userService.createUser("Hamish Mitchell", "mitchell@example.com", descriptionUserThird, + userService.createUser("Hamish Mitchell", null, descriptionUserThird, "group-3", List.of("group-2"), List.of("group-2", "group-3"), List.of("group-2"), new ArrayList<>(), List.of("group-2"), false, true, true); diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/EditorController.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/EditorController.java index d87321a81..9c1836552 100755 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/EditorController.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/EditorController.java @@ -25,6 +25,7 @@ import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder; import com.onlyoffice.integration.entities.User; import com.onlyoffice.integration.dto.Mentions; +import com.onlyoffice.integration.dto.Protect; import com.onlyoffice.integration.documentserver.models.enums.Type; import com.onlyoffice.integration.documentserver.models.filemodel.FileModel; import com.onlyoffice.integration.services.UserServices; @@ -150,6 +151,9 @@ public String index(@RequestParam("fileName") final String fileName, // get user data for mentions and add it to the model model.addAttribute("usersForMentions", getUserMentions(uid)); + + // get user data for protect and add it to the model + model.addAttribute("usersForProtect", getUserProtect(uid)); return "editor.html"; } @@ -169,6 +173,22 @@ private List getUserMentions(final String uid) { // get user data for return usersForMentions; } + private List getUserProtect(final String uid) { // get user data for protect + List usersForProtect = new ArrayList<>(); + if (uid != null && !uid.equals("4")) { + List list = userService.findAll(); + for (User u : list) { + if (u.getId() != Integer.parseInt(uid) && u.getId() != ANONYMOUS_USER_ID) { + + // user data includes user names, IDs and emails + usersForProtect.add(new Protect(u.getId(), u.getName(), u.getEmail())); + } + } + } + + return usersForProtect; + } + @SneakyThrows private String getInsertImage(final Boolean directUrl) { // get an image that will be inserted into the document Map dataInsertImage = new HashMap<>(); diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Protect.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Protect.java new file mode 100644 index 000000000..1d8b5d325 --- /dev/null +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Protect.java @@ -0,0 +1,32 @@ +/** + * + * (c) Copyright Ascensio System SIA 2023 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.onlyoffice.integration.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class Protect { + private Integer id; + private String name; + private String email; +} diff --git a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html index 3694fc328..cda31f795 100755 --- a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html +++ b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html @@ -255,12 +255,24 @@ }; var usersForMentions = [[${usersForMentions}]]; + var usersForProtect = [[${usersForProtect}]]; if (config.editorConfig.user.id != 4) { // add mentions for not anonymous users - config.events['onRequestUsers'] = function () { - docEditor.setUsers({ // set a list of users to mention in the comments - "users": usersForMentions + config.events['onRequestUsers'] = function (event) { + if (event && event.data){ + var c = event.data.c; + } + switch (c) { + case "protect": + var users = usersForProtect; + break; + default: + users = usersForMentions; + } + docEditor.setUsers({ + "c": c, + "users": users, }); }; // the user is mentioned in a comment From b8c6f72e74a4f97aeb2a780932e5cd5b042217be Mon Sep 17 00:00:00 2001 From: sshakndr Date: Mon, 30 Oct 2023 14:38:45 +0700 Subject: [PATCH 196/488] java: setUsers for region protection --- CHANGELOG.md | 1 + .../main/java/controllers/EditorServlet.java | 3 +++ .../java/src/main/java/helpers/Users.java | 17 ++++++++++++++++- .../java/src/main/webapp/editor.jsp | 18 +++++++++++++++--- 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c77ed5f3c..d6b0f31fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- java: setUsers for region protection - java-spring: setUsers for region protection - php: setUsers for region protection - python: setUsers for region protection diff --git a/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java b/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java index 2f6e65f27..9f8a022d1 100644 --- a/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java +++ b/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java @@ -106,6 +106,7 @@ protected void processRequest(final HttpServletRequest request, // users data for mentions List> usersForMentions = Users.getUsersForMentions(user.getId()); + List> usersForProtect = Users.getUsersForProtect(user.getId()); // check if the document token is enabled if (DocumentManager.tokenEnabled()) { @@ -131,6 +132,8 @@ protected void processRequest(final HttpServletRequest request, request.setAttribute("dataSpreadsheet", gson.toJson(dataSpreadsheet)); request.setAttribute("usersForMentions", !user.getId() .equals("uid-0") ? gson.toJson(usersForMentions) : null); + request.setAttribute("usersForProtect", !user.getId() + .equals("uid-0") ? gson.toJson(usersForProtect) : null); request.getRequestDispatcher("editor.jsp").forward(request, response); } diff --git a/web/documentserver-example/java/src/main/java/helpers/Users.java b/web/documentserver-example/java/src/main/java/helpers/Users.java index 173802f4a..8f2c30b9e 100755 --- a/web/documentserver-example/java/src/main/java/helpers/Users.java +++ b/web/documentserver-example/java/src/main/java/helpers/Users.java @@ -84,7 +84,7 @@ public final class Users { "group-2", Arrays.asList("group-2", ""), new CommentGroups(null, Arrays.asList("group-2", ""), Arrays.asList("group-2")), Arrays.asList("group-2", ""), true, new ArrayList(), descriptionUserSecond, false)); - add(new User("uid-3", "Hamish Mitchell", "mitchell@example.com", + add(new User("uid-3", "Hamish Mitchell", null, "group-3", Arrays.asList("group-2"), new CommentGroups(Arrays.asList("group-3", "group-2"), Arrays.asList("group-2"), null), Arrays.asList("group-2"), false, Arrays.asList("copy", "download", "print"), @@ -124,5 +124,20 @@ public static List> getUsersForMentions(final String id) { } return usersData; } + + // get a list of users with their names and emails for protect + public static List> getUsersForProtect(final String id) { + List> usersData = new ArrayList<>(); + for (User user : users) { + if (!user.getId().equals(id) && user.getName() != null) { + Map data = new HashMap<>(); + data.put("name", user.getName()); + data.put("email", user.getEmail()); + data.put("id", user.getId()); + usersData.add(data); + } + } + return usersData; + } } diff --git a/web/documentserver-example/java/src/main/webapp/editor.jsp b/web/documentserver-example/java/src/main/webapp/editor.jsp index e90821d62..31ee7c34d 100644 --- a/web/documentserver-example/java/src/main/webapp/editor.jsp +++ b/web/documentserver-example/java/src/main/webapp/editor.jsp @@ -257,13 +257,25 @@ <% String usersForMentions = (String) request.getAttribute("usersForMentions"); + String usersForProtect = (String) request.getAttribute("usersForProtect"); %> if (config.editorConfig.user.id) { // add mentions for not anonymous users - config.events['onRequestUsers'] = function () { - docEditor.setUsers({ // set a list of users to mention in the comments - "users": <%=usersForMentions%> + config.events['onRequestUsers'] = function (event) { + if (event && event.data){ + var c = event.data.c; + } + switch (c) { + case "protect": + var users = <%=usersForProtect%>; + break; + default: + users = <%=usersForMentions%>; + } + docEditor.setUsers({ + "c": c, + "users": users, }); }; // the user is mentioned in a comment From 7666394f1df8a8773c1bdc1ab02de4a5e1520232 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Mon, 30 Oct 2023 15:28:45 +0700 Subject: [PATCH 197/488] csharp-mvc: setUsers for region protection --- CHANGELOG.md | 1 + .../csharp-mvc/Helpers/Users.cs | 21 ++++++++++++++++++- .../csharp-mvc/Models/FileModel.cs | 9 ++++++++ .../csharp-mvc/Views/Home/Editor.aspx | 19 ++++++++++++++--- 4 files changed, 46 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6b0f31fb..a645ccddf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- csharp-mvc: setUsers for region protection - java: setUsers for region protection - java-spring: setUsers for region protection - php: setUsers for region protection diff --git a/web/documentserver-example/csharp-mvc/Helpers/Users.cs b/web/documentserver-example/csharp-mvc/Helpers/Users.cs index 6960f0584..0ed0a9aba 100644 --- a/web/documentserver-example/csharp-mvc/Helpers/Users.cs +++ b/web/documentserver-example/csharp-mvc/Helpers/Users.cs @@ -108,7 +108,7 @@ public class Users new User( "uid-3", "Hamish Mitchell", - "mitchell@example.com", + null, "group-3", new List() { "group-2" }, new Dictionary() @@ -171,6 +171,25 @@ public static List> getUsersForMentions(string id) } return usersData; } + + // get a list of users with their names and emails for protect + public static List> getUsersForProtect(string id) + { + List> usersData = new List>(); + foreach (User user in users) + { + if (!user.id.Equals(id) && user.name != null) + { + usersData.Add(new Dictionary() + { + {"name", user.name }, + {"email", user.email }, + {"id", user.id} + }); + } + } + return usersData; + } } public class User diff --git a/web/documentserver-example/csharp-mvc/Models/FileModel.cs b/web/documentserver-example/csharp-mvc/Models/FileModel.cs index 14ce0f7b5..ddc0028cb 100755 --- a/web/documentserver-example/csharp-mvc/Models/FileModel.cs +++ b/web/documentserver-example/csharp-mvc/Models/FileModel.cs @@ -372,5 +372,14 @@ public void GetUsersMentions(HttpRequest request, out string usersForMentions) var user = Users.getUser(id); usersForMentions = !user.id.Equals("uid-0") ? jss.Serialize(Users.getUsersForMentions(user.id)) : null; } + + //get a users for protect + public void GetUsersProtect(HttpRequest request, out string usersForProtect) + { + var jss = new JavaScriptSerializer(); + var id = request.Cookies.GetOrDefault("uid", null); + var user = Users.getUser(id); + usersForProtect = !user.id.Equals("uid-0") ? jss.Serialize(Users.getUsersForProtect(user.id)) : null; + } } } \ No newline at end of file diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx index 5c9ccdee9..99c2b4859 100644 --- a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx +++ b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx @@ -254,6 +254,8 @@ <% string usersForMentions; %> <% Model.GetUsersMentions(Request, out usersForMentions); %> + <% string usersForProtect; %> + <% Model.GetUsersProtect(Request, out usersForProtect); %> if (config.editorConfig.user.id) { // the user is trying to show the document version history @@ -269,9 +271,20 @@ // add mentions for not anonymous users <% if (!string.IsNullOrEmpty(usersForMentions)) { %> - config.events['onRequestUsers'] = function () { - docEditor.setUsers({ // set a list of users to mention in the comments - "users": <%= usersForMentions %> + config.events['onRequestUsers'] = function (event) { + if (event && event.data){ + var c = event.data.c; + } + switch (c) { + case "protect": + var users = <%= usersForProtect %>; + break; + default: + users = <%= usersForMentions %>; + } + docEditor.setUsers({ + "c": c, + "users": users, }); }; <% } %> From 0a76dba089159dc471669c74cc2e6fd7992979cc Mon Sep 17 00:00:00 2001 From: sshakndr Date: Mon, 30 Oct 2023 15:45:16 +0700 Subject: [PATCH 198/488] csharp: setUsers for region protection --- CHANGELOG.md | 1 + .../csharp/DocEditor.aspx | 17 +++++++++++--- .../csharp/DocEditor.aspx.cs | 5 +++++ web/documentserver-example/csharp/Users.cs | 22 ++++++++++++++++++- 4 files changed, 41 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a645ccddf..ef33c238e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- csharp: setUsers for region protection - csharp-mvc: setUsers for region protection - java: setUsers for region protection - java-spring: setUsers for region protection diff --git a/web/documentserver-example/csharp/DocEditor.aspx b/web/documentserver-example/csharp/DocEditor.aspx index 4d2540589..25a38b0b6 100644 --- a/web/documentserver-example/csharp/DocEditor.aspx +++ b/web/documentserver-example/csharp/DocEditor.aspx @@ -272,9 +272,20 @@ // add mentions for not anonymous users <% if (!string.IsNullOrEmpty(UsersForMentions)) { %> - config.events['onRequestUsers'] = function () { - docEditor.setUsers({ // set a list of users to mention in the comments - "users": <%= UsersForMentions %> + config.events['onRequestUsers'] = function (event) { + if (event && event.data){ + var c = event.data.c; + } + switch (c) { + case "protect": + var users = <%= UsersForProtect %>; + break; + default: + users = <%= UsersForMentions %>; + } + docEditor.setUsers({ + "c": c, + "users": users, }); }; <% } %> diff --git a/web/documentserver-example/csharp/DocEditor.aspx.cs b/web/documentserver-example/csharp/DocEditor.aspx.cs index 334112a9a..2184c4116 100755 --- a/web/documentserver-example/csharp/DocEditor.aspx.cs +++ b/web/documentserver-example/csharp/DocEditor.aspx.cs @@ -64,6 +64,7 @@ protected string DocServiceApiUri protected string DocumentData { get; private set; } protected string DataSpreadsheet { get; private set; } protected string UsersForMentions { get; private set; } + protected string UsersForProtect { get; private set; } protected string DocumentType { get { return _Default.DocumentType(FileName); } } // get callback url @@ -317,6 +318,10 @@ protected void Page_Load(object sender, EventArgs e) // get users for mentions List> usersData = Users.getUsersForMentions(user.id); UsersForMentions = !user.id.Equals("uid-0") ? jss.Serialize(usersData) : null; + + // get users for protect + List> usersProtectData = Users.getUsersForProtect(user.id); + UsersForProtect = !user.id.Equals("uid-0") ? jss.Serialize(usersProtectData) : null; } catch { } } diff --git a/web/documentserver-example/csharp/Users.cs b/web/documentserver-example/csharp/Users.cs index 1dea57de9..4ce7e731b 100644 --- a/web/documentserver-example/csharp/Users.cs +++ b/web/documentserver-example/csharp/Users.cs @@ -107,7 +107,7 @@ public class Users new User( "uid-3", "Hamish Mitchell", - "mitchell@example.com", + null, "group-3", new List() { "group-2" }, new Dictionary() @@ -171,6 +171,26 @@ public static List> getUsersForMentions(string id) } return usersData; } + + // get a list of users with their names and emails for protect + public static List> getUsersForProtect(string id) + { + List> usersData = new List>(); + + foreach (User user in users) + { + if (!user.id.Equals(id) && user.name != null) + { + usersData.Add(new Dictionary() + { + {"name", user.name }, + {"email", user.email }, + {"id", user.id} + }); + } + } + return usersData; + } } public class User From c78814ced4993d024358a6f9e2770a4e543a16a7 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Mon, 30 Oct 2023 16:15:57 +0700 Subject: [PATCH 199/488] removed pylint --- .github/workflows/lint-python.yml | 6 +--- web/documentserver-example/python/.pylintrc | 34 --------------------- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 web/documentserver-example/python/.pylintrc diff --git a/.github/workflows/lint-python.yml b/.github/workflows/lint-python.yml index 05a3a211d..dda9fed9a 100644 --- a/.github/workflows/lint-python.yml +++ b/.github/workflows/lint-python.yml @@ -27,14 +27,10 @@ jobs: run: | python -m pip install --upgrade pip pip install flake8 - pip install pylint if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - name: Lint Flake8 run: | flake8 --count --select=E9,F63,F7,F82 --show-source --statistics flake8 --count --max-complexity=15 --max-line-length=120 --per-file-ignores="__init__.py:F4" --statistics - - - name: Lint Pylint - run: | - pylint ./**/*.py --rcfile=.pylintrc --disable=import-error + diff --git a/web/documentserver-example/python/.pylintrc b/web/documentserver-example/python/.pylintrc deleted file mode 100644 index 55e1ee71c..000000000 --- a/web/documentserver-example/python/.pylintrc +++ /dev/null @@ -1,34 +0,0 @@ -[MAIN] -disable=C0114, # missing-module-docstring - C0115, # missing-class-docstring - C0116, # missing-function-docstring - E0611, # no-name-in-module - R0902, # too-many-instance-attributes - R0913, # too-many-arguments - R0914, # too-many-locals - W1514, # unspecified-encoding - R1710, # inconsistent-return-statements - R1732, # consider-using-with - -[FORMAT] -max-line-length=120 - -[BASIC] -argument-naming-style=any -attr-naming-style=any -function-naming-style=any -module-naming-style=any -variable-naming-style=any - -[DESIGN] -# max-args= -# max-attributes= -max-branches=15 -# max-locals= -min-public-methods=0 - -[EXCEPTIONS] -overgeneral-exceptions = builtins.[] - -[MISCELLANEOUS] -notes = ["FIXME", "XXX"] \ No newline at end of file From 03ffae8115800d0370d43e1389875ccfe004a99c Mon Sep 17 00:00:00 2001 From: sshakndr Date: Tue, 31 Oct 2023 13:54:06 +0700 Subject: [PATCH 200/488] php: fix convert (50dca2e2c06596d2ccd8fec1e912e97d50170c86) --- web/documentserver-example/php/assets/js/jscript.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/php/assets/js/jscript.js b/web/documentserver-example/php/assets/js/jscript.js index c24117beb..d64210431 100644 --- a/web/documentserver-example/php/assets/js/jscript.js +++ b/web/documentserver-example/php/assets/js/jscript.js @@ -108,7 +108,7 @@ if (typeof jQuery != "undefined") { } var fileName = jq("#hiddenFileName").val(); - var posExt = fileName.lastIndexOf('.'); + var posExt = fileName.lastIndexOf('.') + 1; posExt = 0 <= posExt ? fileName.substring(posExt).trim().toLowerCase() : ''; if (ConverExtList.indexOf(posExt) == -1) { From c7409e3f35f68c20395553b74b0a88a4b96146ff Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 31 Oct 2023 13:02:14 +0300 Subject: [PATCH 201/488] java-spring: added JsonIgnoreProperties annotation to ignore the "windowName" field --- .../main/java/com/onlyoffice/integration/dto/Reference.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Reference.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Reference.java index 799ea7d9c..2eb7d8488 100644 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Reference.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Reference.java @@ -18,6 +18,7 @@ package com.onlyoffice.integration.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -27,8 +28,8 @@ @Setter @AllArgsConstructor @NoArgsConstructor +@JsonIgnoreProperties(ignoreUnknown = true) public class Reference { - private String windowName; private Boolean directUrl; private ReferenceData referenceData; private String path; From 09c1b9e45cf442bea5043b0f501e0c2708a30633 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 31 Oct 2023 13:28:06 +0300 Subject: [PATCH 202/488] onRequestOpen to changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05842d70b..761f5a323 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +- ruby: onRequestOpen +- java-spring: onRequestOpen +- java: onRequestOpen +- csharp-mvc: onRequestOpen +- csharp: onRequestOpen +- python: onRequestOpen +- php: onRequestOpen - onRequestSelectDocument method - onRequestSelectSpreadsheet method - key in referenceData From 84824d1ed4aaad3482b2ff8c804187d5a40bc865 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Tue, 31 Oct 2023 14:26:29 +0300 Subject: [PATCH 203/488] onRequestOpen to changelog --- CHANGELOG.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01f11413b..eeaafcd45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,6 @@ # Change Log -- ruby: onRequestOpen -- java-spring: onRequestOpen -- java: onRequestOpen -- csharp-mvc: onRequestOpen -- csharp: onRequestOpen -- python: onRequestOpen -- php: onRequestOpen +- onRequestOpen method - nodejs: user avatar - trimming long name of uploading file - nodejs: link in referenceData From a5a1df45b1ce6266e7171cd5de08e88062dabb43 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Wed, 1 Nov 2023 10:18:58 +0700 Subject: [PATCH 204/488] python: user avatar --- CHANGELOG.md | 1 + .../python/src/utils/users.py | 18 +++++++----- .../python/src/views/actions.py | 16 +++++++++-- .../python/static/images/uid-1.jpg | Bin 0 -> 61966 bytes .../python/static/images/uid-2.jpg | Bin 0 -> 77760 bytes .../python/templates/editor.html | 26 ++++++++++++++++-- 6 files changed, 49 insertions(+), 12 deletions(-) create mode 100644 web/documentserver-example/python/static/images/uid-1.jpg create mode 100644 web/documentserver-example/python/static/images/uid-2.jpg diff --git a/CHANGELOG.md b/CHANGELOG.md index 05842d70b..0d0381dad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- python: user avatar - onRequestSelectDocument method - onRequestSelectSpreadsheet method - key in referenceData diff --git a/web/documentserver-example/python/src/utils/users.py b/web/documentserver-example/python/src/utils/users.py index ad84024e5..d92edd4aa 100644 --- a/web/documentserver-example/python/src/utils/users.py +++ b/web/documentserver-example/python/src/utils/users.py @@ -19,7 +19,8 @@ from typing import Optional class User: - def __init__(self, id, name, email, group, reviewGroups, commentGroups, userInfoGroups, favorite, deniedPermissions, descriptions, templates): + def __init__(self, id, name, email, group, reviewGroups, commentGroups, userInfoGroups, favorite, + deniedPermissions, descriptions, templates, avatar): self.id = id self.name = name self.email = email @@ -31,6 +32,7 @@ def __init__(self, id, name, email, group, reviewGroups, commentGroups, userInfo self.descriptions = descriptions self.templates = templates self.userInfoGroups = userInfoGroups + self.avatar = avatar descr_user_1 = [ "File author by default", @@ -39,7 +41,8 @@ def __init__(self, id, name, email, group, reviewGroups, commentGroups, userInfo "Can perform all actions with comments", "The file favorite state is undefined", "Can create files from templates using data from the editor", - "Can see the information about all users" + "Can see the information about all users", + "Has an avatar" ] descr_user_2 = [ @@ -48,7 +51,8 @@ def __init__(self, id, name, email, group, reviewGroups, commentGroups, userInfo "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only", "This file is marked as favorite", "Can create new files from the editor", - "Can see the information about users from Group2 and users who don’t belong to any group" + "Can see the information about users from Group2 and users who don’t belong to any group", + "Has an avatar" ] descr_user_3 = [ @@ -81,7 +85,7 @@ def __init__(self, id, name, email, group, reviewGroups, commentGroups, userInfo USERS = [ User('uid-1', 'John Smith', 'smith@example.com', '', None, {}, None, - None, [], descr_user_1, True), + None, [], descr_user_1, True, True), User('uid-2', 'Mark Pottato', 'pottato@example.com', 'group-2', ['group-2', ''], { 'view': "", @@ -89,17 +93,17 @@ def __init__(self, id, name, email, group, reviewGroups, commentGroups, userInfo 'remove': ["group-2"] }, ['group-2', ''], - True, [], descr_user_2, False), + True, [], descr_user_2, False, True), User('uid-3', 'Hamish Mitchell', 'mitchell@example.com', 'group-3', ['group-2'], { 'view': ["group-3", "group-2"], 'edit': ["group-2"], 'remove': [] }, ['group-2'], - False, ["copy", "download", "print"], descr_user_3, False), + False, ["copy", "download", "print"], descr_user_3, False, False), User('uid-0', None, None, '', None, {}, [], - None, ["protect"], descr_user_0, False) + None, ["protect"], descr_user_0, False, False) ] DEFAULT_USER = USERS[0] diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py index 10b6f010f..7d48a24ad 100755 --- a/web/documentserver-example/python/src/views/actions.py +++ b/web/documentserver-example/python/src/views/actions.py @@ -211,6 +211,16 @@ def edit(request): } ] + usersInfo = [] + if user.id != 'uid-0': + for userInfo in users.getAllUsers(): + u = userInfo + u.image = docManager.getServerUrl(True, request) + f'/static/images/{u.id}.jpg' if user.avatar else None + usersInfo.append({"id": u.id, "name": u.name, "email": u.email, "image": u.image, "group": u.group, + "reviewGroups":u.reviewGroups, "commentGroups":u.commentGroups, "favorite": u.favorite, + "deniedPermissions": u.deniedPermissions, "descriptions": u.descriptions, + "templates": u.templates, "userInfoGroups": u.userInfoGroups, "avatar": u.avatar}) + if (meta): # if the document meta data exists, infObj = { # write author and creation time parameters to the information object 'owner': meta['uname'], @@ -269,7 +279,8 @@ def edit(request): 'user': { # the user currently viewing or editing the document 'id': user.id if user.id !='uid-0' else None, 'name': user.name, - 'group': user.group + 'group': user.group, + 'image': docManager.getServerUrl(True, request) + f'/static/images/{user.id}.jpg' if user.avatar else None }, 'embedded': { # the parameters for the embedded document type 'saveUrl': directUrl, # the absolute URL that will allow the document to be saved onto the user personal computer @@ -340,7 +351,8 @@ def edit(request): 'dataInsertImage': json.dumps(dataInsertImage)[1 : len(json.dumps(dataInsertImage)) - 1], # the image which will be inserted into the document 'dataDocument': dataDocument, # document which will be compared with the current document 'dataSpreadsheet': json.dumps(dataSpreadsheet), # recipient data for mail merging - 'usersForMentions': json.dumps(usersForMentions) if user.id !='uid-0' else None + 'usersForMentions': json.dumps(usersForMentions) if user.id !='uid-0' else None, + 'usersInfo': json.dumps(usersInfo) } return render(request, 'editor.html', context) # execute the "editor.html" template with context data diff --git a/web/documentserver-example/python/static/images/uid-1.jpg b/web/documentserver-example/python/static/images/uid-1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e981731765b8cb2ea1eb8eff6bd083a116f31499 GIT binary patch literal 61966 zcmb5WbwE^I+b=x8C?E}jgoGmuQUX%a-2(_nH{39!h;$4fD4kM6D~)sw(jcXDr+{>e zz|i5h$NPET=bZE3cR8-T_pCkZ`mL+i+FSq3{P_tYRZ&n@0AXQ)Kv=*Z(4TpbEC~0` zox69yxOeZ~#lywLBOoUrxOb0$iiDJioR*4?mWGOk`XSR3$U_Dw12xTK9%d*z2iH?B zI><8tUQU50oLrokL9lS~@Cfh;CoIWK5-0x&%F*%t0@YHFW*;@cq9Z&N1p=`~j(n>eT)HNsu{kz$1Ul0|H3_$bdFc z30Dq=4PwET0sxF9?LAaIbvXb6Ng0)~M= zaS$mGNcu?}SScLn#Sj)H=S4+I?D+El=(^dAZ~$AwX*Q9aG2B=6{UvAfSt+gCu@kqc z*e%LAX{nC5%v)qVOZ`^1u)YVap;$4vq<_f}OEgxk^CztO8nETX{vR^{}jd0MwQCB>k&tO3DE zA|tk>;Gj#dISvzHITkl1PTb#LofSO2PDgJZIP{N~_Q?U`0Ga^?`+JlE&Tw-6P8^ho z&x8bby;H(K0EiR@_BQl)f0*GtS)6Y{iDV*ePMtepHT4$fY6e6s`gO4)qD63Jm-pB4 zu945Jr=V$T!yCBCasOP)>B^$GKi8MD;T>PUUkk^x6jH$a;_(B4QGuB;{R;qBiV3&| zfsok$IRW9_;abb)J7O3P&D45tBV%aCf#9ubtoQ4g7kd%iS~q?k zroVhx%DAa~41S-e!KsP`%U0s;jEqG4^M6;Lo_bv>j{BIg>=aJet@w!amJ|~1N@QN3 zstvx zht+02{j!9xX{eYjckh(QKdyMRE4|i>7{W*A9a@cSPBGNS&vLi5k-RjkkELJTDO

{)NS{#n?@)xRDhMU4U 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 RNm5WzMHB$EQA Date: Wed, 1 Nov 2023 10:59:41 +0700 Subject: [PATCH 205/488] python: lint fix --- web/documentserver-example/python/src/utils/docManager.py | 1 - web/documentserver-example/python/src/views/actions.py | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/documentserver-example/python/src/utils/docManager.py b/web/documentserver-example/python/src/utils/docManager.py index 1902810ea..b9ec57cc1 100755 --- a/web/documentserver-example/python/src/utils/docManager.py +++ b/web/documentserver-example/python/src/utils/docManager.py @@ -26,7 +26,6 @@ import requests import magic -from django.conf import settings from django.http import FileResponse from src.configuration import ConfigurationManager from src.format import FormatManager diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py index fb9604f68..2bbf47184 100755 --- a/web/documentserver-example/python/src/views/actions.py +++ b/web/documentserver-example/python/src/views/actions.py @@ -186,7 +186,6 @@ def edit(request): ext = fileUtils.getFileExt(filename) - fileUri = docManager.getFileUri(filename, True, request) directUrl = docManager.getDownloadUrl(filename, request, False) docKey = docManager.generateFileKey(filename, request) fileType = fileUtils.getFileType(filename) @@ -495,6 +494,7 @@ def downloadhistory(request): response.setdefault('error', 'File not found') return HttpResponse(json.dumps(response), content_type='application/json', status=404) + def historyobj(request): body = json.loads(request.body) response = {} @@ -508,13 +508,14 @@ def historyobj(request): if fileName is None: response.setdefault('error', 'File not found') return HttpResponse(json.dumps(response), content_type='application/json', status=404) - + storagePath = docManager.getStoragePath(fileName, request) docKey = docManager.generateFileKey(fileName, request) fileUrl = docManager.getDownloadUrl(fileName, request) response = historyManager.getHistoryObject(storagePath, fileName, docKey, fileUrl, False, request) return HttpResponse(json.dumps(response), content_type='application/json') + # referenceData def reference(request): response = {} From 20ca2d0cbdb261044bc789a2c14f9b761f4864b6 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Wed, 1 Nov 2023 11:17:34 +0700 Subject: [PATCH 206/488] python: lint fix --- web/documentserver-example/python/src/utils/users.py | 2 +- web/documentserver-example/python/src/views/actions.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/documentserver-example/python/src/utils/users.py b/web/documentserver-example/python/src/utils/users.py index 7311a4406..c390c9301 100644 --- a/web/documentserver-example/python/src/utils/users.py +++ b/web/documentserver-example/python/src/utils/users.py @@ -138,7 +138,7 @@ def getUsersForMentions(uid): def getUsersForProtect(uid): usersData = [] for user in USERS: - if(user.id != uid and user.name != None): + if (user.id != uid and user.name is not None): usersData.append({'id': user.id, 'name': user.name, 'email': user.email}) return usersData diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py index 95c31fd81..d4bc7eb63 100755 --- a/web/documentserver-example/python/src/views/actions.py +++ b/web/documentserver-example/python/src/views/actions.py @@ -350,7 +350,7 @@ def edit(request): } # users data for mentions - usersForMentions = users.getUsersForMentions(user.id) + usersForMentions = users.getUsersForMentions(user.id) # users data for protect usersForProtect = users.getUsersForProtect(user.id) @@ -375,8 +375,8 @@ def edit(request): 'dataInsertImage': json.dumps(dataInsertImage)[1: len(json.dumps(dataInsertImage)) - 1], 'dataDocument': dataDocument, # document which will be compared with the current document 'dataSpreadsheet': json.dumps(dataSpreadsheet), # recipient data for mail merging - 'usersForMentions': json.dumps(usersForMentions) if user.id !='uid-0' else None, - 'usersForProtect': json.dumps(usersForProtect) if user.id !='uid-0' else None + 'usersForMentions': json.dumps(usersForMentions) if user.id != 'uid-0' else None, + 'usersForProtect': json.dumps(usersForProtect) if user.id != 'uid-0' else None } return render(request, 'editor.html', context) # execute the "editor.html" template with context data From a220cdd6270aa6ffff242dad5a1d7313e782287d Mon Sep 17 00:00:00 2001 From: sshakndr Date: Wed, 1 Nov 2023 13:23:51 +0700 Subject: [PATCH 207/488] ruby: user avatar --- CHANGELOG.md | 1 + .../ruby/app/assets/images/uid-1.png | Bin 0 -> 2226 bytes .../ruby/app/assets/images/uid-2.png | Bin 0 -> 2199 bytes .../ruby/app/models/file_model.rb | 28 +++++++++++++++++- .../ruby/app/models/users.rb | 21 ++++++++----- .../ruby/app/views/home/editor.html.erb | 26 ++++++++++++++-- 6 files changed, 64 insertions(+), 12 deletions(-) create mode 100644 web/documentserver-example/ruby/app/assets/images/uid-1.png create mode 100644 web/documentserver-example/ruby/app/assets/images/uid-2.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ee89e827..f026ffeb0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- ruby: user avatar - python: user avatar - nodejs: user avatar - trimming long name of uploading file diff --git a/web/documentserver-example/ruby/app/assets/images/uid-1.png b/web/documentserver-example/ruby/app/assets/images/uid-1.png new file mode 100644 index 0000000000000000000000000000000000000000..91cf9e02ce9c581fd3515f132a68945a8b1dea29 GIT binary patch literal 2226 zcmV;j2u=5iP)Px#32;bRa{vGf6951U69E94oEQKA0{~D=R7FQ{Ox)bu z)6>)9;o#oh-p$R;*45P8+1KFT-{0Tg-{0Th;Nafg-q+XH-QC^I&CSu#(bw14&CJWo z%gfW#)6&w?-rnBc-rmZ}%HQAL+S=OJ*VoO>&CSit%*@QPt*YAC*8BVS-rU;E%*@Eh z$jr>l+1c6I+1b(2(f9TB_xJbu`ueY@r=6RY`}+F(_x7csp0~2C`}_O6wz9movf

z*wfAW_Vf7j@#x~;=i=V$=;Ynq-QM2b(b3V^*x1(A*3{J0-{0TU)6><})yvDv+}zyP z*Vo(I+tSj~+1c69(9qi2+RV(%&(F`!&d$xv%@hm@BNY-K6cP~$2Mh-WI3pYy5f3I9 z7X17CG9nxu5f2y+3`{K~{QCI`1O&jFhE+BzDj5_|H!k}8{+^kbn3RzO0RgL}qC7G$ z;JT(aCL%E%7+N|ov5R;1)xxxoedN8Vk!xB#9vaT1l74q{#GZ;a9~nLaBomZdXlfNIGUgHDXCVUqm~ecxHubU!Z(x z^3c7AVpEfEVN5eD@y)n%O+eVJm+Hl_i-&{SzOg715Tu=%kbrzOD<_G2c$j8WP&_tC zHZMjkBl-6AR4^n)CLPAYzwG7Vd0bC|TuQl1#iEj#a%JS?vNI+uz#O*|wyP zZ(a8B?&iX;nRjN{ub@XOByT=9z@(U?a%1`0$y`rNbZ=~NX=m8i*Q%hO)WyP@YFELo zq_?G;aZ*IimxjBBd}mBPuat+GSXY2ZLt!v4n`d3dm4z`w5|{u006cV3PE!DoP_Ms$ zzYtLGAb)Rv&miwWPrq=VrAaEdX@4xS0&rq-LkiYNW z?~vk>3OoP+1oKHmK~y-)ebskV6G6A5`%X4wOWheClrc1};FPV)#djwzId^QWZK>?stpai>@@gCPn6#&BdMi72jM8xH#+;~Ktd)c9+{X2GOOUYz&}*f*0c7fjJU>_ znAQqSZ8*<@Ux6=~Yz~Wcv{Q_iUAv`1f4lMG#q}F%(y#(JWCnxFodxhpE9TI{#s0GN zuK>=C$c%|upLH`$R%pRgFlrK+Whu--j|jwaWzX6zS96CTzLOfxz%9hCB*ckj4Ttj` zCeW%cT-uvx7|ML~s4=TodfZI8R4UaLv9U;Sdj(_C(^1uz9%ktEch5JjkE;du+LU79fWvQN?OOY8IYrN3X@J_8fP^Q3I zMsm{EHN`g9ULnQ{@nU2VT!qAqex200Ri3O#RqWkAGT7XoyJzq3@`oevsLf7

=@QTFH*%9hw0afZChKaSVs@#Y{l6ET}z+LfFv#J1=E zo7Yg6H~fp)^7%eKJdY)aE!zt5UBTEYmni&n_y5{Al0Do|hQBy`B0yc9$83c3Jlh(4 zffdW;LYeNLzxM?U-`QPi885&dM$q~kEs)r4o3$oIpfV~xAo}L+lU%~`p(qvL#>c05c=9JzwTuWUK52JB5zEzepA!NeENbeA03PIq#?(DQb`qx;W&1f_( zhI`PKjx)Gy8C=F;A?O7PKjFIUGXZNn`NX3EYkYy&-i{19T!{D@=O)NRB1|Evy4es7 zus1PWkU8eQG1HZBAfCasCV|LLs6KUOEH=@wiO=W3@fsIcnhY|RONFy<4E`orBN6&x zrl`8;F9W_<9T8EE68OdOX6JxYYQe!n;ccmsNN}m^VgnKZJ|Cny;0>_D#5M|aVerO; zZ;NG-NfKpucXjigejM)%^7Y+zfamadgLWti2?^PlkWeg-l=S4Nt4=kHfnjV43R0B^R>?56m!4E>GrAYYa0t=A_XDsL<+3JVEoFACcnHQ3bG zm!Frh>lUc0di%90&#QNrg@qNB?O3(y%Fmboe6VZhwrwiadn=xL62AWdpl7dNzcw(i zv%LJ)Cm*kP<{3+x{gLDH53db;_Nm?HlaAy60nijp^WHMgaR2}S07*qoM6N<$g1R-5 A9RL6T literal 0 HcmV?d00001 diff --git a/web/documentserver-example/ruby/app/assets/images/uid-2.png b/web/documentserver-example/ruby/app/assets/images/uid-2.png new file mode 100644 index 0000000000000000000000000000000000000000..651b40c6b91e59c94b2752ddcbe0dac2ffe38cab GIT binary patch literal 2199 zcmV;I2x#|-P)Px#32;bRa{vGf6951U69E94oEQKA0{~D=R7FQ{Oq!vx ze}+AOW?e_fc_WbMi|LXMpNJ~|EXlJ0OxrB?IpQgB&pRoY}0h*z+hK-+` zqqU2Yq?@9&eT0{ak)w!@p@4^(hmN3uh?M3@LM|yN zB`G;IIU5fQI4?1|$=*^xJCnge>*BVWkG+?Pjd*pF zYG5-mI6592q_)mqUS?BQW6s;{h?%%NN@a0_ret-KFefTMGc#o(Xj|XN zy`74L@A&?ZaALrrl%%ArfmTf)AS=hLq4L_!gmZ5|K}Ty?T1YA*oUO(v3<^RqD}aKI zkD$I;YK%}{e3`1pTUlXjaD0)Z!B|H_UsYM4l$Nf))!ypzrmwzge44SYwY0s&p_{x zuivlFzmS)l?Zf~81k_1HK~y-)ebskZ6G<2c;6*{;?xcD?mQx@5_1-IzKtk}uAPWlt z0wj0 z_gH{gti85cPd{o`y=cjX)`Ra}TUJ(^$_FVx=e@SJx=$^(%XeF%#_kE{6p21Q@hJ(g za{<7nrq3+0dr0h&YTl`+RQMbLJTbv6A7E2c6BCmKdbu@;-K|p;ohgdonjmRVc}d%@ ze2W4v63^GGcA1+)eDYjqVx^B%iOXaqB?R7<*i}ejr`g;qHXv*tTwQaiQd)xB5IAmw z2OY$T;4-A0cG7#YY#)iagVh6-!Aimg6k#Ki2H`kC#OHgF*hvf7ZB_v9*=^5NC_}4p z!iLENSSD>NhmXlpy-*G(^fF(dFgsMKB=8EAJWyPrluBhde2n;tPQ4yl&Ce0GEUXS8 zs_G7mHZ){M`(G@l{^N)F$Huu~B({j6_N@Bq2;Dt_tR}STueG)8lXewkFTU&{RunTx?!mizG^|mQ*nD z_VzE~nKngQ7jtw3ttosxE;}yfzucT?|Jc~fj4Ecx@hB3*){tX`5bv`F+regE7Ybt< z9^__^0xsam3DxnauhHE?8hgWWZiPc}!kB;lYR$^d%FWB*i9=MXNOTdA*2P{!804^L zr;bifH&6T-oi*MX$>Rme+mD_!GlQB%-mdl7T1Rp_P>!Fcr+!yOHNy}*-ig4Yp{@)H zgR<4a);Myg&>+X*xG8@@rhjgo8sMTLWjvfT@RE~U1Jgtp-IY}T=3Dgwi8?c!7tZ5J zf)W_>wGO7ON39SZ5BB)2-zK6Yd4llp@S>vR^L&JXh8&DOeR_ou|CG}z5RBEU!)pct zlamJ-j5%##0EZ#DLNbRvyVh^?KvQhyuurI5oE$jGv7sd1{0a-gl|-W9o`ntgKy&`)5ttCD{V3@Mg+^)3TyXWZ}=IgQ_7SLPYS@L_e%_zdn?eCe% zYog08-avYTdiTA@ehIgK?Dp^d$uO66==OUXZ+-iT-`E{GpMCm?@fW`sfArx8+jlJb Z@qh8`Ye}<~)Vcrw002ovPDHLkV1jA>VwC^@ literal 0 HcmV?d00001 diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 65ce0d979..0798444d5 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -158,7 +158,8 @@ def get_config :user => { # the user currently viewing or editing the document :id => !@user.id.eql?("uid-0") ? @user.id : nil, :name => @user.name, - :group => @user.group + :group => @user.group, + :image => @user.avatar ? "#{DocumentHelper.get_server_url(true)}/assets/#{@user.id}.png" : nil }, :embedded => { # the parameters for the embedded document type :saveUrl => download_url(false), # the absolute URL that will allow the document to be saved onto the user personal computer @@ -350,6 +351,31 @@ def get_users_mentions return !@user.id.eql?("uid-0") ? Users.get_users_for_mentions(@user.id) : nil end + def get_users_info + users_info = [] + if !@user.id.eql?("uid-0") + Users.get_all_users().each do |user_info| + u = { + id: user_info.id, + name: user_info.name, + email: user_info.email, + group: user_info.group, + reviewGroups: user_info.reviewGroups, + commentGroups: user_info.commentGroups, + userInfoGroups: user_info.userInfoGroups, + favorite: user_info.favorite, + deniedPermissions: user_info.deniedPermissions, + descriptions: user_info.descriptions, + templates: user_info.templates, + avatar: user_info.avatar + } + u["image"] = user_info.avatar ? "#{DocumentHelper.get_server_url(true)}/assets/#{user_info.id}.png" : nil + users_info.push(u) + end + return users_info + end + end + # get direct url existence flag def is_enable_direct_url return @direct_url != nil && @direct_url == "true" diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index a6acbc462..b0435618f 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -15,9 +15,11 @@ # class User - attr_accessor :id, :name, :email, :group, :reviewGroups, :commentGroups, :userInfoGroups, :favorite, :deniedPermissions, :descriptions, :templates + attr_accessor :id, :name, :email, :group, :reviewGroups, :commentGroups, :userInfoGroups, :favorite, + :deniedPermissions, :descriptions, :templates, :avatar - def initialize (id, name, email, group, reviewGroups, commentGroups, userInfoGroups, favorite, deniedPermissions, descriptions, templates) + def initialize (id, name, email, group, reviewGroups, commentGroups, userInfoGroups, favorite, + deniedPermissions, descriptions, templates, avatar) @id = id @name = name @email = email @@ -29,6 +31,7 @@ def initialize (id, name, email, group, reviewGroups, commentGroups, userInfoGro @descriptions = descriptions @templates = templates @userInfoGroups = userInfoGroups + @avatar = avatar end end @@ -40,7 +43,8 @@ class Users "Can perform all actions with comments", "The file favorite state is undefined", "Can create files from templates using data from the editor", - "Can see the information about all users" + "Can see the information about all users", + "Has an avatar", ]; @@descr_user_2 = [ @@ -49,7 +53,8 @@ class Users "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only", "This file is marked as favorite", "Can create new files from the editor", - "Can see the information about users from Group2 and users who don’t belong to any group" + "Can see the information about users from Group2 and users who don’t belong to any group", + "Has an avatar", ]; @@descr_user_3 = [ @@ -82,7 +87,7 @@ class Users @@users = [ User.new("uid-1", "John Smith", "smith@example.com", "", nil, {}, nil, - nil, [], @@descr_user_1, true), + nil, [], @@descr_user_1, true, true), User.new("uid-2", "Mark Pottato", "pottato@example.com", "group-2", ["group-2", ""], { :view => "", @@ -90,7 +95,7 @@ class Users :remove => ["group-2"] }, ["group-2", ""], - true, [], @@descr_user_2, false), + true, [], @@descr_user_2, false, true), User.new("uid-3", "Hamish Mitchell", "mitchell@example.com", "group-3", ["group-2"], { :view => ["group-3", "group-2"], @@ -98,10 +103,10 @@ class Users :remove => [] }, ["group-2"], - false, ["copy", "download", "print"], @@descr_user_3, false), + false, ["copy", "download", "print"], @@descr_user_3, false, false), User.new("uid-0", nil, nil, "", nil, {}, [], - nil, ["protect"], @@descr_user_0, false) + nil, ["protect"], @@descr_user_0, false, false) ] class << self diff --git a/web/documentserver-example/ruby/app/views/home/editor.html.erb b/web/documentserver-example/ruby/app/views/home/editor.html.erb index 7fd218ec4..7f73044bd 100755 --- a/web/documentserver-example/ruby/app/views/home/editor.html.erb +++ b/web/documentserver-example/ruby/app/views/home/editor.html.erb @@ -229,9 +229,29 @@ }; <% end %> // add mentions for not anonymous users - config.events['onRequestUsers'] = function () { - docEditor.setUsers({ // set a list of users to mention in the comments - "users": <%= raw @file.get_users_mentions.to_json %> + config.events['onRequestUsers'] = function (event) { + if (event && event.data){ + var c = event.data.c; + } + switch (c) { + case "info": + users = []; + var allUsers = <%= raw @file.get_users_info.to_json %>; + for (var i = 0; i < event.data.id.length; i++) { + for (var j = 0; j < allUsers.length; j++) { + if (allUsers[j].id == event.data.id[i]) { + users.push(allUsers[j]); + break; + } + } + } + break; + default: + users = <%= raw @file.get_users_mentions.to_json %>; + } + docEditor.setUsers({ + "c": c, + "users": users, }); }; // the user is mentioned in a comment From 20aea45ac7f35d39c811d26f54f0390701eab198 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Thu, 2 Nov 2023 17:17:41 +0700 Subject: [PATCH 208/488] php: user avatar --- CHANGELOG.md | 1 + .../php/assets/images/uid-1.png | Bin 0 -> 2226 bytes .../php/assets/images/uid-2.png | Bin 0 -> 2199 bytes .../php/src/helpers/ExampleUsers.php | 8 +++- .../php/src/helpers/Users.php | 7 +++- .../php/src/views/DocEditorView.php | 36 ++++++++++++++++-- 6 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 web/documentserver-example/php/assets/images/uid-1.png create mode 100644 web/documentserver-example/php/assets/images/uid-2.png diff --git a/CHANGELOG.md b/CHANGELOG.md index f026ffeb0..5f1f3ebef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- php: user avatar - ruby: user avatar - python: user avatar - nodejs: user avatar diff --git a/web/documentserver-example/php/assets/images/uid-1.png b/web/documentserver-example/php/assets/images/uid-1.png new file mode 100644 index 0000000000000000000000000000000000000000..91cf9e02ce9c581fd3515f132a68945a8b1dea29 GIT binary patch literal 2226 zcmV;j2u=5iP)Px#32;bRa{vGf6951U69E94oEQKA0{~D=R7FQ{Ox)bu z)6>)9;o#oh-p$R;*45P8+1KFT-{0Tg-{0Th;Nafg-q+XH-QC^I&CSu#(bw14&CJWo z%gfW#)6&w?-rnBc-rmZ}%HQAL+S=OJ*VoO>&CSit%*@QPt*YAC*8BVS-rU;E%*@Eh z$jr>l+1c6I+1b(2(f9TB_xJbu`ueY@r=6RY`}+F(_x7csp0~2C`}_O6wz9movf

z*wfAW_Vf7j@#x~;=i=V$=;Ynq-QM2b(b3V^*x1(A*3{J0-{0TU)6><})yvDv+}zyP z*Vo(I+tSj~+1c69(9qi2+RV(%&(F`!&d$xv%@hm@BNY-K6cP~$2Mh-WI3pYy5f3I9 z7X17CG9nxu5f2y+3`{K~{QCI`1O&jFhE+BzDj5_|H!k}8{+^kbn3RzO0RgL}qC7G$ z;JT(aCL%E%7+N|ov5R;1)xxxoedN8Vk!xB#9vaT1l74q{#GZ;a9~nLaBomZdXlfNIGUgHDXCVUqm~ecxHubU!Z(x z^3c7AVpEfEVN5eD@y)n%O+eVJm+Hl_i-&{SzOg715Tu=%kbrzOD<_G2c$j8WP&_tC zHZMjkBl-6AR4^n)CLPAYzwG7Vd0bC|TuQl1#iEj#a%JS?vNI+uz#O*|wyP zZ(a8B?&iX;nRjN{ub@XOByT=9z@(U?a%1`0$y`rNbZ=~NX=m8i*Q%hO)WyP@YFELo zq_?G;aZ*IimxjBBd}mBPuat+GSXY2ZLt!v4n`d3dm4z`w5|{u006cV3PE!DoP_Ms$ zzYtLGAb)Rv&miwWPrq=VrAaEdX@4xS0&rq-LkiYNW z?~vk>3OoP+1oKHmK~y-)ebskV6G6A5`%X4wOWheClrc1};FPV)#djwzId^QWZK>?stpai>@@gCPn6#&BdMi72jM8xH#+;~Ktd)c9+{X2GOOUYz&}*f*0c7fjJU>_ znAQqSZ8*<@Ux6=~Yz~Wcv{Q_iUAv`1f4lMG#q}F%(y#(JWCnxFodxhpE9TI{#s0GN zuK>=C$c%|upLH`$R%pRgFlrK+Whu--j|jwaWzX6zS96CTzLOfxz%9hCB*ckj4Ttj` zCeW%cT-uvx7|ML~s4=TodfZI8R4UaLv9U;Sdj(_C(^1uz9%ktEch5JjkE;du+LU79fWvQN?OOY8IYrN3X@J_8fP^Q3I zMsm{EHN`g9ULnQ{@nU2VT!qAqex200Ri3O#RqWkAGT7XoyJzq3@`oevsLf7

=@QTFH*%9hw0afZChKaSVs@#Y{l6ET}z+LfFv#J1=E zo7Yg6H~fp)^7%eKJdY)aE!zt5UBTEYmni&n_y5{Al0Do|hQBy`B0yc9$83c3Jlh(4 zffdW;LYeNLzxM?U-`QPi885&dM$q~kEs)r4o3$oIpfV~xAo}L+lU%~`p(qvL#>c05c=9JzwTuWUK52JB5zEzepA!NeENbeA03PIq#?(DQb`qx;W&1f_( zhI`PKjx)Gy8C=F;A?O7PKjFIUGXZNn`NX3EYkYy&-i{19T!{D@=O)NRB1|Evy4es7 zus1PWkU8eQG1HZBAfCasCV|LLs6KUOEH=@wiO=W3@fsIcnhY|RONFy<4E`orBN6&x zrl`8;F9W_<9T8EE68OdOX6JxYYQe!n;ccmsNN}m^VgnKZJ|Cny;0>_D#5M|aVerO; zZ;NG-NfKpucXjigejM)%^7Y+zfamadgLWti2?^PlkWeg-l=S4Nt4=kHfnjV43R0B^R>?56m!4E>GrAYYa0t=A_XDsL<+3JVEoFACcnHQ3bG zm!Frh>lUc0di%90&#QNrg@qNB?O3(y%Fmboe6VZhwrwiadn=xL62AWdpl7dNzcw(i zv%LJ)Cm*kP<{3+x{gLDH53db;_Nm?HlaAy60nijp^WHMgaR2}S07*qoM6N<$g1R-5 A9RL6T literal 0 HcmV?d00001 diff --git a/web/documentserver-example/php/assets/images/uid-2.png b/web/documentserver-example/php/assets/images/uid-2.png new file mode 100644 index 0000000000000000000000000000000000000000..651b40c6b91e59c94b2752ddcbe0dac2ffe38cab GIT binary patch literal 2199 zcmV;I2x#|-P)Px#32;bRa{vGf6951U69E94oEQKA0{~D=R7FQ{Oq!vx ze}+AOW?e_fc_WbMi|LXMpNJ~|EXlJ0OxrB?IpQgB&pRoY}0h*z+hK-+` zqqU2Yq?@9&eT0{ak)w!@p@4^(hmN3uh?M3@LM|yN zB`G;IIU5fQI4?1|$=*^xJCnge>*BVWkG+?Pjd*pF zYG5-mI6592q_)mqUS?BQW6s;{h?%%NN@a0_ret-KFefTMGc#o(Xj|XN zy`74L@A&?ZaALrrl%%ArfmTf)AS=hLq4L_!gmZ5|K}Ty?T1YA*oUO(v3<^RqD}aKI zkD$I;YK%}{e3`1pTUlXjaD0)Z!B|H_UsYM4l$Nf))!ypzrmwzge44SYwY0s&p_{x zuivlFzmS)l?Zf~81k_1HK~y-)ebskZ6G<2c;6*{;?xcD?mQx@5_1-IzKtk}uAPWlt z0wj0 z_gH{gti85cPd{o`y=cjX)`Ra}TUJ(^$_FVx=e@SJx=$^(%XeF%#_kE{6p21Q@hJ(g za{<7nrq3+0dr0h&YTl`+RQMbLJTbv6A7E2c6BCmKdbu@;-K|p;ohgdonjmRVc}d%@ ze2W4v63^GGcA1+)eDYjqVx^B%iOXaqB?R7<*i}ejr`g;qHXv*tTwQaiQd)xB5IAmw z2OY$T;4-A0cG7#YY#)iagVh6-!Aimg6k#Ki2H`kC#OHgF*hvf7ZB_v9*=^5NC_}4p z!iLENSSD>NhmXlpy-*G(^fF(dFgsMKB=8EAJWyPrluBhde2n;tPQ4yl&Ce0GEUXS8 zs_G7mHZ){M`(G@l{^N)F$Huu~B({j6_N@Bq2;Dt_tR}STueG)8lXewkFTU&{RunTx?!mizG^|mQ*nD z_VzE~nKngQ7jtw3ttosxE;}yfzucT?|Jc~fj4Ecx@hB3*){tX`5bv`F+regE7Ybt< z9^__^0xsam3DxnauhHE?8hgWWZiPc}!kB;lYR$^d%FWB*i9=MXNOTdA*2P{!804^L zr;bifH&6T-oi*MX$>Rme+mD_!GlQB%-mdl7T1Rp_P>!Fcr+!yOHNy}*-ig4Yp{@)H zgR<4a);Myg&>+X*xG8@@rhjgo8sMTLWjvfT@RE~U1Jgtp-IY}T=3Dgwi8?c!7tZ5J zf)W_>wGO7ON39SZ5BB)2-zK6Yd4llp@S>vR^L&JXh8&DOeR_ou|CG}z5RBEU!)pct zlamJ-j5%##0EZ#DLNbRvyVh^?KvQhyuurI5oE$jGv7sd1{0a-gl|-W9o`ntgKy&`)5ttCD{V3@Mg+^)3TyXWZ}=IgQ_7SLPYS@L_e%_zdn?eCe% zYog08-avYTdiTA@ehIgK?Dp^d$uO66==OUXZ+-iT-`E{GpMCm?@fW`sfArx8+jlJb Z@qh8`Ye}<~)Vcrw002ovPDHLkV1jA>VwC^@ literal 0 HcmV?d00001 diff --git a/web/documentserver-example/php/src/helpers/ExampleUsers.php b/web/documentserver-example/php/src/helpers/ExampleUsers.php index cf1e3a0f8..33e0146e3 100644 --- a/web/documentserver-example/php/src/helpers/ExampleUsers.php +++ b/web/documentserver-example/php/src/helpers/ExampleUsers.php @@ -38,6 +38,7 @@ public function __construct() "The file favorite state is undefined", "Can create files from templates using data from the editor", "Can see the information about all users", + "Has an avatar", ]; $this->user2Description = [ "Belongs to Group2", @@ -47,6 +48,7 @@ public function __construct() "This file is marked as favorite", "Can create new files from the editor", "Can see the information about users from Group2 and users who don’t belong to any group", + "Has an avatar", ]; $this->user3Description = [ "Belongs to Group3", @@ -84,6 +86,7 @@ public function __construct() null, [], $this->user1Description, + true, true ), new Users( @@ -101,7 +104,8 @@ public function __construct() true, [], $this->user2Description, - false + false, + true ), new Users( "uid-3", @@ -118,6 +122,7 @@ public function __construct() false, ["copy", "download", "print"], $this->user3Description, + false, false ), new Users( @@ -131,6 +136,7 @@ public function __construct() null, ["protect"], $this->user0Description, + false, false ), ]; diff --git a/web/documentserver-example/php/src/helpers/Users.php b/web/documentserver-example/php/src/helpers/Users.php index 837ea4bc1..decb608c6 100644 --- a/web/documentserver-example/php/src/helpers/Users.php +++ b/web/documentserver-example/php/src/helpers/Users.php @@ -32,6 +32,8 @@ final class Users public ?bool $templates; public ?array $userInfoGroups; + public ?bool $avatar; + /** * Constructor * @@ -46,6 +48,7 @@ final class Users * @param array|null $deniedPermissions * @param array|null $descriptions * @param bool|null $templates + * @param bool|null $avatar * * @return void */ @@ -60,7 +63,8 @@ public function __construct( ?bool $favorite, ?array $deniedPermissions, ?array $descriptions, - ?bool $templates + ?bool $templates, + ?bool $avatar ) { $this->id = $id; $this->name = $name; @@ -73,5 +77,6 @@ public function __construct( $this->descriptions = $descriptions; $this->templates = $templates; $this->userInfoGroups = $userInfoGroups; + $this->avatar = $avatar; } } diff --git a/web/documentserver-example/php/src/views/DocEditorView.php b/web/documentserver-example/php/src/views/DocEditorView.php index 89f29b195..2b6acdd38 100644 --- a/web/documentserver-example/php/src/views/DocEditorView.php +++ b/web/documentserver-example/php/src/views/DocEditorView.php @@ -161,6 +161,7 @@ public function __construct($request, $tempName = "docEditor") "id" => $user->id != "uid-0" ? $user->id : null, "name" => $user->name, "group" => $user->group, + "image" => $user->avatar ? serverPath(true) . "/assets/images/" . $user->id . ".png" : null ], "embedded" => [ // the parameters for the embedded document type // the absolute URL that will allow the document to be saved onto the user personal computer @@ -220,6 +221,14 @@ public function __construct($request, $tempName = "docEditor") // users data for mentions $usersForMentions = $user->id != "uid-0" ? $userList->getUsersForMentions($user->id) : null; + $usersInfo = []; + if ($user->id != 'uid-0'){ + foreach ($userList->getAllUsers() as $userInfo){ + $u = $userInfo; + $u->image = $userInfo->avatar ? serverPath(true) . "/assets/images/" . $userInfo->id . ".png" : null; + array_push($usersInfo, $u); + } + } // check if the secret key to generate token exists if ($jwtManager->isJwtEnabled()) { @@ -249,9 +258,29 @@ public function __construct($request, $tempName = "docEditor") };"; } $historyLayout .= "// add mentions for not anonymous users - config.events['onRequestUsers'] = function () { - docEditor.setUsers({ // set a list of users to mention in the comments - \"users\": {usersForMentions} + config.events['onRequestUsers'] = function (event) { + if (event && event.data){ + var c = event.data.c; + } + switch (c) { + case \"info\": + users = []; + var allUsers = {usersInfo}; + for (var i = 0; i < event.data.id.length; i++) { + for (var j = 0; j < allUsers.length; j++) { + if (allUsers[j].id == event.data.id[i]) { + users.push(allUsers[j]); + break; + } + } + } + break; + default: + users = {usersForMentions}; + } + docEditor.setUsers({ + \"c\": c, + \"users\": users, }); }; // the user is mentioned in a comment @@ -279,6 +308,7 @@ public function __construct($request, $tempName = "docEditor") "config" => json_encode($config), "history" => $historyLayout, "usersForMentions" => json_encode($usersForMentions), + "usersInfo" => json_encode($usersInfo) ]; } } From 13c93ce2de77afcea8fa71acbd19d0c84405bf88 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Fri, 3 Nov 2023 19:44:33 +0700 Subject: [PATCH 209/488] java-spring: user avatar --- CHANGELOG.md | 1 + .../onlyoffice/integration/ExampleData.java | 14 ++++---- .../controllers/EditorController.java | 18 ++++++++++ .../documentserver/models/filemodel/User.java | 7 +++- .../onlyoffice/integration/dto/UserInfo.java | 33 ++++++++++++++++++ .../onlyoffice/integration/entities/User.java | 2 ++ .../integration/services/UserServices.java | 4 ++- .../main/resources/static/css/img/uid-1.png | Bin 0 -> 2226 bytes .../main/resources/static/css/img/uid-2.png | Bin 0 -> 2199 bytes .../src/main/resources/templates/editor.html | 27 ++++++++++++-- 10 files changed, 95 insertions(+), 11 deletions(-) create mode 100644 web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/UserInfo.java create mode 100644 web/documentserver-example/java-spring/src/main/resources/static/css/img/uid-1.png create mode 100644 web/documentserver-example/java-spring/src/main/resources/static/css/img/uid-2.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f1f3ebef..dc2c91b83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- java-spring: user avatar - php: user avatar - ruby: user avatar - python: user avatar diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java index 6fe3c3aea..76ceb38cf 100644 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java @@ -58,7 +58,8 @@ public void init() { "The file favorite state is undefined", "Can create a file from a template with data from the editor", "Can see the information about all users", - "Can view chat" + "Can view chat", + "Has an avatar" ); // the description for user 2 @@ -71,7 +72,8 @@ public void init() { "This file is favorite", "Can create a file from an editor", "Can see the information about users from Group2 and users who don’t belong to any group", - "Can view chat" + "Can view chat", + "Has an avatar" ); // the description for user 3 @@ -93,23 +95,23 @@ public void init() { userService.createUser("John Smith", "smith@example.com", descriptionUserFirst, "", List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()), - List.of(FilterState.NULL.toString()), null, true, true); + List.of(FilterState.NULL.toString()), null, true, true, true); // create user 2 with the specified parameters userService.createUser("Mark Pottato", "pottato@example.com", descriptionUserSecond, "group-2", List.of("", "group-2"), List.of(FilterState.NULL.toString()), List.of("group-2", ""), List.of("group-2"), List.of("group-2", ""), true, true, - true); + true, true); // create user 3 with the specified parameters userService.createUser("Hamish Mitchell", "mitchell@example.com", descriptionUserThird, "group-3", List.of("group-2"), List.of("group-2", "group-3"), List.of("group-2"), - new ArrayList<>(), List.of("group-2"), false, true, true); + new ArrayList<>(), List.of("group-2"), false, true, true, false); // create user 0 with the specified parameters userService.createUser("Anonymous", null, descriptionUserZero, "", List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()), List.of(FilterState.NULL.toString()), - new ArrayList<>(), null, false, false); + new ArrayList<>(), null, false, false, false); } } diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/EditorController.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/EditorController.java index d87321a81..09316e3a1 100755 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/EditorController.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/EditorController.java @@ -25,6 +25,7 @@ import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder; import com.onlyoffice.integration.entities.User; import com.onlyoffice.integration.dto.Mentions; +import com.onlyoffice.integration.dto.UserInfo; import com.onlyoffice.integration.documentserver.models.enums.Type; import com.onlyoffice.integration.documentserver.models.filemodel.FileModel; import com.onlyoffice.integration.services.UserServices; @@ -117,6 +118,8 @@ public String index(@RequestParam("fileName") final String fileName, } User user = optionalUser.get(); + user.setImage(user.getAvatar() ? storagePathBuilder.getServerUrl(true) + "/css/img/uid-" + + user.getId() + ".png" : null); // get file model with the default file parameters FileModel fileModel = fileConfigurer.getFileModel( @@ -150,6 +153,8 @@ public String index(@RequestParam("fileName") final String fileName, // get user data for mentions and add it to the model model.addAttribute("usersForMentions", getUserMentions(uid)); + + model.addAttribute("usersInfo", getUsersInfo(uid)); return "editor.html"; } @@ -169,6 +174,19 @@ private List getUserMentions(final String uid) { // get user data for return usersForMentions; } + private List getUsersInfo(final String uid) { // get user data for mentions + List usersInfo = new ArrayList<>(); + if (uid != null && !uid.equals("4")) { + List list = userService.findAll(); + for (User u : list) { + String image = u.getAvatar() ? storagePathBuilder.getServerUrl(true) + "/css/img/uid-" + + u.getId() + ".png" : null; + usersInfo.add(new UserInfo(u.getId(), u.getName(), u.getEmail(), image)); + } + } + return usersInfo; + } + @SneakyThrows private String getInsertImage(final Boolean directUrl) { // get an image that will be inserted into the document Map dataInsertImage = new HashMap<>(); diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/User.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/User.java index e7e9e6a5c..602988689 100755 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/User.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/User.java @@ -19,6 +19,8 @@ package com.onlyoffice.integration.documentserver.models.filemodel; import com.onlyoffice.integration.documentserver.models.AbstractModel; +import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder; + import lombok.Getter; import lombok.Setter; import org.springframework.context.annotation.Scope; @@ -29,14 +31,17 @@ @Getter @Setter public class User extends AbstractModel { + private FileStoragePathBuilder storagePathBuilder; private String id; private String name; private String group; + private String image; // the user configuration parameters public void configure(final int idParam, final String nameParam, final String groupParam) { - this.id = "uid-" + idParam; // the user id + this.id = "" + idParam; // the user id this.name = nameParam; // the user name this.group = groupParam; // the group the user belongs to + this.image = storagePathBuilder.getServerUrl(true) + "/css/img/uid-" + this.id + ".png"; } } diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/UserInfo.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/UserInfo.java new file mode 100644 index 000000000..573b15aa3 --- /dev/null +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/UserInfo.java @@ -0,0 +1,33 @@ +/** + * + * (c) Copyright Ascensio System SIA 2023 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.onlyoffice.integration.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class UserInfo { + private Integer id; + private String name; + private String email; + private String image; +} diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/entities/User.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/entities/User.java index 94e6b11a0..bf1a65afa 100755 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/entities/User.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/entities/User.java @@ -45,4 +45,6 @@ public class User extends AbstractEntity { @ElementCollection @CollectionTable(name = "user_descriptions") private List descriptions; + private Boolean avatar; + private String image; } diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/UserServices.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/UserServices.java index 53d0d5f63..13f76b704 100755 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/UserServices.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/UserServices.java @@ -58,13 +58,15 @@ public User createUser(final String name, final String email, final List removeGroups, final List userInfoGroups, final Boolean favoriteDoc, final Boolean chat, - final Boolean protect) { + final Boolean protect, + final Boolean avatar) { User newUser = new User(); newUser.setName(name); // set the user name newUser.setEmail(email); // set the user email newUser.setGroup(groupServices.createGroup(group)); // set the user group newUser.setDescriptions(description); // set the user description newUser.setFavorite(favoriteDoc); // specify if the user has the favorite documents or not + newUser.setAvatar(avatar); List groupsReview = groupServices .createGroups(reviewGroups); // define the groups whose changes the user can accept/reject diff --git a/web/documentserver-example/java-spring/src/main/resources/static/css/img/uid-1.png b/web/documentserver-example/java-spring/src/main/resources/static/css/img/uid-1.png new file mode 100644 index 0000000000000000000000000000000000000000..91cf9e02ce9c581fd3515f132a68945a8b1dea29 GIT binary patch literal 2226 zcmV;j2u=5iP)Px#32;bRa{vGf6951U69E94oEQKA0{~D=R7FQ{Ox)bu z)6>)9;o#oh-p$R;*45P8+1KFT-{0Tg-{0Th;Nafg-q+XH-QC^I&CSu#(bw14&CJWo z%gfW#)6&w?-rnBc-rmZ}%HQAL+S=OJ*VoO>&CSit%*@QPt*YAC*8BVS-rU;E%*@Eh z$jr>l+1c6I+1b(2(f9TB_xJbu`ueY@r=6RY`}+F(_x7csp0~2C`}_O6wz9movf

z*wfAW_Vf7j@#x~;=i=V$=;Ynq-QM2b(b3V^*x1(A*3{J0-{0TU)6><})yvDv+}zyP z*Vo(I+tSj~+1c69(9qi2+RV(%&(F`!&d$xv%@hm@BNY-K6cP~$2Mh-WI3pYy5f3I9 z7X17CG9nxu5f2y+3`{K~{QCI`1O&jFhE+BzDj5_|H!k}8{+^kbn3RzO0RgL}qC7G$ z;JT(aCL%E%7+N|ov5R;1)xxxoedN8Vk!xB#9vaT1l74q{#GZ;a9~nLaBomZdXlfNIGUgHDXCVUqm~ecxHubU!Z(x z^3c7AVpEfEVN5eD@y)n%O+eVJm+Hl_i-&{SzOg715Tu=%kbrzOD<_G2c$j8WP&_tC zHZMjkBl-6AR4^n)CLPAYzwG7Vd0bC|TuQl1#iEj#a%JS?vNI+uz#O*|wyP zZ(a8B?&iX;nRjN{ub@XOByT=9z@(U?a%1`0$y`rNbZ=~NX=m8i*Q%hO)WyP@YFELo zq_?G;aZ*IimxjBBd}mBPuat+GSXY2ZLt!v4n`d3dm4z`w5|{u006cV3PE!DoP_Ms$ zzYtLGAb)Rv&miwWPrq=VrAaEdX@4xS0&rq-LkiYNW z?~vk>3OoP+1oKHmK~y-)ebskV6G6A5`%X4wOWheClrc1};FPV)#djwzId^QWZK>?stpai>@@gCPn6#&BdMi72jM8xH#+;~Ktd)c9+{X2GOOUYz&}*f*0c7fjJU>_ znAQqSZ8*<@Ux6=~Yz~Wcv{Q_iUAv`1f4lMG#q}F%(y#(JWCnxFodxhpE9TI{#s0GN zuK>=C$c%|upLH`$R%pRgFlrK+Whu--j|jwaWzX6zS96CTzLOfxz%9hCB*ckj4Ttj` zCeW%cT-uvx7|ML~s4=TodfZI8R4UaLv9U;Sdj(_C(^1uz9%ktEch5JjkE;du+LU79fWvQN?OOY8IYrN3X@J_8fP^Q3I zMsm{EHN`g9ULnQ{@nU2VT!qAqex200Ri3O#RqWkAGT7XoyJzq3@`oevsLf7

=@QTFH*%9hw0afZChKaSVs@#Y{l6ET}z+LfFv#J1=E zo7Yg6H~fp)^7%eKJdY)aE!zt5UBTEYmni&n_y5{Al0Do|hQBy`B0yc9$83c3Jlh(4 zffdW;LYeNLzxM?U-`QPi885&dM$q~kEs)r4o3$oIpfV~xAo}L+lU%~`p(qvL#>c05c=9JzwTuWUK52JB5zEzepA!NeENbeA03PIq#?(DQb`qx;W&1f_( zhI`PKjx)Gy8C=F;A?O7PKjFIUGXZNn`NX3EYkYy&-i{19T!{D@=O)NRB1|Evy4es7 zus1PWkU8eQG1HZBAfCasCV|LLs6KUOEH=@wiO=W3@fsIcnhY|RONFy<4E`orBN6&x zrl`8;F9W_<9T8EE68OdOX6JxYYQe!n;ccmsNN}m^VgnKZJ|Cny;0>_D#5M|aVerO; zZ;NG-NfKpucXjigejM)%^7Y+zfamadgLWti2?^PlkWeg-l=S4Nt4=kHfnjV43R0B^R>?56m!4E>GrAYYa0t=A_XDsL<+3JVEoFACcnHQ3bG zm!Frh>lUc0di%90&#QNrg@qNB?O3(y%Fmboe6VZhwrwiadn=xL62AWdpl7dNzcw(i zv%LJ)Cm*kP<{3+x{gLDH53db;_Nm?HlaAy60nijp^WHMgaR2}S07*qoM6N<$g1R-5 A9RL6T literal 0 HcmV?d00001 diff --git a/web/documentserver-example/java-spring/src/main/resources/static/css/img/uid-2.png b/web/documentserver-example/java-spring/src/main/resources/static/css/img/uid-2.png new file mode 100644 index 0000000000000000000000000000000000000000..651b40c6b91e59c94b2752ddcbe0dac2ffe38cab GIT binary patch literal 2199 zcmV;I2x#|-P)Px#32;bRa{vGf6951U69E94oEQKA0{~D=R7FQ{Oq!vx ze}+AOW?e_fc_WbMi|LXMpNJ~|EXlJ0OxrB?IpQgB&pRoY}0h*z+hK-+` zqqU2Yq?@9&eT0{ak)w!@p@4^(hmN3uh?M3@LM|yN zB`G;IIU5fQI4?1|$=*^xJCnge>*BVWkG+?Pjd*pF zYG5-mI6592q_)mqUS?BQW6s;{h?%%NN@a0_ret-KFefTMGc#o(Xj|XN zy`74L@A&?ZaALrrl%%ArfmTf)AS=hLq4L_!gmZ5|K}Ty?T1YA*oUO(v3<^RqD}aKI zkD$I;YK%}{e3`1pTUlXjaD0)Z!B|H_UsYM4l$Nf))!ypzrmwzge44SYwY0s&p_{x zuivlFzmS)l?Zf~81k_1HK~y-)ebskZ6G<2c;6*{;?xcD?mQx@5_1-IzKtk}uAPWlt z0wj0 z_gH{gti85cPd{o`y=cjX)`Ra}TUJ(^$_FVx=e@SJx=$^(%XeF%#_kE{6p21Q@hJ(g za{<7nrq3+0dr0h&YTl`+RQMbLJTbv6A7E2c6BCmKdbu@;-K|p;ohgdonjmRVc}d%@ ze2W4v63^GGcA1+)eDYjqVx^B%iOXaqB?R7<*i}ejr`g;qHXv*tTwQaiQd)xB5IAmw z2OY$T;4-A0cG7#YY#)iagVh6-!Aimg6k#Ki2H`kC#OHgF*hvf7ZB_v9*=^5NC_}4p z!iLENSSD>NhmXlpy-*G(^fF(dFgsMKB=8EAJWyPrluBhde2n;tPQ4yl&Ce0GEUXS8 zs_G7mHZ){M`(G@l{^N)F$Huu~B({j6_N@Bq2;Dt_tR}STueG)8lXewkFTU&{RunTx?!mizG^|mQ*nD z_VzE~nKngQ7jtw3ttosxE;}yfzucT?|Jc~fj4Ecx@hB3*){tX`5bv`F+regE7Ybt< z9^__^0xsam3DxnauhHE?8hgWWZiPc}!kB;lYR$^d%FWB*i9=MXNOTdA*2P{!804^L zr;bifH&6T-oi*MX$>Rme+mD_!GlQB%-mdl7T1Rp_P>!Fcr+!yOHNy}*-ig4Yp{@)H zgR<4a);Myg&>+X*xG8@@rhjgo8sMTLWjvfT@RE~U1Jgtp-IY}T=3Dgwi8?c!7tZ5J zf)W_>wGO7ON39SZ5BB)2-zK6Yd4llp@S>vR^L&JXh8&DOeR_ou|CG}z5RBEU!)pct zlamJ-j5%##0EZ#DLNbRvyVh^?KvQhyuurI5oE$jGv7sd1{0a-gl|-W9o`ntgKy&`)5ttCD{V3@Mg+^)3TyXWZ}=IgQ_7SLPYS@L_e%_zdn?eCe% zYog08-avYTdiTA@ehIgK?Dp^d$uO66==OUXZ+-iT-`E{GpMCm?@fW`sfArx8+jlJb Z@qh8`Ye}<~)Vcrw002ovPDHLkV1jA>VwC^@ literal 0 HcmV?d00001 diff --git a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html index 3694fc328..d3fe4dc16 100755 --- a/web/documentserver-example/java-spring/src/main/resources/templates/editor.html +++ b/web/documentserver-example/java-spring/src/main/resources/templates/editor.html @@ -255,12 +255,33 @@ }; var usersForMentions = [[${usersForMentions}]]; + var usersInfo = [[${usersInfo}]]; if (config.editorConfig.user.id != 4) { // add mentions for not anonymous users - config.events['onRequestUsers'] = function () { - docEditor.setUsers({ // set a list of users to mention in the comments - "users": usersForMentions + config.events['onRequestUsers'] = function (event) { + if (event && event.data){ + var c = event.data.c; + } + switch (c) { + case "info": + users = []; + var allUsers = usersInfo; + for (var i = 0; i < event.data.id.length; i++) { + for (var j = 0; j < allUsers.length; j++) { + if (allUsers[j].id == event.data.id[i]) { + users.push(allUsers[j]); + break; + } + } + } + break; + default: + users = usersForMentions; + } + docEditor.setUsers({ + "c": c, + "users": users, }); }; // the user is mentioned in a comment From dfe61c501348cf56e288e10b8230993c8b95993e Mon Sep 17 00:00:00 2001 From: sshakndr Date: Fri, 3 Nov 2023 20:47:43 +0700 Subject: [PATCH 210/488] java: user avatar --- CHANGELOG.md | 1 + .../main/java/controllers/EditorServlet.java | 3 ++ .../src/main/java/entities/FileModel.java | 7 +++++ .../java/src/main/java/entities/User.java | 8 +++++- .../java/src/main/java/helpers/Users.java | 24 +++++++++++++--- .../java/src/main/webapp/css/img/uid-1.png | Bin 0 -> 2226 bytes .../java/src/main/webapp/css/img/uid-2.png | Bin 0 -> 2199 bytes .../java/src/main/webapp/editor.jsp | 27 ++++++++++++++++-- 8 files changed, 62 insertions(+), 8 deletions(-) create mode 100644 web/documentserver-example/java/src/main/webapp/css/img/uid-1.png create mode 100644 web/documentserver-example/java/src/main/webapp/css/img/uid-2.png diff --git a/CHANGELOG.md b/CHANGELOG.md index dc2c91b83..24e23c663 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- java: user avatar - java-spring: user avatar - php: user avatar - ruby: user avatar diff --git a/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java b/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java index 2f6e65f27..fad184190 100644 --- a/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java +++ b/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java @@ -107,6 +107,8 @@ protected void processRequest(final HttpServletRequest request, // users data for mentions List> usersForMentions = Users.getUsersForMentions(user.getId()); + List> usersInfo = Users.getUsersInfo(); + // check if the document token is enabled if (DocumentManager.tokenEnabled()) { file.buildToken(); // generate document token @@ -131,6 +133,7 @@ protected void processRequest(final HttpServletRequest request, request.setAttribute("dataSpreadsheet", gson.toJson(dataSpreadsheet)); request.setAttribute("usersForMentions", !user.getId() .equals("uid-0") ? gson.toJson(usersForMentions) : null); + request.setAttribute("usersInfo", gson.toJson(usersInfo)); request.getRequestDispatcher("editor.jsp").forward(request, response); } diff --git a/web/documentserver-example/java/src/main/java/entities/FileModel.java b/web/documentserver-example/java/src/main/java/entities/FileModel.java index c50c4ad3e..071a695b8 100755 --- a/web/documentserver-example/java/src/main/java/entities/FileModel.java +++ b/web/documentserver-example/java/src/main/java/entities/FileModel.java @@ -111,6 +111,8 @@ public FileModel(final String fileNameParam, editorConfig.getUser().setId(!user.getId().equals("uid-0") ? user.getId() : null); editorConfig.getUser().setName(user.getName()); editorConfig.getUser().setGroup(user.getGroup()); + editorConfig.getUser().setImage(user.getAvatar() ? DocumentManager.getServerUrl(false) + + "/css/img/" + user.getId() + ".png" : null); // write the absolute URL to the file location editorConfig.getCustomization().getGoback() @@ -521,6 +523,7 @@ public class User { private String id; private String name; private String group; + private String image; public String getId() { return id; @@ -545,6 +548,10 @@ public String getGroup() { public void setGroup(final String groupParam) { this.group = groupParam; } + + public void setImage(final String imageParam) { + this.image = imageParam; + } } // customization parameters diff --git a/web/documentserver-example/java/src/main/java/entities/User.java b/web/documentserver-example/java/src/main/java/entities/User.java index 555acc526..f8c85afd0 100755 --- a/web/documentserver-example/java/src/main/java/entities/User.java +++ b/web/documentserver-example/java/src/main/java/entities/User.java @@ -32,12 +32,13 @@ public class User { private final List descriptions; private final Boolean templates; private final List userInfoGroups; + private final Boolean avatar; public User(final String idParam, final String nameParam, final String emailParam, final String groupParam, final List reviewGroupsParam, final CommentGroups commentGroupsParam, final List userInfoGroupsParam, final Boolean favoriteParam, final List deniedPermissionsParam, final List descriptionsParam, - final Boolean templatesParam) { + final Boolean templatesParam, final Boolean avatarParam) { this.id = idParam; this.name = nameParam; this.email = emailParam; @@ -49,6 +50,7 @@ public User(final String idParam, final String nameParam, final String emailPara this.descriptions = descriptionsParam; this.templates = templatesParam; this.userInfoGroups = userInfoGroupsParam; + this.avatar = avatarParam; } public String getId() { @@ -94,4 +96,8 @@ public Boolean getTemplates() { public List getUserInfoGroups() { return userInfoGroups; } + + public Boolean getAvatar() { + return avatar; + } } diff --git a/web/documentserver-example/java/src/main/java/helpers/Users.java b/web/documentserver-example/java/src/main/java/helpers/Users.java index 173802f4a..ca9b1ca8b 100755 --- a/web/documentserver-example/java/src/main/java/helpers/Users.java +++ b/web/documentserver-example/java/src/main/java/helpers/Users.java @@ -37,6 +37,7 @@ public final class Users { add("The file favorite state is undefined"); add("Can create files from templates using data from the editor"); add("Can see the information about all users"); + add("Has an avatar"); }}; private static List descriptionUserSecond = new ArrayList() {{ @@ -47,6 +48,7 @@ public final class Users { add("This file is marked as favorite"); add("Can create new files from the editor"); add("Can see the information about users from Group2 and users who don’t belong to any group"); + add("Has an avatar"); }}; private static List descriptionUserThird = new ArrayList() {{ @@ -79,19 +81,19 @@ public final class Users { private static List users = new ArrayList() {{ add(new User("uid-1", "John Smith", "smith@example.com", "", null, new CommentGroups(), null, - null, new ArrayList(), descriptionUserFirst, true)); + null, new ArrayList(), descriptionUserFirst, true, true)); add(new User("uid-2", "Mark Pottato", "pottato@example.com", "group-2", Arrays.asList("group-2", ""), new CommentGroups(null, Arrays.asList("group-2", ""), Arrays.asList("group-2")), Arrays.asList("group-2", ""), - true, new ArrayList(), descriptionUserSecond, false)); + true, new ArrayList(), descriptionUserSecond, false, true)); add(new User("uid-3", "Hamish Mitchell", "mitchell@example.com", "group-3", Arrays.asList("group-2"), new CommentGroups(Arrays.asList("group-3", "group-2"), Arrays.asList("group-2"), null), Arrays.asList("group-2"), false, Arrays.asList("copy", "download", "print"), - descriptionUserThird, false)); + descriptionUserThird, false, false)); add(new User("uid-0", null, null, "", null, null, null, - null, Arrays.asList("protect"), descriptionUserZero, false)); + null, Arrays.asList("protect"), descriptionUserZero, false, false)); }}; private Users() { } @@ -124,5 +126,19 @@ public static List> getUsersForMentions(final String id) { } return usersData; } + + public static List> getUsersInfo() { + List> usersData = new ArrayList<>(); + for (User user : users) { + Map data = new HashMap<>(); + data.put("id", user.getId()); + data.put("name", user.getName()); + data.put("email", user.getEmail()); + data.put("image", user.getAvatar() ? DocumentManager.getServerUrl(false) + + "/css/img/" + user.getId() + ".png" : null); + usersData.add(data); + } + return usersData; + } } diff --git a/web/documentserver-example/java/src/main/webapp/css/img/uid-1.png b/web/documentserver-example/java/src/main/webapp/css/img/uid-1.png new file mode 100644 index 0000000000000000000000000000000000000000..91cf9e02ce9c581fd3515f132a68945a8b1dea29 GIT binary patch literal 2226 zcmV;j2u=5iP)Px#32;bRa{vGf6951U69E94oEQKA0{~D=R7FQ{Ox)bu z)6>)9;o#oh-p$R;*45P8+1KFT-{0Tg-{0Th;Nafg-q+XH-QC^I&CSu#(bw14&CJWo z%gfW#)6&w?-rnBc-rmZ}%HQAL+S=OJ*VoO>&CSit%*@QPt*YAC*8BVS-rU;E%*@Eh z$jr>l+1c6I+1b(2(f9TB_xJbu`ueY@r=6RY`}+F(_x7csp0~2C`}_O6wz9movf

z*wfAW_Vf7j@#x~;=i=V$=;Ynq-QM2b(b3V^*x1(A*3{J0-{0TU)6><})yvDv+}zyP z*Vo(I+tSj~+1c69(9qi2+RV(%&(F`!&d$xv%@hm@BNY-K6cP~$2Mh-WI3pYy5f3I9 z7X17CG9nxu5f2y+3`{K~{QCI`1O&jFhE+BzDj5_|H!k}8{+^kbn3RzO0RgL}qC7G$ z;JT(aCL%E%7+N|ov5R;1)xxxoedN8Vk!xB#9vaT1l74q{#GZ;a9~nLaBomZdXlfNIGUgHDXCVUqm~ecxHubU!Z(x z^3c7AVpEfEVN5eD@y)n%O+eVJm+Hl_i-&{SzOg715Tu=%kbrzOD<_G2c$j8WP&_tC zHZMjkBl-6AR4^n)CLPAYzwG7Vd0bC|TuQl1#iEj#a%JS?vNI+uz#O*|wyP zZ(a8B?&iX;nRjN{ub@XOByT=9z@(U?a%1`0$y`rNbZ=~NX=m8i*Q%hO)WyP@YFELo zq_?G;aZ*IimxjBBd}mBPuat+GSXY2ZLt!v4n`d3dm4z`w5|{u006cV3PE!DoP_Ms$ zzYtLGAb)Rv&miwWPrq=VrAaEdX@4xS0&rq-LkiYNW z?~vk>3OoP+1oKHmK~y-)ebskV6G6A5`%X4wOWheClrc1};FPV)#djwzId^QWZK>?stpai>@@gCPn6#&BdMi72jM8xH#+;~Ktd)c9+{X2GOOUYz&}*f*0c7fjJU>_ znAQqSZ8*<@Ux6=~Yz~Wcv{Q_iUAv`1f4lMG#q}F%(y#(JWCnxFodxhpE9TI{#s0GN zuK>=C$c%|upLH`$R%pRgFlrK+Whu--j|jwaWzX6zS96CTzLOfxz%9hCB*ckj4Ttj` zCeW%cT-uvx7|ML~s4=TodfZI8R4UaLv9U;Sdj(_C(^1uz9%ktEch5JjkE;du+LU79fWvQN?OOY8IYrN3X@J_8fP^Q3I zMsm{EHN`g9ULnQ{@nU2VT!qAqex200Ri3O#RqWkAGT7XoyJzq3@`oevsLf7

=@QTFH*%9hw0afZChKaSVs@#Y{l6ET}z+LfFv#J1=E zo7Yg6H~fp)^7%eKJdY)aE!zt5UBTEYmni&n_y5{Al0Do|hQBy`B0yc9$83c3Jlh(4 zffdW;LYeNLzxM?U-`QPi885&dM$q~kEs)r4o3$oIpfV~xAo}L+lU%~`p(qvL#>c05c=9JzwTuWUK52JB5zEzepA!NeENbeA03PIq#?(DQb`qx;W&1f_( zhI`PKjx)Gy8C=F;A?O7PKjFIUGXZNn`NX3EYkYy&-i{19T!{D@=O)NRB1|Evy4es7 zus1PWkU8eQG1HZBAfCasCV|LLs6KUOEH=@wiO=W3@fsIcnhY|RONFy<4E`orBN6&x zrl`8;F9W_<9T8EE68OdOX6JxYYQe!n;ccmsNN}m^VgnKZJ|Cny;0>_D#5M|aVerO; zZ;NG-NfKpucXjigejM)%^7Y+zfamadgLWti2?^PlkWeg-l=S4Nt4=kHfnjV43R0B^R>?56m!4E>GrAYYa0t=A_XDsL<+3JVEoFACcnHQ3bG zm!Frh>lUc0di%90&#QNrg@qNB?O3(y%Fmboe6VZhwrwiadn=xL62AWdpl7dNzcw(i zv%LJ)Cm*kP<{3+x{gLDH53db;_Nm?HlaAy60nijp^WHMgaR2}S07*qoM6N<$g1R-5 A9RL6T literal 0 HcmV?d00001 diff --git a/web/documentserver-example/java/src/main/webapp/css/img/uid-2.png b/web/documentserver-example/java/src/main/webapp/css/img/uid-2.png new file mode 100644 index 0000000000000000000000000000000000000000..651b40c6b91e59c94b2752ddcbe0dac2ffe38cab GIT binary patch literal 2199 zcmV;I2x#|-P)Px#32;bRa{vGf6951U69E94oEQKA0{~D=R7FQ{Oq!vx ze}+AOW?e_fc_WbMi|LXMpNJ~|EXlJ0OxrB?IpQgB&pRoY}0h*z+hK-+` zqqU2Yq?@9&eT0{ak)w!@p@4^(hmN3uh?M3@LM|yN zB`G;IIU5fQI4?1|$=*^xJCnge>*BVWkG+?Pjd*pF zYG5-mI6592q_)mqUS?BQW6s;{h?%%NN@a0_ret-KFefTMGc#o(Xj|XN zy`74L@A&?ZaALrrl%%ArfmTf)AS=hLq4L_!gmZ5|K}Ty?T1YA*oUO(v3<^RqD}aKI zkD$I;YK%}{e3`1pTUlXjaD0)Z!B|H_UsYM4l$Nf))!ypzrmwzge44SYwY0s&p_{x zuivlFzmS)l?Zf~81k_1HK~y-)ebskZ6G<2c;6*{;?xcD?mQx@5_1-IzKtk}uAPWlt z0wj0 z_gH{gti85cPd{o`y=cjX)`Ra}TUJ(^$_FVx=e@SJx=$^(%XeF%#_kE{6p21Q@hJ(g za{<7nrq3+0dr0h&YTl`+RQMbLJTbv6A7E2c6BCmKdbu@;-K|p;ohgdonjmRVc}d%@ ze2W4v63^GGcA1+)eDYjqVx^B%iOXaqB?R7<*i}ejr`g;qHXv*tTwQaiQd)xB5IAmw z2OY$T;4-A0cG7#YY#)iagVh6-!Aimg6k#Ki2H`kC#OHgF*hvf7ZB_v9*=^5NC_}4p z!iLENSSD>NhmXlpy-*G(^fF(dFgsMKB=8EAJWyPrluBhde2n;tPQ4yl&Ce0GEUXS8 zs_G7mHZ){M`(G@l{^N)F$Huu~B({j6_N@Bq2;Dt_tR}STueG)8lXewkFTU&{RunTx?!mizG^|mQ*nD z_VzE~nKngQ7jtw3ttosxE;}yfzucT?|Jc~fj4Ecx@hB3*){tX`5bv`F+regE7Ybt< z9^__^0xsam3DxnauhHE?8hgWWZiPc}!kB;lYR$^d%FWB*i9=MXNOTdA*2P{!804^L zr;bifH&6T-oi*MX$>Rme+mD_!GlQB%-mdl7T1Rp_P>!Fcr+!yOHNy}*-ig4Yp{@)H zgR<4a);Myg&>+X*xG8@@rhjgo8sMTLWjvfT@RE~U1Jgtp-IY}T=3Dgwi8?c!7tZ5J zf)W_>wGO7ON39SZ5BB)2-zK6Yd4llp@S>vR^L&JXh8&DOeR_ou|CG}z5RBEU!)pct zlamJ-j5%##0EZ#DLNbRvyVh^?KvQhyuurI5oE$jGv7sd1{0a-gl|-W9o`ntgKy&`)5ttCD{V3@Mg+^)3TyXWZ}=IgQ_7SLPYS@L_e%_zdn?eCe% zYog08-avYTdiTA@ehIgK?Dp^d$uO66==OUXZ+-iT-`E{GpMCm?@fW`sfArx8+jlJb Z@qh8`Ye}<~)Vcrw002ovPDHLkV1jA>VwC^@ literal 0 HcmV?d00001 diff --git a/web/documentserver-example/java/src/main/webapp/editor.jsp b/web/documentserver-example/java/src/main/webapp/editor.jsp index e90821d62..a471d7440 100644 --- a/web/documentserver-example/java/src/main/webapp/editor.jsp +++ b/web/documentserver-example/java/src/main/webapp/editor.jsp @@ -257,13 +257,34 @@ <% String usersForMentions = (String) request.getAttribute("usersForMentions"); + String usersInfo = (String) request.getAttribute("usersInfo"); %> if (config.editorConfig.user.id) { // add mentions for not anonymous users - config.events['onRequestUsers'] = function () { - docEditor.setUsers({ // set a list of users to mention in the comments - "users": <%=usersForMentions%> + config.events['onRequestUsers'] = function (event) { + if (event && event.data){ + var c = event.data.c; + } + switch (c) { + case "info": + users = []; + var allUsers = <%=usersInfo%>; + for (var i = 0; i < event.data.id.length; i++) { + for (var j = 0; j < allUsers.length; j++) { + if (allUsers[j].id == event.data.id[i]) { + users.push(allUsers[j]); + break; + } + } + } + break; + default: + users = <%=usersForMentions%>; + } + docEditor.setUsers({ + "c": c, + "users": users, }); }; // the user is mentioned in a comment From 672a351402ac154fe3e6eeaadb198f3c85438b5f Mon Sep 17 00:00:00 2001 From: sshakndr Date: Mon, 6 Nov 2023 10:54:39 +0700 Subject: [PATCH 211/488] csharp-mvc: user image --- CHANGELOG.md | 1 + .../csharp-mvc/Content/images/uid-1.png | Bin 0 -> 2226 bytes .../csharp-mvc/Content/images/uid-2.png | Bin 0 -> 2199 bytes .../csharp-mvc/Helpers/Users.cs | 34 +++++++++++++++--- .../csharp-mvc/Models/FileModel.cs | 11 +++++- .../csharp-mvc/Views/Home/Editor.aspx | 28 +++++++++++++-- 6 files changed, 66 insertions(+), 8 deletions(-) create mode 100644 web/documentserver-example/csharp-mvc/Content/images/uid-1.png create mode 100644 web/documentserver-example/csharp-mvc/Content/images/uid-2.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 24e23c663..638bbc061 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- csharp-mvc: user avatar - java: user avatar - java-spring: user avatar - php: user avatar diff --git a/web/documentserver-example/csharp-mvc/Content/images/uid-1.png b/web/documentserver-example/csharp-mvc/Content/images/uid-1.png new file mode 100644 index 0000000000000000000000000000000000000000..91cf9e02ce9c581fd3515f132a68945a8b1dea29 GIT binary patch literal 2226 zcmV;j2u=5iP)Px#32;bRa{vGf6951U69E94oEQKA0{~D=R7FQ{Ox)bu z)6>)9;o#oh-p$R;*45P8+1KFT-{0Tg-{0Th;Nafg-q+XH-QC^I&CSu#(bw14&CJWo z%gfW#)6&w?-rnBc-rmZ}%HQAL+S=OJ*VoO>&CSit%*@QPt*YAC*8BVS-rU;E%*@Eh z$jr>l+1c6I+1b(2(f9TB_xJbu`ueY@r=6RY`}+F(_x7csp0~2C`}_O6wz9movf

z*wfAW_Vf7j@#x~;=i=V$=;Ynq-QM2b(b3V^*x1(A*3{J0-{0TU)6><})yvDv+}zyP z*Vo(I+tSj~+1c69(9qi2+RV(%&(F`!&d$xv%@hm@BNY-K6cP~$2Mh-WI3pYy5f3I9 z7X17CG9nxu5f2y+3`{K~{QCI`1O&jFhE+BzDj5_|H!k}8{+^kbn3RzO0RgL}qC7G$ z;JT(aCL%E%7+N|ov5R;1)xxxoedN8Vk!xB#9vaT1l74q{#GZ;a9~nLaBomZdXlfNIGUgHDXCVUqm~ecxHubU!Z(x z^3c7AVpEfEVN5eD@y)n%O+eVJm+Hl_i-&{SzOg715Tu=%kbrzOD<_G2c$j8WP&_tC zHZMjkBl-6AR4^n)CLPAYzwG7Vd0bC|TuQl1#iEj#a%JS?vNI+uz#O*|wyP zZ(a8B?&iX;nRjN{ub@XOByT=9z@(U?a%1`0$y`rNbZ=~NX=m8i*Q%hO)WyP@YFELo zq_?G;aZ*IimxjBBd}mBPuat+GSXY2ZLt!v4n`d3dm4z`w5|{u006cV3PE!DoP_Ms$ zzYtLGAb)Rv&miwWPrq=VrAaEdX@4xS0&rq-LkiYNW z?~vk>3OoP+1oKHmK~y-)ebskV6G6A5`%X4wOWheClrc1};FPV)#djwzId^QWZK>?stpai>@@gCPn6#&BdMi72jM8xH#+;~Ktd)c9+{X2GOOUYz&}*f*0c7fjJU>_ znAQqSZ8*<@Ux6=~Yz~Wcv{Q_iUAv`1f4lMG#q}F%(y#(JWCnxFodxhpE9TI{#s0GN zuK>=C$c%|upLH`$R%pRgFlrK+Whu--j|jwaWzX6zS96CTzLOfxz%9hCB*ckj4Ttj` zCeW%cT-uvx7|ML~s4=TodfZI8R4UaLv9U;Sdj(_C(^1uz9%ktEch5JjkE;du+LU79fWvQN?OOY8IYrN3X@J_8fP^Q3I zMsm{EHN`g9ULnQ{@nU2VT!qAqex200Ri3O#RqWkAGT7XoyJzq3@`oevsLf7

=@QTFH*%9hw0afZChKaSVs@#Y{l6ET}z+LfFv#J1=E zo7Yg6H~fp)^7%eKJdY)aE!zt5UBTEYmni&n_y5{Al0Do|hQBy`B0yc9$83c3Jlh(4 zffdW;LYeNLzxM?U-`QPi885&dM$q~kEs)r4o3$oIpfV~xAo}L+lU%~`p(qvL#>c05c=9JzwTuWUK52JB5zEzepA!NeENbeA03PIq#?(DQb`qx;W&1f_( zhI`PKjx)Gy8C=F;A?O7PKjFIUGXZNn`NX3EYkYy&-i{19T!{D@=O)NRB1|Evy4es7 zus1PWkU8eQG1HZBAfCasCV|LLs6KUOEH=@wiO=W3@fsIcnhY|RONFy<4E`orBN6&x zrl`8;F9W_<9T8EE68OdOX6JxYYQe!n;ccmsNN}m^VgnKZJ|Cny;0>_D#5M|aVerO; zZ;NG-NfKpucXjigejM)%^7Y+zfamadgLWti2?^PlkWeg-l=S4Nt4=kHfnjV43R0B^R>?56m!4E>GrAYYa0t=A_XDsL<+3JVEoFACcnHQ3bG zm!Frh>lUc0di%90&#QNrg@qNB?O3(y%Fmboe6VZhwrwiadn=xL62AWdpl7dNzcw(i zv%LJ)Cm*kP<{3+x{gLDH53db;_Nm?HlaAy60nijp^WHMgaR2}S07*qoM6N<$g1R-5 A9RL6T literal 0 HcmV?d00001 diff --git a/web/documentserver-example/csharp-mvc/Content/images/uid-2.png b/web/documentserver-example/csharp-mvc/Content/images/uid-2.png new file mode 100644 index 0000000000000000000000000000000000000000..651b40c6b91e59c94b2752ddcbe0dac2ffe38cab GIT binary patch literal 2199 zcmV;I2x#|-P)Px#32;bRa{vGf6951U69E94oEQKA0{~D=R7FQ{Oq!vx ze}+AOW?e_fc_WbMi|LXMpNJ~|EXlJ0OxrB?IpQgB&pRoY}0h*z+hK-+` zqqU2Yq?@9&eT0{ak)w!@p@4^(hmN3uh?M3@LM|yN zB`G;IIU5fQI4?1|$=*^xJCnge>*BVWkG+?Pjd*pF zYG5-mI6592q_)mqUS?BQW6s;{h?%%NN@a0_ret-KFefTMGc#o(Xj|XN zy`74L@A&?ZaALrrl%%ArfmTf)AS=hLq4L_!gmZ5|K}Ty?T1YA*oUO(v3<^RqD}aKI zkD$I;YK%}{e3`1pTUlXjaD0)Z!B|H_UsYM4l$Nf))!ypzrmwzge44SYwY0s&p_{x zuivlFzmS)l?Zf~81k_1HK~y-)ebskZ6G<2c;6*{;?xcD?mQx@5_1-IzKtk}uAPWlt z0wj0 z_gH{gti85cPd{o`y=cjX)`Ra}TUJ(^$_FVx=e@SJx=$^(%XeF%#_kE{6p21Q@hJ(g za{<7nrq3+0dr0h&YTl`+RQMbLJTbv6A7E2c6BCmKdbu@;-K|p;ohgdonjmRVc}d%@ ze2W4v63^GGcA1+)eDYjqVx^B%iOXaqB?R7<*i}ejr`g;qHXv*tTwQaiQd)xB5IAmw z2OY$T;4-A0cG7#YY#)iagVh6-!Aimg6k#Ki2H`kC#OHgF*hvf7ZB_v9*=^5NC_}4p z!iLENSSD>NhmXlpy-*G(^fF(dFgsMKB=8EAJWyPrluBhde2n;tPQ4yl&Ce0GEUXS8 zs_G7mHZ){M`(G@l{^N)F$Huu~B({j6_N@Bq2;Dt_tR}STueG)8lXewkFTU&{RunTx?!mizG^|mQ*nD z_VzE~nKngQ7jtw3ttosxE;}yfzucT?|Jc~fj4Ecx@hB3*){tX`5bv`F+regE7Ybt< z9^__^0xsam3DxnauhHE?8hgWWZiPc}!kB;lYR$^d%FWB*i9=MXNOTdA*2P{!804^L zr;bifH&6T-oi*MX$>Rme+mD_!GlQB%-mdl7T1Rp_P>!Fcr+!yOHNy}*-ig4Yp{@)H zgR<4a);Myg&>+X*xG8@@rhjgo8sMTLWjvfT@RE~U1Jgtp-IY}T=3Dgwi8?c!7tZ5J zf)W_>wGO7ON39SZ5BB)2-zK6Yd4llp@S>vR^L&JXh8&DOeR_ou|CG}z5RBEU!)pct zlamJ-j5%##0EZ#DLNbRvyVh^?KvQhyuurI5oE$jGv7sd1{0a-gl|-W9o`ntgKy&`)5ttCD{V3@Mg+^)3TyXWZ}=IgQ_7SLPYS@L_e%_zdn?eCe% zYog08-avYTdiTA@ehIgK?Dp^d$uO66==OUXZ+-iT-`E{GpMCm?@fW`sfArx8+jlJb Z@qh8`Ye}<~)Vcrw002ovPDHLkV1jA>VwC^@ literal 0 HcmV?d00001 diff --git a/web/documentserver-example/csharp-mvc/Helpers/Users.cs b/web/documentserver-example/csharp-mvc/Helpers/Users.cs index 6960f0584..d9f0abe43 100644 --- a/web/documentserver-example/csharp-mvc/Helpers/Users.cs +++ b/web/documentserver-example/csharp-mvc/Helpers/Users.cs @@ -31,7 +31,8 @@ public class Users "Can perform all actions with comments", "The file favorite state is undefined", "Can create files from templates using data from the editor", - "Can see the information about all users" + "Can see the information about all users", + "Has an avatar" }; static List descr_user_2 = new List() @@ -41,7 +42,8 @@ public class Users "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only", "This file is marked as favorite", "Can create new files from the editor", - "Can see the information about users from Group2 and users who don’t belong to any group" + "Can see the information about users from Group2 and users who don’t belong to any group", + "Has an avatar" }; static List descr_user_3 = new List() @@ -85,6 +87,7 @@ public class Users null, new List(), descr_user_1, + true, true ), new User( @@ -103,7 +106,8 @@ public class Users true, new List(), descr_user_2, - false + false, + true ), new User( "uid-3", @@ -121,6 +125,7 @@ public class Users false, new List() { "copy", "download", "print" }, descr_user_3, + false, false ), new User( @@ -134,6 +139,7 @@ public class Users null, new List() { "protect" }, descr_user_0, + false, false ) }; @@ -171,6 +177,24 @@ public static List> getUsersForMentions(string id) } return usersData; } + + public static List> getUsersInfo(string id) + { + List> usersData = new List>(); + if (id != "uid-0") { + foreach (User user in users) + { + usersData.Add(new Dictionary() + { + {"id", user.id}, + {"name", user.name }, + {"email", user.email }, + {"image", user.avatar ? DocManagerHelper.GetServerUrl(false) + "/Content/images/" + user.id + ".png" : null} + }); + } + } + return usersData; + } } public class User @@ -186,8 +210,9 @@ public class User public List descriptions; public bool templates; public List userInfoGroups; + public bool avatar; - public User(string id, string name, string email, string group, List reviewGroups, Dictionary commentGroups, List userInfoGroups, bool? favorite, List deniedPermissions, List descriptions, bool templates) + public User(string id, string name, string email, string group, List reviewGroups, Dictionary commentGroups, List userInfoGroups, bool? favorite, List deniedPermissions, List descriptions, bool templates, bool avatar) { this.id = id; this.name = name; @@ -200,6 +225,7 @@ public User(string id, string name, string email, string group, List rev this.descriptions = descriptions; this.templates = templates; this.userInfoGroups = userInfoGroups; + this.avatar = avatar; } } } diff --git a/web/documentserver-example/csharp-mvc/Models/FileModel.cs b/web/documentserver-example/csharp-mvc/Models/FileModel.cs index 14ce0f7b5..bd097b047 100755 --- a/web/documentserver-example/csharp-mvc/Models/FileModel.cs +++ b/web/documentserver-example/csharp-mvc/Models/FileModel.cs @@ -190,7 +190,8 @@ public string GetDocConfig(HttpRequest request, UrlHelper url) { { "id", !user.id.Equals("uid-0") ? user.id : null }, { "name", user.name }, - { "group", user.group } + { "group", user.group }, + { "image", user.avatar ? DocManagerHelper.GetServerUrl(false) + "/Content/images/" + user.id + ".png" : null} } }, { @@ -372,5 +373,13 @@ public void GetUsersMentions(HttpRequest request, out string usersForMentions) var user = Users.getUser(id); usersForMentions = !user.id.Equals("uid-0") ? jss.Serialize(Users.getUsersForMentions(user.id)) : null; } + + public void GetUsersInfo(HttpRequest request, out string usersInfo) + { + var jss = new JavaScriptSerializer(); + var id = request.Cookies.GetOrDefault("uid", null); + var user = Users.getUser(id); + usersInfo = jss.Serialize(Users.getUsersInfo(user.id)); + } } } \ No newline at end of file diff --git a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx index 5c9ccdee9..fa4315a3e 100644 --- a/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx +++ b/web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx @@ -254,6 +254,8 @@ <% string usersForMentions; %> <% Model.GetUsersMentions(Request, out usersForMentions); %> + <% string usersInfo; %> + <% Model.GetUsersInfo(Request, out usersInfo); %> if (config.editorConfig.user.id) { // the user is trying to show the document version history @@ -269,9 +271,29 @@ // add mentions for not anonymous users <% if (!string.IsNullOrEmpty(usersForMentions)) { %> - config.events['onRequestUsers'] = function () { - docEditor.setUsers({ // set a list of users to mention in the comments - "users": <%= usersForMentions %> + config.events['onRequestUsers'] = function (event) { + if (event && event.data){ + var c = event.data.c; + } + switch (c) { + case "info": + users = []; + var allUsers = <%= usersInfo %>; + for (var i = 0; i < event.data.id.length; i++) { + for (var j = 0; j < allUsers.length; j++) { + if (allUsers[j].id == event.data.id[i]) { + users.push(allUsers[j]); + break; + } + } + } + break; + default: + users = <%= usersForMentions %>; + } + docEditor.setUsers({ + "c": c, + "users": users, }); }; <% } %> From 62e2f7426c01a4aa9d030758731b0f7de0ab6ff9 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Mon, 6 Nov 2023 11:41:09 +0700 Subject: [PATCH 212/488] csharp: user avatar --- CHANGELOG.md | 1 + .../csharp/App_Themes/images/uid-1.png | Bin 0 -> 2226 bytes .../csharp/App_Themes/images/uid-2.png | Bin 0 -> 2199 bytes .../csharp/DocEditor.aspx | 26 ++++++++++++-- .../csharp/DocEditor.aspx.cs | 7 +++- web/documentserver-example/csharp/Users.cs | 34 +++++++++++++++--- 6 files changed, 60 insertions(+), 8 deletions(-) create mode 100644 web/documentserver-example/csharp/App_Themes/images/uid-1.png create mode 100644 web/documentserver-example/csharp/App_Themes/images/uid-2.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 638bbc061..5bbe64508 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- csharp: user avatar - csharp-mvc: user avatar - java: user avatar - java-spring: user avatar diff --git a/web/documentserver-example/csharp/App_Themes/images/uid-1.png b/web/documentserver-example/csharp/App_Themes/images/uid-1.png new file mode 100644 index 0000000000000000000000000000000000000000..91cf9e02ce9c581fd3515f132a68945a8b1dea29 GIT binary patch literal 2226 zcmV;j2u=5iP)Px#32;bRa{vGf6951U69E94oEQKA0{~D=R7FQ{Ox)bu z)6>)9;o#oh-p$R;*45P8+1KFT-{0Tg-{0Th;Nafg-q+XH-QC^I&CSu#(bw14&CJWo z%gfW#)6&w?-rnBc-rmZ}%HQAL+S=OJ*VoO>&CSit%*@QPt*YAC*8BVS-rU;E%*@Eh z$jr>l+1c6I+1b(2(f9TB_xJbu`ueY@r=6RY`}+F(_x7csp0~2C`}_O6wz9movf

z*wfAW_Vf7j@#x~;=i=V$=;Ynq-QM2b(b3V^*x1(A*3{J0-{0TU)6><})yvDv+}zyP z*Vo(I+tSj~+1c69(9qi2+RV(%&(F`!&d$xv%@hm@BNY-K6cP~$2Mh-WI3pYy5f3I9 z7X17CG9nxu5f2y+3`{K~{QCI`1O&jFhE+BzDj5_|H!k}8{+^kbn3RzO0RgL}qC7G$ z;JT(aCL%E%7+N|ov5R;1)xxxoedN8Vk!xB#9vaT1l74q{#GZ;a9~nLaBomZdXlfNIGUgHDXCVUqm~ecxHubU!Z(x z^3c7AVpEfEVN5eD@y)n%O+eVJm+Hl_i-&{SzOg715Tu=%kbrzOD<_G2c$j8WP&_tC zHZMjkBl-6AR4^n)CLPAYzwG7Vd0bC|TuQl1#iEj#a%JS?vNI+uz#O*|wyP zZ(a8B?&iX;nRjN{ub@XOByT=9z@(U?a%1`0$y`rNbZ=~NX=m8i*Q%hO)WyP@YFELo zq_?G;aZ*IimxjBBd}mBPuat+GSXY2ZLt!v4n`d3dm4z`w5|{u006cV3PE!DoP_Ms$ zzYtLGAb)Rv&miwWPrq=VrAaEdX@4xS0&rq-LkiYNW z?~vk>3OoP+1oKHmK~y-)ebskV6G6A5`%X4wOWheClrc1};FPV)#djwzId^QWZK>?stpai>@@gCPn6#&BdMi72jM8xH#+;~Ktd)c9+{X2GOOUYz&}*f*0c7fjJU>_ znAQqSZ8*<@Ux6=~Yz~Wcv{Q_iUAv`1f4lMG#q}F%(y#(JWCnxFodxhpE9TI{#s0GN zuK>=C$c%|upLH`$R%pRgFlrK+Whu--j|jwaWzX6zS96CTzLOfxz%9hCB*ckj4Ttj` zCeW%cT-uvx7|ML~s4=TodfZI8R4UaLv9U;Sdj(_C(^1uz9%ktEch5JjkE;du+LU79fWvQN?OOY8IYrN3X@J_8fP^Q3I zMsm{EHN`g9ULnQ{@nU2VT!qAqex200Ri3O#RqWkAGT7XoyJzq3@`oevsLf7

=@QTFH*%9hw0afZChKaSVs@#Y{l6ET}z+LfFv#J1=E zo7Yg6H~fp)^7%eKJdY)aE!zt5UBTEYmni&n_y5{Al0Do|hQBy`B0yc9$83c3Jlh(4 zffdW;LYeNLzxM?U-`QPi885&dM$q~kEs)r4o3$oIpfV~xAo}L+lU%~`p(qvL#>c05c=9JzwTuWUK52JB5zEzepA!NeENbeA03PIq#?(DQb`qx;W&1f_( zhI`PKjx)Gy8C=F;A?O7PKjFIUGXZNn`NX3EYkYy&-i{19T!{D@=O)NRB1|Evy4es7 zus1PWkU8eQG1HZBAfCasCV|LLs6KUOEH=@wiO=W3@fsIcnhY|RONFy<4E`orBN6&x zrl`8;F9W_<9T8EE68OdOX6JxYYQe!n;ccmsNN}m^VgnKZJ|Cny;0>_D#5M|aVerO; zZ;NG-NfKpucXjigejM)%^7Y+zfamadgLWti2?^PlkWeg-l=S4Nt4=kHfnjV43R0B^R>?56m!4E>GrAYYa0t=A_XDsL<+3JVEoFACcnHQ3bG zm!Frh>lUc0di%90&#QNrg@qNB?O3(y%Fmboe6VZhwrwiadn=xL62AWdpl7dNzcw(i zv%LJ)Cm*kP<{3+x{gLDH53db;_Nm?HlaAy60nijp^WHMgaR2}S07*qoM6N<$g1R-5 A9RL6T literal 0 HcmV?d00001 diff --git a/web/documentserver-example/csharp/App_Themes/images/uid-2.png b/web/documentserver-example/csharp/App_Themes/images/uid-2.png new file mode 100644 index 0000000000000000000000000000000000000000..651b40c6b91e59c94b2752ddcbe0dac2ffe38cab GIT binary patch literal 2199 zcmV;I2x#|-P)Px#32;bRa{vGf6951U69E94oEQKA0{~D=R7FQ{Oq!vx ze}+AOW?e_fc_WbMi|LXMpNJ~|EXlJ0OxrB?IpQgB&pRoY}0h*z+hK-+` zqqU2Yq?@9&eT0{ak)w!@p@4^(hmN3uh?M3@LM|yN zB`G;IIU5fQI4?1|$=*^xJCnge>*BVWkG+?Pjd*pF zYG5-mI6592q_)mqUS?BQW6s;{h?%%NN@a0_ret-KFefTMGc#o(Xj|XN zy`74L@A&?ZaALrrl%%ArfmTf)AS=hLq4L_!gmZ5|K}Ty?T1YA*oUO(v3<^RqD}aKI zkD$I;YK%}{e3`1pTUlXjaD0)Z!B|H_UsYM4l$Nf))!ypzrmwzge44SYwY0s&p_{x zuivlFzmS)l?Zf~81k_1HK~y-)ebskZ6G<2c;6*{;?xcD?mQx@5_1-IzKtk}uAPWlt z0wj0 z_gH{gti85cPd{o`y=cjX)`Ra}TUJ(^$_FVx=e@SJx=$^(%XeF%#_kE{6p21Q@hJ(g za{<7nrq3+0dr0h&YTl`+RQMbLJTbv6A7E2c6BCmKdbu@;-K|p;ohgdonjmRVc}d%@ ze2W4v63^GGcA1+)eDYjqVx^B%iOXaqB?R7<*i}ejr`g;qHXv*tTwQaiQd)xB5IAmw z2OY$T;4-A0cG7#YY#)iagVh6-!Aimg6k#Ki2H`kC#OHgF*hvf7ZB_v9*=^5NC_}4p z!iLENSSD>NhmXlpy-*G(^fF(dFgsMKB=8EAJWyPrluBhde2n;tPQ4yl&Ce0GEUXS8 zs_G7mHZ){M`(G@l{^N)F$Huu~B({j6_N@Bq2;Dt_tR}STueG)8lXewkFTU&{RunTx?!mizG^|mQ*nD z_VzE~nKngQ7jtw3ttosxE;}yfzucT?|Jc~fj4Ecx@hB3*){tX`5bv`F+regE7Ybt< z9^__^0xsam3DxnauhHE?8hgWWZiPc}!kB;lYR$^d%FWB*i9=MXNOTdA*2P{!804^L zr;bifH&6T-oi*MX$>Rme+mD_!GlQB%-mdl7T1Rp_P>!Fcr+!yOHNy}*-ig4Yp{@)H zgR<4a);Myg&>+X*xG8@@rhjgo8sMTLWjvfT@RE~U1Jgtp-IY}T=3Dgwi8?c!7tZ5J zf)W_>wGO7ON39SZ5BB)2-zK6Yd4llp@S>vR^L&JXh8&DOeR_ou|CG}z5RBEU!)pct zlamJ-j5%##0EZ#DLNbRvyVh^?KvQhyuurI5oE$jGv7sd1{0a-gl|-W9o`ntgKy&`)5ttCD{V3@Mg+^)3TyXWZ}=IgQ_7SLPYS@L_e%_zdn?eCe% zYog08-avYTdiTA@ehIgK?Dp^d$uO66==OUXZ+-iT-`E{GpMCm?@fW`sfArx8+jlJb Z@qh8`Ye}<~)Vcrw002ovPDHLkV1jA>VwC^@ literal 0 HcmV?d00001 diff --git a/web/documentserver-example/csharp/DocEditor.aspx b/web/documentserver-example/csharp/DocEditor.aspx index 4d2540589..e4c6cdb62 100644 --- a/web/documentserver-example/csharp/DocEditor.aspx +++ b/web/documentserver-example/csharp/DocEditor.aspx @@ -272,9 +272,29 @@ // add mentions for not anonymous users <% if (!string.IsNullOrEmpty(UsersForMentions)) { %> - config.events['onRequestUsers'] = function () { - docEditor.setUsers({ // set a list of users to mention in the comments - "users": <%= UsersForMentions %> + config.events['onRequestUsers'] = function (event) { + if (event && event.data){ + var c = event.data.c; + } + switch (c) { + case "info": + users = []; + var allUsers = <%= UsersInfo %>; + for (var i = 0; i < event.data.id.length; i++) { + for (var j = 0; j < allUsers.length; j++) { + if (allUsers[j].id == event.data.id[i]) { + users.push(allUsers[j]); + break; + } + } + } + break; + default: + users = <%= UsersForMentions %>; + } + docEditor.setUsers({ + "c": c, + "users": users, }); }; <% } %> diff --git a/web/documentserver-example/csharp/DocEditor.aspx.cs b/web/documentserver-example/csharp/DocEditor.aspx.cs index 334112a9a..28a2a67da 100755 --- a/web/documentserver-example/csharp/DocEditor.aspx.cs +++ b/web/documentserver-example/csharp/DocEditor.aspx.cs @@ -64,6 +64,7 @@ protected string DocServiceApiUri protected string DocumentData { get; private set; } protected string DataSpreadsheet { get; private set; } protected string UsersForMentions { get; private set; } + protected string UsersInfo { get; private set; } protected string DocumentType { get { return _Default.DocumentType(FileName); } } // get callback url @@ -256,7 +257,8 @@ protected void Page_Load(object sender, EventArgs e) { { "id", !user.id.Equals("uid-0") ? user.id : null }, { "name", user.name }, - { "group", user.group } + { "group", user.group }, + { "image", user.avatar ? _Default.GetServerUrl(false) + "/App_Themes/images/"+ user.id + ".png" : null } } }, { @@ -317,6 +319,9 @@ protected void Page_Load(object sender, EventArgs e) // get users for mentions List> usersData = Users.getUsersForMentions(user.id); UsersForMentions = !user.id.Equals("uid-0") ? jss.Serialize(usersData) : null; + + List> usersInfo = Users.getUsersInfo(user.id); + UsersInfo = jss.Serialize(usersData); } catch { } } diff --git a/web/documentserver-example/csharp/Users.cs b/web/documentserver-example/csharp/Users.cs index 1dea57de9..40c250a06 100644 --- a/web/documentserver-example/csharp/Users.cs +++ b/web/documentserver-example/csharp/Users.cs @@ -30,7 +30,8 @@ public class Users "Can perform all actions with comments", "The file favorite state is undefined", "Can create files from templates using data from the editor", - "Can see the information about all users" + "Can see the information about all users", + "Has an avatar" }; static List descr_user_2 = new List() @@ -40,7 +41,8 @@ public class Users "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only", "This file is marked as favorite", "Can create new files from the editor", - "Can see the information about users from Group2 and users who don’t belong to any group" + "Can see the information about users from Group2 and users who don’t belong to any group", + "Has an avatar" }; static List descr_user_3 = new List() @@ -84,6 +86,7 @@ public class Users null, new List(), descr_user_1, + true, true ), new User( @@ -102,7 +105,8 @@ public class Users true, new List(), descr_user_2, - false + false, + true ), new User( "uid-3", @@ -120,6 +124,7 @@ public class Users false, new List() { "copy", "download", "print" }, descr_user_3, + false, false ), new User( @@ -133,6 +138,7 @@ public class Users null, new List() { "protect" }, descr_user_0, + false, false ) }; @@ -171,6 +177,24 @@ public static List> getUsersForMentions(string id) } return usersData; } + + public static List> getUsersInfo(string id) + { + List> usersData = new List>(); + if(id != "uid-0"){ + foreach (User user in users) + { + usersData.Add(new Dictionary() + { + {"id", user.id}, + {"name", user.name }, + {"email", user.email }, + {"image", user.avatar ? _Default.GetServerUrl(false) + "/App_Themes/images/"+ user.id + ".png" : null } + }); + } + } + return usersData; + } } public class User @@ -186,8 +210,9 @@ public class User public List descriptions; public bool templates; public List userInfoGroups; + public bool avatar; - public User(string id, string name, string email, string group, List reviewGroups, Dictionary commentGroups, List userInfoGroups, bool? favorite, List deniedPermissions, List descriptions, bool templates) + public User(string id, string name, string email, string group, List reviewGroups, Dictionary commentGroups, List userInfoGroups, bool? favorite, List deniedPermissions, List descriptions, bool templates, bool avatar) { this.id = id; this.name = name; @@ -200,6 +225,7 @@ public User(string id, string name, string email, string group, List rev this.descriptions = descriptions; this.templates = templates; this.userInfoGroups = userInfoGroups; + this.avatar = avatar; } } } From f620da3b98a0773de647bf0ff34bbff3a82e3e78 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Mon, 6 Nov 2023 12:02:38 +0700 Subject: [PATCH 213/488] java: empty usersInfo for anonymous --- .../main/java/controllers/EditorServlet.java | 2 +- .../java/src/main/java/helpers/Users.java | 20 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java b/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java index fad184190..0cc639967 100644 --- a/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java +++ b/web/documentserver-example/java/src/main/java/controllers/EditorServlet.java @@ -107,7 +107,7 @@ protected void processRequest(final HttpServletRequest request, // users data for mentions List> usersForMentions = Users.getUsersForMentions(user.getId()); - List> usersInfo = Users.getUsersInfo(); + List> usersInfo = Users.getUsersInfo(user.getId()); // check if the document token is enabled if (DocumentManager.tokenEnabled()) { diff --git a/web/documentserver-example/java/src/main/java/helpers/Users.java b/web/documentserver-example/java/src/main/java/helpers/Users.java index ca9b1ca8b..969bb2a60 100755 --- a/web/documentserver-example/java/src/main/java/helpers/Users.java +++ b/web/documentserver-example/java/src/main/java/helpers/Users.java @@ -127,16 +127,18 @@ public static List> getUsersForMentions(final String id) { return usersData; } - public static List> getUsersInfo() { + public static List> getUsersInfo(final String id) { List> usersData = new ArrayList<>(); - for (User user : users) { - Map data = new HashMap<>(); - data.put("id", user.getId()); - data.put("name", user.getName()); - data.put("email", user.getEmail()); - data.put("image", user.getAvatar() ? DocumentManager.getServerUrl(false) - + "/css/img/" + user.getId() + ".png" : null); - usersData.add(data); + if (id != "uid-0") { + for (User user : users) { + Map data = new HashMap<>(); + data.put("id", user.getId()); + data.put("name", user.getName()); + data.put("email", user.getEmail()); + data.put("image", user.getAvatar() ? DocumentManager.getServerUrl(false) + + "/css/img/" + user.getId() + ".png" : null); + usersData.add(data); + } } return usersData; } From 65b9bfec01167fda8e60e5cb4d78ef9926080710 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 6 Nov 2023 09:55:45 +0300 Subject: [PATCH 214/488] java-spring: remove logo parameter in config and Logo.java class --- .../models/configurations/Customization.java | 2 - .../models/configurations/Logo.java | 38 ------------------- .../src/main/resources/application.properties | 4 -- 3 files changed, 44 deletions(-) delete mode 100755 web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Logo.java diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Customization.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Customization.java index 821b6dfe7..bcfad7db1 100755 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Customization.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Customization.java @@ -32,8 +32,6 @@ other products (if there are any) and change the presence or absence of the additional buttons, links, change logos and editor owner details. */ public class Customization { - @Autowired - private Logo logo; // the image file at the top left corner of the Editor header @Autowired private Goback goback; // the settings for the Open file location menu button and upper right corner button private Boolean autosave = true; // if the Autosave menu option is enabled or disabled diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Logo.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Logo.java deleted file mode 100755 index ba66376bc..000000000 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Logo.java +++ /dev/null @@ -1,38 +0,0 @@ -/** - * - * (c) Copyright Ascensio System SIA 2023 - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package com.onlyoffice.integration.documentserver.models.configurations; - -import lombok.Getter; -import lombok.Setter; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Component; - -@Component -@Scope("prototype") -@Getter -@Setter -public class Logo { // the image file at the top left corner of the Editor header - @Value("${logo.image}") - private String image; // the path to the image file used to show in common work mode - @Value("${logo.imageEmbedded}") - private String imageEmbedded; // the path to the image file used to show in the embedded mode - @Value("${logo.url}") - private String url; // the absolute URL which will be used when someone clicks the logo image -} diff --git a/web/documentserver-example/java-spring/src/main/resources/application.properties b/web/documentserver-example/java-spring/src/main/resources/application.properties index 9c4c3f773..2fefdaf83 100755 --- a/web/documentserver-example/java-spring/src/main/resources/application.properties +++ b/web/documentserver-example/java-spring/src/main/resources/application.properties @@ -43,7 +43,3 @@ url.converter=/converter url.editor=/editor url.track=/track url.download=/download - -logo.image= -logo.imageEmbedded= -logo.url=https://www.onlyoffice.com From 089819cdc4b91e8d3aa66b36bca9d6c3d2200b10 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Mon, 6 Nov 2023 14:43:33 +0300 Subject: [PATCH 215/488] setUsers for region protection in changelog --- CHANGELOG.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bef986f63..0c7e01256 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,6 @@ # Change Log -- csharp: setUsers for region protection -- csharp-mvc: setUsers for region protection -- java: setUsers for region protection -- java-spring: setUsers for region protection -- php: setUsers for region protection -- python: setUsers for region protection -- ruby: setUsers for region protection +- setUsers for region protection - onRequestOpen method - nodejs: user avatar - trimming long name of uploading file From 794e578a376909d993f516cd5009bf84f55684a6 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Tue, 7 Nov 2023 12:00:51 +0700 Subject: [PATCH 216/488] merging fix --- web/documentserver-example/php/src/views/DocEditorView.php | 6 +++--- web/documentserver-example/python/src/views/actions.py | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/web/documentserver-example/php/src/views/DocEditorView.php b/web/documentserver-example/php/src/views/DocEditorView.php index fc5ecf775..79e520395 100644 --- a/web/documentserver-example/php/src/views/DocEditorView.php +++ b/web/documentserver-example/php/src/views/DocEditorView.php @@ -226,8 +226,8 @@ public function __construct($request, $tempName = "docEditor") $usersForProtect = $user->id != "uid-0" ? $userList->getUsersForProtect($user->id) : null; $usersInfo = []; - if ($user->id != 'uid-0'){ - foreach ($userList->getAllUsers() as $userInfo){ + if ($user->id != 'uid-0') { + foreach ($userList->getAllUsers() as $userInfo) { $u = $userInfo; $u->image = $userInfo->avatar ? serverPath(true) . "/assets/images/" . $userInfo->id . ".png" : null; array_push($usersInfo, $u); @@ -315,7 +315,7 @@ public function __construct($request, $tempName = "docEditor") "config" => json_encode($config), "history" => $historyLayout, "usersForMentions" => json_encode($usersForMentions), - "usersInfo" => json_encode($usersInfo) + "usersInfo" => json_encode($usersInfo), "usersForProtect" => json_encode($usersForProtect), ]; } diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py index 7411465bf..fca6c1c15 100755 --- a/web/documentserver-example/python/src/views/actions.py +++ b/web/documentserver-example/python/src/views/actions.py @@ -238,7 +238,7 @@ def edit(request): u = userInfo u.image = docManager.getServerUrl(True, request) + f'/static/images/{u.id}.jpg' if user.avatar else None usersInfo.append({"id": u.id, "name": u.name, "email": u.email, "image": u.image, "group": u.group, - "reviewGroups":u.reviewGroups, "commentGroups":u.commentGroups, "favorite": u.favorite, + "reviewGroups": u.reviewGroups, "commentGroups": u.commentGroups, "favorite": u.favorite, "deniedPermissions": u.deniedPermissions, "descriptions": u.descriptions, "templates": u.templates, "userInfoGroups": u.userInfoGroups, "avatar": u.avatar}) @@ -305,7 +305,8 @@ def edit(request): 'id': user.id if user.id != 'uid-0' else None, 'name': user.name, 'group': user.group, - 'image': docManager.getServerUrl(True, request) + f'/static/images/{user.id}.jpg' if user.avatar else None + 'image': docManager.getServerUrl(True, request) + f'/static/images/{user.id}.jpg' if user.avatar + else None }, 'embedded': { # the parameters for the embedded document type # the absolute URL that will allow the document to be saved onto the user personal computer @@ -386,7 +387,7 @@ def edit(request): 'dataInsertImage': json.dumps(dataInsertImage)[1: len(json.dumps(dataInsertImage)) - 1], 'dataDocument': dataDocument, # document which will be compared with the current document 'dataSpreadsheet': json.dumps(dataSpreadsheet), # recipient data for mail merging - 'usersForMentions': json.dumps(usersForMentions) if user.id !='uid-0' else None, + 'usersForMentions': json.dumps(usersForMentions) if user.id != 'uid-0' else None, 'usersInfo': json.dumps(usersInfo), 'usersForProtect': json.dumps(usersForProtect) if user.id != 'uid-0' else None, } From e18d36f18de9271dd89d4e7d779cd48178e326b5 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Tue, 7 Nov 2023 12:43:05 +0700 Subject: [PATCH 217/488] php: convert after uploading only tagged formats --- CHANGELOG.md | 1 + web/documentserver-example/php/assets/document-formats | 2 +- web/documentserver-example/php/src/format/FormatManager.php | 5 +---- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c7e01256..722ddc7c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- php: convert after uploading only tagged formats - setUsers for region protection - onRequestOpen method - nodejs: user avatar diff --git a/web/documentserver-example/php/assets/document-formats b/web/documentserver-example/php/assets/document-formats index 6e38b1767..bf21acc76 160000 --- a/web/documentserver-example/php/assets/document-formats +++ b/web/documentserver-example/php/assets/document-formats @@ -1 +1 @@ -Subproject commit 6e38b17679e4939684b067a9175e3bc64cf7923c +Subproject commit bf21acc7666b9ddb64606247f5afb119952f8475 diff --git a/web/documentserver-example/php/src/format/FormatManager.php b/web/documentserver-example/php/src/format/FormatManager.php index fcbf8dc51..fd4ee84ee 100644 --- a/web/documentserver-example/php/src/format/FormatManager.php +++ b/web/documentserver-example/php/src/format/FormatManager.php @@ -147,10 +147,7 @@ public function convertible(): array $formats = $this->all(); $filtered = []; foreach ($formats as $format) { - if ($format->type === 'cell' and in_array('xlsx', $format->convert) or - $format->type === 'slide' and in_array('pptx', $format->convert) or - $format->type === 'word' and in_array('docx', $format->convert) - ) { + if (in_array('auto-convert', $format->actions)) { $filtered[] = $format; } } From d3185253a872e6223f18d8912fe68722195c7bab Mon Sep 17 00:00:00 2001 From: sshakndr Date: Tue, 7 Nov 2023 12:56:06 +0700 Subject: [PATCH 218/488] python: convert after uploading only tagged formats --- CHANGELOG.md | 1 + web/documentserver-example/python/assets/document-formats | 2 +- web/documentserver-example/python/src/format/format.py | 4 +--- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 722ddc7c9..69dbf29e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- python: convert after uploading only tagged formats - php: convert after uploading only tagged formats - setUsers for region protection - onRequestOpen method diff --git a/web/documentserver-example/python/assets/document-formats b/web/documentserver-example/python/assets/document-formats index 6e38b1767..bf21acc76 160000 --- a/web/documentserver-example/python/assets/document-formats +++ b/web/documentserver-example/python/assets/document-formats @@ -1 +1 @@ -Subproject commit 6e38b17679e4939684b067a9175e3bc64cf7923c +Subproject commit bf21acc7666b9ddb64606247f5afb119952f8475 diff --git a/web/documentserver-example/python/src/format/format.py b/web/documentserver-example/python/src/format/format.py index f9d87563f..494897078 100644 --- a/web/documentserver-example/python/src/format/format.py +++ b/web/documentserver-example/python/src/format/format.py @@ -77,9 +77,7 @@ def convertible(self) -> list[Format]: formats = self.all() filtered = filter( lambda format: ( - format.type == 'cell' and 'xlsx' in format.convert or - format.type == 'slide' and 'pptx' in format.convert or - format.type == 'word' and 'docx' in format.convert + 'auto-convert' in format.actions ), formats ) From f7386df0504f877ef4842c41467f41528e5d7b16 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Tue, 7 Nov 2023 13:01:27 +0700 Subject: [PATCH 219/488] ruby: convert after uploading only tagged formats --- CHANGELOG.md | 1 + web/documentserver-example/ruby/app/format/format.rb | 4 +--- web/documentserver-example/ruby/assets/document-formats | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69dbf29e0..f750a1478 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- ruby: convert after uploading only tagged formats - python: convert after uploading only tagged formats - php: convert after uploading only tagged formats - setUsers for region protection diff --git a/web/documentserver-example/ruby/app/format/format.rb b/web/documentserver-example/ruby/app/format/format.rb index 314b9144b..130210fa2 100644 --- a/web/documentserver-example/ruby/app/format/format.rb +++ b/web/documentserver-example/ruby/app/format/format.rb @@ -88,9 +88,7 @@ def convertible_extensions sig { returns(T::Array[Format]) } def convertible all.filter do |format| - format.type == 'cell' && format.convert.include?('xlsx') || - format.type == 'slide' && format.convert.include?('pptx') || - format.type == 'word' && format.convert.include?('docx') + format.actions.include?('auto-convert') end end diff --git a/web/documentserver-example/ruby/assets/document-formats b/web/documentserver-example/ruby/assets/document-formats index 6e38b1767..bf21acc76 160000 --- a/web/documentserver-example/ruby/assets/document-formats +++ b/web/documentserver-example/ruby/assets/document-formats @@ -1 +1 @@ -Subproject commit 6e38b17679e4939684b067a9175e3bc64cf7923c +Subproject commit bf21acc7666b9ddb64606247f5afb119952f8475 From 2ee051e9fc08907fbaef818a9b2dee4dc4d0e612 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Wed, 8 Nov 2023 11:38:04 +0700 Subject: [PATCH 220/488] java-spring: 'uid-' prefix was returned to User class id field --- .../integration/documentserver/models/filemodel/User.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/User.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/User.java index 602988689..71ad9aeb4 100755 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/User.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/User.java @@ -39,7 +39,7 @@ public class User extends AbstractModel { // the user configuration parameters public void configure(final int idParam, final String nameParam, final String groupParam) { - this.id = "" + idParam; // the user id + this.id = "uid-" + idParam; // the user id this.name = nameParam; // the user name this.group = groupParam; // the group the user belongs to this.image = storagePathBuilder.getServerUrl(true) + "/css/img/uid-" + this.id + ".png"; From d75a4c529d3b5026d5e6d7e355e0032b0a5910b0 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Wed, 8 Nov 2023 12:17:42 +0700 Subject: [PATCH 221/488] ruby: renaming asset method to assets --- .../ruby/app/controllers/home_controller.rb | 2 +- web/documentserver-example/ruby/config/application.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 988370dcb..e473656ec 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -279,7 +279,7 @@ def csv end # downloading an assets file - def asset + def assets file_name = File.basename(params[:fileName]) asset_path = Rails.root.join('assets', 'document-templates', 'sample', file_name) diff --git a/web/documentserver-example/ruby/config/application.rb b/web/documentserver-example/ruby/config/application.rb index 6b39993d0..12dfd4df0 100644 --- a/web/documentserver-example/ruby/config/application.rb +++ b/web/documentserver-example/ruby/config/application.rb @@ -28,7 +28,7 @@ class Application < Rails::Application root to: 'home#index' match '/convert', to: 'home#convert', via: 'post' match '/csv', to: 'home#csv', via: 'get' - match '/asset', to: 'home#asset', via: 'get' + match '/asset', to: 'home#assets', via: 'get' match '/download', to: 'home#download', via: 'get' match '/downloadhistory', to: 'home#downloadhistory', via: 'get' match '/editor', to: 'home#editor', via: 'get' From 7c57b0f575b6e088c7b0e119d1fae3efe7a77a6f Mon Sep 17 00:00:00 2001 From: sshakndr Date: Wed, 8 Nov 2023 13:08:07 +0700 Subject: [PATCH 222/488] python: code refactoring --- web/documentserver-example/python/manage.py | 2 +- .../python/src/views/actions.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/web/documentserver-example/python/manage.py b/web/documentserver-example/python/manage.py index 4311d80b4..af8c700d6 100644 --- a/web/documentserver-example/python/manage.py +++ b/web/documentserver-example/python/manage.py @@ -70,7 +70,7 @@ def routers(): path('csv', actions.csv), path('download', actions.download), path('downloadhistory', actions.downloadhistory), - path('historyobj', actions.historyobj), + path('historyobj', actions.history_obj), path('edit', actions.edit), path('files', actions.files), path('reference', actions.reference), diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py index d4081d06d..54392dd4e 100755 --- a/web/documentserver-example/python/src/views/actions.py +++ b/web/documentserver-example/python/src/views/actions.py @@ -498,24 +498,24 @@ def downloadhistory(request): return HttpResponse(json.dumps(response), content_type='application/json', status=404) -def historyobj(request): +def history_obj(request): body = json.loads(request.body) response = {} - fileName = None + file_name = None try: - fileName = body['fileName'] + file_name = body['fileName'] except Exception: pass - if fileName is None: + if file_name is None: response.setdefault('error', 'File not found') return HttpResponse(json.dumps(response), content_type='application/json', status=404) - storagePath = docManager.getStoragePath(fileName, request) - docKey = docManager.generateFileKey(fileName, request) - fileUrl = docManager.getDownloadUrl(fileName, request) - response = historyManager.getHistoryObject(storagePath, fileName, docKey, fileUrl, False, request) + storage_path = docManager.getStoragePath(file_name, request) + doc_key = docManager.generateFileKey(file_name, request) + file_url = docManager.getDownloadUrl(file_name, request) + response = historyManager.getHistoryObject(storage_path, file_name, doc_key, file_url, False, request) return HttpResponse(json.dumps(response), content_type='application/json') From 030985bbebed05c70035fd8c2df792eadb4a2ccc Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 8 Nov 2023 15:02:58 +0300 Subject: [PATCH 223/488] csharp: moved the submodule to the assets/document-templates subfolder --- .gitmodules | 8 ++++---- web/documentserver-example/csharp/DocEditor.aspx.cs | 2 +- web/documentserver-example/csharp/WebEditor.ashx.cs | 4 ++-- .../csharp/{assets => assets/document-templates} | 0 4 files changed, 7 insertions(+), 7 deletions(-) rename web/documentserver-example/csharp/{assets => assets/document-templates} (100%) diff --git a/.gitmodules b/.gitmodules index ea03c04be..3a2744ed3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,10 +2,6 @@ path = web/documentserver-example/csharp-mvc/assets url = https://github.com/ONLYOFFICE/document-templates branch = main/en -[submodule "web/documentserver-example/csharp/assets"] - path = web/documentserver-example/csharp/assets - url = https://github.com/ONLYOFFICE/document-templates - branch = main/en [submodule "web/documentserver-example/nodejs/public/assets/document-templates"] path = web/documentserver-example/nodejs/public/assets/document-templates url = https://github.com/ONLYOFFICE/document-templates @@ -54,3 +50,7 @@ path = web/documentserver-example/java-spring/src/main/resources/assets/document-formats url = https://github.com/ONLYOFFICE/document-formats branch = master +[submodule "web/documentserver-example/csharp/assets/document-templates"] + path = web/documentserver-example/csharp/assets/document-templates + url = https://github.com/ONLYOFFICE/document-templates + branch = main/en diff --git a/web/documentserver-example/csharp/DocEditor.aspx.cs b/web/documentserver-example/csharp/DocEditor.aspx.cs index 2184c4116..8fc1e540d 100755 --- a/web/documentserver-example/csharp/DocEditor.aspx.cs +++ b/web/documentserver-example/csharp/DocEditor.aspx.cs @@ -489,7 +489,7 @@ private static void Try(string type, string sample, HttpRequest request) return; } var demoName = (string.IsNullOrEmpty(sample) ? "new" : "sample") + ext; // create demo document name with the necessary extension - var demoPath = "assets\\" + (string.IsNullOrEmpty(sample) ? "new\\" : "sample\\"); // and put this file into the assets directory + var demoPath = "assets\\document-templates\\" + (string.IsNullOrEmpty(sample) ? "new\\" : "sample\\"); // and put this file into the assets directory FileName = _Default.GetCorrectName(demoName); // get file name with an index if such a file name already exists diff --git a/web/documentserver-example/csharp/WebEditor.ashx.cs b/web/documentserver-example/csharp/WebEditor.ashx.cs index 2b2a75929..ed1fad984 100644 --- a/web/documentserver-example/csharp/WebEditor.ashx.cs +++ b/web/documentserver-example/csharp/WebEditor.ashx.cs @@ -275,7 +275,7 @@ private static void Files(HttpContext context) private static void Assets(HttpContext context) { var fileName = Path.GetFileName(context.Request["filename"]); - var filePath = HttpRuntime.AppDomainAppPath + "assets/sample/" + fileName; + var filePath = HttpRuntime.AppDomainAppPath + "assets/document-templates/sample/" + fileName; download(filePath, context); } @@ -283,7 +283,7 @@ private static void Assets(HttpContext context) private static void GetCsv(HttpContext context) { var fileName = "csv.csv"; - var filePath = HttpRuntime.AppDomainAppPath + "assets/sample/" + fileName; + var filePath = HttpRuntime.AppDomainAppPath + "assets/document-templates/sample/" + fileName; download(filePath, context); } diff --git a/web/documentserver-example/csharp/assets b/web/documentserver-example/csharp/assets/document-templates similarity index 100% rename from web/documentserver-example/csharp/assets rename to web/documentserver-example/csharp/assets/document-templates From c91fbf6320cb251ef1174a7c7ea3ea3ca41135e2 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 8 Nov 2023 15:24:14 +0300 Subject: [PATCH 224/488] csharp: add document-formats submodule --- .gitmodules | 3 +++ web/documentserver-example/csharp/assets/document-formats | 1 + 2 files changed, 4 insertions(+) create mode 160000 web/documentserver-example/csharp/assets/document-formats diff --git a/.gitmodules b/.gitmodules index 3a2744ed3..49e6a0a6f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -54,3 +54,6 @@ path = web/documentserver-example/csharp/assets/document-templates url = https://github.com/ONLYOFFICE/document-templates branch = main/en +[submodule "web/documentserver-example/csharp/assets/document-formats"] + path = web/documentserver-example/csharp/assets/document-formats + url = https://github.com/ONLYOFFICE/document-formats diff --git a/web/documentserver-example/csharp/assets/document-formats b/web/documentserver-example/csharp/assets/document-formats new file mode 160000 index 000000000..bf21acc76 --- /dev/null +++ b/web/documentserver-example/csharp/assets/document-formats @@ -0,0 +1 @@ +Subproject commit bf21acc7666b9ddb64606247f5afb119952f8475 From 28c8410e7d2ffbddb9cb36bcf4108fdccd3496ba Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Thu, 9 Nov 2023 09:51:43 +0300 Subject: [PATCH 225/488] csharp: add format module --- .../csharp/FormatManager.cs | 188 ++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 web/documentserver-example/csharp/FormatManager.cs diff --git a/web/documentserver-example/csharp/FormatManager.cs b/web/documentserver-example/csharp/FormatManager.cs new file mode 100644 index 000000000..37d2df5c6 --- /dev/null +++ b/web/documentserver-example/csharp/FormatManager.cs @@ -0,0 +1,188 @@ +/** + * + * (c) Copyright Ascensio System SIA 2023 + * + * 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. + * + */ + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using Newtonsoft.Json; + +namespace OnlineEditorsExample +{ + public class Format + { + public string Name { get; } + public string Type { get; } + public List Actions { get; } + public List Convert { get; } + public List Mime { get; } + + public Format(string name, string type, List actions, List convert, List mime) + { + Name = name; + Type = type; + Actions = actions; + Convert = convert; + Mime = mime; + } + + public string Extension() + { + return "." + Name; + } + } + + public class FormatManager + { + public static List FillableExtensions() + { + return Fillable() + .Select(format => format.Extension()) + .ToList(); + } + + public static List Fillable() + { + return All() + .Where(format => format.Actions.Contains("fill")) + .ToList(); + } + + public static List ViewableExtensions() + { + return Viewable() + .Select(format => format.Extension()) + .ToList(); + } + + public static List Viewable() + { + return All() + .Where(format => format.Actions.Contains("view")) + .ToList(); + } + + public static List EditableExtensions() + { + return Editable() + .Select(format => format.Extension()) + .ToList(); + } + + public static List Editable() + { + return All() + .Where(format => format.Actions.Contains("edit") || format.Actions.Contains("lossy-edit")) + .ToList(); + } + + public static List ConvertibleExtensions() + { + return Convertible() + .Select(format => format.Extension()) + .ToList(); + } + + public static List Convertible() + { + return All() + .Where(format => (format.Type == "cell" && format.Convert.Contains("xlsx")) + || (format.Type == "slide" && format.Convert.Contains("pptx")) + || (format.Type == "word" && format.Convert.Contains("docx"))) + .ToList(); + } + + public static List SpreadsheetExtensions() + { + return Spreadsheets() + .Select(format => format.Extension()) + .ToList(); + } + + public static List Spreadsheets() + { + return All() + .Where(format => format.Type == "cell") + .ToList(); + } + + public static List PresentationExtensions() + { + return Presentations() + .Select(format => format.Extension()) + .ToList(); + } + + public static List Presentations() + { + return All() + .Where(format => format.Type == "slide") + .ToList(); + } + + public static List DocumentExtensions() + { + return Documents() + .Select(format => format.Extension()) + .ToList(); + } + + public static List Documents() + { + return All() + .Where(format => format.Type == "word") + .ToList(); + } + + public static List AllExtensions() + { + return All() + .Select(format => format.Extension()) + .ToList(); + } + + public static List All() + { + var path = GetPath(); + var lines = File.ReadLines(path, Encoding.UTF8); + var contents = string.Join(Environment.NewLine, lines); + var formats = JsonConvert.DeserializeObject(contents); + return formats.ToList(); + } + + private static string GetPath() + { + string path = Path.Combine(GetDirectory(), "onlyoffice-docs-formats.json"); + if (File.Exists(path)) + { + return path; + } + else + { + throw new FileNotFoundException("The JSON file does not exist."); + } + } + + private static string GetDirectory() + { + string directory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets", "document-formats"); + return Path.GetFullPath(directory); + } + } +} \ No newline at end of file From 0057b81adc72fe19d1fe82f9775a8f0c611f1fa8 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Thu, 9 Nov 2023 09:56:55 +0300 Subject: [PATCH 226/488] csharp-mvc: moved the submodule to the assets/document-templates subfolder --- .gitmodules | 8 +++---- .../csharp-mvc/Helpers/DocManagerHelper.cs | 2 +- .../csharp-mvc/OnlineEditorsExampleMVC.csproj | 23 ++++++++++--------- .../csharp-mvc/WebEditor.ashx.cs | 4 ++-- .../{assets => assets/document-templates} | 0 5 files changed, 19 insertions(+), 18 deletions(-) rename web/documentserver-example/csharp-mvc/{assets => assets/document-templates} (100%) diff --git a/.gitmodules b/.gitmodules index ea03c04be..985a0e5f3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,3 @@ -[submodule "web/documentserver-example/csharp-mvc/assets"] - path = web/documentserver-example/csharp-mvc/assets - url = https://github.com/ONLYOFFICE/document-templates - branch = main/en [submodule "web/documentserver-example/csharp/assets"] path = web/documentserver-example/csharp/assets url = https://github.com/ONLYOFFICE/document-templates @@ -54,3 +50,7 @@ path = web/documentserver-example/java-spring/src/main/resources/assets/document-formats url = https://github.com/ONLYOFFICE/document-formats branch = master +[submodule "web/documentserver-example/csharp-mvc/assets/document-templates"] + path = web/documentserver-example/csharp-mvc/assets/document-templates + url = https://github.com/ONLYOFFICE/document-templates + branch = main/en diff --git a/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs b/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs index 4de692969..7721001c2 100644 --- a/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs +++ b/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs @@ -220,7 +220,7 @@ public static List GetStoredFiles() public static string CreateDemo(string fileExt, bool withContent) { var demoName = (withContent ? "sample." : "new.") + fileExt; // create sample or new template file with the necessary extension - var demoPath = "assets\\" + (withContent ? "sample\\" : "new\\"); // get the path to the sample document + var demoPath = "assets\\document-templates\\" + (withContent ? "sample\\" : "new\\"); // get the path to the sample document var fileName = GetCorrectName(demoName); // get a file name with an index if the file with such a name already exists diff --git a/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj b/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj index c7d6abc25..3691fc7dc 100644 --- a/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj +++ b/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj @@ -181,17 +181,18 @@ - - - - - - - - - - - + + + + + + + + + + + + diff --git a/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs b/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs index 89487893e..70d40e36f 100644 --- a/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs +++ b/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs @@ -453,7 +453,7 @@ private static void Files(HttpContext context) private static void Assets(HttpContext context) { var fileName = Path.GetFileName(context.Request["filename"]); - var filePath = HttpRuntime.AppDomainAppPath + "assets/sample/" + fileName; + var filePath = HttpRuntime.AppDomainAppPath + "assets/document-templates/sample/" + fileName; download(filePath, context); } @@ -461,7 +461,7 @@ private static void Assets(HttpContext context) private static void GetCsv(HttpContext context) { var fileName = "csv.csv"; - var filePath = HttpRuntime.AppDomainAppPath + "assets/sample/" + fileName; + var filePath = HttpRuntime.AppDomainAppPath + "assets/document-templates/sample/" + fileName; download(filePath, context); } diff --git a/web/documentserver-example/csharp-mvc/assets b/web/documentserver-example/csharp-mvc/assets/document-templates similarity index 100% rename from web/documentserver-example/csharp-mvc/assets rename to web/documentserver-example/csharp-mvc/assets/document-templates From 6350e33c64b8133c3cdf2a35feebd58cbc8005ce Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Fri, 10 Nov 2023 11:10:06 +0300 Subject: [PATCH 227/488] csharp-mvc: add document-formats submodule --- .gitmodules | 3 +++ web/documentserver-example/csharp-mvc/assets/document-formats | 1 + 2 files changed, 4 insertions(+) create mode 160000 web/documentserver-example/csharp-mvc/assets/document-formats diff --git a/.gitmodules b/.gitmodules index 985a0e5f3..04bd88a9b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -54,3 +54,6 @@ path = web/documentserver-example/csharp-mvc/assets/document-templates url = https://github.com/ONLYOFFICE/document-templates branch = main/en +[submodule "web/documentserver-example/csharp-mvc/assets/document-formats"] + path = web/documentserver-example/csharp-mvc/assets/document-formats + url = https://github.com/ONLYOFFICE/document-formats diff --git a/web/documentserver-example/csharp-mvc/assets/document-formats b/web/documentserver-example/csharp-mvc/assets/document-formats new file mode 160000 index 000000000..bf21acc76 --- /dev/null +++ b/web/documentserver-example/csharp-mvc/assets/document-formats @@ -0,0 +1 @@ +Subproject commit bf21acc7666b9ddb64606247f5afb119952f8475 From 9b9049a2fc30b5719a96e7d18c19fe501a9e0544 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Fri, 10 Nov 2023 12:32:38 +0300 Subject: [PATCH 228/488] csharp-mvc: add format module --- .../csharp-mvc/Models/FileUtility.cs | 166 ++++++++++++++++++ 1 file changed, 166 insertions(+) diff --git a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs index 7463daf90..f7eb6d8e2 100644 --- a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs +++ b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs @@ -16,8 +16,13 @@ * */ +using Newtonsoft.Json; +using System; using System.Collections.Generic; using System.IO; +using static OnlineEditorsExampleMVC.Models.FileUtility; +using System.Linq; +using System.Text; namespace OnlineEditorsExampleMVC.Models { @@ -69,4 +74,165 @@ public static FileType GetFileType(string fileName) ".odp", ".fodp", ".otp" }; } + + public class Format + { + public string Name { get; } + public FileType Type { get; } + public List Actions { get; } + public List Convert { get; } + public List Mime { get; } + + public Format(string name, FileType type, List actions, List convert, List mime) + { + Name = name; + Type = type; + Actions = actions; + Convert = convert; + Mime = mime; + } + + public string Extension() + { + return "." + Name; + } + } + + public class FormatManager + { + public static List FillableExtensions() + { + return Fillable() + .Select(format => format.Extension()) + .ToList(); + } + + public static List Fillable() + { + return All() + .Where(format => format.Actions.Contains("fill")) + .ToList(); + } + + public static List ViewableExtensions() + { + return Viewable() + .Select(format => format.Extension()) + .ToList(); + } + + public static List Viewable() + { + return All() + .Where(format => format.Actions.Contains("view")) + .ToList(); + } + + public static List EditableExtensions() + { + return Editable() + .Select(format => format.Extension()) + .ToList(); + } + + public static List Editable() + { + return All() + .Where(format => format.Actions.Contains("edit") || format.Actions.Contains("lossy-edit")) + .ToList(); + } + + public static List ConvertibleExtensions() + { + return Convertible() + .Select(format => format.Extension()) + .ToList(); + } + + public static List Convertible() + { + return All() + .Where(format => (format.Type == FileType.Cell && format.Convert.Contains("xlsx")) + || (format.Type == FileType.Slide && format.Convert.Contains("pptx")) + || (format.Type == FileType.Word && format.Convert.Contains("docx"))) + .ToList(); + } + + public static List SpreadsheetExtensions() + { + return Spreadsheets() + .Select(format => format.Extension()) + .ToList(); + } + + public static List Spreadsheets() + { + return All() + .Where(format => format.Type == FileType.Cell) + .ToList(); + } + + public static List PresentationExtensions() + { + return Presentations() + .Select(format => format.Extension()) + .ToList(); + } + + public static List Presentations() + { + return All() + .Where(format => format.Type == FileType.Slide) + .ToList(); + } + + public static List DocumentExtensions() + { + return Documents() + .Select(format => format.Extension()) + .ToList(); + } + + public static List Documents() + { + return All() + .Where(format => format.Type == FileType.Word) + .ToList(); + } + + public static List AllExtensions() + { + return All() + .Select(format => format.Extension()) + .ToList(); + } + + public static List All() + { + var path = GetPath(); + var lines = File.ReadLines(path, Encoding.UTF8); + var contents = string.Join(Environment.NewLine, lines); + var formats = JsonConvert.DeserializeObject(contents); + return formats.ToList(); + } + + private static string GetPath() + { + string path = Path.Combine(GetDirectory(), "onlyoffice-docs-formats.json"); + if (File.Exists(path)) + { + return path; + } + else + { + throw new FileNotFoundException("The JSON file does not exist."); + } + } + + private static string GetDirectory() + { + string directory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "assets", "document-formats"); + return Path.GetFullPath(directory); + } + } } \ No newline at end of file From 9e351e41907f9cdc43bf98fae03b2f52cb381cd0 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Fri, 10 Nov 2023 12:46:30 +0300 Subject: [PATCH 229/488] csharp-mvc: replace the previous implementation of formats --- .../csharp-mvc/Helpers/DocManagerHelper.cs | 8 ++--- .../csharp-mvc/Models/FileUtility.cs | 35 +++---------------- .../csharp-mvc/OnlineEditorsExampleMVC.csproj | 5 +++ .../csharp-mvc/web.appsettings.config | 4 --- 4 files changed, 13 insertions(+), 39 deletions(-) diff --git a/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs b/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs index 7721001c2..41493888a 100644 --- a/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs +++ b/web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs @@ -51,24 +51,24 @@ public static List FileExts // get file extensions that can be viewed public static List ViewedExts { - get { return (WebConfigurationManager.AppSettings["files.docservice.viewed-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); } + get { return FormatManager.ViewableExtensions(); } } public static List FillFormExts { - get { return (WebConfigurationManager.AppSettings["files.docservice.fillform-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); } + get { return FormatManager.FillableExtensions(); } } // get file extensions that can be edited public static List EditedExts { - get { return (WebConfigurationManager.AppSettings["files.docservice.edited-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); } + get { return FormatManager.EditableExtensions(); } } // get file extensions that can be converted public static List ConvertExts { - get { return (WebConfigurationManager.AppSettings["files.docservice.convert-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); } + get { return FormatManager.ConvertibleExtensions(); } } // get current user host address diff --git a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs index f7eb6d8e2..b2de3abac 100644 --- a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs +++ b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs @@ -40,39 +40,12 @@ public static FileType GetFileType(string fileName) { var ext = Path.GetExtension(fileName).ToLower(); - if (ExtsDocument.Contains(ext)) return FileType.Word; // word type for document extensions - if (ExtsSpreadsheet.Contains(ext)) return FileType.Cell; // cell type for spreadsheet extensions - if (ExtsPresentation.Contains(ext)) return FileType.Slide; // slide type for presentation extensions + if (FormatManager.DocumentExtensions().Contains(ext)) return FileType.Word; // word type for document extensions + if (FormatManager.SpreadsheetExtensions().Contains(ext)) return FileType.Cell; // cell type for spreadsheet extensions + if (FormatManager.PresentationExtensions().Contains(ext)) return FileType.Slide; // slide type for presentation extensions return FileType.Word; // the default type is word } - - // document extensions - public static readonly List ExtsDocument = new List - { - ".doc", ".docx", ".docm", - ".dot", ".dotx", ".dotm", - ".odt", ".fodt", ".ott", ".rtf", ".txt", - ".html", ".htm", ".mht", ".xml", - ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps", ".oform" - }; - - // spreadsheet extensions - public static readonly List ExtsSpreadsheet = new List - { - ".xls", ".xlsx", ".xlsm", ".xlsb", - ".xlt", ".xltx", ".xltm", - ".ods", ".fods", ".ots", ".csv" - }; - - // presentation extensions - public static readonly List ExtsPresentation = new List - { - ".pps", ".ppsx", ".ppsm", - ".ppt", ".pptx", ".pptm", - ".pot", ".potx", ".potm", - ".odp", ".fodp", ".otp" - }; } public class Format @@ -98,7 +71,7 @@ public string Extension() } } - public class FormatManager + public static class FormatManager { public static List FillableExtensions() { diff --git a/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj b/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj index 3691fc7dc..e9e884332 100644 --- a/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj +++ b/web/documentserver-example/csharp-mvc/OnlineEditorsExampleMVC.csproj @@ -193,6 +193,11 @@ + + + + + diff --git a/web/documentserver-example/csharp-mvc/web.appsettings.config b/web/documentserver-example/csharp-mvc/web.appsettings.config index fb6b5f440..51630ee63 100644 --- a/web/documentserver-example/csharp-mvc/web.appsettings.config +++ b/web/documentserver-example/csharp-mvc/web.appsettings.config @@ -7,10 +7,6 @@ - - - - From 1d65ec61eaa4a538259f6ee08573a85f0c5b9a73 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Fri, 10 Nov 2023 13:06:25 +0300 Subject: [PATCH 230/488] nodejs: saving formsdata --- web/documentserver-example/nodejs/app.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js index 1a0378e4b..647dfcb6b 100755 --- a/web/documentserver-example/nodejs/app.js +++ b/web/documentserver-example/nodejs/app.js @@ -762,6 +762,26 @@ app.post('/track', async (req, res) => { // define a handler for tracking file c if (isSubmitForm) { const uid = body.actions[0].userid; req.DocManager.saveFileData(correctName, uid, 'Filling Form', userAddress); + + const { formsdataurl } = body; + if (formsdataurl) { + const formsdataName = req.DocManager.getCorrectName( + `${fileUtility.getFileName(correctName, true)}.txt`, + userAddress, + ); + // get the path to the file with forms data + const formsdataPath = req.DocManager.storagePath(formsdataName, userAddress); + const formsdata = await urllib.request(formsdataurl, { method: 'GET' }); + const statusFormsdata = formsdata.status; + const dataFormsdata = formsdata.data; + if (status === 200) { + fileSystem.writeFileSync(formsdataPath, dataFormsdata); // write the forms data + } else { + emitWarning(`Document editing service returned status: ${statusFormsdata}`); + } + } else { + emitWarning('Document editing service do not returned formsdataurl'); + } } } catch (ex) { response.write('{"error":1}'); From c2d190e81177ea2810d27a570691e8a1ef688851 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Fri, 27 Oct 2023 08:24:51 +0300 Subject: [PATCH 231/488] python: link in referenceData --- CHANGELOG.md | 1 + .../python/src/views/actions.py | 25 ++++++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22691d660..8feec19b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- python: link in referenceData - ruby: convert after uploading only tagged formats - python: convert after uploading only tagged formats - php: convert after uploading only tagged formats diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py index fca6c1c15..53c7a2303 100755 --- a/web/documentserver-example/python/src/views/actions.py +++ b/web/documentserver-example/python/src/views/actions.py @@ -29,6 +29,7 @@ from src.configuration import ConfigurationManager from src.response import ErrorResponse from src.utils import docManager, fileUtils, serviceConverter, users, jwtManager, historyManager, trackManager +from urllib.parse import urlparse, parse_qs config_manager = ConfigurationManager() @@ -540,19 +541,35 @@ def reference(request): if userAddress == request.META['REMOTE_ADDR']: fileName = fileKey['fileName'] + link = body['link'] + if not fileName and link: + if docManager.getServerUrl(False, request) not in link: + data = { + 'url': link, + 'directUrl': link + } + return HttpResponse(json.dumps(data), content_type='application/json') + + url_obj = urlparse(link) + query = parse_qs(url_obj.query) + if 'filename' in query: + fileName = query['filename'][0] + if not os.path.exists(docManager.getStoragePath(fileName, request)): + response.setdefault('error', 'File does not exist') + return HttpResponse(json.dumps(response), content_type='application/json', status=404) + if fileName is None: try: path = fileUtils.getFileName(body['path']) if os.path.exists(docManager.getStoragePath(path, request)): fileName = path + else: + response.setdefault('error', 'File not found') + return HttpResponse(json.dumps(response), content_type='application/json', status=404) except KeyError: response.setdefault('error', 'Path not found') return HttpResponse(json.dumps(response), content_type='application/json', status=404) - if fileName is None: - response.setdefault('error', 'File not found') - return HttpResponse(json.dumps(response), content_type='application/json', status=404) - data = { 'fileType': fileUtils.getFileExt(fileName).replace('.', ''), 'key': docManager.generateFileKey(fileName, request), From 99c046e49865aef409bf7488d65c012559f7ec35 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Fri, 27 Oct 2023 08:25:56 +0300 Subject: [PATCH 232/488] csharp: link in referenceData # Conflicts: # CHANGELOG.md --- CHANGELOG.md | 1 + .../csharp/WebEditor.ashx.cs | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8feec19b4..24844f766 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- csharp: link in referenceData - python: link in referenceData - ruby: convert after uploading only tagged formats - python: convert after uploading only tagged formats diff --git a/web/documentserver-example/csharp/WebEditor.ashx.cs b/web/documentserver-example/csharp/WebEditor.ashx.cs index 2b2a75929..481e8c668 100644 --- a/web/documentserver-example/csharp/WebEditor.ashx.cs +++ b/web/documentserver-example/csharp/WebEditor.ashx.cs @@ -29,6 +29,7 @@ using System.Collections; using System.Net.Sockets; using ASC.Api.DocumentConverter; +using Newtonsoft.Json; namespace OnlineEditorsExample { @@ -622,6 +623,27 @@ private static void Reference(HttpContext context) } } + if (fileName == "" && body.ContainsKey("link")) + { + string link = body["link"].ToString(); + if (!link.Contains(_Default.GetServerUrl(false))) + { + context.Response.Write(jss.Serialize(new Dictionary() { + { "url", link }, + { "directUrl", link } + })); + return; + } + + Uri linkUri = new Uri(link); + fileName = HttpUtility.ParseQueryString(linkUri.Query).Get("fileID"); + if (string.IsNullOrEmpty(fileName) || !File.Exists(_Default.StoragePath(fileName, null))) + { + context.Response.Write("{ \"error\": \"File is not exist\"}"); + return; + } + } + if (fileName == "") { try From 21e61a31af49673cacb37309f430e9deeb6200f3 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Fri, 27 Oct 2023 09:03:25 +0300 Subject: [PATCH 233/488] csharp-mvc: link in referenceData --- CHANGELOG.md | 1 + .../csharp-mvc/WebEditor.ashx.cs | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24844f766..179298e64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- csharp-mvc: link in referenceData - csharp: link in referenceData - python: link in referenceData - ruby: convert after uploading only tagged formats diff --git a/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs b/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs index 89487893e..3ff8e03a2 100644 --- a/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs +++ b/web/documentserver-example/csharp-mvc/WebEditor.ashx.cs @@ -812,6 +812,27 @@ private static void Reference(HttpContext context) } } + if (fileName == "" && body.ContainsKey("link")) + { + string link = body["link"].ToString(); + if (!link.Contains(DocManagerHelper.GetServerUrl(false))) + { + context.Response.Write(jss.Serialize(new Dictionary() { + { "url", link }, + { "directUrl", link } + })); + return; + } + + Uri linkUri = new Uri(link); + fileName = HttpUtility.ParseQueryString(linkUri.Query).Get("fileName"); + if (string.IsNullOrEmpty(fileName) || !File.Exists(DocManagerHelper.StoragePath(fileName, null))) + { + context.Response.Write("{ \"error\": \"File is not exist\"}"); + return; + } + } + if (fileName == "") { try From 778121f2afffbddd4eb9f3c28b9aef79a2d8d97d Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 30 Oct 2023 15:04:09 +0300 Subject: [PATCH 234/488] java-spring: link in referenceData --- CHANGELOG.md | 1 + .../controllers/FileController.java | 18 ++++++++++++++++++ .../onlyoffice/integration/dto/Reference.java | 1 + 3 files changed, 20 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 179298e64..041717aae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- java-spring: link in referenceData - csharp-mvc: link in referenceData - csharp: link in referenceData - python: link in referenceData diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java index 159b0eea5..4709da208 100755 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/FileController.java @@ -62,6 +62,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.util.UriComponents; +import org.springframework.web.util.UriComponentsBuilder; import javax.servlet.http.HttpServletRequest; import java.io.File; @@ -485,6 +487,22 @@ public String reference(@RequestBody final Reference body) { } } + String link = body.getLink(); + if (fileName.equals("") && link != null) { + if (!link.contains(storagePathBuilder.getServerUrl(true))) { + HashMap data = new HashMap<>(); + data.put("url", link); + data.put("directUrl", link); + return gson.toJson(data); + } + + UriComponents uriComponents = UriComponentsBuilder.fromUriString(body.getLink()).build(); + fileName = uriComponents.getQueryParams().getFirst("fileName"); + boolean fileExists = new File(storagePathBuilder.getFileLocation(fileName)).exists(); + if (!fileExists) { + return "{ \"error\": \"File is not exist\"}"; + } + } if (fileName.equals("")) { try { diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Reference.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Reference.java index 2eb7d8488..141555582 100644 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Reference.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Reference.java @@ -33,4 +33,5 @@ public class Reference { private Boolean directUrl; private ReferenceData referenceData; private String path; + private String link; } From 6c6dd7a954abc8e3b7542d6e2045f3f81c0f403c Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 30 Oct 2023 15:13:28 +0300 Subject: [PATCH 235/488] java: link in referenceData --- CHANGELOG.md | 1 + .../main/java/controllers/IndexServlet.java | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 041717aae..0af86a1c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- java: link in referenceData - java-spring: link in referenceData - csharp-mvc: link in referenceData - csharp: link in referenceData diff --git a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java index 970db3044..778ddfecd 100755 --- a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java +++ b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java @@ -694,6 +694,33 @@ private static void reference(final HttpServletRequest request, } } + Object link = body.get("link"); + if (fileName.equals("") && link != null) { + if (!((String) link).contains(DocumentManager.getServerUrl(false))) { + HashMap data = new HashMap<>(); + data.put("url", link); + data.put("directUrl", link); + writer.write(gson.toJson(data)); + return; + } + + URL url = new URL((String) link); + String query = url.getQuery(); + String[] parameters = query.split("&"); + for (String parameter : parameters) { + String[] keyValue = parameter.split("="); + if (keyValue.length == 2 && "fileName".equals(keyValue[0])) { + fileName = keyValue[1]; + break; + } + } + boolean fileExists = new File(DocumentManager.storagePath(fileName, null)).exists(); + if (!fileExists) { + writer.write("{ \"error\": \"File is not exist\"}"); + return; + } + } + if (fileName.equals("")) { try { String path = (String) body.get("path"); From d2a6ebeb747aa38fd8028fddd6abc91730d0dd82 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 30 Oct 2023 18:11:04 +0300 Subject: [PATCH 236/488] ruby: link in referenceData --- CHANGELOG.md | 1 + .../ruby/app/controllers/home_controller.rb | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0af86a1c3..a84ed87e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- ruby: link in referenceData - java: link in referenceData - java-spring: link in referenceData - csharp-mvc: link in referenceData diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index f02ab2b1a..8b6a0f715 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -395,6 +395,26 @@ def reference end end + link = body["link"] + if fileName.empty? and body.key?("link") + if !link.include?(DocumentHelper.get_server_url(false)) + data = { + url: link, + directUrl: link + } + render plain: data.to_json + return + end + + url_obj = URI(link) + query_params = CGI.parse(url_obj.query) + fileName = query_params['fileName'].first + if !File.exist?(DocumentHelper.storage_path(fileName, nil)) + render plain: '{ "error": "File is not exist"}' + return + end + end + if fileName.empty? and body.key?("path") path = File.basename(body["path"]) if File.exist?(DocumentHelper.storage_path(path, nil)) From 9f70cca92c55845aaf49696a4bf8ebece34bafab Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Thu, 26 Oct 2023 19:02:50 +0300 Subject: [PATCH 237/488] php: link in referenceData # Conflicts: # CHANGELOG.md --- CHANGELOG.md | 1 + web/documentserver-example/php/src/ajax.php | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a84ed87e4..17a48a314 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- php: link in referenceData - ruby: link in referenceData - java: link in referenceData - java-spring: link in referenceData diff --git a/web/documentserver-example/php/src/ajax.php b/web/documentserver-example/php/src/ajax.php index 59fc065e1..9ce21a195 100644 --- a/web/documentserver-example/php/src/ajax.php +++ b/web/documentserver-example/php/src/ajax.php @@ -553,6 +553,20 @@ function reference() } } + $link = $post["link"]; + if (!isset($filename) && isset($link)) { + if (strpos($link, serverPath()) === false) { + return ["url" => $link, "directUrl"=> $link]; + } + + $urlObj = parse_url($link); + parse_str($urlObj["query"], $urlParams); + $fileName = $urlParams["fileID"]; + if (!file_exists(getStoragePath($fileName))) { + return ["error" => "File does not exist"]; + } + } + if (!isset($filename) && isset($post["path"])) { $path = basename($post["path"]); if (file_exists(getStoragePath($path))) { From 63b2202f8232cc5fce6f44f3c9e8ba7ee2189189 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Mon, 13 Nov 2023 16:15:05 +0700 Subject: [PATCH 238/488] python: storage folder in configuration manager --- web/documentserver-example/python/manage.py | 1 + web/documentserver-example/python/src/utils/docManager.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/web/documentserver-example/python/manage.py b/web/documentserver-example/python/manage.py index af8c700d6..1cdf8f969 100644 --- a/web/documentserver-example/python/manage.py +++ b/web/documentserver-example/python/manage.py @@ -51,6 +51,7 @@ def configuration(): 'SECRET_KEY': uuid1(), 'STATIC_ROOT': f'{static_root}', 'STATIC_URL': static_url, + 'STORAGE_FOLDER': '/storage/', 'TEMPLATES': [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', diff --git a/web/documentserver-example/python/src/utils/docManager.py b/web/documentserver-example/python/src/utils/docManager.py index b9ec57cc1..680d111f1 100755 --- a/web/documentserver-example/python/src/utils/docManager.py +++ b/web/documentserver-example/python/src/utils/docManager.py @@ -26,6 +26,7 @@ import requests import magic +from django.conf import settings from django.http import FileResponse from src.configuration import ConfigurationManager from src.format import FormatManager @@ -111,7 +112,7 @@ def getServerUrl(forDocumentServer, req): def getFileUri(filename, forDocumentServer, req): host = getServerUrl(forDocumentServer, req) curAdr = req.META['REMOTE_ADDR'] - return f'{host}/storage/{curAdr}/{filename}' + return f'{host}{settings.STORAGE_FOLDER}{curAdr}/{filename}' # get absolute URL to the document storage service From 888957c9673daa434b92096b1225c7e34727569a Mon Sep 17 00:00:00 2001 From: sshakndr Date: Mon, 13 Nov 2023 16:31:26 +0700 Subject: [PATCH 239/488] php: removed unnecessary route and method 'csv' --- web/documentserver-example/php/index.php | 6 ------ web/documentserver-example/php/src/ajax.php | 14 -------------- .../php/src/views/DocEditorView.php | 6 +++--- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/web/documentserver-example/php/index.php b/web/documentserver-example/php/index.php index 565489ac1..6c7c25d7e 100755 --- a/web/documentserver-example/php/index.php +++ b/web/documentserver-example/php/index.php @@ -80,12 +80,6 @@ function routers() echo json_encode($response); return; } - if (str_starts_with($path, '/csv')) { - $response = csv(); - $response['status'] = 'success'; - echo json_encode($response); - return; - } if (str_starts_with($path, '/delete')) { $response = delete(); $response['status'] = isset($response['error']) ? 'error' : 'success'; diff --git a/web/documentserver-example/php/src/ajax.php b/web/documentserver-example/php/src/ajax.php index 9f9b7e5ef..cd5ed06fe 100644 --- a/web/documentserver-example/php/src/ajax.php +++ b/web/documentserver-example/php/src/ajax.php @@ -333,20 +333,6 @@ function files() } } -/** - * Download a csv file - * - * @return void - */ -function csv() -{ - $fileName = "csv.csv"; - $filePath = dirname(__FILE__) . DIRECTORY_SEPARATOR . '..' . - DIRECTORY_SEPARATOR . "assets" . DIRECTORY_SEPARATOR . "document-templates" - . DIRECTORY_SEPARATOR . "sample" . DIRECTORY_SEPARATOR . $fileName; - downloadFile($filePath); -} - /** * Download a file from history * diff --git a/web/documentserver-example/php/src/views/DocEditorView.php b/web/documentserver-example/php/src/views/DocEditorView.php index 89f29b195..017bf62be 100644 --- a/web/documentserver-example/php/src/views/DocEditorView.php +++ b/web/documentserver-example/php/src/views/DocEditorView.php @@ -211,11 +211,11 @@ public function __construct($request, $tempName = "docEditor") // recipients data for mail merging $dataSpreadsheet = $isEnableDirectUrl ? [ "fileType" => "csv", - "url" => serverPath(true) . "/csv", - "directUrl" => serverPath(false) . "/csv", + "url" => serverPath(true) . "/assets/document-templates/sample/csv.csv", + "directUrl" => serverPath(false) . "/assets/document-templates/sample/csv.csv", ] : [ "fileType" => "csv", - "url" => serverPath(true) . "/csv", + "url" => serverPath(true) . "/assets/document-templates/sample/csv.csv", ]; // users data for mentions From 6207d0398454ff4bf43855a2eff4e900c4b76e2b Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 13 Nov 2023 09:29:11 +0300 Subject: [PATCH 240/488] python: saving formsdata --- .../python/src/utils/trackManager.py | 17 ++++++++++++++++- .../python/src/utils/users.py | 10 +++++++--- .../python/src/views/actions.py | 2 +- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/web/documentserver-example/python/src/utils/trackManager.py b/web/documentserver-example/python/src/utils/trackManager.py index 574daadfd..6a6e12ddd 100755 --- a/web/documentserver-example/python/src/utils/trackManager.py +++ b/web/documentserver-example/python/src/utils/trackManager.py @@ -159,12 +159,27 @@ def processForceSave(body, filename, usAddr): if forcesavePath == "": forcesavePath = docManager.getForcesavePath(filename, usAddr, True) - docManager.saveFile(download, forcesavePath) # save document file + docManager.saveFile(data, forcesavePath) # save document file if isSubmitForm: uid = body['actions'][0]['userid'] # get the user id historyManager.createMetaData(filename, uid, "Filling Form", usAddr) # create meta data for forcesaved file + forms_data_url = body.get('formsdataurl') + if forms_data_url: + data_name = docManager.getCorrectName(fileUtils.getFileNameWithoutExt(filename) + ".txt", usAddr) + data_path = docManager.getStoragePath(data_name, usAddr) + + forms_data = docManager.downloadFileFromUri(forms_data_url); + + if data is None: + raise Exception("Document editing service didn't return forms_data"); + else: + with open(data_path, 'w') as file: + file.write(forms_data.text) + else: + raise Exception('Document editing service did not return forms_data_url') + # create a command request def commandRequest(method, key, meta=None): diff --git a/web/documentserver-example/python/src/utils/users.py b/web/documentserver-example/python/src/utils/users.py index c390c9301..354ce639a 100644 --- a/web/documentserver-example/python/src/utils/users.py +++ b/web/documentserver-example/python/src/utils/users.py @@ -42,7 +42,8 @@ def __init__(self, uid, name, email, group, reviewGroups, commentGroups, userInf "Can perform all actions with comments", "The file favorite state is undefined", "Can create files from templates using data from the editor", - "Can see the information about all users" + "Can see the information about all users", + "Can submit forms" ] descr_user_2 = [ @@ -52,7 +53,8 @@ def __init__(self, uid, name, email, group, reviewGroups, commentGroups, userInf "Can remove his own comments only"), "This file is marked as favorite", "Can create new files from the editor", - "Can see the information about users from Group2 and users who don’t belong to any group" + "Can see the information about users from Group2 and users who don’t belong to any group", + "Can’t submit forms" ] descr_user_3 = [ @@ -64,7 +66,8 @@ def __init__(self, uid, name, email, group, reviewGroups, commentGroups, userInf "Can’t download the file", "Can’t print the file", "Can create new files from the editor", - "Can see the information about Group2 users" + "Can see the information about Group2 users", + "Can’t submit forms" ] descr_user_0 = [ @@ -80,6 +83,7 @@ def __init__(self, uid, name, email, group, reviewGroups, commentGroups, userInf "Can't view chat", "Can't protect file", "View file without collaboration", + "Can’t submit forms" ] USERS = [ diff --git a/web/documentserver-example/python/src/views/actions.py b/web/documentserver-example/python/src/views/actions.py index d4bc7eb63..c1a647ceb 100755 --- a/web/documentserver-example/python/src/views/actions.py +++ b/web/documentserver-example/python/src/views/actions.py @@ -200,7 +200,7 @@ def edit(request): edMode = 'fillForms' canEdit = True # if the Submit form button is displayed or hidden - submitForm = edMode == 'fillForms' and user.id == 'uid-1' and False + submitForm = edMode == 'fillForms' and user.id == 'uid-1' mode = 'edit' if canEdit & (edMode != 'view') else 'view' # if the file can't be edited, the mode is view types = ['desktop', 'mobile', 'embedded'] From b6b001d7ef2a6e744055b1531d08c65437e88f06 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 13 Nov 2023 11:43:17 +0300 Subject: [PATCH 241/488] php: saving formsdata --- .../php/src/helpers/ExampleUsers.php | 4 ++++ .../php/src/trackmanager.php | 19 +++++++++++++++++++ .../php/src/views/DocEditorView.php | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/web/documentserver-example/php/src/helpers/ExampleUsers.php b/web/documentserver-example/php/src/helpers/ExampleUsers.php index 87e42289e..d1bbc1e33 100644 --- a/web/documentserver-example/php/src/helpers/ExampleUsers.php +++ b/web/documentserver-example/php/src/helpers/ExampleUsers.php @@ -38,6 +38,7 @@ public function __construct() "The file favorite state is undefined", "Can create files from templates using data from the editor", "Can see the information about all users", + "Can submit forms" ]; $this->user2Description = [ "Belongs to Group2", @@ -47,6 +48,7 @@ public function __construct() "This file is marked as favorite", "Can create new files from the editor", "Can see the information about users from Group2 and users who don’t belong to any group", + "Can’t submit forms" ]; $this->user3Description = [ "Belongs to Group3", @@ -58,6 +60,7 @@ public function __construct() "Can’t print the file", "Can create new files from the editor", "Can see the information about Group2 users", + "Can’t submit forms" ]; $this->user0Description = [ "The name is requested when the editor is opened", @@ -71,6 +74,7 @@ public function __construct() "Can't rename files from the editor", "Can't view chat", "View file without collaboration", + "Can’t submit forms" ]; $this->users = [ new Users( diff --git a/web/documentserver-example/php/src/trackmanager.php b/web/documentserver-example/php/src/trackmanager.php index ec55fb518..f61969fbb 100755 --- a/web/documentserver-example/php/src/trackmanager.php +++ b/web/documentserver-example/php/src/trackmanager.php @@ -273,6 +273,25 @@ function processForceSave($data, $fileName, $userAddress) if ($isSubmitForm) { $uid = $data->actions[0]->userid; // get the user id createMeta($fileName, $uid, "Filling Form", $userAddress); // create meta data for the forcesaved file + + $formsDataUrl = $data->formsdataurl; + if ($formsDataUrl) { + $formsName = getCorrectName($baseNameWithoutExt . ".txt", $userAddress); + $formsPath = getStoragePath($formsName, $userAddress); + + if (!(($formsData = file_get_contents( + $formsDataUrl, + false, + stream_context_create(["http" => ["timeout" => 5]]) + )) === false) + ) { + file_put_contents($formsPath, $formsData, LOCK_EX); + } else { + throw new Exception("Document editing service didn't return formsData"); + } + } else { + throw new Exception('Document editing service did not return formsDataUrl'); + } } $saved = 0; diff --git a/web/documentserver-example/php/src/views/DocEditorView.php b/web/documentserver-example/php/src/views/DocEditorView.php index 9fbbb120e..e68dd60f7 100644 --- a/web/documentserver-example/php/src/views/DocEditorView.php +++ b/web/documentserver-example/php/src/views/DocEditorView.php @@ -85,7 +85,7 @@ public function __construct($request, $tempName = "docEditor") } // check if the Submit form button is displayed or not - $submitForm = $editorsMode == "fillForms" && $user->id == "uid-1" && !1; + $submitForm = $editorsMode == "fillForms" && $user->id == "uid-1"; $mode = $canEdit && $editorsMode != "view" ? "edit" : "view"; // define if the editing mode is edit or view $type = empty($request["type"]) ? "desktop" : $request["type"]; From 1fda76552fccdb30e77707d3f230950f4c4e1782 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 13 Nov 2023 13:10:52 +0300 Subject: [PATCH 242/488] java: saving formsdata --- .../java/src/main/java/entities/FileModel.java | 2 +- .../src/main/java/helpers/TrackManager.java | 18 ++++++++++++++++++ .../java/src/main/java/helpers/Users.java | 4 ++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/web/documentserver-example/java/src/main/java/entities/FileModel.java b/web/documentserver-example/java/src/main/java/entities/FileModel.java index c50c4ad3e..4693c963b 100755 --- a/web/documentserver-example/java/src/main/java/entities/FileModel.java +++ b/web/documentserver-example/java/src/main/java/entities/FileModel.java @@ -152,7 +152,7 @@ public void changeType(final String modeParam, final String typeParam, final Use String fileExt = FileUtility.getFileExtension(document.getTitle()); Boolean canEdit = DocumentManager.getEditedExts().contains(fileExt); // check if the Submit form button is displayed or not - editorConfig.getCustomization().setSubmitForm(false); + editorConfig.getCustomization().setSubmitForm(true); if ((!canEdit && mode.equals("edit") || mode.equals("fillForms")) && DocumentManager.getFillExts().contains(fileExt)) { diff --git a/web/documentserver-example/java/src/main/java/helpers/TrackManager.java b/web/documentserver-example/java/src/main/java/helpers/TrackManager.java index 83fdae5ed..4cf23f67c 100755 --- a/web/documentserver-example/java/src/main/java/helpers/TrackManager.java +++ b/web/documentserver-example/java/src/main/java/helpers/TrackManager.java @@ -293,6 +293,24 @@ public static void processForceSave(final JSONObject body, // create meta data for forcesaved file DocumentManager.createMeta(fileName, user, "Filling Form", userAddress); + + try { + String formsDataUrl = body.get("formsdataurl").toString(); + + if (formsDataUrl != null && !formsDataUrl.isEmpty()) { + String formsName = DocumentManager.getCorrectName(FileUtility + .getFileNameWithoutExtension(fileName) + ".txt", userAddress); + String formsPath = DocumentManager.storagePath(formsName, userAddress); + + byte[] byteArrayFormsData = getDownloadFile(formsDataUrl); + + saveFile(byteArrayFormsData, Paths.get(formsPath)); + } else { + throw new Exception("Document editing service did not return formsDataUrl"); + } + } catch (Exception e) { + e.printStackTrace(); + } } } diff --git a/web/documentserver-example/java/src/main/java/helpers/Users.java b/web/documentserver-example/java/src/main/java/helpers/Users.java index 8f2c30b9e..8aa4c2227 100755 --- a/web/documentserver-example/java/src/main/java/helpers/Users.java +++ b/web/documentserver-example/java/src/main/java/helpers/Users.java @@ -37,6 +37,7 @@ public final class Users { add("The file favorite state is undefined"); add("Can create files from templates using data from the editor"); add("Can see the information about all users"); + add("Can submit forms"); }}; private static List descriptionUserSecond = new ArrayList() {{ @@ -47,6 +48,7 @@ public final class Users { add("This file is marked as favorite"); add("Can create new files from the editor"); add("Can see the information about users from Group2 and users who don’t belong to any group"); + add("Can’t submit forms"); }}; private static List descriptionUserThird = new ArrayList() {{ @@ -59,6 +61,7 @@ public final class Users { add("Can’t print the file"); add("Can create new files from the editor"); add("Can see the information about Group2 users"); + add("Can’t submit forms"); }}; private static List descriptionUserZero = new ArrayList() {{ @@ -74,6 +77,7 @@ public final class Users { add("Can't view chat"); add("Can't protect file"); add("View file without collaboration"); + add("Can’t submit forms"); }}; private static List users = new ArrayList() {{ From ccf6fb4098f68f484c950029601666f75d35b52f Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 13 Nov 2023 14:02:49 +0300 Subject: [PATCH 243/488] java-spring: saving formsdata --- .../onlyoffice/integration/ExampleData.java | 12 ++++++++---- .../callback/DefaultCallbackManager.java | 18 ++++++++++++++++++ .../models/configurations/Customization.java | 2 +- .../com/onlyoffice/integration/dto/Track.java | 1 + .../DefaultCustomizationConfigurer.java | 1 - 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java index 3fe484998..4c3e8d245 100644 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java @@ -46,7 +46,8 @@ public void init() { "Can't rename files from the editor", "Can't view chat", "Can't protect file", - "View file without collaboration" + "View file without collaboration", + "Can’t submit forms" ); // the description for user 1 @@ -58,7 +59,8 @@ public void init() { "The file favorite state is undefined", "Can create a file from a template with data from the editor", "Can see the information about all users", - "Can view chat" + "Can view chat", + "Can submit forms" ); // the description for user 2 @@ -71,7 +73,8 @@ public void init() { "This file is favorite", "Can create a file from an editor", "Can see the information about users from Group2 and users who don’t belong to any group", - "Can view chat" + "Can view chat", + "Can’t submit forms" ); // the description for user 3 @@ -86,7 +89,8 @@ public void init() { "He can’t print the file", "Can create a file from an editor", "Can see the information about Group2 users", - "Can view chat" + "Can view chat", + "Can’t submit forms" ); // create user 1 with the specified parameters diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/callback/DefaultCallbackManager.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/callback/DefaultCallbackManager.java index 7d378ec71..f0efb4acc 100755 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/callback/DefaultCallbackManager.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/callback/DefaultCallbackManager.java @@ -315,6 +315,24 @@ public void processForceSave(final Track body, final String fileNameParam) { // String user = action.getUserid(); // get the user ID // create meta data for the forcesaved file storageMutator.createMeta(fileName, user, "Filling Form"); + + try { + String formsDataUrl = body.getFormsdataurl(); + + if (formsDataUrl != null && !formsDataUrl.isEmpty()) { + String formsName = documentManager.getCorrectName(fileUtility + .getFileNameWithoutExtension(fileName) + ".txt"); + String formsPath = storagePathBuilder.getFileLocation(formsName); + + byte[] byteArrayFormsData = getDownloadFile(formsDataUrl); + + saveFile(byteArrayFormsData, Paths.get(formsPath)); + } else { + throw new RuntimeException("Document editing service did not return formsDataUrl"); + } + } catch (Exception e) { + e.printStackTrace(); + } } else { if (newFileName) { fileName = documentManager diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Customization.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Customization.java index bcfad7db1..3d51914ad 100755 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Customization.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/configurations/Customization.java @@ -45,7 +45,7 @@ in the upper part of the editor window header next to the logo (false) or in the private Boolean help = true; // if the Help menu button is displayed or hidden private Boolean hideRightMenu = false; // if the right menu is displayed or hidden on first loading private Boolean hideRulers = false; // if the editor rulers are displayed or hidden - private Boolean submitForm = false; // if the Submit form button is displayed or hidden + private Boolean submitForm = true; // if the Submit form button is displayed or hidden private Boolean about = true; private Boolean feedback = true; } diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Track.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Track.java index 23b75225e..a296fd4bf 100644 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Track.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/dto/Track.java @@ -43,4 +43,5 @@ public class Track { private String userdata; private String lastsave; private Boolean notmodified; + private String formsdataurl; } diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java index 5af0568b5..1c8537ef6 100644 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/implementations/DefaultCustomizationConfigurer.java @@ -34,6 +34,5 @@ public class DefaultCustomizationConfigurer implements CustomizationConfigurer Date: Mon, 13 Nov 2023 15:17:44 +0300 Subject: [PATCH 244/488] csharp: saving formsdata --- .../csharp/DocEditor.aspx.cs | 2 +- .../csharp/TrackManager.cs | 16 ++++++++++++++++ web/documentserver-example/csharp/Users.cs | 10 +++++++--- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/web/documentserver-example/csharp/DocEditor.aspx.cs b/web/documentserver-example/csharp/DocEditor.aspx.cs index 2184c4116..2a957cbf4 100755 --- a/web/documentserver-example/csharp/DocEditor.aspx.cs +++ b/web/documentserver-example/csharp/DocEditor.aspx.cs @@ -153,7 +153,7 @@ protected void Page_Load(object sender, EventArgs e) editorsMode = "fillForms"; canEdit = true; } - var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1") && false; // check if the Submit form button is displayed or hidden + var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1"); // check if the Submit form button is displayed or hidden var mode = canEdit && editorsMode != "view" ? "edit" : "view"; // get the editor opening mode (edit or view) var jss = new JavaScriptSerializer(); diff --git a/web/documentserver-example/csharp/TrackManager.cs b/web/documentserver-example/csharp/TrackManager.cs index cc5f8c93b..9a2678243 100644 --- a/web/documentserver-example/csharp/TrackManager.cs +++ b/web/documentserver-example/csharp/TrackManager.cs @@ -258,6 +258,22 @@ public static int processForceSave(Dictionary fileData, string f var action = jss.Deserialize>(jss.Serialize(actions[0])); var user = action["userid"].ToString(); // get the user id DocEditor.CreateMeta(fileName, user, "Filling Form", userAddress); // create meta data for the forcesaved file + + string formsDataUrl = fileData["formsdataurl"].ToString(); + + if (!string.IsNullOrEmpty(formsDataUrl)) + { + string formsName = _Default.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + ".txt", userAddress); + string formsPath = _Default.StoragePath(formsName, userAddress); + + var bytesForms = DownloadFile(formsDataUrl); + + SaveFile(bytesForms, formsPath); + } + else + { + throw new Exception("Document editing service did not return formsDataUrl"); + } } } catch (Exception) diff --git a/web/documentserver-example/csharp/Users.cs b/web/documentserver-example/csharp/Users.cs index 4ce7e731b..7b899836a 100644 --- a/web/documentserver-example/csharp/Users.cs +++ b/web/documentserver-example/csharp/Users.cs @@ -30,7 +30,8 @@ public class Users "Can perform all actions with comments", "The file favorite state is undefined", "Can create files from templates using data from the editor", - "Can see the information about all users" + "Can see the information about all users", + "Can submit forms" }; static List descr_user_2 = new List() @@ -40,7 +41,8 @@ public class Users "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only", "This file is marked as favorite", "Can create new files from the editor", - "Can see the information about users from Group2 and users who don’t belong to any group" + "Can see the information about users from Group2 and users who don’t belong to any group", + "Can’t submit forms" }; static List descr_user_3 = new List() @@ -53,7 +55,8 @@ public class Users "Can’t download the file", "Can’t print the file", "Can create new files from the editor", - "Can see the information about Group2 users" + "Can see the information about Group2 users", + "Can’t submit forms" }; static List descr_user_0 = new List() @@ -70,6 +73,7 @@ public class Users "Can't view chat", "Can't protect file", "View file without collaboration", + "Can’t submit forms" }; private static List users = new List() { From 9369b124da65d1f661d7d720b19140dfec6f80fe Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 13 Nov 2023 15:26:17 +0300 Subject: [PATCH 245/488] csharp-mvc: saving formsdata --- .../csharp-mvc/Helpers/TrackManager.cs | 16 ++++++++++++++++ .../csharp-mvc/Helpers/Users.cs | 10 +++++++--- .../csharp-mvc/Models/FileModel.cs | 2 +- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/web/documentserver-example/csharp-mvc/Helpers/TrackManager.cs b/web/documentserver-example/csharp-mvc/Helpers/TrackManager.cs index 46785a4ba..ef777ae9e 100644 --- a/web/documentserver-example/csharp-mvc/Helpers/TrackManager.cs +++ b/web/documentserver-example/csharp-mvc/Helpers/TrackManager.cs @@ -256,6 +256,22 @@ public static int processForceSave(Dictionary fileData, string f var action = jss.Deserialize>(jss.Serialize(actions[0])); var user = action["userid"].ToString(); // get the user id DocManagerHelper.CreateMeta(fileName, user, "Filling Form", userAddress); // create meta data for the forcesaved file + + string formsDataUrl = fileData["formsdataurl"].ToString(); + + if (!string.IsNullOrEmpty(formsDataUrl)) + { + string formsName = DocManagerHelper.GetCorrectName(Path.GetFileNameWithoutExtension(fileName) + ".txt", userAddress); + string formsPath = DocManagerHelper.StoragePath(formsName, userAddress); + + var bytesForms = DownloadFile(formsDataUrl); + + SaveFile(bytesForms, formsPath); + } + else + { + throw new Exception("Document editing service did not return formsDataUrl"); + } } } catch (Exception) { diff --git a/web/documentserver-example/csharp-mvc/Helpers/Users.cs b/web/documentserver-example/csharp-mvc/Helpers/Users.cs index 0ed0a9aba..937182b37 100644 --- a/web/documentserver-example/csharp-mvc/Helpers/Users.cs +++ b/web/documentserver-example/csharp-mvc/Helpers/Users.cs @@ -31,7 +31,8 @@ public class Users "Can perform all actions with comments", "The file favorite state is undefined", "Can create files from templates using data from the editor", - "Can see the information about all users" + "Can see the information about all users", + "Can submit forms" }; static List descr_user_2 = new List() @@ -41,7 +42,8 @@ public class Users "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only", "This file is marked as favorite", "Can create new files from the editor", - "Can see the information about users from Group2 and users who don’t belong to any group" + "Can see the information about users from Group2 and users who don’t belong to any group", + "Can’t submit forms" }; static List descr_user_3 = new List() @@ -54,7 +56,8 @@ public class Users "Can’t download the file", "Can’t print the file", "Can create new files from the editor", - "Can see the information about Group2 users" + "Can see the information about Group2 users", + "Can’t submit forms" }; static List descr_user_0 = new List() @@ -71,6 +74,7 @@ public class Users "Can't view chat", "Can't protect file", "View file without collaboration", + "Can’t submit forms" }; private static List users = new List() { diff --git a/web/documentserver-example/csharp-mvc/Models/FileModel.cs b/web/documentserver-example/csharp-mvc/Models/FileModel.cs index ddc0028cb..a3a1b1dc1 100755 --- a/web/documentserver-example/csharp-mvc/Models/FileModel.cs +++ b/web/documentserver-example/csharp-mvc/Models/FileModel.cs @@ -88,7 +88,7 @@ public string GetDocConfig(HttpRequest request, UrlHelper url) editorsMode = "fillForms"; canEdit = true; } - var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1") && false; // check if the Submit form button is displayed or not + var submitForm = editorsMode.Equals("fillForms") && id.Equals("uid-1"); // check if the Submit form button is displayed or not var mode = canEdit && editorsMode != "view" ? "edit" : "view"; // set the mode parameter: change it to view if the document can't be edited // favorite icon state From 9ea7e14c37769d552cbb56579878564b39968493 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 13 Nov 2023 16:45:48 +0300 Subject: [PATCH 246/488] ruby: saving formsdata --- .../ruby/app/models/file_model.rb | 2 +- .../ruby/app/models/track_helper.rb | 14 ++++++++++++++ .../ruby/app/models/users.rb | 10 +++++++--- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 7c1129aef..76682c82e 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -93,7 +93,7 @@ def get_config editorsmode = "fillForms" canEdit = true end - submitForm = editorsmode.eql?("fillForms") && @user.id.eql?("uid-1") && false # the Submit form button state + submitForm = editorsmode.eql?("fillForms") && @user.id.eql?("uid-1") # the Submit form button state mode = canEdit && !editorsmode.eql?("view") ? "edit" : "view" templatesImageUrl = DocumentHelper.get_template_image_url(document_type) # templates image url in the "From Template" section templates = [ diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 844e9193e..e62e70fff 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -238,6 +238,20 @@ def process_force_save(file_data, file_name, user_address) if is_submit_form uid = file_data['actions'][0]['userid'] DocumentHelper.create_meta(file_name, uid, "Filling Form", user_address) # create file meta information with the Filling form tag instead of user name + + forms_data_url = file_data["formsdataurl"].to_s + + if forms_data_url && !forms_data_url.eql?("") + forms_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + ".txt", user_address) + forms_path = DocumentHelper.storage_path(forms_name, user_address) + forms = download_file(forms_data_url) + if forms.eql?(nil) + return saved + end + save_file(forms, forms_path) + else + raise 'Document editing service did not return formsDataUrl' + end end saved = 0 diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index e8a3cfaf7..ef2de6a7c 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -40,7 +40,8 @@ class Users "Can perform all actions with comments", "The file favorite state is undefined", "Can create files from templates using data from the editor", - "Can see the information about all users" + "Can see the information about all users", + "Can submit forms" ]; @@descr_user_2 = [ @@ -49,7 +50,8 @@ class Users "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only", "This file is marked as favorite", "Can create new files from the editor", - "Can see the information about users from Group2 and users who don’t belong to any group" + "Can see the information about users from Group2 and users who don’t belong to any group", + "Can't submit forms" ]; @@descr_user_3 = [ @@ -62,6 +64,7 @@ class Users "Can’t print the file", "Can create new files from the editor", "Can see the information about Group2 users", + "Can't submit forms" ]; @@descr_user_0 = [ @@ -76,7 +79,8 @@ class Users "Can't rename files from the editor", "Can't view chat", "Can't protect file", - "View file without collaboration" + "View file without collaboration", + "Can't submit forms" ]; @@users = [ From a1db88e0577497785bfcf329f8aa8e017692d7d2 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 13 Nov 2023 18:03:52 +0300 Subject: [PATCH 247/488] php: fixed overwriting of array elements when file creation dates are the same --- web/documentserver-example/php/src/functions.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/documentserver-example/php/src/functions.php b/web/documentserver-example/php/src/functions.php index 25912d68c..30c09ea59 100644 --- a/web/documentserver-example/php/src/functions.php +++ b/web/documentserver-example/php/src/functions.php @@ -353,12 +353,13 @@ function getStoredFiles() $cdir = scandir($directory); // get all the files and folders from the directory $result = []; + $index = 0; foreach ($cdir as $key => $fileName) { // run through all the file and folder names if (!in_array($fileName, [".", ".."])) { if (!is_dir($directory . DIRECTORY_SEPARATOR . $fileName)) { // if an element isn't a directory $ext = mb_strtolower(pathinfo($fileName, PATHINFO_EXTENSION)); $dat = filemtime($directory . DIRECTORY_SEPARATOR . $fileName); // get the time of element modification - $result[$dat] = (object) [ // and write the file to the result + $result[$dat + $index++] = (object) [ // and write the file to the result "name" => $fileName, "documentType" => getDocumentType($fileName), "canEdit" => in_array($ext, $formatManager->editableExtensions()), From ce9d62ad7daf9385938ce029dc071fb1e07b85d0 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 12:31:56 +0300 Subject: [PATCH 248/488] ruby: Layout/EmptyLineAfterGuardClause correct --- .../ruby/app/configuration/configuration.rb | 6 ++++++ web/documentserver-example/ruby/app/format/format.rb | 1 + .../ruby/app/models/document_helper.rb | 1 + web/documentserver-example/ruby/app/models/track_helper.rb | 2 ++ web/documentserver-example/ruby/app/proxy/proxy.rb | 1 + 5 files changed, 11 insertions(+) diff --git a/web/documentserver-example/ruby/app/configuration/configuration.rb b/web/documentserver-example/ruby/app/configuration/configuration.rb index 5803b11e3..c2c1846fb 100644 --- a/web/documentserver-example/ruby/app/configuration/configuration.rb +++ b/web/documentserver-example/ruby/app/configuration/configuration.rb @@ -37,6 +37,7 @@ def initialize def example_uri url = ENV['EXAMPLE_URL'] return nil if url.nil? + URI(url) end @@ -50,6 +51,7 @@ def document_server_public_uri def document_server_private_uri url = ENV['DOCUMENT_SERVER_PRIVATE_URL'] return URI(url) if url + document_server_public_uri end @@ -99,6 +101,7 @@ def jwt_header def jwt_use_for_request env = ENV['JWT_USE_FOR_REQUEST'] return ActiveModel::Type::Boolean.new.cast(env) if env + true end @@ -106,6 +109,7 @@ def jwt_use_for_request def ssl_verify_peer_mode_enabled env = ENV['SSL_VERIFY_PEER_MODE_ENABLED'] return ActiveModel::Type::Boolean.new.cast(env) if env + false end @@ -114,6 +118,7 @@ def storage_path storage_path = ENV['STORAGE_PATH'] || 'storage' storage_directory = Pathname(storage_path) return storage_directory if storage_directory.absolute? + current_directory = Pathname(File.expand_path(__dir__)) directory = current_directory.join('..', '..', storage_directory) directory.cleanpath @@ -123,6 +128,7 @@ def storage_path def maximum_file_size env = ENV['MAXIMUM_FILE_SIZE'] return env.to_i if env + 5 * 1024 * 1024 end diff --git a/web/documentserver-example/ruby/app/format/format.rb b/web/documentserver-example/ruby/app/format/format.rb index 130210fa2..0cca61d83 100644 --- a/web/documentserver-example/ruby/app/format/format.rb +++ b/web/documentserver-example/ruby/app/format/format.rb @@ -136,6 +136,7 @@ def all_extensions sig { returns(T::Array[Format]) } def all return @all if defined?(@all) + content = file.read hash = JSON.parse(content) @all ||= hash.map do |item| diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 2bb9b9f08..47d5dce31 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -139,6 +139,7 @@ def get_file_version(hist_dir) Dir.foreach(hist_dir) {|e| # run through all the file versions next if e.eql?(".") next if e.eql?("..") + if File.directory?(File.join(hist_dir, e)) ver += 1 # and count them end diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 844e9193e..92f306852 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -303,11 +303,13 @@ def download_file(uristr) if status_code != '200' # checking status code raise "Document editing service returned status: #{status_code}" end + data = res.body # and take its body if data == nil raise 'stream is null' end + data end diff --git a/web/documentserver-example/ruby/app/proxy/proxy.rb b/web/documentserver-example/ruby/app/proxy/proxy.rb index fa1c66b4f..fd5a364c1 100644 --- a/web/documentserver-example/ruby/app/proxy/proxy.rb +++ b/web/documentserver-example/ruby/app/proxy/proxy.rb @@ -32,6 +32,7 @@ def initialize(config_manager:) sig { params(uri: URI::Generic).returns(URI::Generic) } def resolve_uri(uri) return uri unless refer_public_url(uri) + redirect_public_url(uri) end From 266e249b125aaec2d96896f36d3bfe0ff97314b8 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 12:37:38 +0300 Subject: [PATCH 249/488] ruby: Layout/TrailingEmptyLines correct --- .../ruby/app/controllers/application_controller.rb | 2 +- web/documentserver-example/ruby/app/models/document_helper.rb | 2 +- web/documentserver-example/ruby/app/models/file_model.rb | 2 +- web/documentserver-example/ruby/app/models/jwt_helper.rb | 2 +- web/documentserver-example/ruby/app/models/service_converter.rb | 2 +- web/documentserver-example/ruby/app/models/track_helper.rb | 2 +- web/documentserver-example/ruby/app/models/users.rb | 1 - 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/application_controller.rb b/web/documentserver-example/ruby/app/controllers/application_controller.rb index 92474a5f0..32ce5cfdb 100644 --- a/web/documentserver-example/ruby/app/controllers/application_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/application_controller.rb @@ -15,4 +15,4 @@ # class ApplicationController < ActionController::Base -end \ No newline at end of file +end diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 47d5dce31..ab7f5d444 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -341,4 +341,4 @@ def verify_ssl(file_uri, http) end end -end \ No newline at end of file +end diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index da63a1aa9..43ea40dc5 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -386,4 +386,4 @@ def is_enable_direct_url return @direct_url != nil && @direct_url == "true" end -end \ No newline at end of file +end diff --git a/web/documentserver-example/ruby/app/models/jwt_helper.rb b/web/documentserver-example/ruby/app/models/jwt_helper.rb index 838659bd0..4101c144b 100644 --- a/web/documentserver-example/ruby/app/models/jwt_helper.rb +++ b/web/documentserver-example/ruby/app/models/jwt_helper.rb @@ -50,4 +50,4 @@ def decode(token) return decoded[0].to_json # get json payload end end -end \ No newline at end of file +end diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index f4d4e86ca..aa951621d 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -184,4 +184,4 @@ def get_response_data(json_data) end -end \ No newline at end of file +end diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 92f306852..a3250eacf 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -319,4 +319,4 @@ def save_file(data, path) end end end -end \ No newline at end of file +end diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index bf0faabf0..fe827482a 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -145,4 +145,3 @@ def get_users_for_protect(id) # get a list of users with their id, names and em end end - From e9e6586d6d9110f59e2c65e65369a45de9813545 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 12:43:19 +0300 Subject: [PATCH 250/488] ruby: Layout/EmptyLinesAroundMethodBody correct --- .../ruby/app/controllers/home_controller.rb | 8 -------- .../ruby/app/models/document_helper.rb | 7 ------- web/documentserver-example/ruby/app/models/file_model.rb | 1 - .../ruby/app/models/service_converter.rb | 6 ------ 4 files changed, 22 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 8b6a0f715..c47353ba9 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -30,26 +30,21 @@ def index end def editor - DocumentHelper.init(request.remote_ip, request.base_url) user = Users.get_user(params[:userId]) @file = FileModel.new(:file_name => File.basename(params[:fileName]), :mode => params[:editorsMode], :type => params[:editorsType], :user_ip => request.remote_ip, :lang => cookies[:ulang], :user => user, :action_data => params[:actionLink], :direct_url => params[:directUrl]) - end # creating a sample document def sample - DocumentHelper.init(request.remote_ip, request.base_url) user = Users.get_user(params[:userId]) file_name = DocumentHelper.create_demo(params[:fileExt], params[:sample], user) redirect_to :controller => 'home', :action => 'editor', :fileName => file_name, :userId => user.id - end # uploading a file def upload - DocumentHelper.init(request.remote_ip, request.base_url) begin @@ -87,12 +82,10 @@ def upload rescue => ex render plain: '{ "error": "' + ex.message + '"}' # write an error message to the response end - end # converting a file def convert - begin file_data = request.body.read if file_data == nil || file_data.empty? @@ -154,7 +147,6 @@ def convert rescue => ex render plain: '{ "error": "' + ex.message + '"}' end - end # downloading a history file from public diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index ab7f5d444..dff8bd611 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -244,29 +244,22 @@ def get_server_url(for_document_server) # get callback url def get_callback(file_name) - get_server_url(true) + '/track?fileName=' + ERB::Util.url_encode(file_name) + '&userAddress=' + cur_user_host_address(nil) - end # get url to the created file def get_create_url(document_type) - get_server_url(false) + '/sample?fileExt=' + get_internal_extension(document_type).delete('.') - end # get url to download a file def get_download_url(file_name, is_serverUrl=true) - user_host = is_serverUrl ? '&userAddress=' + cur_user_host_address(nil) : "" get_server_url(is_serverUrl) + '/download?fileName=' + ERB::Util.url_encode(file_name) + user_host - end # get internal file extension by its type def get_internal_extension(file_type) - case file_type when 'word' # .docx for word type ext = '.docx' diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 43ea40dc5..15a7d3554 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -289,7 +289,6 @@ def get_history end return nil - end # get image information diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index aa951621d..b7268f011 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -30,7 +30,6 @@ class << self # get the url of the converted file def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_async, file_pass, lang = nil) - from_ext = from_ext == nil ? File.extname(document_uri).downcase : from_ext # get the current document extension # get the current document name or uuid @@ -93,7 +92,6 @@ def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_ # generate the document key value def generate_revision_id(expected_key) - require 'zlib' if expected_key.length > 20 # check if the expected key length is greater than 20 @@ -102,12 +100,10 @@ def generate_revision_id(expected_key) key = expected_key.gsub(/[^0-9a-zA-Z.=]/, '_') key[(key.length - [key.length, 20].min)..key.length] # the resulting key is of the length 20 or less - end # create an error message for the error code def process_convert_service_responce_error(error_code) - error_message = 'unknown error' # add an error message to the error message template depending on the error code @@ -135,12 +131,10 @@ def process_convert_service_responce_error(error_code) end raise error_message - end # get the response url def get_response_data(json_data) - file_result = json_data error_element = file_result['error'] From 1b91592a9a90cd36fb91b829aa36aa7e207222cf Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 13:10:31 +0300 Subject: [PATCH 251/488] ruby: Layout/ExtraSpacing correct --- .../ruby/app/controllers/home_controller.rb | 68 +++++----- .../ruby/app/models/document_helper.rb | 56 ++++---- .../ruby/app/models/file_model.rb | 120 +++++++++--------- .../ruby/app/models/service_converter.rb | 54 ++++---- .../ruby/app/models/track_helper.rb | 86 ++++++------- .../ruby/app/models/users.rb | 6 +- 6 files changed, 195 insertions(+), 195 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index c47353ba9..f4218dbd0 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -78,9 +78,9 @@ def upload DocumentHelper.create_meta(file_name, user.id, user.name, nil) - render plain: '{ "filename": "' + file_name + '", "documentType": "' + document_type + '"}' # write a new file name to the response + render plain: '{ "filename": "' + file_name + '", "documentType": "' + document_type + '"}' # write a new file name to the response rescue => ex - render plain: '{ "error": "' + ex.message + '"}' # write an error message to the response + render plain: '{ "error": "' + ex.message + '"}' # write an error message to the response end end @@ -101,9 +101,9 @@ def convert extension = File.extname(file_name).downcase internal_extension = 'ooxml' - if DocumentHelper.convert_exts.include? (extension) # check if the file with such an extension can be converted - key = ServiceConverter.generate_revision_id(file_uri) # generate document key - percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data(file_uri, extension.delete('.'), internal_extension.delete('.'), key, true, file_pass, lang) # get the url and file type of the converted file and the conversion percentage + if DocumentHelper.convert_exts.include? (extension) # check if the file with such an extension can be converted + key = ServiceConverter.generate_revision_id(file_uri) # generate document key + percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data(file_uri, extension.delete('.'), internal_extension.delete('.'), key, true, file_pass, lang) # get the url and file type of the converted file and the conversion percentage # if the conversion isn't completed, write file name and step values to the response if percent != 100 @@ -114,12 +114,12 @@ def convert # get the correct file name if such a name already exists correct_name = DocumentHelper.get_correct_name(File.basename(file_name, extension) + "." + new_file_type, nil) - uri = URI.parse(new_file_uri) # create the request url - http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server + uri = URI.parse(new_file_uri) # create the request url + http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server DocumentHelper.verify_ssl(new_file_uri, http) - req = Net::HTTP::Get.new(uri.request_uri) # create the get requets + req = Net::HTTP::Get.new(uri.request_uri) # create the get requets res = http.request(req) data = res.body @@ -140,7 +140,7 @@ def convert file_name = correct_name user = Users.get_user(params[:userId]) - DocumentHelper.create_meta(file_name, user.id, user.name, nil) # create meta data of the new file + DocumentHelper.create_meta(file_name, user.id, user.name, nil) # create meta data of the new file end render plain: '{ "filename" : "' + file_name + '"}' @@ -190,9 +190,9 @@ def downloadhistory # tracking file changes def track - file_data = TrackHelper.read_body(request) # read the request body + file_data = TrackHelper.read_body(request) # read the request body if file_data == nil || file_data.empty? - render plain: '{"error":1}' # an error occurs if the file is empty + render plain: '{"error":1}' # an error occurs if the file is empty return end @@ -201,23 +201,23 @@ def track user_address = params[:userAddress] file_name = File.basename(params[:fileName]) - if status == 1 # editing - if file_data['actions'][0]['type'] == 0 # finished edit - user = file_data['actions'][0]['userid'] # get the user id + if status == 1 # editing + if file_data['actions'][0]['type'] == 0 # finished edit + user = file_data['actions'][0]['userid'] # get the user id if !file_data['users'].index(user) - json_data = TrackHelper.command_request("forcesave", file_data['key']) # call the forcesave command + json_data = TrackHelper.command_request("forcesave", file_data['key']) # call the forcesave command end end end - if status == 2 || status == 3 # MustSave, Corrupted - saved = TrackHelper.process_save(file_data, file_name, user_address) # save file + if status == 2 || status == 3 # MustSave, Corrupted + saved = TrackHelper.process_save(file_data, file_name, user_address) # save file render plain: '{"error":' + saved.to_s + '}' return end - if status == 6 || status == 7 # MustForceave, CorruptedForcesave - saved = TrackHelper.process_force_save(file_data, file_name, user_address) # force save file + if status == 6 || status == 7 # MustForceave, CorruptedForcesave + saved = TrackHelper.process_force_save(file_data, file_name, user_address) # force save file render plain: '{"error":' + saved.to_s + '}' return end @@ -228,9 +228,9 @@ def track # removing a file def remove - file_name = File.basename(params[:filename]) # get the file name - if !file_name # if it doesn't exist - render plain: '{"success":false}' # report that the operation is unsuccessful + file_name = File.basename(params[:filename]) # get the file name + if !file_name # if it doesn't exist + render plain: '{"success":false}' # report that the operation is unsuccessful return end @@ -238,22 +238,22 @@ def remove storage_path = DocumentHelper.storage_path(file_name, nil) hist_dir = DocumentHelper.history_dir(storage_path) - if File.exist?(storage_path) # if the file exists - File.delete(storage_path) # delete it from the storage path + if File.exist?(storage_path) # if the file exists + File.delete(storage_path) # delete it from the storage path end - if Dir.exist?(hist_dir) # if the history directory of this file exists - FileUtils.remove_entry_secure(hist_dir) # delete it + if Dir.exist?(hist_dir) # if the history directory of this file exists + FileUtils.remove_entry_secure(hist_dir) # delete it end - render plain: '{"success":true}' # report that the operation is successful + render plain: '{"success":true}' # report that the operation is successful return end # getting files information def files file_id = params[:fileId] - filesInfo = DocumentHelper.get_files_info(file_id) # get the information about the file specified by a file id + filesInfo = DocumentHelper.get_files_info(file_id) # get the information about the file specified by a file id render json: filesInfo end @@ -290,9 +290,9 @@ def download end end - file_path = DocumentHelper.forcesave_path(file_name, user_address, false) # get the path to the force saved document version + file_path = DocumentHelper.forcesave_path(file_name, user_address, false) # get the path to the force saved document version if file_path.eql?("") - file_path = DocumentHelper.storage_path(file_name, user_address) # or to the original document + file_path = DocumentHelper.storage_path(file_name, user_address) # or to the original document end # add headers to the response to specify the page parameters @@ -321,12 +321,12 @@ def saveas return end - uri = URI.parse(file_url) # create the request url - http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server + uri = URI.parse(file_url) # create the request url + http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server DocumentHelper.verify_ssl(file_url, http) - req = Net::HTTP::Get.new(uri.request_uri) # create the get requets + req = Net::HTTP::Get.new(uri.request_uri) # create the get requets res = http.request(req) data = res.body @@ -339,7 +339,7 @@ def saveas file.write(data) end user = Users.get_user(params[:userId]) - DocumentHelper.create_meta(file_name, user.id, user.name, nil) # create meta data of the new file + DocumentHelper.create_meta(file_name, user.id, user.name, nil) # create meta data of the new file render plain: '{"file" : "' + file_name + '"}' return diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index dff8bd611..ab6be3bd2 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -93,16 +93,16 @@ def forcesave_path(file_name, user_address, create) return "" end - directory = File.join(directory,"#{File.basename(file_name)}-hist") # get the path to the history of the given file + directory = File.join(directory,"#{File.basename(file_name)}-hist") # get the path to the history of the given file unless File.directory?(directory) if create - FileUtils.mkdir_p(directory) # create history directory if it doesn't exist + FileUtils.mkdir_p(directory) # create history directory if it doesn't exist else - return "" # the history directory doesn't exist and we are not supposed to create it + return "" # the history directory doesn't exist and we are not supposed to create it end end - directory = File.join(directory, File.basename(file_name)) # get the path to the given file + directory = File.join(directory, File.basename(file_name)) # get the path to the given file unless File.file?(directory) if !create return "" @@ -136,12 +136,12 @@ def get_file_version(hist_dir) end ver = 1 - Dir.foreach(hist_dir) {|e| # run through all the file versions + Dir.foreach(hist_dir) {|e| # run through all the file versions next if e.eql?(".") next if e.eql?("..") if File.directory?(File.join(hist_dir, e)) - ver += 1 # and count them + ver += 1 # and count them end } @@ -151,14 +151,14 @@ def get_file_version(hist_dir) # get the correct file name if such a name already exists def get_correct_name(file_name, user_address) maxName = 50 - ext = File.extname(file_name) # get file extension + ext = File.extname(file_name) # get file extension # get file name without extension base_name = File.basename(file_name, ext)[0...maxName] + (file_name.length > maxName ? '[...]' : '') - name = base_name + ext.downcase # get full file name + name = base_name + ext.downcase # get full file name index = 1 - while File.exist?(storage_path(name, user_address)) # if the file with such a name already exists in this directory - name = base_name + ' (' + index.to_s + ')' + ext.downcase # add an index after its base name + while File.exist?(storage_path(name, user_address)) # if the file with such a name already exists in this directory + name = base_name + ' (' + index.to_s + ')' + ext.downcase # add an index after its base name index = index + 1 end @@ -172,12 +172,12 @@ def get_stored_files(user_address) arr = []; if Dir.exist?(directory) - Dir.foreach(directory) {|e| # run through all the elements from the folder + Dir.foreach(directory) {|e| # run through all the elements from the folder next if e.eql?(".") next if e.eql?("..") - next if File.directory?(File.join(directory, e)) # if the element is a directory, skip it + next if File.directory?(File.join(directory, e)) # if the element is a directory, skip it - arr.push(e) # push the file to the array + arr.push(e) # push the file to the array } end @@ -186,7 +186,7 @@ def get_stored_files(user_address) # create file meta information def create_meta(file_name, uid, uname, user_address) - hist_dir = history_dir(storage_path(file_name, user_address)) # get the path to the file history + hist_dir = history_dir(storage_path(file_name, user_address)) # get the path to the file history # write user name, user uid and the creation time to the json object json = { @@ -204,9 +204,9 @@ def create_meta(file_name, uid, uname, user_address) # create demo document def create_demo(file_ext, sample, user) demo_name = (sample == 'true' ? 'sample.' : 'new.') + file_ext - file_name = get_correct_name(demo_name, nil) # get the correct file name if such a name already exists + file_name = get_correct_name(demo_name, nil) # get the correct file name if such a name already exists - src = Rails.root.join('assets', 'document-templates', sample == 'true' ? 'sample' : 'new', demo_name) # save sample document of a necessary extension to the storage directory + src = Rails.root.join('assets', 'document-templates', sample == 'true' ? 'sample' : 'new', demo_name) # save sample document of a necessary extension to the storage directory dest = storage_path file_name, nil FileUtils.cp src, dest @@ -244,7 +244,7 @@ def get_server_url(for_document_server) # get callback url def get_callback(file_name) - get_server_url(true) + '/track?fileName=' + ERB::Util.url_encode(file_name) + '&userAddress=' + cur_user_host_address(nil) + get_server_url(true) + '/track?fileName=' + ERB::Util.url_encode(file_name) + '&userAddress=' + cur_user_host_address(nil) end # get url to the created file @@ -255,7 +255,7 @@ def get_create_url(document_type) # get url to download a file def get_download_url(file_name, is_serverUrl=true) user_host = is_serverUrl ? '&userAddress=' + cur_user_host_address(nil) : "" - get_server_url(is_serverUrl) + '/download?fileName=' + ERB::Util.url_encode(file_name) + user_host + get_server_url(is_serverUrl) + '/download?fileName=' + ERB::Util.url_encode(file_name) + user_host end # get internal file extension by its type @@ -265,10 +265,10 @@ def get_internal_extension(file_type) ext = '.docx' when 'cell' # .xlsx for cell type ext = '.xlsx' - when 'slide' # .pptx for slide type + when 'slide' # .pptx for slide type ext = '.pptx' else - ext = '.docx' # the default value is .docx + ext = '.docx' # the default value is .docx end ext @@ -282,10 +282,10 @@ def get_template_image_url(file_type) full_path = path + 'file_docx.svg' when 'cell' # .xlsx for cell type full_path = path + 'file_xlsx.svg' - when 'slide' # .pptx for slide type + when 'slide' # .pptx for slide type full_path = path + 'file_pptx.svg' else - full_path = path + 'file_docx.svg' # the default value is .docx + full_path = path + 'file_docx.svg' # the default value is .docx end full_path @@ -295,7 +295,7 @@ def get_template_image_url(file_type) def get_files_info(file_id) result = []; - for fileName in get_stored_files(nil) # run through all the stored files from the folder + for fileName in get_stored_files(nil) # run through all the stored files from the folder directory = storage_path(fileName, nil) uri = cur_user_host_address(nil) + '/' + fileName @@ -309,11 +309,11 @@ def get_files_info(file_id) "updated" => File.mtime(directory) } - if file_id == nil # if file id is undefined - result.push(info) # push info object to the response array - else # if file id is defined - if file_id.eql?(info["id"]) # and it is equal to the document key value - result.push(info) # response object will be equal to the info object + if file_id == nil # if file id is undefined + result.push(info) # push info object to the response array + else # if file id is defined + if file_id.eql?(info["id"]) # and it is equal to the document key value + result.push(info) # response object will be equal to the info object return result end end diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 15a7d3554..8f2fb2c8f 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -35,7 +35,7 @@ def initialize(attributes = {}) end def type - @type ? @type : "desktop" # the default platform type is desktop + @type ? @type : "desktop" # the default platform type is desktop end # get file extension from its name @@ -60,8 +60,8 @@ def document_type # generate the document key value def key - uri = DocumentHelper.cur_user_host_address(nil) + '/' + @file_name # get current user host address - stat = File.mtime(DocumentHelper.storage_path(@file_name, nil)) # get the modification time of the given file + uri = DocumentHelper.cur_user_host_address(nil) + '/' + @file_name # get current user host address + stat = File.mtime(DocumentHelper.storage_path(@file_name, nil)) # get the modification time of the given file return ServiceConverter.generate_revision_id("#{uri}.#{stat.to_s}") end @@ -87,13 +87,13 @@ def cur_user_host_address # get config parameters def get_config - editorsmode = @mode ? @mode : "edit" # mode: view/edit/review/comment/fillForms/embedded - canEdit = DocumentHelper.edited_exts.include?(file_ext) # check if the document can be edited + editorsmode = @mode ? @mode : "edit" # mode: view/edit/review/comment/fillForms/embedded + canEdit = DocumentHelper.edited_exts.include?(file_ext) # check if the document can be edited if (!canEdit && editorsmode.eql?("edit") || editorsmode.eql?("fillForms")) && DocumentHelper.fill_forms_exts.include?(file_ext) editorsmode = "fillForms" canEdit = true end - submitForm = editorsmode.eql?("fillForms") && @user.id.eql?("uid-1") && false # the Submit form button state + submitForm = editorsmode.eql?("fillForms") && @user.id.eql?("uid-1") && false # the Submit form button state mode = canEdit && !editorsmode.eql?("view") ? "edit" : "view" templatesImageUrl = DocumentHelper.get_template_image_url(document_type) # templates image url in the "From Template" section templates = [ @@ -123,11 +123,11 @@ def get_config :uploaded => Time.now.to_s, :favorite => @user.favorite }, - :permissions => { # the permission for the document to be edited and downloaded or not + :permissions => { # the permission for the document to be edited and downloaded or not :comment => !editorsmode.eql?("view") && !editorsmode.eql?("fillForms") && !editorsmode.eql?("embedded") && !editorsmode.eql?("blockcontent"), :copy => !@user.deniedPermissions.include?("copy"), :download => !@user.deniedPermissions.include?("download"), - :edit => canEdit && (editorsmode.eql?("edit") || editorsmode.eql?("view") || editorsmode.eql?("filter") || editorsmode.eql?("blockcontent")), + :edit => canEdit && (editorsmode.eql?("edit") || editorsmode.eql?("view") || editorsmode.eql?("filter") || editorsmode.eql?("blockcontent")), :print => !@user.deniedPermissions.include?("print"), :fillForms => !editorsmode.eql?("view") && !editorsmode.eql?("comment") && !editorsmode.eql?("embedded") && !editorsmode.eql?("blockcontent"), :modifyFilter => !editorsmode.eql?("filter"), @@ -148,31 +148,31 @@ def get_config :actionLink => @action_data ? JSON.parse(@action_data) : nil, :mode => mode, :lang => @lang ? @lang : "en", - :callbackUrl => callback_url, # absolute URL to the document storage service + :callbackUrl => callback_url, # absolute URL to the document storage service :coEditing => editorsmode.eql?("view") && @user.id.eql?("uid-0") ? { :mode => "strict", :change => false } : nil, :createUrl => !@user.id.eql?("uid-0") ? create_url : nil, :templates => @user.templates ? templates : nil, - :user => { # the user currently viewing or editing the document + :user => { # the user currently viewing or editing the document :id => !@user.id.eql?("uid-0") ? @user.id : nil, :name => @user.name, :group => @user.group, :image => @user.avatar ? "#{DocumentHelper.get_server_url(true)}/assets/#{@user.id}.png" : nil }, - :embedded => { # the parameters for the embedded document type - :saveUrl => download_url(false), # the absolute URL that will allow the document to be saved onto the user personal computer + :embedded => { # the parameters for the embedded document type + :saveUrl => download_url(false), # the absolute URL that will allow the document to be saved onto the user personal computer :embedUrl => download_url(false), # the absolute URL to the document serving as a source file for the document embedded into the web page :shareUrl => download_url(false), # the absolute URL that will allow other users to share this document - :toolbarDocked => "top" # the place for the embedded viewer toolbar (top or bottom) + :toolbarDocked => "top" # the place for the embedded viewer toolbar (top or bottom) }, - :customization => { # the parameters for the editor interface - :about => true, # the About section display + :customization => { # the parameters for the editor interface + :about => true, # the About section display :comments => true, - :feedback => true, # the Feedback & Support menu button display - :forcesave => false, # adding the request for the forced file saving to the callback handler - :submitForm => submitForm, # the Submit form button state + :feedback => true, # the Feedback & Support menu button display + :forcesave => false, # adding the request for the forced file saving to the callback handler + :submitForm => submitForm, # the Submit form button state :goback => { :url => DocumentHelper.get_server_url(false) }, @@ -180,8 +180,8 @@ def get_config } } - if JwtHelper.is_enabled # check if a secret key to generate token exists or not - config["token"] = JwtHelper.encode(config) # encode a payload object into a token and write it to the config + if JwtHelper.is_enabled # check if a secret key to generate token exists or not + config["token"] = JwtHelper.encode(config) # encode a payload object into a token and write it to the config end return config @@ -194,17 +194,17 @@ def get_history doc_key = key() doc_uri = file_uri() - hist_dir = DocumentHelper.history_dir(DocumentHelper.storage_path(@file_name, nil)) # get the path to the file history - cur_ver = DocumentHelper.get_file_version(hist_dir) # get the file version + hist_dir = DocumentHelper.history_dir(DocumentHelper.storage_path(@file_name, nil)) # get the path to the file history + cur_ver = DocumentHelper.get_file_version(hist_dir) # get the file version - if (cur_ver > 0) # if file was modified + if (cur_ver > 0) # if file was modified hist = [] histData = {} - for i in 1..cur_ver # run through all the file versions + for i in 1..cur_ver # run through all the file versions obj = {} dataObj = {} - ver_dir = DocumentHelper.version_dir(hist_dir, i) # get the path to the given file version + ver_dir = DocumentHelper.version_dir(hist_dir, i) # get the path to the given file version # get document key cur_key = doc_key @@ -216,10 +216,10 @@ def get_history obj["key"] = cur_key obj["version"] = i - if (i == 1) # check if the version number is equal to 1 - if File.file?(File.join(hist_dir, "createdInfo.json")) # check if the createdInfo.json file with meta data exists - File.open(File.join(hist_dir, "createdInfo.json"), 'r') do |file| # open it - cr_info = JSON.parse(file.read()) # parse the file content + if (i == 1) # check if the version number is equal to 1 + if File.file?(File.join(hist_dir, "createdInfo.json")) # check if the createdInfo.json file with meta data exists + File.open(File.join(hist_dir, "createdInfo.json"), 'r') do |file| # open it + cr_info = JSON.parse(file.read()) # parse the file content # write information about changes to the object obj["created"] = cr_info["created"] @@ -240,11 +240,11 @@ def get_history end dataObj["version"] = i - if (i > 1) # check if the version number is greater than 1 + if (i > 1) # check if the version number is greater than 1 changes = nil change = nil - File.open(File.join(DocumentHelper.version_dir(hist_dir, i - 1), "changes.json"), 'r') do |file| # get the path to the changes.json file - changes = JSON.parse(file.read()) # and parse its content + File.open(File.join(DocumentHelper.version_dir(hist_dir, i - 1), "changes.json"), 'r') do |file| # get the path to the changes.json file + changes = JSON.parse(file.read()) # and parse its content end change = changes["changes"][0] @@ -255,8 +255,8 @@ def get_history obj["created"] = change ? change["created"] : nil obj["user"] = change ? change["user"] : nil - prev = histData[(i - 2).to_s] # get the history data from the previous file version - dataObj["previous"] = is_enable_direct_url == true ? { # write key and url information about previous file version with optional direct url + prev = histData[(i - 2).to_s] # get the history data from the previous file version + dataObj["previous"] = is_enable_direct_url == true ? { # write key and url information about previous file version with optional direct url :fileType => prev["fileType"], :key => prev["key"], :url => prev["url"], @@ -271,16 +271,16 @@ def get_history dataObj["changesUrl"] = DocumentHelper.get_historypath_uri(file_name, i - 1, "diff.zip") end - if JwtHelper.is_enabled # check if a secret key to generate token exists or not - dataObj["token"] = JwtHelper.encode(dataObj) # encode a payload object into a token and write it to the data object + if JwtHelper.is_enabled # check if a secret key to generate token exists or not + dataObj["token"] = JwtHelper.encode(dataObj) # encode a payload object into a token and write it to the data object end - hist.push(obj) # add object dictionary to the hist list - histData[(i - 1).to_s] = dataObj # write data object information to the history data + hist.push(obj) # add object dictionary to the hist list + histData[(i - 1).to_s] = dataObj # write data object information to the history data end return { - :hist => { # write history information about the current file version to the hist + :hist => { # write history information about the current file version to the hist :currentVersion => cur_ver, :history => hist }, @@ -294,16 +294,16 @@ def get_history # get image information def get_insert_image insert_image = is_enable_direct_url == true ? { - :fileType => "png", # image file type - :url => DocumentHelper.get_server_url(true) + "/assets/logo.png", # server url to the image - :directUrl => DocumentHelper.get_server_url(false) + "/assets/logo.png" # direct url to the image + :fileType => "png", # image file type + :url => DocumentHelper.get_server_url(true) + "/assets/logo.png", # server url to the image + :directUrl => DocumentHelper.get_server_url(false) + "/assets/logo.png" # direct url to the image } : { - :fileType => "png", # image file type - :url => DocumentHelper.get_server_url(true) + "/assets/logo.png" # server url to the image + :fileType => "png", # image file type + :url => DocumentHelper.get_server_url(true) + "/assets/logo.png" # server url to the image } - if JwtHelper.is_enabled # check if a secret key to generate token exists or not - insert_image["token"] = JwtHelper.encode(insert_image) # encode a payload object into a token and write it to the insert_image object + if JwtHelper.is_enabled # check if a secret key to generate token exists or not + insert_image["token"] = JwtHelper.encode(insert_image) # encode a payload object into a token and write it to the insert_image object end return insert_image.to_json.tr("{", "").tr("}","") @@ -312,16 +312,16 @@ def get_insert_image # get compared file information def dataDocument compare_file = is_enable_direct_url == true ? { - :fileType => "docx", # file type - :url => DocumentHelper.get_server_url(true) + "/asset?fileName=sample.docx", # server url to the compared file - :directUrl => DocumentHelper.get_server_url(false) + "/asset?fileName=sample.docx" # direct url to the compared file + :fileType => "docx", # file type + :url => DocumentHelper.get_server_url(true) + "/asset?fileName=sample.docx", # server url to the compared file + :directUrl => DocumentHelper.get_server_url(false) + "/asset?fileName=sample.docx" # direct url to the compared file } : { - :fileType => "docx", # file type - :url => DocumentHelper.get_server_url(true) + "/asset?fileName=sample.docx" # server url to the compared file + :fileType => "docx", # file type + :url => DocumentHelper.get_server_url(true) + "/asset?fileName=sample.docx" # server url to the compared file } - if JwtHelper.is_enabled # check if a secret key to generate token exists or not - compare_file["token"] = JwtHelper.encode(compare_file) # encode a payload object into a token and write it to the compare_file object + if JwtHelper.is_enabled # check if a secret key to generate token exists or not + compare_file["token"] = JwtHelper.encode(compare_file) # encode a payload object into a token and write it to the compare_file object end return compare_file @@ -330,16 +330,16 @@ def dataDocument # get mail merge recipients information def dataSpreadsheet dataSpreadsheet = is_enable_direct_url == true ? { - :fileType => "csv", # file type - :url => DocumentHelper.get_server_url(true) + "/csv", # server url to the mail merge recipients file - :directUrl => DocumentHelper.get_server_url(false) + "/csv" # direct url to the mail merge recipients file + :fileType => "csv", # file type + :url => DocumentHelper.get_server_url(true) + "/csv", # server url to the mail merge recipients file + :directUrl => DocumentHelper.get_server_url(false) + "/csv" # direct url to the mail merge recipients file } : { - :fileType => "csv", # file type - :url => DocumentHelper.get_server_url(true) + "/csv" # server url to the mail merge recipients file + :fileType => "csv", # file type + :url => DocumentHelper.get_server_url(true) + "/csv" # server url to the mail merge recipients file } - if JwtHelper.is_enabled # check if a secret key to generate token exists or not - dataSpreadsheet["token"] = JwtHelper.encode(dataSpreadsheet) # encode a payload object into a token and write it to the dataSpreadsheet object + if JwtHelper.is_enabled # check if a secret key to generate token exists or not + dataSpreadsheet["token"] = JwtHelper.encode(dataSpreadsheet) # encode a payload object into a token and write it to the dataSpreadsheet object end return dataSpreadsheet diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index b7268f011..ebb708237 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -30,7 +30,7 @@ class << self # get the url of the converted file def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_async, file_pass, lang = nil) - from_ext = from_ext == nil ? File.extname(document_uri).downcase : from_ext # get the current document extension + from_ext = from_ext == nil ? File.extname(document_uri).downcase : from_ext # get the current document extension # get the current document name or uuid title = File.basename(URI.parse(document_uri).path) @@ -40,7 +40,7 @@ def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_ document_revision_id = document_revision_id.empty? ? document_uri : document_revision_id document_revision_id = generate_revision_id(document_revision_id) - payload = { # write all the conversion parameters to the payload + payload = { # write all the conversion parameters to the payload :async => is_async ? true : false, :url => document_uri, :outputtype => to_ext.delete('.'), @@ -54,52 +54,52 @@ def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_ data = nil begin - uri = URI.parse(@@document_converter_url) # create the request url - http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server + uri = URI.parse(@@document_converter_url) # create the request url + http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server DocumentHelper.verify_ssl(@@document_converter_url, http) http.read_timeout = @@convert_timeout http.open_timeout = 5 - req = Net::HTTP::Post.new(uri.request_uri) # create the post request - req.add_field("Accept", "application/json") # set headers + req = Net::HTTP::Post.new(uri.request_uri) # create the post request + req.add_field("Accept", "application/json") # set headers req.add_field("Content-Type", "application/json") - if JwtHelper.is_enabled && JwtHelper.use_for_request # if the signature is enabled - payload["token"] = JwtHelper.encode(payload) # get token and save it to the payload - jwtHeader = ServiceConverter.config_manager.jwt_header; # get signature authorization header - req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ :payload => payload })}") # set it to the request with the Bearer prefix + if JwtHelper.is_enabled && JwtHelper.use_for_request # if the signature is enabled + payload["token"] = JwtHelper.encode(payload) # get token and save it to the payload + jwtHeader = ServiceConverter.config_manager.jwt_header; # get signature authorization header + req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ :payload => payload })}") # set it to the request with the Bearer prefix end req.body = payload.to_json - res = http.request(req) # get the response + res = http.request(req) # get the response status_code = res.code.to_i - if status_code != 200 # checking status code + if status_code != 200 # checking status code raise "Conversion service returned status: #{status_code}" end - data = res.body # and take its body + data = res.body # and take its body rescue Timeout::Error # try again rescue => ex raise ex.message end - json_data = JSON.parse(data) # parse response body - return get_response_data(json_data) # get response url + json_data = JSON.parse(data) # parse response body + return get_response_data(json_data) # get response url end # generate the document key value def generate_revision_id(expected_key) require 'zlib' - if expected_key.length > 20 # check if the expected key length is greater than 20 - expected_key = (Zlib.crc32 expected_key).to_s # calculate 32-bit crc value from the expected key and turn it into the string + if expected_key.length > 20 # check if the expected key length is greater than 20 + expected_key = (Zlib.crc32 expected_key).to_s # calculate 32-bit crc value from the expected key and turn it into the string end key = expected_key.gsub(/[^0-9a-zA-Z.=]/, '_') - key[(key.length - [key.length, 20].min)..key.length] # the resulting key is of the length 20 or less + key[(key.length - [key.length, 20].min)..key.length] # the resulting key is of the length 20 or less end # create an error message for the error code @@ -127,7 +127,7 @@ def process_convert_service_responce_error(error_code) when 0 # public const int c_nErrorNo = 0 else - error_message = 'ErrorCode = ' + error_code.to_s # default value for the error message + error_message = 'ErrorCode = ' + error_code.to_s # default value for the error message end raise error_message @@ -138,30 +138,30 @@ def get_response_data(json_data) file_result = json_data error_element = file_result['error'] - if error_element != nil # if an error occurs - process_convert_service_responce_error(error_element.to_i) # get an error message + if error_element != nil # if an error occurs + process_convert_service_responce_error(error_element.to_i) # get an error message end - is_end_convert = file_result['endConvert'] # check if the conversion is completed + is_end_convert = file_result['endConvert'] # check if the conversion is completed - result_percent = 0 # the conversion percentage + result_percent = 0 # the conversion percentage response_uri = '' response_file_type = '' - if is_end_convert # if the conversion is completed + if is_end_convert # if the conversion is completed file_url_element = file_result['fileUrl'] file_type_element = file_result['fileType'] - if file_url_element == nil # and the file url doesn't exist + if file_url_element == nil # and the file url doesn't exist raise 'Invalid answer format' # get ann error message end response_uri = file_url_element # otherwise, get the file url - response_file_type = file_type_element # get the file type + response_file_type = file_type_element # get the file type result_percent = 100 - else # if the conversion isn't completed + else # if the conversion isn't completed percent_element = file_result['percent'] # get the percentage value diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index a3250eacf..65b56b2ca 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -40,22 +40,22 @@ def read_body(request) return "" end - file_data = JSON.parse(body) # parse file data + file_data = JSON.parse(body) # parse file data # check if a secret key to generate token exists or not if JwtHelper.is_enabled && JwtHelper.use_for_request inHeader = false token = nil - jwtHeader = TrackHelper.config_manager.jwt_header; # get the authorization header from the config - if file_data["token"] # if the token is in the body - token = JwtHelper.decode(file_data["token"]) # decode a token into a payload object using a secret key - elsif request.headers[jwtHeader] # if the token is in the header + jwtHeader = TrackHelper.config_manager.jwt_header; # get the authorization header from the config + if file_data["token"] # if the token is in the body + token = JwtHelper.decode(file_data["token"]) # decode a token into a payload object using a secret key + elsif request.headers[jwtHeader] # if the token is in the header hdr = request.headers[jwtHeader] - hdr.slice!(0, "Bearer ".length) # get token from it (after Bearer prefix) - token = JwtHelper.decode(hdr) # decode a token into a payload object using a secret key + hdr.slice!(0, "Bearer ".length) # get token from it (after Bearer prefix) + token = JwtHelper.decode(hdr) # decode a token into a payload object using a secret key inHeader = true else - raise "Expected JWT" # token missing error message + raise "Expected JWT" # token missing error message end if !token || token.eql?("") @@ -108,9 +108,9 @@ def process_save(raw_file_data, file_name, user_address) end new_file_name = file_name - download_ext = "."+file_data['filetype'] # get the extension of the downloaded file + download_ext = "."+file_data['filetype'] # get the extension of the downloaded file - cur_ext = File.extname(file_name).downcase # get current file extension + cur_ext = File.extname(file_name).downcase # get current file extension # convert downloaded file to the file with the current extension if these extensions aren't equal unless cur_ext.eql?(download_ext) @@ -135,16 +135,16 @@ def process_save(raw_file_data, file_name, user_address) end begin - storage_path = DocumentHelper.storage_path(new_file_name, user_address) # get the storage directory of the new file + storage_path = DocumentHelper.storage_path(new_file_name, user_address) # get the storage directory of the new file - hist_dir = DocumentHelper.history_dir(storage_path) # get the history directory of the new file - ver_dir = DocumentHelper.version_dir(hist_dir, DocumentHelper.get_file_version(hist_dir)) # get the path to the specified file version + hist_dir = DocumentHelper.history_dir(storage_path) # get the history directory of the new file + ver_dir = DocumentHelper.version_dir(hist_dir, DocumentHelper.get_file_version(hist_dir)) # get the path to the specified file version - FileUtils.mkdir_p(ver_dir) # create the version directory if doesn't exist + FileUtils.mkdir_p(ver_dir) # create the version directory if doesn't exist - FileUtils.move(DocumentHelper.storage_path(file_name, user_address), File.join(ver_dir, "prev#{cur_ext}")) # move the file from the storage directory to the previous file version directory + FileUtils.move(DocumentHelper.storage_path(file_name, user_address), File.join(ver_dir, "prev#{cur_ext}")) # move the file from the storage directory to the previous file version directory - save_file(data, storage_path) # save the downloaded file to the storage directory + save_file(data, storage_path) # save the downloaded file to the storage directory change_data = download_file(file_data["changesurl"]) # download file with document versions differences save_file(change_data, File.join(ver_dir, "diff.zip")) # save file with document versions differences @@ -154,8 +154,8 @@ def process_save(raw_file_data, file_name, user_address) hist_data = file_data["history"].to_json # write the original history information to the history data end if hist_data - File.open(File.join(ver_dir, "changes.json"), 'wb') do |file| # open the file with document changes - file.write(hist_data) # and write history data to this file + File.open(File.join(ver_dir, "changes.json"), 'wb') do |file| # open the file with document changes + file.write(hist_data) # and write history data to this file end end @@ -164,7 +164,7 @@ def process_save(raw_file_data, file_name, user_address) file.write(file_data["key"]) end - forcesave_path = DocumentHelper.forcesave_path(new_file_name, user_address, false) # get the path to the forcesaved file + forcesave_path = DocumentHelper.forcesave_path(new_file_name, user_address, false) # get the path to the forcesaved file unless forcesave_path.eql?("") # if this path is empty File.delete(forcesave_path) # remove it end @@ -185,9 +185,9 @@ def process_force_save(file_data, file_name, user_address) return saved end - download_ext = "."+file_data['filetype'] # get the extension of the downloaded file + download_ext = "."+file_data['filetype'] # get the extension of the downloaded file - cur_ext = File.extname(file_name).downcase # get current file extension + cur_ext = File.extname(file_name).downcase # get current file extension new_file_name = false @@ -214,30 +214,30 @@ def process_force_save(file_data, file_name, user_address) end begin - is_submit_form = file_data["forcesavetype"].to_i == 3 # check if the forcesave type is equal to 3 (the form was submitted) + is_submit_form = file_data["forcesavetype"].to_i == 3 # check if the forcesave type is equal to 3 (the form was submitted) if is_submit_form if new_file_name - file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + "-form" + download_ext, user_address) # get the correct file name if it already exists + file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + "-form" + download_ext, user_address) # get the correct file name if it already exists else file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + "-form" + cur_ext, user_address) end - forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file + forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file else if new_file_name file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) end forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, false) if forcesave_path.eql?("") - forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, true) # if the path to the new file doesn't exist, create it + forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, true) # if the path to the new file doesn't exist, create it end end - save_file(data, forcesave_path) # save the downloaded file to the storage directory + save_file(data, forcesave_path) # save the downloaded file to the storage directory if is_submit_form uid = file_data['actions'][0]['userid'] - DocumentHelper.create_meta(file_name, uid, "Filling Form", user_address) # create file meta information with the Filling form tag instead of user name + DocumentHelper.create_meta(file_name, uid, "Filling Form", user_address) # create file meta information with the Filling form tag instead of user name end saved = 0 @@ -263,35 +263,35 @@ def command_request(method, key, meta = nil) data = nil begin - uri = URI.parse(@@document_command_url) # parse the document command url - http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server + uri = URI.parse(@@document_command_url) # parse the document command url + http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server DocumentHelper.verify_ssl(@@document_command_url, http) - req = Net::HTTP::Post.new(uri.request_uri) # create the post request - req.add_field("Content-Type", "application/json") # set headers + req = Net::HTTP::Post.new(uri.request_uri) # create the post request + req.add_field("Content-Type", "application/json") # set headers - if JwtHelper.is_enabled && JwtHelper.use_for_request # if the signature is enabled - payload["token"] = JwtHelper.encode(payload) # get token and save it to the payload - jwtHeader = TrackHelper.config_manager.jwt_header; # get signature authorization header - req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ :payload => payload })}") # set it to the request with the Bearer prefix + if JwtHelper.is_enabled && JwtHelper.use_for_request # if the signature is enabled + payload["token"] = JwtHelper.encode(payload) # get token and save it to the payload + jwtHeader = TrackHelper.config_manager.jwt_header; # get signature authorization header + req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ :payload => payload })}") # set it to the request with the Bearer prefix end - req.body = payload.to_json # convert the payload object into the json format - res = http.request(req) # get the response - data = res.body # and take its body + req.body = payload.to_json # convert the payload object into the json format + res = http.request(req) # get the response + data = res.body # and take its body rescue => ex raise ex.message end - json_data = JSON.parse(data) # convert the response body into the json format + json_data = JSON.parse(data) # convert the response body into the json format return json_data end # save file from the url def download_file(uristr) - uri = URI.parse(uristr) # parse the url string - http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server + uri = URI.parse(uristr) # parse the url string + http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server http.open_timeout = 5 DocumentHelper.verify_ssl(uristr, http) @@ -304,7 +304,7 @@ def download_file(uristr) raise "Document editing service returned status: #{status_code}" end - data = res.body # and take its body + data = res.body # and take its body if data == nil raise 'stream is null' @@ -314,7 +314,7 @@ def download_file(uristr) end def save_file(data, path) - File.open(path, 'wb') do |file| # open the file from the path specified + File.open(path, 'wb') do |file| # open the file from the path specified file.write(data) # and write the response data to it end end diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index fe827482a..00d43150d 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -110,11 +110,11 @@ class Users ] class << self - def get_all_users() # get a list of all the users + def get_all_users() # get a list of all the users @@users end - def get_user(id) # get a user by id specified + def get_user(id) # get a user by id specified for user in @@users do if user.id.eql?(id) return user @@ -123,7 +123,7 @@ def get_user(id) # get a user by id specified return @@users[0] end - def get_users_for_mentions(id) # get a list of users with their names and emails for mentions + def get_users_for_mentions(id) # get a list of users with their names and emails for mentions usersData = [] for user in @@users do if (!user.id.eql?(id) && user.name != nil && user.email != nil) From 3b66092a45e81b2eaf5393e465a631fb87cc697a Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 13:25:32 +0300 Subject: [PATCH 252/488] ruby: Layout/IndentationWidth correct --- .../ruby/app/controllers/home_controller.rb | 148 +++--- .../ruby/app/models/document_helper.rb | 2 +- .../ruby/app/models/jwt_helper.rb | 52 +- .../ruby/app/models/track_helper.rb | 460 +++++++++--------- .../ruby/app/models/users.rb | 226 ++++----- 5 files changed, 444 insertions(+), 444 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index f4218dbd0..0d97d3f92 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -89,7 +89,7 @@ def convert begin file_data = request.body.read if file_data == nil || file_data.empty? - return "" + return "" end body = JSON.parse(file_data) @@ -205,7 +205,7 @@ def track if file_data['actions'][0]['type'] == 0 # finished edit user = file_data['actions'][0]['userid'] # get the user id if !file_data['users'].index(user) - json_data = TrackHelper.command_request("forcesave", file_data['key']) # call the forcesave command + json_data = TrackHelper.command_request("forcesave", file_data['key']) # call the forcesave command end end end @@ -280,7 +280,7 @@ def download if JwtHelper.is_enabled && isEmbedded == nil && user_address != nil && JwtHelper.use_for_request jwtHeader = HomeController.config_manager.jwt_header; if request.headers[jwtHeader] - hdr = request.headers[jwtHeader] + hdr = request.headers[jwtHeader] hdr.slice!(0, "Bearer ".length) token = JwtHelper.decode(hdr) end @@ -350,95 +350,95 @@ def saveas end # Rename... - def rename - body = JSON.parse(request.body.read) - dockey = body["dockey"] - newfilename = body["newfilename"] + def rename + body = JSON.parse(request.body.read) + dockey = body["dockey"] + newfilename = body["newfilename"] - orig_ext = '.' + body["ext"] - cur_ext = File.extname(newfilename).downcase - if orig_ext != cur_ext - newfilename += orig_ext - end + orig_ext = '.' + body["ext"] + cur_ext = File.extname(newfilename).downcase + if orig_ext != cur_ext + newfilename += orig_ext + end - meta = { - :title => newfilename - } + meta = { + :title => newfilename + } - json_data = TrackHelper.command_request("meta", dockey, meta) - render plain: '{ "result" : "' + JSON.dump(json_data) + '"}' - end + json_data = TrackHelper.command_request("meta", dockey, meta) + render plain: '{ "result" : "' + JSON.dump(json_data) + '"}' + end #ReferenceData - def reference - body = JSON.parse(request.body.read) - fileName = "" - - - if body.key?("referenceData") - referenceData = body["referenceData"] - instanceId = referenceData["instanceId"] - if instanceId == DocumentHelper.get_server_url(false) - fileKey = JSON.parse(referenceData["fileKey"]) - userAddress = fileKey["userAddress"] - if userAddress == DocumentHelper.cur_user_host_address(nil) - fileName = fileKey["fileName"] - end + def reference + body = JSON.parse(request.body.read) + fileName = "" + + + if body.key?("referenceData") + referenceData = body["referenceData"] + instanceId = referenceData["instanceId"] + if instanceId == DocumentHelper.get_server_url(false) + fileKey = JSON.parse(referenceData["fileKey"]) + userAddress = fileKey["userAddress"] + if userAddress == DocumentHelper.cur_user_host_address(nil) + fileName = fileKey["fileName"] end end + end - link = body["link"] - if fileName.empty? and body.key?("link") - if !link.include?(DocumentHelper.get_server_url(false)) - data = { - url: link, - directUrl: link - } - render plain: data.to_json - return - end - - url_obj = URI(link) - query_params = CGI.parse(url_obj.query) - fileName = query_params['fileName'].first - if !File.exist?(DocumentHelper.storage_path(fileName, nil)) - render plain: '{ "error": "File is not exist"}' - return - end + link = body["link"] + if fileName.empty? and body.key?("link") + if !link.include?(DocumentHelper.get_server_url(false)) + data = { + url: link, + directUrl: link + } + render plain: data.to_json + return end - if fileName.empty? and body.key?("path") - path = File.basename(body["path"]) - if File.exist?(DocumentHelper.storage_path(path, nil)) - fileName = path - end + url_obj = URI(link) + query_params = CGI.parse(url_obj.query) + fileName = query_params['fileName'].first + if !File.exist?(DocumentHelper.storage_path(fileName, nil)) + render plain: '{ "error": "File is not exist"}' + return end + end - if fileName.empty? - render plain: '{ "error": "File not found"}' - return + if fileName.empty? and body.key?("path") + path = File.basename(body["path"]) + if File.exist?(DocumentHelper.storage_path(path, nil)) + fileName = path end + end - data = { - :fileType => File.extname(fileName).downcase.delete("."), - :key => ServiceConverter.generate_revision_id("#{DocumentHelper.cur_user_host_address(nil) + '/' + fileName}.#{File.mtime(DocumentHelper.storage_path(fileName, nil)).to_s}"), - :url => DocumentHelper.get_download_url(fileName), - :directUrl => body["directUrl"] ? DocumentHelper.get_download_url(fileName, false) : nil, - :referenceData => { - :instanceId => DocumentHelper.get_server_url(false), - :fileKey => {:fileName => fileName,:userAddress => DocumentHelper.cur_user_host_address(nil)}.to_json - }, - :path => fileName, - :link => DocumentHelper.get_server_url(false) + '/editor?fileName=' + fileName - } + if fileName.empty? + render plain: '{ "error": "File not found"}' + return + end - if JwtHelper.is_enabled - data["token"] = JwtHelper.encode(data) - end + data = { + :fileType => File.extname(fileName).downcase.delete("."), + :key => ServiceConverter.generate_revision_id("#{DocumentHelper.cur_user_host_address(nil) + '/' + fileName}.#{File.mtime(DocumentHelper.storage_path(fileName, nil)).to_s}"), + :url => DocumentHelper.get_download_url(fileName), + :directUrl => body["directUrl"] ? DocumentHelper.get_download_url(fileName, false) : nil, + :referenceData => { + :instanceId => DocumentHelper.get_server_url(false), + :fileKey => {:fileName => fileName,:userAddress => DocumentHelper.cur_user_host_address(nil)}.to_json + }, + :path => fileName, + :link => DocumentHelper.get_server_url(false) + '/editor?fileName=' + fileName + } - render plain: data.to_json + if JwtHelper.is_enabled + data["token"] = JwtHelper.encode(data) end + render plain: data.to_json + end + def restore body = JSON.parse(request.body.read) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index ab6be3bd2..78558091d 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -158,7 +158,7 @@ def get_correct_name(file_name, user_address) index = 1 while File.exist?(storage_path(name, user_address)) # if the file with such a name already exists in this directory - name = base_name + ' (' + index.to_s + ')' + ext.downcase # add an index after its base name + name = base_name + ' (' + index.to_s + ')' + ext.downcase # add an index after its base name index = index + 1 end diff --git a/web/documentserver-example/ruby/app/models/jwt_helper.rb b/web/documentserver-example/ruby/app/models/jwt_helper.rb index 4101c144b..1e0b22f62 100644 --- a/web/documentserver-example/ruby/app/models/jwt_helper.rb +++ b/web/documentserver-example/ruby/app/models/jwt_helper.rb @@ -19,35 +19,35 @@ class JwtHelper - @jwt_secret = ConfigurationManager.new.jwt_secret - @token_use_for_request = ConfigurationManager.new.jwt_use_for_request + @jwt_secret = ConfigurationManager.new.jwt_secret + @token_use_for_request = ConfigurationManager.new.jwt_use_for_request - class << self - # check if a secret key to generate token exists or not - def is_enabled - return @jwt_secret && !@jwt_secret.empty? ? true : false - end + class << self + # check if a secret key to generate token exists or not + def is_enabled + return @jwt_secret && !@jwt_secret.empty? ? true : false + end - # check if a secret key used for request - def use_for_request - return @token_use_for_request - end + # check if a secret key used for request + def use_for_request + return @token_use_for_request + end - # encode a payload object into a token using a secret key - def encode(payload) - return JWT.encode payload, @jwt_secret, 'HS256' # define the hashing algorithm and get token - end + # encode a payload object into a token using a secret key + def encode(payload) + return JWT.encode payload, @jwt_secret, 'HS256' # define the hashing algorithm and get token + end - # decode a token into a payload object using a secret key - def decode(token) - begin - decoded = JWT.decode token, @jwt_secret, true, { algorithm: 'HS256' } - rescue - return "" - end - # decoded = Array [ {"data"=>"test"}, # payload - # {"alg"=>"HS256"} # header ] - return decoded[0].to_json # get json payload - end + # decode a token into a payload object using a secret key + def decode(token) + begin + decoded = JWT.decode token, @jwt_secret, true, { algorithm: 'HS256' } + rescue + return "" + end + # decoded = Array [ {"data"=>"test"}, # payload + # {"alg"=>"HS256"} # header ] + return decoded[0].to_json # get json payload end + end end diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 65b56b2ca..c7b0f45b7 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -30,293 +30,293 @@ class << self @@document_command_url = TrackHelper.config_manager.document_server_command_uri.to_s - class << self + class << self + + # read the request body + def read_body(request) + body = request.body.read - # read the request body - def read_body(request) - body = request.body.read + if body == nil || body.empty? + return "" + end - if body == nil || body.empty? - return "" + file_data = JSON.parse(body) # parse file data + + # check if a secret key to generate token exists or not + if JwtHelper.is_enabled && JwtHelper.use_for_request + inHeader = false + token = nil + jwtHeader = TrackHelper.config_manager.jwt_header; # get the authorization header from the config + if file_data["token"] # if the token is in the body + token = JwtHelper.decode(file_data["token"]) # decode a token into a payload object using a secret key + elsif request.headers[jwtHeader] # if the token is in the header + hdr = request.headers[jwtHeader] + hdr.slice!(0, "Bearer ".length) # get token from it (after Bearer prefix) + token = JwtHelper.decode(hdr) # decode a token into a payload object using a secret key + inHeader = true + else + raise "Expected JWT" # token missing error message end - file_data = JSON.parse(body) # parse file data - - # check if a secret key to generate token exists or not - if JwtHelper.is_enabled && JwtHelper.use_for_request - inHeader = false - token = nil - jwtHeader = TrackHelper.config_manager.jwt_header; # get the authorization header from the config - if file_data["token"] # if the token is in the body - token = JwtHelper.decode(file_data["token"]) # decode a token into a payload object using a secret key - elsif request.headers[jwtHeader] # if the token is in the header - hdr = request.headers[jwtHeader] - hdr.slice!(0, "Bearer ".length) # get token from it (after Bearer prefix) - token = JwtHelper.decode(hdr) # decode a token into a payload object using a secret key - inHeader = true - else - raise "Expected JWT" # token missing error message - end - - if !token || token.eql?("") - raise "Invalid JWT signature" - end - - file_data = JSON.parse(token) - - if inHeader - file_data = file_data["payload"] - end + if !token || token.eql?("") + raise "Invalid JWT signature" end - return file_data - end + file_data = JSON.parse(token) - def resolve_process_save_body(body) - copied = body.dup + if inHeader + file_data = file_data["payload"] + end + end - url = copied['url'] - if url - uri = URI(url) - resolved_uri = TrackHelper.proxy_manager.resolve_uri(uri) - copied['url'] = resolved_uri.to_s - end + return file_data + end - changesurl = copied['changesurl'] - if changesurl - uri = URI(changesurl) - resolved_uri = TrackHelper.proxy_manager.resolve_uri(uri) - copied['changesurl'] = resolved_uri.to_s - end + def resolve_process_save_body(body) + copied = body.dup + + url = copied['url'] + if url + uri = URI(url) + resolved_uri = TrackHelper.proxy_manager.resolve_uri(uri) + copied['url'] = resolved_uri.to_s + end + + changesurl = copied['changesurl'] + if changesurl + uri = URI(changesurl) + resolved_uri = TrackHelper.proxy_manager.resolve_uri(uri) + copied['changesurl'] = resolved_uri.to_s + end + + home = copied['home'] + if home + copied['home'] = resolve_process_save_body(home) + end + + copied + end - home = copied['home'] - if home - copied['home'] = resolve_process_save_body(home) - end + # file saving process + def process_save(raw_file_data, file_name, user_address) + file_data = resolve_process_save_body(raw_file_data) - copied + download_uri = file_data['url'] + if download_uri.eql?(nil) + saved = 1 + return saved end - # file saving process - def process_save(raw_file_data, file_name, user_address) - file_data = resolve_process_save_body(raw_file_data) + new_file_name = file_name + download_ext = "."+file_data['filetype'] # get the extension of the downloaded file - download_uri = file_data['url'] - if download_uri.eql?(nil) - saved = 1 - return saved - end + cur_ext = File.extname(file_name).downcase # get current file extension - new_file_name = file_name - download_ext = "."+file_data['filetype'] # get the extension of the downloaded file - - cur_ext = File.extname(file_name).downcase # get current file extension - - # convert downloaded file to the file with the current extension if these extensions aren't equal - unless cur_ext.eql?(download_ext) - key = ServiceConverter.generate_revision_id(download_uri) # get the document key - begin - percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data(download_uri, download_ext.delete('.'), cur_ext.delete('.'), key, false, nil) # get the url of the converted file - if new_file_uri == nil || new_file_uri.empty? - new_file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) # get the correct file name if it already exists - else - download_uri = new_file_uri - end - rescue StandardError => msg - new_file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) - end + # convert downloaded file to the file with the current extension if these extensions aren't equal + unless cur_ext.eql?(download_ext) + key = ServiceConverter.generate_revision_id(download_uri) # get the document key + begin + percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data(download_uri, download_ext.delete('.'), cur_ext.delete('.'), key, false, nil) # get the url of the converted file + if new_file_uri == nil || new_file_uri.empty? + new_file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) # get the correct file name if it already exists + else + download_uri = new_file_uri + end + rescue StandardError => msg + new_file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) end + end - saved = 1 - - data = download_file(download_uri) # download document file - if data.eql?(nil) - return saved - end + saved = 1 - begin - storage_path = DocumentHelper.storage_path(new_file_name, user_address) # get the storage directory of the new file + data = download_file(download_uri) # download document file + if data.eql?(nil) + return saved + end - hist_dir = DocumentHelper.history_dir(storage_path) # get the history directory of the new file - ver_dir = DocumentHelper.version_dir(hist_dir, DocumentHelper.get_file_version(hist_dir)) # get the path to the specified file version + begin + storage_path = DocumentHelper.storage_path(new_file_name, user_address) # get the storage directory of the new file - FileUtils.mkdir_p(ver_dir) # create the version directory if doesn't exist + hist_dir = DocumentHelper.history_dir(storage_path) # get the history directory of the new file + ver_dir = DocumentHelper.version_dir(hist_dir, DocumentHelper.get_file_version(hist_dir)) # get the path to the specified file version - FileUtils.move(DocumentHelper.storage_path(file_name, user_address), File.join(ver_dir, "prev#{cur_ext}")) # move the file from the storage directory to the previous file version directory + FileUtils.mkdir_p(ver_dir) # create the version directory if doesn't exist - save_file(data, storage_path) # save the downloaded file to the storage directory + FileUtils.move(DocumentHelper.storage_path(file_name, user_address), File.join(ver_dir, "prev#{cur_ext}")) # move the file from the storage directory to the previous file version directory - change_data = download_file(file_data["changesurl"]) # download file with document versions differences - save_file(change_data, File.join(ver_dir, "diff.zip")) # save file with document versions differences + save_file(data, storage_path) # save the downloaded file to the storage directory - hist_data = file_data["changeshistory"] - unless hist_data # if there are no changes in the history - hist_data = file_data["history"].to_json # write the original history information to the history data - end - if hist_data - File.open(File.join(ver_dir, "changes.json"), 'wb') do |file| # open the file with document changes - file.write(hist_data) # and write history data to this file - end - end + change_data = download_file(file_data["changesurl"]) # download file with document versions differences + save_file(change_data, File.join(ver_dir, "diff.zip")) # save file with document versions differences - # write the key value to the key.txt file - File.open(File.join(ver_dir, "key.txt"), 'wb') do |file| - file.write(file_data["key"]) - end + hist_data = file_data["changeshistory"] + unless hist_data # if there are no changes in the history + hist_data = file_data["history"].to_json # write the original history information to the history data + end + if hist_data + File.open(File.join(ver_dir, "changes.json"), 'wb') do |file| # open the file with document changes + file.write(hist_data) # and write history data to this file + end + end - forcesave_path = DocumentHelper.forcesave_path(new_file_name, user_address, false) # get the path to the forcesaved file - unless forcesave_path.eql?("") # if this path is empty - File.delete(forcesave_path) # remove it - end + # write the key value to the key.txt file + File.open(File.join(ver_dir, "key.txt"), 'wb') do |file| + file.write(file_data["key"]) + end - saved = 0 - rescue StandardError => msg - saved = 1 - end + forcesave_path = DocumentHelper.forcesave_path(new_file_name, user_address, false) # get the path to the forcesaved file + unless forcesave_path.eql?("") # if this path is empty + File.delete(forcesave_path) # remove it + end - saved + saved = 0 + rescue StandardError => msg + saved = 1 end - # file force saving process - def process_force_save(file_data, file_name, user_address) - download_uri = file_data['url'] - if download_uri.eql?(nil) - saved = 1 - return saved - end + saved + end - download_ext = "."+file_data['filetype'] # get the extension of the downloaded file - - cur_ext = File.extname(file_name).downcase # get current file extension - - new_file_name = false - - # convert downloaded file to the file with the current extension if these extensions aren't equal - unless cur_ext.eql?(download_ext) - key = ServiceConverter.generate_revision_id(download_uri) # get the document key - begin - percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data(download_uri, download_ext.delete('.'), cur_ext.delete('.'), key, false, nil) # get the url of the converted file - if new_file_uri == nil || new_file_uri.empty? - new_file_name = true - else - download_uri = new_file_uri - end - rescue StandardError => msg - new_file_name = true - end - end + # file force saving process + def process_force_save(file_data, file_name, user_address) + download_uri = file_data['url'] + if download_uri.eql?(nil) + saved = 1 + return saved + end - saved = 1 + download_ext = "."+file_data['filetype'] # get the extension of the downloaded file - data = download_file(download_uri) # download document file - if data.eql?(nil) - return saved - end + cur_ext = File.extname(file_name).downcase # get current file extension + + new_file_name = false + # convert downloaded file to the file with the current extension if these extensions aren't equal + unless cur_ext.eql?(download_ext) + key = ServiceConverter.generate_revision_id(download_uri) # get the document key begin - is_submit_form = file_data["forcesavetype"].to_i == 3 # check if the forcesave type is equal to 3 (the form was submitted) - - if is_submit_form - if new_file_name - file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + "-form" + download_ext, user_address) # get the correct file name if it already exists - else - file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + "-form" + cur_ext, user_address) - end - forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file - else - if new_file_name - file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) - end - forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, false) - if forcesave_path.eql?("") - forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, true) # if the path to the new file doesn't exist, create it - end - end - - save_file(data, forcesave_path) # save the downloaded file to the storage directory - - if is_submit_form - uid = file_data['actions'][0]['userid'] - DocumentHelper.create_meta(file_name, uid, "Filling Form", user_address) # create file meta information with the Filling form tag instead of user name - end - - saved = 0 - rescue StandardError => msg - saved = 1 + percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data(download_uri, download_ext.delete('.'), cur_ext.delete('.'), key, false, nil) # get the url of the converted file + if new_file_uri == nil || new_file_uri.empty? + new_file_name = true + else + download_uri = new_file_uri + end + rescue StandardError => msg + new_file_name = true end + end + + saved = 1 - saved + data = download_file(download_uri) # download document file + if data.eql?(nil) + return saved end - # send the command request - def command_request(method, key, meta = nil) - # create a payload object with the method and key - payload = { - :c => method, - :key => key - } + begin + is_submit_form = file_data["forcesavetype"].to_i == 3 # check if the forcesave type is equal to 3 (the form was submitted) - if (meta != nil) - payload.merge!({:meta => meta}) + if is_submit_form + if new_file_name + file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + "-form" + download_ext, user_address) # get the correct file name if it already exists + else + file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + "-form" + cur_ext, user_address) end + forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file + else + if new_file_name + file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) + end + forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, false) + if forcesave_path.eql?("") + forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, true) # if the path to the new file doesn't exist, create it + end + end - data = nil - begin - - uri = URI.parse(@@document_command_url) # parse the document command url - http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server + save_file(data, forcesave_path) # save the downloaded file to the storage directory - DocumentHelper.verify_ssl(@@document_command_url, http) + if is_submit_form + uid = file_data['actions'][0]['userid'] + DocumentHelper.create_meta(file_name, uid, "Filling Form", user_address) # create file meta information with the Filling form tag instead of user name + end - req = Net::HTTP::Post.new(uri.request_uri) # create the post request - req.add_field("Content-Type", "application/json") # set headers + saved = 0 + rescue StandardError => msg + saved = 1 + end - if JwtHelper.is_enabled && JwtHelper.use_for_request # if the signature is enabled - payload["token"] = JwtHelper.encode(payload) # get token and save it to the payload - jwtHeader = TrackHelper.config_manager.jwt_header; # get signature authorization header - req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ :payload => payload })}") # set it to the request with the Bearer prefix - end + saved + end - req.body = payload.to_json # convert the payload object into the json format - res = http.request(req) # get the response - data = res.body # and take its body - rescue => ex - raise ex.message - end + # send the command request + def command_request(method, key, meta = nil) + # create a payload object with the method and key + payload = { + :c => method, + :key => key + } - json_data = JSON.parse(data) # convert the response body into the json format - return json_data + if (meta != nil) + payload.merge!({:meta => meta}) end - # save file from the url - def download_file(uristr) - uri = URI.parse(uristr) # parse the url string - http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server - http.open_timeout = 5 + data = nil + begin - DocumentHelper.verify_ssl(uristr, http) + uri = URI.parse(@@document_command_url) # parse the document command url + http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server - req = Net::HTTP::Get.new(uri) - res = http.request(req) # get the response + DocumentHelper.verify_ssl(@@document_command_url, http) - status_code = res.code - if status_code != '200' # checking status code - raise "Document editing service returned status: #{status_code}" - end + req = Net::HTTP::Post.new(uri.request_uri) # create the post request + req.add_field("Content-Type", "application/json") # set headers - data = res.body # and take its body + if JwtHelper.is_enabled && JwtHelper.use_for_request # if the signature is enabled + payload["token"] = JwtHelper.encode(payload) # get token and save it to the payload + jwtHeader = TrackHelper.config_manager.jwt_header; # get signature authorization header + req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ :payload => payload })}") # set it to the request with the Bearer prefix + end - if data == nil - raise 'stream is null' - end + req.body = payload.to_json # convert the payload object into the json format + res = http.request(req) # get the response + data = res.body # and take its body + rescue => ex + raise ex.message + end + + json_data = JSON.parse(data) # convert the response body into the json format + return json_data + end + + # save file from the url + def download_file(uristr) + uri = URI.parse(uristr) # parse the url string + http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server + http.open_timeout = 5 + + DocumentHelper.verify_ssl(uristr, http) + + req = Net::HTTP::Get.new(uri) + res = http.request(req) # get the response - data + status_code = res.code + if status_code != '200' # checking status code + raise "Document editing service returned status: #{status_code}" end - def save_file(data, path) - File.open(path, 'wb') do |file| # open the file from the path specified - file.write(data) # and write the response data to it - end + data = res.body # and take its body + + if data == nil + raise 'stream is null' end + + data end + + def save_file(data, path) + File.open(path, 'wb') do |file| # open the file from the path specified + file.write(data) # and write the response data to it + end + end + end end diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 00d43150d..471b6b382 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -15,133 +15,133 @@ # class User - attr_accessor :id, :name, :email, :group, :reviewGroups, :commentGroups, :userInfoGroups, :favorite, - :deniedPermissions, :descriptions, :templates, :avatar + attr_accessor :id, :name, :email, :group, :reviewGroups, :commentGroups, :userInfoGroups, :favorite, + :deniedPermissions, :descriptions, :templates, :avatar - def initialize (id, name, email, group, reviewGroups, commentGroups, userInfoGroups, favorite, - deniedPermissions, descriptions, templates, avatar) - @id = id - @name = name - @email = email - @group = group - @reviewGroups = reviewGroups - @commentGroups = commentGroups - @favorite = favorite - @deniedPermissions = deniedPermissions - @descriptions = descriptions - @templates = templates - @userInfoGroups = userInfoGroups - @avatar = avatar - end + def initialize (id, name, email, group, reviewGroups, commentGroups, userInfoGroups, favorite, + deniedPermissions, descriptions, templates, avatar) + @id = id + @name = name + @email = email + @group = group + @reviewGroups = reviewGroups + @commentGroups = commentGroups + @favorite = favorite + @deniedPermissions = deniedPermissions + @descriptions = descriptions + @templates = templates + @userInfoGroups = userInfoGroups + @avatar = avatar + end end class Users - @@descr_user_1 = [ - "File author by default", - "Doesn’t belong to any group", - "Can review all the changes", - "Can perform all actions with comments", - "The file favorite state is undefined", - "Can create files from templates using data from the editor", - "Can see the information about all users", - "Has an avatar", - ]; + @@descr_user_1 = [ + "File author by default", + "Doesn’t belong to any group", + "Can review all the changes", + "Can perform all actions with comments", + "The file favorite state is undefined", + "Can create files from templates using data from the editor", + "Can see the information about all users", + "Has an avatar", + ]; - @@descr_user_2 = [ - "Belongs to Group2", - "Can review only his own changes or changes made by users with no group", - "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only", - "This file is marked as favorite", - "Can create new files from the editor", - "Can see the information about users from Group2 and users who don’t belong to any group", - "Has an avatar", - ]; + @@descr_user_2 = [ + "Belongs to Group2", + "Can review only his own changes or changes made by users with no group", + "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only", + "This file is marked as favorite", + "Can create new files from the editor", + "Can see the information about users from Group2 and users who don’t belong to any group", + "Has an avatar", + ]; - @@descr_user_3 = [ - "Belongs to Group3", - "Can review changes made by Group2 users", - "Can view comments left by Group2 and Group3 users. Can edit comments left by the Group2 users", - "This file isn’t marked as favorite", - "Can’t copy data from the file to clipboard", - "Can’t download the file", - "Can’t print the file", - "Can create new files from the editor", - "Can see the information about Group2 users", - ]; + @@descr_user_3 = [ + "Belongs to Group3", + "Can review changes made by Group2 users", + "Can view comments left by Group2 and Group3 users. Can edit comments left by the Group2 users", + "This file isn’t marked as favorite", + "Can’t copy data from the file to clipboard", + "Can’t download the file", + "Can’t print the file", + "Can create new files from the editor", + "Can see the information about Group2 users", + ]; - @@descr_user_0 = [ - "The name is requested when the editor is opened", - "Doesn’t belong to any group", - "Can review all the changes", - "Can perform all actions with comments", - "The file favorite state is undefined", - "Can't mention others in comments", - "Can't create new files from the editor", - "Can’t see anyone’s information", - "Can't rename files from the editor", - "Can't view chat", - "Can't protect file", - "View file without collaboration" - ]; + @@descr_user_0 = [ + "The name is requested when the editor is opened", + "Doesn’t belong to any group", + "Can review all the changes", + "Can perform all actions with comments", + "The file favorite state is undefined", + "Can't mention others in comments", + "Can't create new files from the editor", + "Can’t see anyone’s information", + "Can't rename files from the editor", + "Can't view chat", + "Can't protect file", + "View file without collaboration" + ]; - @@users = [ - User.new("uid-1", "John Smith", "smith@example.com", - "", nil, {}, nil, - nil, [], @@descr_user_1, true, true), - User.new("uid-2", "Mark Pottato", "pottato@example.com", - "group-2", ["group-2", ""], { - :view => "", - :edit => ["group-2", ""], - :remove => ["group-2"] - }, - ["group-2", ""], - true, [], @@descr_user_2, false, true), - User.new("uid-3", "Hamish Mitchell", nil, - "group-3", ["group-2"], { - :view => ["group-3", "group-2"], - :edit => ["group-2"], - :remove => [] - }, - ["group-2"], - false, ["copy", "download", "print"], @@descr_user_3, false, false), - User.new("uid-0", nil, nil, - "", nil, {}, [], - nil, ["protect"], @@descr_user_0, false, false) - ] + @@users = [ + User.new("uid-1", "John Smith", "smith@example.com", + "", nil, {}, nil, + nil, [], @@descr_user_1, true, true), + User.new("uid-2", "Mark Pottato", "pottato@example.com", + "group-2", ["group-2", ""], { + :view => "", + :edit => ["group-2", ""], + :remove => ["group-2"] + }, + ["group-2", ""], + true, [], @@descr_user_2, false, true), + User.new("uid-3", "Hamish Mitchell", nil, + "group-3", ["group-2"], { + :view => ["group-3", "group-2"], + :edit => ["group-2"], + :remove => [] + }, + ["group-2"], + false, ["copy", "download", "print"], @@descr_user_3, false, false), + User.new("uid-0", nil, nil, + "", nil, {}, [], + nil, ["protect"], @@descr_user_0, false, false) + ] - class << self - def get_all_users() # get a list of all the users - @@users - end + class << self + def get_all_users() # get a list of all the users + @@users + end - def get_user(id) # get a user by id specified - for user in @@users do - if user.id.eql?(id) - return user - end - end - return @@users[0] + def get_user(id) # get a user by id specified + for user in @@users do + if user.id.eql?(id) + return user end + end + return @@users[0] + end - def get_users_for_mentions(id) # get a list of users with their names and emails for mentions - usersData = [] - for user in @@users do - if (!user.id.eql?(id) && user.name != nil && user.email != nil) - usersData.push({:name => user.name, :email => user.email}) - end - end - return usersData + def get_users_for_mentions(id) # get a list of users with their names and emails for mentions + usersData = [] + for user in @@users do + if (!user.id.eql?(id) && user.name != nil && user.email != nil) + usersData.push({:name => user.name, :email => user.email}) + end end + return usersData + end - def get_users_for_protect(id) # get a list of users with their id, names and emails for protect - users_data = [] - for user in @@users do - if (!user.id.eql?(id) && user.name != nil) - users_data.push({id: user.id, name: user.name, email: user.email}) - end - end - return users_data + def get_users_for_protect(id) # get a list of users with their id, names and emails for protect + users_data = [] + for user in @@users do + if (!user.id.eql?(id) && user.name != nil) + users_data.push({id: user.id, name: user.name, email: user.email}) + end end - + return users_data end + + end end From dbce9946e0903a2b8bddde5142a2dc052973833d Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 13:29:46 +0300 Subject: [PATCH 253/488] ruby: Layout/TrailingWhitespace correct --- .../ruby/app/controllers/home_controller.rb | 4 ++-- .../ruby/app/models/document_helper.rb | 2 +- .../ruby/app/models/file_model.rb | 20 +++++++++---------- .../ruby/app/models/track_helper.rb | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 0d97d3f92..28ad29bff 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -93,7 +93,7 @@ def convert end body = JSON.parse(file_data) - + file_name = File.basename(body["filename"]) lang = cookies[:ulang] ? cookies[:ulang] : "en" file_pass = body["filePass"] ? body["filePass"] : nil @@ -373,7 +373,7 @@ def rename def reference body = JSON.parse(request.body.read) fileName = "" - + if body.key?("referenceData") referenceData = body["referenceData"] diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 78558091d..36ff13178 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -306,7 +306,7 @@ def get_files_info(file_id) "contentLength" => "#{(File.size(directory)/ 1024.0).round(2)} KB", "pureContentLength" => File.size(directory), "title" => fileName, - "updated" => File.mtime(directory) + "updated" => File.mtime(directory) } if file_id == nil # if file id is undefined diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 8f2fb2c8f..feb2e8e6f 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -150,7 +150,7 @@ def get_config :lang => @lang ? @lang : "en", :callbackUrl => callback_url, # absolute URL to the document storage service :coEditing => editorsmode.eql?("view") && @user.id.eql?("uid-0") ? { - :mode => "strict", + :mode => "strict", :change => false } : nil, :createUrl => !@user.id.eql?("uid-0") ? create_url : nil, @@ -169,7 +169,7 @@ def get_config }, :customization => { # the parameters for the editor interface :about => true, # the About section display - :comments => true, + :comments => true, :feedback => true, # the Feedback & Support menu button display :forcesave => false, # adding the request for the forced file saving to the callback handler :submitForm => submitForm, # the Submit form button state @@ -323,7 +323,7 @@ def dataDocument if JwtHelper.is_enabled # check if a secret key to generate token exists or not compare_file["token"] = JwtHelper.encode(compare_file) # encode a payload object into a token and write it to the compare_file object end - + return compare_file end @@ -358,14 +358,14 @@ def get_users_info id: user_info.id, name: user_info.name, email: user_info.email, - group: user_info.group, - reviewGroups: user_info.reviewGroups, - commentGroups: user_info.commentGroups, - userInfoGroups: user_info.userInfoGroups, + group: user_info.group, + reviewGroups: user_info.reviewGroups, + commentGroups: user_info.commentGroups, + userInfoGroups: user_info.userInfoGroups, favorite: user_info.favorite, - deniedPermissions: user_info.deniedPermissions, - descriptions: user_info.descriptions, - templates: user_info.templates, + deniedPermissions: user_info.deniedPermissions, + descriptions: user_info.descriptions, + templates: user_info.templates, avatar: user_info.avatar } u["image"] = user_info.avatar ? "#{DocumentHelper.get_server_url(true)}/assets/#{user_info.id}.png" : nil diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index c7b0f45b7..34c03eb35 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -178,7 +178,7 @@ def process_save(raw_file_data, file_name, user_address) end # file force saving process - def process_force_save(file_data, file_name, user_address) + def process_force_save(file_data, file_name, user_address) download_uri = file_data['url'] if download_uri.eql?(nil) saved = 1 @@ -237,7 +237,7 @@ def process_force_save(file_data, file_name, user_address) if is_submit_form uid = file_data['actions'][0]['userid'] - DocumentHelper.create_meta(file_name, uid, "Filling Form", user_address) # create file meta information with the Filling form tag instead of user name + DocumentHelper.create_meta(file_name, uid, "Filling Form", user_address) # create file meta information with the Filling form tag instead of user name end saved = 0 From f1a69218ae0cd93d6f911921766f8dfd01e3bd01 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 13:32:08 +0300 Subject: [PATCH 254/488] ruby: Layout/IndentationConsistency correct --- .../ruby/app/controllers/home_controller.rb | 10 +- .../ruby/app/models/document_helper.rb | 2 +- .../ruby/app/models/file_model.rb | 2 +- .../ruby/app/models/jwt_helper.rb | 2 +- .../ruby/app/models/track_helper.rb | 342 +++++++++--------- .../ruby/app/models/users.rb | 44 +-- 6 files changed, 201 insertions(+), 201 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 28ad29bff..7124d017c 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -204,9 +204,9 @@ def track if status == 1 # editing if file_data['actions'][0]['type'] == 0 # finished edit user = file_data['actions'][0]['userid'] # get the user id - if !file_data['users'].index(user) - json_data = TrackHelper.command_request("forcesave", file_data['key']) # call the forcesave command - end + if !file_data['users'].index(user) + json_data = TrackHelper.command_request("forcesave", file_data['key']) # call the forcesave command + end end end @@ -281,8 +281,8 @@ def download jwtHeader = HomeController.config_manager.jwt_header; if request.headers[jwtHeader] hdr = request.headers[jwtHeader] - hdr.slice!(0, "Bearer ".length) - token = JwtHelper.decode(hdr) + hdr.slice!(0, "Bearer ".length) + token = JwtHelper.decode(hdr) end if !token || token.eql?("") render plain: "JWT validation failed", :status => 403 diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 36ff13178..6bdcd805a 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -159,7 +159,7 @@ def get_correct_name(file_name, user_address) while File.exist?(storage_path(name, user_address)) # if the file with such a name already exists in this directory name = base_name + ' (' + index.to_s + ')' + ext.downcase # add an index after its base name - index = index + 1 + index = index + 1 end name diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index feb2e8e6f..6f8620e29 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -371,7 +371,7 @@ def get_users_info u["image"] = user_info.avatar ? "#{DocumentHelper.get_server_url(true)}/assets/#{user_info.id}.png" : nil users_info.push(u) end - return users_info + return users_info end end diff --git a/web/documentserver-example/ruby/app/models/jwt_helper.rb b/web/documentserver-example/ruby/app/models/jwt_helper.rb index 1e0b22f62..872251da9 100644 --- a/web/documentserver-example/ruby/app/models/jwt_helper.rb +++ b/web/documentserver-example/ruby/app/models/jwt_helper.rb @@ -47,7 +47,7 @@ def decode(token) end # decoded = Array [ {"data"=>"test"}, # payload # {"alg"=>"HS256"} # header ] - return decoded[0].to_json # get json payload + return decoded[0].to_json # get json payload end end end diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 34c03eb35..0cec3d263 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -36,40 +36,40 @@ class << self def read_body(request) body = request.body.read - if body == nil || body.empty? - return "" - end + if body == nil || body.empty? + return "" + end - file_data = JSON.parse(body) # parse file data + file_data = JSON.parse(body) # parse file data # check if a secret key to generate token exists or not - if JwtHelper.is_enabled && JwtHelper.use_for_request - inHeader = false - token = nil - jwtHeader = TrackHelper.config_manager.jwt_header; # get the authorization header from the config - if file_data["token"] # if the token is in the body - token = JwtHelper.decode(file_data["token"]) # decode a token into a payload object using a secret key - elsif request.headers[jwtHeader] # if the token is in the header - hdr = request.headers[jwtHeader] - hdr.slice!(0, "Bearer ".length) # get token from it (after Bearer prefix) - token = JwtHelper.decode(hdr) # decode a token into a payload object using a secret key - inHeader = true - else - raise "Expected JWT" # token missing error message - end - - if !token || token.eql?("") - raise "Invalid JWT signature" - end - - file_data = JSON.parse(token) - - if inHeader - file_data = file_data["payload"] - end + if JwtHelper.is_enabled && JwtHelper.use_for_request + inHeader = false + token = nil + jwtHeader = TrackHelper.config_manager.jwt_header; # get the authorization header from the config + if file_data["token"] # if the token is in the body + token = JwtHelper.decode(file_data["token"]) # decode a token into a payload object using a secret key + elsif request.headers[jwtHeader] # if the token is in the header + hdr = request.headers[jwtHeader] + hdr.slice!(0, "Bearer ".length) # get token from it (after Bearer prefix) + token = JwtHelper.decode(hdr) # decode a token into a payload object using a secret key + inHeader = true + else + raise "Expected JWT" # token missing error message end - return file_data + if !token || token.eql?("") + raise "Invalid JWT signature" + end + + file_data = JSON.parse(token) + + if inHeader + file_data = file_data["payload"] + end + end + + return file_data end def resolve_process_save_body(body) @@ -101,151 +101,151 @@ def resolve_process_save_body(body) def process_save(raw_file_data, file_name, user_address) file_data = resolve_process_save_body(raw_file_data) - download_uri = file_data['url'] - if download_uri.eql?(nil) - saved = 1 - return saved - end + download_uri = file_data['url'] + if download_uri.eql?(nil) + saved = 1 + return saved + end - new_file_name = file_name - download_ext = "."+file_data['filetype'] # get the extension of the downloaded file + new_file_name = file_name + download_ext = "."+file_data['filetype'] # get the extension of the downloaded file - cur_ext = File.extname(file_name).downcase # get current file extension + cur_ext = File.extname(file_name).downcase # get current file extension # convert downloaded file to the file with the current extension if these extensions aren't equal - unless cur_ext.eql?(download_ext) - key = ServiceConverter.generate_revision_id(download_uri) # get the document key - begin - percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data(download_uri, download_ext.delete('.'), cur_ext.delete('.'), key, false, nil) # get the url of the converted file - if new_file_uri == nil || new_file_uri.empty? - new_file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) # get the correct file name if it already exists - else - download_uri = new_file_uri - end - rescue StandardError => msg - new_file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) - end + unless cur_ext.eql?(download_ext) + key = ServiceConverter.generate_revision_id(download_uri) # get the document key + begin + percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data(download_uri, download_ext.delete('.'), cur_ext.delete('.'), key, false, nil) # get the url of the converted file + if new_file_uri == nil || new_file_uri.empty? + new_file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) # get the correct file name if it already exists + else + download_uri = new_file_uri + end + rescue StandardError => msg + new_file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) end + end - saved = 1 - - data = download_file(download_uri) # download document file - if data.eql?(nil) - return saved - end + saved = 1 - begin - storage_path = DocumentHelper.storage_path(new_file_name, user_address) # get the storage directory of the new file + data = download_file(download_uri) # download document file + if data.eql?(nil) + return saved + end - hist_dir = DocumentHelper.history_dir(storage_path) # get the history directory of the new file - ver_dir = DocumentHelper.version_dir(hist_dir, DocumentHelper.get_file_version(hist_dir)) # get the path to the specified file version + begin + storage_path = DocumentHelper.storage_path(new_file_name, user_address) # get the storage directory of the new file - FileUtils.mkdir_p(ver_dir) # create the version directory if doesn't exist + hist_dir = DocumentHelper.history_dir(storage_path) # get the history directory of the new file + ver_dir = DocumentHelper.version_dir(hist_dir, DocumentHelper.get_file_version(hist_dir)) # get the path to the specified file version - FileUtils.move(DocumentHelper.storage_path(file_name, user_address), File.join(ver_dir, "prev#{cur_ext}")) # move the file from the storage directory to the previous file version directory + FileUtils.mkdir_p(ver_dir) # create the version directory if doesn't exist - save_file(data, storage_path) # save the downloaded file to the storage directory + FileUtils.move(DocumentHelper.storage_path(file_name, user_address), File.join(ver_dir, "prev#{cur_ext}")) # move the file from the storage directory to the previous file version directory - change_data = download_file(file_data["changesurl"]) # download file with document versions differences - save_file(change_data, File.join(ver_dir, "diff.zip")) # save file with document versions differences + save_file(data, storage_path) # save the downloaded file to the storage directory - hist_data = file_data["changeshistory"] - unless hist_data # if there are no changes in the history - hist_data = file_data["history"].to_json # write the original history information to the history data - end - if hist_data - File.open(File.join(ver_dir, "changes.json"), 'wb') do |file| # open the file with document changes - file.write(hist_data) # and write history data to this file - end - end + change_data = download_file(file_data["changesurl"]) # download file with document versions differences + save_file(change_data, File.join(ver_dir, "diff.zip")) # save file with document versions differences - # write the key value to the key.txt file - File.open(File.join(ver_dir, "key.txt"), 'wb') do |file| - file.write(file_data["key"]) + hist_data = file_data["changeshistory"] + unless hist_data # if there are no changes in the history + hist_data = file_data["history"].to_json # write the original history information to the history data + end + if hist_data + File.open(File.join(ver_dir, "changes.json"), 'wb') do |file| # open the file with document changes + file.write(hist_data) # and write history data to this file end + end - forcesave_path = DocumentHelper.forcesave_path(new_file_name, user_address, false) # get the path to the forcesaved file - unless forcesave_path.eql?("") # if this path is empty - File.delete(forcesave_path) # remove it - end + # write the key value to the key.txt file + File.open(File.join(ver_dir, "key.txt"), 'wb') do |file| + file.write(file_data["key"]) + end - saved = 0 - rescue StandardError => msg - saved = 1 + forcesave_path = DocumentHelper.forcesave_path(new_file_name, user_address, false) # get the path to the forcesaved file + unless forcesave_path.eql?("") # if this path is empty + File.delete(forcesave_path) # remove it end - saved + saved = 0 + rescue StandardError => msg + saved = 1 + end + + saved end # file force saving process def process_force_save(file_data, file_name, user_address) download_uri = file_data['url'] - if download_uri.eql?(nil) - saved = 1 - return saved - end + if download_uri.eql?(nil) + saved = 1 + return saved + end - download_ext = "."+file_data['filetype'] # get the extension of the downloaded file + download_ext = "."+file_data['filetype'] # get the extension of the downloaded file - cur_ext = File.extname(file_name).downcase # get current file extension + cur_ext = File.extname(file_name).downcase # get current file extension - new_file_name = false + new_file_name = false # convert downloaded file to the file with the current extension if these extensions aren't equal - unless cur_ext.eql?(download_ext) - key = ServiceConverter.generate_revision_id(download_uri) # get the document key - begin - percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data(download_uri, download_ext.delete('.'), cur_ext.delete('.'), key, false, nil) # get the url of the converted file - if new_file_uri == nil || new_file_uri.empty? - new_file_name = true - else - download_uri = new_file_uri - end - rescue StandardError => msg + unless cur_ext.eql?(download_ext) + key = ServiceConverter.generate_revision_id(download_uri) # get the document key + begin + percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data(download_uri, download_ext.delete('.'), cur_ext.delete('.'), key, false, nil) # get the url of the converted file + if new_file_uri == nil || new_file_uri.empty? new_file_name = true - end + else + download_uri = new_file_uri + end + rescue StandardError => msg + new_file_name = true end + end - saved = 1 + saved = 1 - data = download_file(download_uri) # download document file - if data.eql?(nil) - return saved - end + data = download_file(download_uri) # download document file + if data.eql?(nil) + return saved + end - begin - is_submit_form = file_data["forcesavetype"].to_i == 3 # check if the forcesave type is equal to 3 (the form was submitted) - - if is_submit_form - if new_file_name - file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + "-form" + download_ext, user_address) # get the correct file name if it already exists - else - file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + "-form" + cur_ext, user_address) - end - forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file + begin + is_submit_form = file_data["forcesavetype"].to_i == 3 # check if the forcesave type is equal to 3 (the form was submitted) + + if is_submit_form + if new_file_name + file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + "-form" + download_ext, user_address) # get the correct file name if it already exists else - if new_file_name - file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) - end - forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, false) - if forcesave_path.eql?("") - forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, true) # if the path to the new file doesn't exist, create it - end + file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + "-form" + cur_ext, user_address) end - - save_file(data, forcesave_path) # save the downloaded file to the storage directory - - if is_submit_form - uid = file_data['actions'][0]['userid'] - DocumentHelper.create_meta(file_name, uid, "Filling Form", user_address) # create file meta information with the Filling form tag instead of user name + forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file + else + if new_file_name + file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) + end + forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, false) + if forcesave_path.eql?("") + forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, true) # if the path to the new file doesn't exist, create it end + end - saved = 0 - rescue StandardError => msg - saved = 1 + save_file(data, forcesave_path) # save the downloaded file to the storage directory + + if is_submit_form + uid = file_data['actions'][0]['userid'] + DocumentHelper.create_meta(file_name, uid, "Filling Form", user_address) # create file meta information with the Filling form tag instead of user name end - saved + saved = 0 + rescue StandardError => msg + saved = 1 + end + + saved end # send the command request @@ -256,61 +256,61 @@ def command_request(method, key, meta = nil) :key => key } - if (meta != nil) - payload.merge!({:meta => meta}) - end - - data = nil - begin + if (meta != nil) + payload.merge!({:meta => meta}) + end - uri = URI.parse(@@document_command_url) # parse the document command url - http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server + data = nil + begin - DocumentHelper.verify_ssl(@@document_command_url, http) + uri = URI.parse(@@document_command_url) # parse the document command url + http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server - req = Net::HTTP::Post.new(uri.request_uri) # create the post request - req.add_field("Content-Type", "application/json") # set headers + DocumentHelper.verify_ssl(@@document_command_url, http) - if JwtHelper.is_enabled && JwtHelper.use_for_request # if the signature is enabled - payload["token"] = JwtHelper.encode(payload) # get token and save it to the payload - jwtHeader = TrackHelper.config_manager.jwt_header; # get signature authorization header - req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ :payload => payload })}") # set it to the request with the Bearer prefix - end + req = Net::HTTP::Post.new(uri.request_uri) # create the post request + req.add_field("Content-Type", "application/json") # set headers - req.body = payload.to_json # convert the payload object into the json format - res = http.request(req) # get the response - data = res.body # and take its body - rescue => ex - raise ex.message + if JwtHelper.is_enabled && JwtHelper.use_for_request # if the signature is enabled + payload["token"] = JwtHelper.encode(payload) # get token and save it to the payload + jwtHeader = TrackHelper.config_manager.jwt_header; # get signature authorization header + req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ :payload => payload })}") # set it to the request with the Bearer prefix end - json_data = JSON.parse(data) # convert the response body into the json format - return json_data + req.body = payload.to_json # convert the payload object into the json format + res = http.request(req) # get the response + data = res.body # and take its body + rescue => ex + raise ex.message + end + + json_data = JSON.parse(data) # convert the response body into the json format + return json_data end # save file from the url def download_file(uristr) uri = URI.parse(uristr) # parse the url string - http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server - http.open_timeout = 5 + http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server + http.open_timeout = 5 - DocumentHelper.verify_ssl(uristr, http) + DocumentHelper.verify_ssl(uristr, http) - req = Net::HTTP::Get.new(uri) - res = http.request(req) # get the response + req = Net::HTTP::Get.new(uri) + res = http.request(req) # get the response - status_code = res.code - if status_code != '200' # checking status code - raise "Document editing service returned status: #{status_code}" - end + status_code = res.code + if status_code != '200' # checking status code + raise "Document editing service returned status: #{status_code}" + end - data = res.body # and take its body + data = res.body # and take its body - if data == nil - raise 'stream is null' - end + if data == nil + raise 'stream is null' + end - data + data end def save_file(data, path) diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 471b6b382..e17136010 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -21,17 +21,17 @@ class User def initialize (id, name, email, group, reviewGroups, commentGroups, userInfoGroups, favorite, deniedPermissions, descriptions, templates, avatar) @id = id - @name = name - @email = email - @group = group - @reviewGroups = reviewGroups - @commentGroups = commentGroups - @favorite = favorite - @deniedPermissions = deniedPermissions - @descriptions = descriptions - @templates = templates - @userInfoGroups = userInfoGroups - @avatar = avatar + @name = name + @email = email + @group = group + @reviewGroups = reviewGroups + @commentGroups = commentGroups + @favorite = favorite + @deniedPermissions = deniedPermissions + @descriptions = descriptions + @templates = templates + @userInfoGroups = userInfoGroups + @avatar = avatar end end @@ -120,27 +120,27 @@ def get_user(id) # get a user by id specified return user end end - return @@users[0] + return @@users[0] end def get_users_for_mentions(id) # get a list of users with their names and emails for mentions usersData = [] - for user in @@users do - if (!user.id.eql?(id) && user.name != nil && user.email != nil) - usersData.push({:name => user.name, :email => user.email}) - end + for user in @@users do + if (!user.id.eql?(id) && user.name != nil && user.email != nil) + usersData.push({:name => user.name, :email => user.email}) end - return usersData + end + return usersData end def get_users_for_protect(id) # get a list of users with their id, names and emails for protect users_data = [] - for user in @@users do - if (!user.id.eql?(id) && user.name != nil) - users_data.push({id: user.id, name: user.name, email: user.email}) - end + for user in @@users do + if (!user.id.eql?(id) && user.name != nil) + users_data.push({id: user.id, name: user.name, email: user.email}) end - return users_data + end + return users_data end end From b5585cf3db168c24ddcff4309fec42aba324006c Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 13:33:31 +0300 Subject: [PATCH 255/488] ruby: Layout/LeadingCommentSpace correct --- .../ruby/app/controllers/home_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 7124d017c..40a62cc77 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -369,7 +369,7 @@ def rename render plain: '{ "result" : "' + JSON.dump(json_data) + '"}' end - #ReferenceData + # ReferenceData def reference body = JSON.parse(request.body.read) fileName = "" From f12fb576d83500fa3748b7b8b9db457db1585478 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 13:34:49 +0300 Subject: [PATCH 256/488] ruby: Layout/SpaceInsideHashLiteralBraces correct --- .../ruby/app/controllers/home_controller.rb | 2 +- web/documentserver-example/ruby/app/models/file_model.rb | 2 +- web/documentserver-example/ruby/app/models/track_helper.rb | 2 +- web/documentserver-example/ruby/app/models/users.rb | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 40a62cc77..36796b8e7 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -426,7 +426,7 @@ def reference :directUrl => body["directUrl"] ? DocumentHelper.get_download_url(fileName, false) : nil, :referenceData => { :instanceId => DocumentHelper.get_server_url(false), - :fileKey => {:fileName => fileName,:userAddress => DocumentHelper.cur_user_host_address(nil)}.to_json + :fileKey => { :fileName => fileName,:userAddress => DocumentHelper.cur_user_host_address(nil) }.to_json }, :path => fileName, :link => DocumentHelper.get_server_url(false) + '/editor?fileName=' + fileName diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 6f8620e29..60410b155 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -141,7 +141,7 @@ def get_config }, :referenceData => { :instanceId => DocumentHelper.get_server_url(false), - :fileKey => !@user.id.eql?("uid-0") ? {:fileName => @file_name,:userAddress => DocumentHelper.cur_user_host_address(nil)}.to_json : nil + :fileKey => !@user.id.eql?("uid-0") ? { :fileName => @file_name,:userAddress => DocumentHelper.cur_user_host_address(nil) }.to_json : nil } }, :editorConfig => { diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 0cec3d263..dcaee067c 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -257,7 +257,7 @@ def command_request(method, key, meta = nil) } if (meta != nil) - payload.merge!({:meta => meta}) + payload.merge!({ :meta => meta }) end data = nil diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index e17136010..8c170ca4b 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -127,7 +127,7 @@ def get_users_for_mentions(id) # get a list of users with their names and emails usersData = [] for user in @@users do if (!user.id.eql?(id) && user.name != nil && user.email != nil) - usersData.push({:name => user.name, :email => user.email}) + usersData.push({ :name => user.name, :email => user.email }) end end return usersData @@ -137,7 +137,7 @@ def get_users_for_protect(id) # get a list of users with their id, names and em users_data = [] for user in @@users do if (!user.id.eql?(id) && user.name != nil) - users_data.push({id: user.id, name: user.name, email: user.email}) + users_data.push({ id: user.id, name: user.name, email: user.email }) end end return users_data From fde6a09f7522aafc4c63fa04fc095fa620d7ffc8 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 13:39:32 +0300 Subject: [PATCH 257/488] ruby: Layout/SpaceAfterComma correct --- .../ruby/app/controllers/home_controller.rb | 2 +- web/documentserver-example/ruby/app/models/document_helper.rb | 4 ++-- web/documentserver-example/ruby/app/models/file_model.rb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 36796b8e7..68868fde4 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -426,7 +426,7 @@ def reference :directUrl => body["directUrl"] ? DocumentHelper.get_download_url(fileName, false) : nil, :referenceData => { :instanceId => DocumentHelper.get_server_url(false), - :fileKey => { :fileName => fileName,:userAddress => DocumentHelper.cur_user_host_address(nil) }.to_json + :fileKey => { :fileName => fileName, :userAddress => DocumentHelper.cur_user_host_address(nil) }.to_json }, :path => fileName, :link => DocumentHelper.get_server_url(false) + '/editor?fileName=' + fileName diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 6bdcd805a..5eac98727 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -93,7 +93,7 @@ def forcesave_path(file_name, user_address, create) return "" end - directory = File.join(directory,"#{File.basename(file_name)}-hist") # get the path to the history of the given file + directory = File.join(directory, "#{File.basename(file_name)}-hist") # get the path to the history of the given file unless File.directory?(directory) if create FileUtils.mkdir_p(directory) # create history directory if it doesn't exist @@ -226,7 +226,7 @@ def get_file_uri(file_name, for_document_server) end # get history path url - def get_historypath_uri(file_name,version,file,is_serverUrl=true) + def get_historypath_uri(file_name, version, file, is_serverUrl=true) # for redirection to my link user_host = is_serverUrl ? '&userAddress=' + cur_user_host_address(nil) : "" uri = get_server_url(is_serverUrl) + '/downloadhistory/?fileName=' + ERB::Util.url_encode(file_name) + '&ver='+ version.to_s + '&file='+ ERB::Util.url_encode(file) + user_host diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 60410b155..efccde508 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -141,7 +141,7 @@ def get_config }, :referenceData => { :instanceId => DocumentHelper.get_server_url(false), - :fileKey => !@user.id.eql?("uid-0") ? { :fileName => @file_name,:userAddress => DocumentHelper.cur_user_host_address(nil) }.to_json : nil + :fileKey => !@user.id.eql?("uid-0") ? { :fileName => @file_name, :userAddress => DocumentHelper.cur_user_host_address(nil) }.to_json : nil } }, :editorConfig => { @@ -306,7 +306,7 @@ def get_insert_image insert_image["token"] = JwtHelper.encode(insert_image) # encode a payload object into a token and write it to the insert_image object end - return insert_image.to_json.tr("{", "").tr("}","") + return insert_image.to_json.tr("{", "").tr("}", "") end # get compared file information From ac3e0faba86a0d8da02f9c0159d2b2006e34cc80 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 13:40:44 +0300 Subject: [PATCH 258/488] ruby: Layout/MultilineOperationIndentation correct --- web/documentserver-example/ruby/app/format/format.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/ruby/app/format/format.rb b/web/documentserver-example/ruby/app/format/format.rb index 0cca61d83..59bb56ea1 100644 --- a/web/documentserver-example/ruby/app/format/format.rb +++ b/web/documentserver-example/ruby/app/format/format.rb @@ -76,7 +76,7 @@ def editable_extensions def editable all.filter do |format| format.actions.include?('edit') || - format.actions.include?('lossy-edit') + format.actions.include?('lossy-edit') end end From 64f66d4fa3220dc248024218231f3f49392d40a2 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 13:41:38 +0300 Subject: [PATCH 259/488] ruby: Layout/EmptyLinesAroundClassBody correct --- web/documentserver-example/ruby/app/models/document_helper.rb | 2 -- web/documentserver-example/ruby/app/models/file_model.rb | 2 -- web/documentserver-example/ruby/app/models/jwt_helper.rb | 1 - .../ruby/app/models/service_converter.rb | 3 --- web/documentserver-example/ruby/app/models/track_helper.rb | 1 - web/documentserver-example/ruby/app/models/users.rb | 1 - 6 files changed, 10 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 5eac98727..294c7cd53 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -31,7 +31,6 @@ class << self @@base_url = nil class << self - def init (ip, url) @@remote_ip = ip @@base_url = url @@ -333,5 +332,4 @@ def verify_ssl(file_uri, http) end end end - end diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index efccde508..a20ffc0f0 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -17,7 +17,6 @@ require_relative '../configuration/configuration' class FileModel - attr_accessor :file_name, :mode, :type, :user_ip, :lang, :user, :action_data, :direct_url attr_reader :config_manager @@ -384,5 +383,4 @@ def get_users_protect def is_enable_direct_url return @direct_url != nil && @direct_url == "true" end - end diff --git a/web/documentserver-example/ruby/app/models/jwt_helper.rb b/web/documentserver-example/ruby/app/models/jwt_helper.rb index 872251da9..779cb7aa5 100644 --- a/web/documentserver-example/ruby/app/models/jwt_helper.rb +++ b/web/documentserver-example/ruby/app/models/jwt_helper.rb @@ -18,7 +18,6 @@ require_relative '../configuration/configuration' class JwtHelper - @jwt_secret = ConfigurationManager.new.jwt_secret @token_use_for_request = ConfigurationManager.new.jwt_use_for_request diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index ebb708237..5f6e3cafe 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -27,7 +27,6 @@ class << self @@document_converter_url = ServiceConverter.config_manager.document_server_converter_uri.to_s class << self - # get the url of the converted file def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_async, file_pass, lang = nil) from_ext = from_ext == nil ? File.extname(document_uri).downcase : from_ext # get the current document extension @@ -175,7 +174,5 @@ def get_response_data(json_data) return result_percent, response_uri, response_file_type end - end - end diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index dcaee067c..90c1d9882 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -31,7 +31,6 @@ class << self @@document_command_url = TrackHelper.config_manager.document_server_command_uri.to_s class << self - # read the request body def read_body(request) body = request.body.read diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 8c170ca4b..f2e2b4fde 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -142,6 +142,5 @@ def get_users_for_protect(id) # get a list of users with their id, names and em end return users_data end - end end From 276f5c1e2090f893d26fd61e99982b758bd96f3e Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 13:42:27 +0300 Subject: [PATCH 260/488] ruby: Layout/SpaceAfterMethodName correct --- web/documentserver-example/ruby/app/models/document_helper.rb | 2 +- web/documentserver-example/ruby/app/models/users.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 294c7cd53..48fcdb9ff 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -31,7 +31,7 @@ class << self @@base_url = nil class << self - def init (ip, url) + def init(ip, url) @@remote_ip = ip @@base_url = url end diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index f2e2b4fde..3d801aae2 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -18,7 +18,7 @@ class User attr_accessor :id, :name, :email, :group, :reviewGroups, :commentGroups, :userInfoGroups, :favorite, :deniedPermissions, :descriptions, :templates, :avatar - def initialize (id, name, email, group, reviewGroups, commentGroups, userInfoGroups, favorite, + def initialize(id, name, email, group, reviewGroups, commentGroups, userInfoGroups, favorite, deniedPermissions, descriptions, templates, avatar) @id = id @name = name From 118779aac1e44ff7163df39eae620b0552110230 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 13:47:02 +0300 Subject: [PATCH 261/488] ruby: Layout/SpaceInsideBlockBraces correct --- web/documentserver-example/ruby/app/models/document_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 48fcdb9ff..92d6ef41a 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -135,7 +135,7 @@ def get_file_version(hist_dir) end ver = 1 - Dir.foreach(hist_dir) {|e| # run through all the file versions + Dir.foreach(hist_dir) { |e| # run through all the file versions next if e.eql?(".") next if e.eql?("..") @@ -171,7 +171,7 @@ def get_stored_files(user_address) arr = []; if Dir.exist?(directory) - Dir.foreach(directory) {|e| # run through all the elements from the folder + Dir.foreach(directory) { |e| # run through all the elements from the folder next if e.eql?(".") next if e.eql?("..") next if File.directory?(File.join(directory, e)) # if the element is a directory, skip it From c0eb1c8a859543a4bd7b7da8aca8270374e13b32 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 13:48:06 +0300 Subject: [PATCH 262/488] ruby: Layout/SpaceAroundEqualsInParameterDefault correct --- web/documentserver-example/ruby/app/models/document_helper.rb | 4 ++-- web/documentserver-example/ruby/app/models/file_model.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 92d6ef41a..9da15f2d5 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -225,7 +225,7 @@ def get_file_uri(file_name, for_document_server) end # get history path url - def get_historypath_uri(file_name, version, file, is_serverUrl=true) + def get_historypath_uri(file_name, version, file, is_serverUrl = true) # for redirection to my link user_host = is_serverUrl ? '&userAddress=' + cur_user_host_address(nil) : "" uri = get_server_url(is_serverUrl) + '/downloadhistory/?fileName=' + ERB::Util.url_encode(file_name) + '&ver='+ version.to_s + '&file='+ ERB::Util.url_encode(file) + user_host @@ -252,7 +252,7 @@ def get_create_url(document_type) end # get url to download a file - def get_download_url(file_name, is_serverUrl=true) + def get_download_url(file_name, is_serverUrl = true) user_host = is_serverUrl ? '&userAddress=' + cur_user_host_address(nil) : "" get_server_url(is_serverUrl) + '/download?fileName=' + ERB::Util.url_encode(file_name) + user_host end diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index a20ffc0f0..407c34bea 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -75,7 +75,7 @@ def create_url end # get url to download a file - def download_url(is_serverUrl=true) + def download_url(is_serverUrl = true) DocumentHelper.get_download_url(@file_name, is_serverUrl) end From b48efac604d5cd66a7e904cf27a7c534c32a4be6 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 13:48:40 +0300 Subject: [PATCH 263/488] ruby: Layout/SpaceAroundOperators correct --- web/documentserver-example/ruby/app/models/document_helper.rb | 4 ++-- web/documentserver-example/ruby/app/models/track_helper.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 9da15f2d5..d708dacbf 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -228,7 +228,7 @@ def get_file_uri(file_name, for_document_server) def get_historypath_uri(file_name, version, file, is_serverUrl = true) # for redirection to my link user_host = is_serverUrl ? '&userAddress=' + cur_user_host_address(nil) : "" - uri = get_server_url(is_serverUrl) + '/downloadhistory/?fileName=' + ERB::Util.url_encode(file_name) + '&ver='+ version.to_s + '&file='+ ERB::Util.url_encode(file) + user_host + uri = get_server_url(is_serverUrl) + '/downloadhistory/?fileName=' + ERB::Util.url_encode(file_name) + '&ver=' + version.to_s + '&file=' + ERB::Util.url_encode(file) + user_host return uri end @@ -302,7 +302,7 @@ def get_files_info(file_id) info = { "version" => get_file_version(history_dir(directory)), "id" => ServiceConverter.generate_revision_id("#{uri}.#{File.mtime(directory).to_s}"), - "contentLength" => "#{(File.size(directory)/ 1024.0).round(2)} KB", + "contentLength" => "#{(File.size(directory) / 1024.0).round(2)} KB", "pureContentLength" => File.size(directory), "title" => fileName, "updated" => File.mtime(directory) diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 90c1d9882..31c6627a2 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -107,7 +107,7 @@ def process_save(raw_file_data, file_name, user_address) end new_file_name = file_name - download_ext = "."+file_data['filetype'] # get the extension of the downloaded file + download_ext = "." + file_data['filetype'] # get the extension of the downloaded file cur_ext = File.extname(file_name).downcase # get current file extension @@ -184,7 +184,7 @@ def process_force_save(file_data, file_name, user_address) return saved end - download_ext = "."+file_data['filetype'] # get the extension of the downloaded file + download_ext = "." + file_data['filetype'] # get the extension of the downloaded file cur_ext = File.extname(file_name).downcase # get current file extension From 95de0fc2c7d15f81b23a14d0858688102f5b5fc7 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 13:50:09 +0300 Subject: [PATCH 264/488] ruby: Layout/CaseIndentation correct --- .../ruby/app/models/document_helper.rb | 12 ++++++------ .../ruby/app/models/service_converter.rb | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index d708dacbf..dc2abb911 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -260,11 +260,11 @@ def get_download_url(file_name, is_serverUrl = true) # get internal file extension by its type def get_internal_extension(file_type) case file_type - when 'word' # .docx for word type + when 'word' # .docx for word type ext = '.docx' - when 'cell' # .xlsx for cell type + when 'cell' # .xlsx for cell type ext = '.xlsx' - when 'slide' # .pptx for slide type + when 'slide' # .pptx for slide type ext = '.pptx' else ext = '.docx' # the default value is .docx @@ -277,11 +277,11 @@ def get_internal_extension(file_type) def get_template_image_url(file_type) path = get_server_url(true) + "/assets/" case file_type - when 'word' # for word type + when 'word' # for word type full_path = path + 'file_docx.svg' - when 'cell' # .xlsx for cell type + when 'cell' # .xlsx for cell type full_path = path + 'file_xlsx.svg' - when 'slide' # .pptx for slide type + when 'slide' # .pptx for slide type full_path = path + 'file_pptx.svg' else full_path = path + 'file_docx.svg' # the default value is .docx diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index 5f6e3cafe..cbf966bd4 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -107,23 +107,23 @@ def process_convert_service_responce_error(error_code) # add an error message to the error message template depending on the error code case error_code - when -8 + when -8 error_message = 'Error occurred in the ConvertService.ashx: Error document VKey' - when -7 + when -7 error_message = 'Error occurred in the ConvertService.ashx: Error document request' - when -6 + when -6 error_message = 'Error occurred in the ConvertService.ashx: Error database' - when -5 + when -5 error_message = 'Error occurred in the ConvertService.ashx: Incorrect password' - when -4 + when -4 error_message = 'Error occurred in the ConvertService.ashx: Error download error' - when -3 + when -3 error_message = 'Error occurred in the ConvertService.ashx: Error convertation error' - when -2 + when -2 error_message = 'Error occurred in the ConvertService.ashx: Error convertation timeout' - when -1 + when -1 error_message = 'Error occurred in the ConvertService.ashx: Error convertation unknown' - when 0 + when 0 # public const int c_nErrorNo = 0 else error_message = 'ErrorCode = ' + error_code.to_s # default value for the error message From 831e59b3901aa73d5a22b3d738aef43773249a3e Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 13:50:53 +0300 Subject: [PATCH 265/488] ruby: Layout/EmptyLineBetweenDefs correct --- web/documentserver-example/ruby/app/models/document_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index dc2abb911..8fc44dd82 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -324,6 +324,7 @@ def get_files_info(file_id) return result end end + # enable ignore certificate def verify_ssl(file_uri, http) if file_uri.start_with?('https') && DocumentHelper.config_manager.ssl_verify_peer_mode_enabled From 8ddbb6ba18e32834271b530c82acdaf3ad81e454 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 13:51:36 +0300 Subject: [PATCH 266/488] ruby: Layout/EmptyLinesAroundBeginBody correct --- web/documentserver-example/ruby/app/models/service_converter.rb | 1 - web/documentserver-example/ruby/app/models/track_helper.rb | 1 - 2 files changed, 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index cbf966bd4..aee29c3cb 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -52,7 +52,6 @@ def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_ data = nil begin - uri = URI.parse(@@document_converter_url) # create the request url http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 31c6627a2..8f652c0ae 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -261,7 +261,6 @@ def command_request(method, key, meta = nil) data = nil begin - uri = URI.parse(@@document_command_url) # parse the document command url http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server From d8b0bd55cfff3171f6415c5e06cd9ba423432cb6 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 13:52:07 +0300 Subject: [PATCH 267/488] ruby: Layout/FirstHashElementIndentation correct --- web/documentserver-example/ruby/app/models/track_helper.rb | 2 +- web/documentserver-example/ruby/app/models/users.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 8f652c0ae..1abf4d729 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -251,7 +251,7 @@ def process_force_save(file_data, file_name, user_address) def command_request(method, key, meta = nil) # create a payload object with the method and key payload = { - :c => method, + :c => method, :key => key } diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 3d801aae2..c4c003d85 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -90,7 +90,7 @@ class Users nil, [], @@descr_user_1, true, true), User.new("uid-2", "Mark Pottato", "pottato@example.com", "group-2", ["group-2", ""], { - :view => "", + :view => "", :edit => ["group-2", ""], :remove => ["group-2"] }, @@ -98,7 +98,7 @@ class Users true, [], @@descr_user_2, false, true), User.new("uid-3", "Hamish Mitchell", nil, "group-3", ["group-2"], { - :view => ["group-3", "group-2"], + :view => ["group-3", "group-2"], :edit => ["group-2"], :remove => [] }, From dcf78b13f2f63df863038e65fb1aab2fd49611c1 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 13:52:39 +0300 Subject: [PATCH 268/488] ruby: Layout/ArgumentAlignment correct --- .../ruby/app/models/users.rb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index c4c003d85..84e3d3f23 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -16,7 +16,7 @@ class User attr_accessor :id, :name, :email, :group, :reviewGroups, :commentGroups, :userInfoGroups, :favorite, - :deniedPermissions, :descriptions, :templates, :avatar + :deniedPermissions, :descriptions, :templates, :avatar def initialize(id, name, email, group, reviewGroups, commentGroups, userInfoGroups, favorite, deniedPermissions, descriptions, templates, avatar) @@ -86,27 +86,27 @@ class Users @@users = [ User.new("uid-1", "John Smith", "smith@example.com", - "", nil, {}, nil, - nil, [], @@descr_user_1, true, true), + "", nil, {}, nil, + nil, [], @@descr_user_1, true, true), User.new("uid-2", "Mark Pottato", "pottato@example.com", - "group-2", ["group-2", ""], { + "group-2", ["group-2", ""], { :view => "", :edit => ["group-2", ""], :remove => ["group-2"] }, ["group-2", ""], - true, [], @@descr_user_2, false, true), + true, [], @@descr_user_2, false, true), User.new("uid-3", "Hamish Mitchell", nil, - "group-3", ["group-2"], { + "group-3", ["group-2"], { :view => ["group-3", "group-2"], :edit => ["group-2"], :remove => [] }, ["group-2"], - false, ["copy", "download", "print"], @@descr_user_3, false, false), + false, ["copy", "download", "print"], @@descr_user_3, false, false), User.new("uid-0", nil, nil, - "", nil, {}, [], - nil, ["protect"], @@descr_user_0, false, false) + "", nil, {}, [], + nil, ["protect"], @@descr_user_0, false, false) ] class << self From b6e71e42c1fbaeef7251872640c2dd08bc5db249 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 13:53:08 +0300 Subject: [PATCH 269/488] ruby: Layout/ParameterAlignment correct --- web/documentserver-example/ruby/app/models/users.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 84e3d3f23..01a9b27b6 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -19,7 +19,7 @@ class User :deniedPermissions, :descriptions, :templates, :avatar def initialize(id, name, email, group, reviewGroups, commentGroups, userInfoGroups, favorite, - deniedPermissions, descriptions, templates, avatar) + deniedPermissions, descriptions, templates, avatar) @id = id @name = name @email = email From 2d3fc7228300ef823939b07028723909d9b201cc Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 13:53:42 +0300 Subject: [PATCH 270/488] ruby: Layout/FirstArrayElementIndentation correct --- .../ruby/app/models/users.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 01a9b27b6..a7c367ba9 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -37,7 +37,7 @@ def initialize(id, name, email, group, reviewGroups, commentGroups, userInfoGrou class Users @@descr_user_1 = [ - "File author by default", + "File author by default", "Doesn’t belong to any group", "Can review all the changes", "Can perform all actions with comments", @@ -48,7 +48,7 @@ class Users ]; @@descr_user_2 = [ - "Belongs to Group2", + "Belongs to Group2", "Can review only his own changes or changes made by users with no group", "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only", "This file is marked as favorite", @@ -58,7 +58,7 @@ class Users ]; @@descr_user_3 = [ - "Belongs to Group3", + "Belongs to Group3", "Can review changes made by Group2 users", "Can view comments left by Group2 and Group3 users. Can edit comments left by the Group2 users", "This file isn’t marked as favorite", @@ -70,7 +70,7 @@ class Users ]; @@descr_user_0 = [ - "The name is requested when the editor is opened", + "The name is requested when the editor is opened", "Doesn’t belong to any group", "Can review all the changes", "Can perform all actions with comments", @@ -85,9 +85,9 @@ class Users ]; @@users = [ - User.new("uid-1", "John Smith", "smith@example.com", - "", nil, {}, nil, - nil, [], @@descr_user_1, true, true), + User.new("uid-1", "John Smith", "smith@example.com", + "", nil, {}, nil, + nil, [], @@descr_user_1, true, true), User.new("uid-2", "Mark Pottato", "pottato@example.com", "group-2", ["group-2", ""], { :view => "", From 63c04c85b0608294a835c938828ed41c749495cd Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 14:01:39 +0300 Subject: [PATCH 271/488] ruby: Lint/ParenthesesAsGroupedExpression correct --- .../ruby/app/controllers/home_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 68868fde4..86bc277eb 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -101,7 +101,7 @@ def convert extension = File.extname(file_name).downcase internal_extension = 'ooxml' - if DocumentHelper.convert_exts.include? (extension) # check if the file with such an extension can be converted + if DocumentHelper.convert_exts.include?(extension) # check if the file with such an extension can be converted key = ServiceConverter.generate_revision_id(file_uri) # generate document key percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data(file_uri, extension.delete('.'), internal_extension.delete('.'), key, true, file_pass, lang) # get the url and file type of the converted file and the conversion percentage From de32be3945590b7d12fc2ebccae68caac9dee74a Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 14:30:45 +0300 Subject: [PATCH 272/488] ruby: Lint/RedundantStringCoercion correct --- .../ruby/app/controllers/home_controller.rb | 2 +- web/documentserver-example/ruby/app/models/document_helper.rb | 2 +- web/documentserver-example/ruby/app/models/file_model.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 86bc277eb..4c8f38f62 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -421,7 +421,7 @@ def reference data = { :fileType => File.extname(fileName).downcase.delete("."), - :key => ServiceConverter.generate_revision_id("#{DocumentHelper.cur_user_host_address(nil) + '/' + fileName}.#{File.mtime(DocumentHelper.storage_path(fileName, nil)).to_s}"), + :key => ServiceConverter.generate_revision_id("#{DocumentHelper.cur_user_host_address(nil) + '/' + fileName}.#{File.mtime(DocumentHelper.storage_path(fileName, nil))}"), :url => DocumentHelper.get_download_url(fileName), :directUrl => body["directUrl"] ? DocumentHelper.get_download_url(fileName, false) : nil, :referenceData => { diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 8fc44dd82..7c45357eb 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -301,7 +301,7 @@ def get_files_info(file_id) # write file parameters to the info object info = { "version" => get_file_version(history_dir(directory)), - "id" => ServiceConverter.generate_revision_id("#{uri}.#{File.mtime(directory).to_s}"), + "id" => ServiceConverter.generate_revision_id("#{uri}.#{File.mtime(directory)}"), "contentLength" => "#{(File.size(directory) / 1024.0).round(2)} KB", "pureContentLength" => File.size(directory), "title" => fileName, diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 407c34bea..e2c4ec5de 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -61,7 +61,7 @@ def document_type def key uri = DocumentHelper.cur_user_host_address(nil) + '/' + @file_name # get current user host address stat = File.mtime(DocumentHelper.storage_path(@file_name, nil)) # get the modification time of the given file - return ServiceConverter.generate_revision_id("#{uri}.#{stat.to_s}") + return ServiceConverter.generate_revision_id("#{uri}.#{stat}") end # get callback url From 5e29215a11d02d6e7ebf66e937b7a6402e4e7954 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 14:38:10 +0300 Subject: [PATCH 273/488] ruby: Style/StringLiterals correct --- web/documentserver-example/ruby/Gemfile | 46 ++--- .../ruby/app/controllers/home_controller.rb | 72 ++++---- .../ruby/app/models/document_helper.rb | 38 ++-- .../ruby/app/models/file_model.rb | 174 +++++++++--------- .../ruby/app/models/jwt_helper.rb | 2 +- .../ruby/app/models/service_converter.rb | 6 +- .../ruby/app/models/track_helper.rb | 50 ++--- .../ruby/app/models/users.rb | 96 +++++----- 8 files changed, 242 insertions(+), 242 deletions(-) diff --git a/web/documentserver-example/ruby/Gemfile b/web/documentserver-example/ruby/Gemfile index f826fb4c4..43adf6cd6 100644 --- a/web/documentserver-example/ruby/Gemfile +++ b/web/documentserver-example/ruby/Gemfile @@ -1,25 +1,25 @@ -source "https://rubygems.org" +source 'https://rubygems.org' -gem "byebug", "~> 11.1", :groups => [:development, :test] -gem "coffee-rails", "~> 5.0" -gem "dalli", "~> 3.2", :group => :development -gem "jbuilder", "~> 2.11" -gem "jquery-rails", "~> 4.5" -gem "jwt", "~> 2.7" -gem "mimemagic", github: "mimemagicrb/mimemagic", ref: "01f92d86d15d85cfd0f20dabd025dcbd36a8a60f" -gem "rack-cors", "~> 2.0" -gem "rails", "~> 7.0.8" -gem "rubocop", "~> 1.52", :group => :development -gem "sass-rails", "~> 6.0" -gem "sdoc", "~> 2.6", :group => :doc -gem "sorbet-runtime", "~> 0.5.10871" -gem "test-unit", "~> 3.6", :groups => [:development, :test] -gem "turbolinks", "~> 5.2" -gem "tzinfo-data", "~> 1.2023" -gem "uglifier", "~> 4.2" -gem "uuid", "~> 2.3" -gem "web-console", "~> 4.2", :groups => [:development, :test] -gem "webrick", "~> 1.8" +gem 'byebug', '~> 11.1', :groups => [:development, :test] +gem 'coffee-rails', '~> 5.0' +gem 'dalli', '~> 3.2', :group => :development +gem 'jbuilder', '~> 2.11' +gem 'jquery-rails', '~> 4.5' +gem 'jwt', '~> 2.7' +gem 'mimemagic', github: 'mimemagicrb/mimemagic', ref: '01f92d86d15d85cfd0f20dabd025dcbd36a8a60f' +gem 'rack-cors', '~> 2.0' +gem 'rails', '~> 7.0.8' +gem 'rubocop', '~> 1.52', :group => :development +gem 'sass-rails', '~> 6.0' +gem 'sdoc', '~> 2.6', :group => :doc +gem 'sorbet-runtime', '~> 0.5.10871' +gem 'test-unit', '~> 3.6', :groups => [:development, :test] +gem 'turbolinks', '~> 5.2' +gem 'tzinfo-data', '~> 1.2023' +gem 'uglifier', '~> 4.2' +gem 'uuid', '~> 2.3' +gem 'web-console', '~> 4.2', :groups => [:development, :test] +gem 'webrick', '~> 1.8' # Unfortunately, Sorbet only supports Darwin and Linux-based systems. # Additionally, it doesn't support Linux on ARM64, which may be used in a Docker @@ -28,6 +28,6 @@ gem "webrick", "~> 1.8" # https://github.com/sorbet/sorbet/issues/4011 # https://github.com/sorbet/sorbet/issues/4119 install_if -> { RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /x86_64/ } do - gem "sorbet", "~> 0.5.10871", :group => :development - gem "tapioca", "~> 0.11.6", :group => :development + gem 'sorbet', '~> 0.5.10871', :group => :development + gem 'tapioca', '~> 0.11.6', :group => :development end diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 4c8f38f62..b968b45bb 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -89,14 +89,14 @@ def convert begin file_data = request.body.read if file_data == nil || file_data.empty? - return "" + return '' end body = JSON.parse(file_data) - file_name = File.basename(body["filename"]) - lang = cookies[:ulang] ? cookies[:ulang] : "en" - file_pass = body["filePass"] ? body["filePass"] : nil + file_name = File.basename(body['filename']) + lang = cookies[:ulang] ? cookies[:ulang] : 'en' + file_pass = body['filePass'] ? body['filePass'] : nil file_uri = DocumentHelper.get_download_url(file_name) extension = File.extname(file_name).downcase internal_extension = 'ooxml' @@ -112,7 +112,7 @@ def convert end # get the correct file name if such a name already exists - correct_name = DocumentHelper.get_correct_name(File.basename(file_name, extension) + "." + new_file_type, nil) + correct_name = DocumentHelper.get_correct_name(File.basename(file_name, extension) + '.' + new_file_type, nil) uri = URI.parse(new_file_uri) # create the request url http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server @@ -162,18 +162,18 @@ def downloadhistory jwtHeader = HomeController.config_manager.jwt_header; if request.headers[jwtHeader] hdr = request.headers[jwtHeader] - hdr.slice!(0, "Bearer ".length) + hdr.slice!(0, 'Bearer '.length) token = JwtHelper.decode(hdr) - if !token || token.eql?("") - render plain: "JWT validation failed", :status => 403 + if !token || token.eql?('') + render plain: 'JWT validation failed', :status => 403 return end else - render plain: "JWT validation failed", :status => 403 + render plain: 'JWT validation failed', :status => 403 return end end - hist_path = DocumentHelper.storage_path(file_name, user_address) + "-hist" # or to the original document + hist_path = DocumentHelper.storage_path(file_name, user_address) + '-hist' # or to the original document file_path = File.join(hist_path, version, file) @@ -205,7 +205,7 @@ def track if file_data['actions'][0]['type'] == 0 # finished edit user = file_data['actions'][0]['userid'] # get the user id if !file_data['users'].index(user) - json_data = TrackHelper.command_request("forcesave", file_data['key']) # call the forcesave command + json_data = TrackHelper.command_request('forcesave', file_data['key']) # call the forcesave command end end end @@ -259,7 +259,7 @@ def files # downloading a csv file def csv - file_name = "csv.csv" + file_name = 'csv.csv' csvPath = Rails.root.join('assets', 'document-templates', 'sample', file_name) # add headers to the response to specify the page parameters @@ -281,17 +281,17 @@ def download jwtHeader = HomeController.config_manager.jwt_header; if request.headers[jwtHeader] hdr = request.headers[jwtHeader] - hdr.slice!(0, "Bearer ".length) + hdr.slice!(0, 'Bearer '.length) token = JwtHelper.decode(hdr) end - if !token || token.eql?("") - render plain: "JWT validation failed", :status => 403 + if !token || token.eql?('') + render plain: 'JWT validation failed', :status => 403 return end end file_path = DocumentHelper.forcesave_path(file_name, user_address, false) # get the path to the force saved document version - if file_path.eql?("") + if file_path.eql?('') file_path = DocumentHelper.storage_path(file_name, user_address) # or to the original document end @@ -310,8 +310,8 @@ def download def saveas begin body = JSON.parse(request.body.read) - file_url = body["url"] - title = body["title"] + file_url = body['url'] + title = body['title'] file_name = DocumentHelper.get_correct_name(title, nil) extension = File.extname(file_name).downcase all_exts = DocumentHelper.convert_exts + DocumentHelper.edited_exts + DocumentHelper.viewed_exts + DocumentHelper.fill_forms_exts @@ -352,10 +352,10 @@ def saveas # Rename... def rename body = JSON.parse(request.body.read) - dockey = body["dockey"] - newfilename = body["newfilename"] + dockey = body['dockey'] + newfilename = body['newfilename'] - orig_ext = '.' + body["ext"] + orig_ext = '.' + body['ext'] cur_ext = File.extname(newfilename).downcase if orig_ext != cur_ext newfilename += orig_ext @@ -365,30 +365,30 @@ def rename :title => newfilename } - json_data = TrackHelper.command_request("meta", dockey, meta) + json_data = TrackHelper.command_request('meta', dockey, meta) render plain: '{ "result" : "' + JSON.dump(json_data) + '"}' end # ReferenceData def reference body = JSON.parse(request.body.read) - fileName = "" + fileName = '' - if body.key?("referenceData") - referenceData = body["referenceData"] - instanceId = referenceData["instanceId"] + if body.key?('referenceData') + referenceData = body['referenceData'] + instanceId = referenceData['instanceId'] if instanceId == DocumentHelper.get_server_url(false) - fileKey = JSON.parse(referenceData["fileKey"]) - userAddress = fileKey["userAddress"] + fileKey = JSON.parse(referenceData['fileKey']) + userAddress = fileKey['userAddress'] if userAddress == DocumentHelper.cur_user_host_address(nil) - fileName = fileKey["fileName"] + fileName = fileKey['fileName'] end end end - link = body["link"] - if fileName.empty? and body.key?("link") + link = body['link'] + if fileName.empty? and body.key?('link') if !link.include?(DocumentHelper.get_server_url(false)) data = { url: link, @@ -407,8 +407,8 @@ def reference end end - if fileName.empty? and body.key?("path") - path = File.basename(body["path"]) + if fileName.empty? and body.key?('path') + path = File.basename(body['path']) if File.exist?(DocumentHelper.storage_path(path, nil)) fileName = path end @@ -420,10 +420,10 @@ def reference end data = { - :fileType => File.extname(fileName).downcase.delete("."), + :fileType => File.extname(fileName).downcase.delete('.'), :key => ServiceConverter.generate_revision_id("#{DocumentHelper.cur_user_host_address(nil) + '/' + fileName}.#{File.mtime(DocumentHelper.storage_path(fileName, nil))}"), :url => DocumentHelper.get_download_url(fileName), - :directUrl => body["directUrl"] ? DocumentHelper.get_download_url(fileName, false) : nil, + :directUrl => body['directUrl'] ? DocumentHelper.get_download_url(fileName, false) : nil, :referenceData => { :instanceId => DocumentHelper.get_server_url(false), :fileKey => { :fileName => fileName, :userAddress => DocumentHelper.cur_user_host_address(nil) }.to_json @@ -433,7 +433,7 @@ def reference } if JwtHelper.is_enabled - data["token"] = JwtHelper.encode(data) + data['token'] = JwtHelper.encode(data) end render plain: data.to_json diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 7c45357eb..445deddd6 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -89,7 +89,7 @@ def forcesave_path(file_name, user_address, create) # the directory with host address doesn't exist unless File.directory?(directory) - return "" + return '' end directory = File.join(directory, "#{File.basename(file_name)}-hist") # get the path to the history of the given file @@ -97,14 +97,14 @@ def forcesave_path(file_name, user_address, create) if create FileUtils.mkdir_p(directory) # create history directory if it doesn't exist else - return "" # the history directory doesn't exist and we are not supposed to create it + return '' # the history directory doesn't exist and we are not supposed to create it end end directory = File.join(directory, File.basename(file_name)) # get the path to the given file unless File.file?(directory) if !create - return "" + return '' end end @@ -136,8 +136,8 @@ def get_file_version(hist_dir) ver = 1 Dir.foreach(hist_dir) { |e| # run through all the file versions - next if e.eql?(".") - next if e.eql?("..") + next if e.eql?('.') + next if e.eql?('..') if File.directory?(File.join(hist_dir, e)) ver += 1 # and count them @@ -172,8 +172,8 @@ def get_stored_files(user_address) if Dir.exist?(directory) Dir.foreach(directory) { |e| # run through all the elements from the folder - next if e.eql?(".") - next if e.eql?("..") + next if e.eql?('.') + next if e.eql?('..') next if File.directory?(File.join(directory, e)) # if the element is a directory, skip it arr.push(e) # push the file to the array @@ -195,7 +195,7 @@ def create_meta(file_name, uid, uname, user_address) } # write file meta information to the createdInfo.json file - File.open(File.join(hist_dir, "createdInfo.json"), 'wb') do |file| + File.open(File.join(hist_dir, 'createdInfo.json'), 'wb') do |file| file.write(json.to_json) end end @@ -227,7 +227,7 @@ def get_file_uri(file_name, for_document_server) # get history path url def get_historypath_uri(file_name, version, file, is_serverUrl = true) # for redirection to my link - user_host = is_serverUrl ? '&userAddress=' + cur_user_host_address(nil) : "" + user_host = is_serverUrl ? '&userAddress=' + cur_user_host_address(nil) : '' uri = get_server_url(is_serverUrl) + '/downloadhistory/?fileName=' + ERB::Util.url_encode(file_name) + '&ver=' + version.to_s + '&file=' + ERB::Util.url_encode(file) + user_host return uri end @@ -253,7 +253,7 @@ def get_create_url(document_type) # get url to download a file def get_download_url(file_name, is_serverUrl = true) - user_host = is_serverUrl ? '&userAddress=' + cur_user_host_address(nil) : "" + user_host = is_serverUrl ? '&userAddress=' + cur_user_host_address(nil) : '' get_server_url(is_serverUrl) + '/download?fileName=' + ERB::Util.url_encode(file_name) + user_host end @@ -275,7 +275,7 @@ def get_internal_extension(file_type) # get image url for templates def get_template_image_url(file_type) - path = get_server_url(true) + "/assets/" + path = get_server_url(true) + '/assets/' case file_type when 'word' # for word type full_path = path + 'file_docx.svg' @@ -300,18 +300,18 @@ def get_files_info(file_id) # write file parameters to the info object info = { - "version" => get_file_version(history_dir(directory)), - "id" => ServiceConverter.generate_revision_id("#{uri}.#{File.mtime(directory)}"), - "contentLength" => "#{(File.size(directory) / 1024.0).round(2)} KB", - "pureContentLength" => File.size(directory), - "title" => fileName, - "updated" => File.mtime(directory) + 'version' => get_file_version(history_dir(directory)), + 'id' => ServiceConverter.generate_revision_id("#{uri}.#{File.mtime(directory)}"), + 'contentLength' => "#{(File.size(directory) / 1024.0).round(2)} KB", + 'pureContentLength' => File.size(directory), + 'title' => fileName, + 'updated' => File.mtime(directory) } if file_id == nil # if file id is undefined result.push(info) # push info object to the response array else # if file id is defined - if file_id.eql?(info["id"]) # and it is equal to the document key value + if file_id.eql?(info['id']) # and it is equal to the document key value result.push(info) # response object will be equal to the info object return result end @@ -319,7 +319,7 @@ def get_files_info(file_id) end if file_id != nil - return "\"File not found\"" + return '"File not found"' else return result end diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index e2c4ec5de..d0b1e531b 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -34,7 +34,7 @@ def initialize(attributes = {}) end def type - @type ? @type : "desktop" # the default platform type is desktop + @type ? @type : 'desktop' # the default platform type is desktop end # get file extension from its name @@ -49,7 +49,7 @@ def file_uri # get file uri for document server def file_uri_user - @config_manager.storage_path.absolute? ? download_url + "&dmode=emb" : DocumentHelper.get_file_uri(@file_name, false) + @config_manager.storage_path.absolute? ? download_url + '&dmode=emb' : DocumentHelper.get_file_uri(@file_name, false) end # get document type from its name (word, cell or slide) @@ -86,25 +86,25 @@ def cur_user_host_address # get config parameters def get_config - editorsmode = @mode ? @mode : "edit" # mode: view/edit/review/comment/fillForms/embedded + editorsmode = @mode ? @mode : 'edit' # mode: view/edit/review/comment/fillForms/embedded canEdit = DocumentHelper.edited_exts.include?(file_ext) # check if the document can be edited - if (!canEdit && editorsmode.eql?("edit") || editorsmode.eql?("fillForms")) && DocumentHelper.fill_forms_exts.include?(file_ext) - editorsmode = "fillForms" + if (!canEdit && editorsmode.eql?('edit') || editorsmode.eql?('fillForms')) && DocumentHelper.fill_forms_exts.include?(file_ext) + editorsmode = 'fillForms' canEdit = true end - submitForm = editorsmode.eql?("fillForms") && @user.id.eql?("uid-1") && false # the Submit form button state - mode = canEdit && !editorsmode.eql?("view") ? "edit" : "view" + submitForm = editorsmode.eql?('fillForms') && @user.id.eql?('uid-1') && false # the Submit form button state + mode = canEdit && !editorsmode.eql?('view') ? 'edit' : 'view' templatesImageUrl = DocumentHelper.get_template_image_url(document_type) # templates image url in the "From Template" section templates = [ { - :image => "", - :title => "Blank", + :image => '', + :title => 'Blank', :url => create_url }, { :image => templatesImageUrl, - :title => "With sample content", - :url => create_url + "&sample=true" + :title => 'With sample content', + :url => create_url + '&sample=true' } ] @@ -114,48 +114,48 @@ def get_config :document => { :title => @file_name, :url => download_url, - :directUrl => is_enable_direct_url ? download_url(false) : "", - :fileType => file_ext.delete("."), + :directUrl => is_enable_direct_url ? download_url(false) : '', + :fileType => file_ext.delete('.'), :key => key, :info => { - :owner => "Me", + :owner => 'Me', :uploaded => Time.now.to_s, :favorite => @user.favorite }, :permissions => { # the permission for the document to be edited and downloaded or not - :comment => !editorsmode.eql?("view") && !editorsmode.eql?("fillForms") && !editorsmode.eql?("embedded") && !editorsmode.eql?("blockcontent"), - :copy => !@user.deniedPermissions.include?("copy"), - :download => !@user.deniedPermissions.include?("download"), - :edit => canEdit && (editorsmode.eql?("edit") || editorsmode.eql?("view") || editorsmode.eql?("filter") || editorsmode.eql?("blockcontent")), - :print => !@user.deniedPermissions.include?("print"), - :fillForms => !editorsmode.eql?("view") && !editorsmode.eql?("comment") && !editorsmode.eql?("embedded") && !editorsmode.eql?("blockcontent"), - :modifyFilter => !editorsmode.eql?("filter"), - :modifyContentControl => !editorsmode.eql?("blockcontent"), - :review => canEdit && (editorsmode.eql?("edit") || editorsmode.eql?("review")), - :chat => !@user.id.eql?("uid-0"), + :comment => !editorsmode.eql?('view') && !editorsmode.eql?('fillForms') && !editorsmode.eql?('embedded') && !editorsmode.eql?('blockcontent'), + :copy => !@user.deniedPermissions.include?('copy'), + :download => !@user.deniedPermissions.include?('download'), + :edit => canEdit && (editorsmode.eql?('edit') || editorsmode.eql?('view') || editorsmode.eql?('filter') || editorsmode.eql?('blockcontent')), + :print => !@user.deniedPermissions.include?('print'), + :fillForms => !editorsmode.eql?('view') && !editorsmode.eql?('comment') && !editorsmode.eql?('embedded') && !editorsmode.eql?('blockcontent'), + :modifyFilter => !editorsmode.eql?('filter'), + :modifyContentControl => !editorsmode.eql?('blockcontent'), + :review => canEdit && (editorsmode.eql?('edit') || editorsmode.eql?('review')), + :chat => !@user.id.eql?('uid-0'), :reviewGroups => @user.reviewGroups, :commentGroups => @user.commentGroups, :userInfoGroups => @user.userInfoGroups, - :protect => !@user.deniedPermissions.include?("protect") + :protect => !@user.deniedPermissions.include?('protect') }, :referenceData => { :instanceId => DocumentHelper.get_server_url(false), - :fileKey => !@user.id.eql?("uid-0") ? { :fileName => @file_name, :userAddress => DocumentHelper.cur_user_host_address(nil) }.to_json : nil + :fileKey => !@user.id.eql?('uid-0') ? { :fileName => @file_name, :userAddress => DocumentHelper.cur_user_host_address(nil) }.to_json : nil } }, :editorConfig => { :actionLink => @action_data ? JSON.parse(@action_data) : nil, :mode => mode, - :lang => @lang ? @lang : "en", + :lang => @lang ? @lang : 'en', :callbackUrl => callback_url, # absolute URL to the document storage service - :coEditing => editorsmode.eql?("view") && @user.id.eql?("uid-0") ? { - :mode => "strict", + :coEditing => editorsmode.eql?('view') && @user.id.eql?('uid-0') ? { + :mode => 'strict', :change => false } : nil, - :createUrl => !@user.id.eql?("uid-0") ? create_url : nil, + :createUrl => !@user.id.eql?('uid-0') ? create_url : nil, :templates => @user.templates ? templates : nil, :user => { # the user currently viewing or editing the document - :id => !@user.id.eql?("uid-0") ? @user.id : nil, + :id => !@user.id.eql?('uid-0') ? @user.id : nil, :name => @user.name, :group => @user.group, :image => @user.avatar ? "#{DocumentHelper.get_server_url(true)}/assets/#{@user.id}.png" : nil @@ -164,7 +164,7 @@ def get_config :saveUrl => download_url(false), # the absolute URL that will allow the document to be saved onto the user personal computer :embedUrl => download_url(false), # the absolute URL to the document serving as a source file for the document embedded into the web page :shareUrl => download_url(false), # the absolute URL that will allow other users to share this document - :toolbarDocked => "top" # the place for the embedded viewer toolbar (top or bottom) + :toolbarDocked => 'top' # the place for the embedded viewer toolbar (top or bottom) }, :customization => { # the parameters for the editor interface :about => true, # the About section display @@ -180,7 +180,7 @@ def get_config } if JwtHelper.is_enabled # check if a secret key to generate token exists or not - config["token"] = JwtHelper.encode(config) # encode a payload object into a token and write it to the config + config['token'] = JwtHelper.encode(config) # encode a payload object into a token and write it to the config end return config @@ -208,70 +208,70 @@ def get_history # get document key cur_key = doc_key if (i != cur_ver) - File.open(File.join(ver_dir, "key.txt"), 'r') do |file| + File.open(File.join(ver_dir, 'key.txt'), 'r') do |file| cur_key = file.read() end end - obj["key"] = cur_key - obj["version"] = i + obj['key'] = cur_key + obj['version'] = i if (i == 1) # check if the version number is equal to 1 - if File.file?(File.join(hist_dir, "createdInfo.json")) # check if the createdInfo.json file with meta data exists - File.open(File.join(hist_dir, "createdInfo.json"), 'r') do |file| # open it + if File.file?(File.join(hist_dir, 'createdInfo.json')) # check if the createdInfo.json file with meta data exists + File.open(File.join(hist_dir, 'createdInfo.json'), 'r') do |file| # open it cr_info = JSON.parse(file.read()) # parse the file content # write information about changes to the object - obj["created"] = cr_info["created"] - obj["user"] = { - :id => cr_info["uid"], - :name => cr_info["uname"] + obj['created'] = cr_info['created'] + obj['user'] = { + :id => cr_info['uid'], + :name => cr_info['uname'] } end end end # get the history data from the previous file version and write key and url information about it - dataObj["fileType"] = file_ext[1..file_ext.length] - dataObj["key"] = cur_key - dataObj["url"] = i == cur_ver ? doc_uri : DocumentHelper.get_historypath_uri(file_name, i, "prev#{file_ext}") + dataObj['fileType'] = file_ext[1..file_ext.length] + dataObj['key'] = cur_key + dataObj['url'] = i == cur_ver ? doc_uri : DocumentHelper.get_historypath_uri(file_name, i, "prev#{file_ext}") if is_enable_direct_url == true - dataObj["directUrl"] = i == cur_ver ? download_url(false) : DocumentHelper.get_historypath_uri(file_name, i, "prev#{file_ext}", false) + dataObj['directUrl'] = i == cur_ver ? download_url(false) : DocumentHelper.get_historypath_uri(file_name, i, "prev#{file_ext}", false) end - dataObj["version"] = i + dataObj['version'] = i if (i > 1) # check if the version number is greater than 1 changes = nil change = nil - File.open(File.join(DocumentHelper.version_dir(hist_dir, i - 1), "changes.json"), 'r') do |file| # get the path to the changes.json file + File.open(File.join(DocumentHelper.version_dir(hist_dir, i - 1), 'changes.json'), 'r') do |file| # get the path to the changes.json file changes = JSON.parse(file.read()) # and parse its content end - change = changes["changes"][0] + change = changes['changes'][0] # write information about changes to the object - obj["changes"] = change ? changes["changes"] : nil - obj["serverVersion"] = changes["serverVersion"] - obj["created"] = change ? change["created"] : nil - obj["user"] = change ? change["user"] : nil + obj['changes'] = change ? changes['changes'] : nil + obj['serverVersion'] = changes['serverVersion'] + obj['created'] = change ? change['created'] : nil + obj['user'] = change ? change['user'] : nil prev = histData[(i - 2).to_s] # get the history data from the previous file version - dataObj["previous"] = is_enable_direct_url == true ? { # write key and url information about previous file version with optional direct url - :fileType => prev["fileType"], - :key => prev["key"], - :url => prev["url"], - :directUrl => prev["directUrl"] + dataObj['previous'] = is_enable_direct_url == true ? { # write key and url information about previous file version with optional direct url + :fileType => prev['fileType'], + :key => prev['key'], + :url => prev['url'], + :directUrl => prev['directUrl'] } : { - :fileType => prev["fileType"], - :key => prev["key"], - :url => prev["url"] + :fileType => prev['fileType'], + :key => prev['key'], + :url => prev['url'] } # write the path to the diff.zip archive with differences in this file version - dataObj["changesUrl"] = DocumentHelper.get_historypath_uri(file_name, i - 1, "diff.zip") + dataObj['changesUrl'] = DocumentHelper.get_historypath_uri(file_name, i - 1, 'diff.zip') end if JwtHelper.is_enabled # check if a secret key to generate token exists or not - dataObj["token"] = JwtHelper.encode(dataObj) # encode a payload object into a token and write it to the data object + dataObj['token'] = JwtHelper.encode(dataObj) # encode a payload object into a token and write it to the data object end hist.push(obj) # add object dictionary to the hist list @@ -293,34 +293,34 @@ def get_history # get image information def get_insert_image insert_image = is_enable_direct_url == true ? { - :fileType => "png", # image file type - :url => DocumentHelper.get_server_url(true) + "/assets/logo.png", # server url to the image - :directUrl => DocumentHelper.get_server_url(false) + "/assets/logo.png" # direct url to the image + :fileType => 'png', # image file type + :url => DocumentHelper.get_server_url(true) + '/assets/logo.png', # server url to the image + :directUrl => DocumentHelper.get_server_url(false) + '/assets/logo.png' # direct url to the image } : { - :fileType => "png", # image file type - :url => DocumentHelper.get_server_url(true) + "/assets/logo.png" # server url to the image + :fileType => 'png', # image file type + :url => DocumentHelper.get_server_url(true) + '/assets/logo.png' # server url to the image } if JwtHelper.is_enabled # check if a secret key to generate token exists or not - insert_image["token"] = JwtHelper.encode(insert_image) # encode a payload object into a token and write it to the insert_image object + insert_image['token'] = JwtHelper.encode(insert_image) # encode a payload object into a token and write it to the insert_image object end - return insert_image.to_json.tr("{", "").tr("}", "") + return insert_image.to_json.tr('{', '').tr('}', '') end # get compared file information def dataDocument compare_file = is_enable_direct_url == true ? { - :fileType => "docx", # file type - :url => DocumentHelper.get_server_url(true) + "/asset?fileName=sample.docx", # server url to the compared file - :directUrl => DocumentHelper.get_server_url(false) + "/asset?fileName=sample.docx" # direct url to the compared file + :fileType => 'docx', # file type + :url => DocumentHelper.get_server_url(true) + '/asset?fileName=sample.docx', # server url to the compared file + :directUrl => DocumentHelper.get_server_url(false) + '/asset?fileName=sample.docx' # direct url to the compared file } : { - :fileType => "docx", # file type - :url => DocumentHelper.get_server_url(true) + "/asset?fileName=sample.docx" # server url to the compared file + :fileType => 'docx', # file type + :url => DocumentHelper.get_server_url(true) + '/asset?fileName=sample.docx' # server url to the compared file } if JwtHelper.is_enabled # check if a secret key to generate token exists or not - compare_file["token"] = JwtHelper.encode(compare_file) # encode a payload object into a token and write it to the compare_file object + compare_file['token'] = JwtHelper.encode(compare_file) # encode a payload object into a token and write it to the compare_file object end return compare_file @@ -329,16 +329,16 @@ def dataDocument # get mail merge recipients information def dataSpreadsheet dataSpreadsheet = is_enable_direct_url == true ? { - :fileType => "csv", # file type - :url => DocumentHelper.get_server_url(true) + "/csv", # server url to the mail merge recipients file - :directUrl => DocumentHelper.get_server_url(false) + "/csv" # direct url to the mail merge recipients file + :fileType => 'csv', # file type + :url => DocumentHelper.get_server_url(true) + '/csv', # server url to the mail merge recipients file + :directUrl => DocumentHelper.get_server_url(false) + '/csv' # direct url to the mail merge recipients file } : { - :fileType => "csv", # file type - :url => DocumentHelper.get_server_url(true) + "/csv" # server url to the mail merge recipients file + :fileType => 'csv', # file type + :url => DocumentHelper.get_server_url(true) + '/csv' # server url to the mail merge recipients file } if JwtHelper.is_enabled # check if a secret key to generate token exists or not - dataSpreadsheet["token"] = JwtHelper.encode(dataSpreadsheet) # encode a payload object into a token and write it to the dataSpreadsheet object + dataSpreadsheet['token'] = JwtHelper.encode(dataSpreadsheet) # encode a payload object into a token and write it to the dataSpreadsheet object end return dataSpreadsheet @@ -346,12 +346,12 @@ def dataSpreadsheet # get users data for mentions def get_users_mentions - return !@user.id.eql?("uid-0") ? Users.get_users_for_mentions(@user.id) : nil + return !@user.id.eql?('uid-0') ? Users.get_users_for_mentions(@user.id) : nil end def get_users_info users_info = [] - if !@user.id.eql?("uid-0") + if !@user.id.eql?('uid-0') Users.get_all_users().each do |user_info| u = { id: user_info.id, @@ -367,7 +367,7 @@ def get_users_info templates: user_info.templates, avatar: user_info.avatar } - u["image"] = user_info.avatar ? "#{DocumentHelper.get_server_url(true)}/assets/#{user_info.id}.png" : nil + u['image'] = user_info.avatar ? "#{DocumentHelper.get_server_url(true)}/assets/#{user_info.id}.png" : nil users_info.push(u) end return users_info @@ -376,11 +376,11 @@ def get_users_info # get users data for protect def get_users_protect - return !@user.id.eql?("uid-0") ? Users.get_users_for_protect(@user.id) : nil + return !@user.id.eql?('uid-0') ? Users.get_users_for_protect(@user.id) : nil end # get direct url existence flag def is_enable_direct_url - return @direct_url != nil && @direct_url == "true" + return @direct_url != nil && @direct_url == 'true' end end diff --git a/web/documentserver-example/ruby/app/models/jwt_helper.rb b/web/documentserver-example/ruby/app/models/jwt_helper.rb index 779cb7aa5..6951c6ced 100644 --- a/web/documentserver-example/ruby/app/models/jwt_helper.rb +++ b/web/documentserver-example/ruby/app/models/jwt_helper.rb @@ -42,7 +42,7 @@ def decode(token) begin decoded = JWT.decode token, @jwt_secret, true, { algorithm: 'HS256' } rescue - return "" + return '' end # decoded = Array [ {"data"=>"test"}, # payload # {"alg"=>"HS256"} # header ] diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index aee29c3cb..10bd71691 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -60,11 +60,11 @@ def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_ http.read_timeout = @@convert_timeout http.open_timeout = 5 req = Net::HTTP::Post.new(uri.request_uri) # create the post request - req.add_field("Accept", "application/json") # set headers - req.add_field("Content-Type", "application/json") + req.add_field('Accept', 'application/json') # set headers + req.add_field('Content-Type', 'application/json') if JwtHelper.is_enabled && JwtHelper.use_for_request # if the signature is enabled - payload["token"] = JwtHelper.encode(payload) # get token and save it to the payload + payload['token'] = JwtHelper.encode(payload) # get token and save it to the payload jwtHeader = ServiceConverter.config_manager.jwt_header; # get signature authorization header req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ :payload => payload })}") # set it to the request with the Bearer prefix end diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 1abf4d729..1b61fe9e3 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -36,7 +36,7 @@ def read_body(request) body = request.body.read if body == nil || body.empty? - return "" + return '' end file_data = JSON.parse(body) # parse file data @@ -46,25 +46,25 @@ def read_body(request) inHeader = false token = nil jwtHeader = TrackHelper.config_manager.jwt_header; # get the authorization header from the config - if file_data["token"] # if the token is in the body - token = JwtHelper.decode(file_data["token"]) # decode a token into a payload object using a secret key + if file_data['token'] # if the token is in the body + token = JwtHelper.decode(file_data['token']) # decode a token into a payload object using a secret key elsif request.headers[jwtHeader] # if the token is in the header hdr = request.headers[jwtHeader] - hdr.slice!(0, "Bearer ".length) # get token from it (after Bearer prefix) + hdr.slice!(0, 'Bearer '.length) # get token from it (after Bearer prefix) token = JwtHelper.decode(hdr) # decode a token into a payload object using a secret key inHeader = true else - raise "Expected JWT" # token missing error message + raise 'Expected JWT' # token missing error message end - if !token || token.eql?("") - raise "Invalid JWT signature" + if !token || token.eql?('') + raise 'Invalid JWT signature' end file_data = JSON.parse(token) if inHeader - file_data = file_data["payload"] + file_data = file_data['payload'] end end @@ -107,7 +107,7 @@ def process_save(raw_file_data, file_name, user_address) end new_file_name = file_name - download_ext = "." + file_data['filetype'] # get the extension of the downloaded file + download_ext = '.' + file_data['filetype'] # get the extension of the downloaded file cur_ext = File.extname(file_name).downcase # get current file extension @@ -145,26 +145,26 @@ def process_save(raw_file_data, file_name, user_address) save_file(data, storage_path) # save the downloaded file to the storage directory - change_data = download_file(file_data["changesurl"]) # download file with document versions differences - save_file(change_data, File.join(ver_dir, "diff.zip")) # save file with document versions differences + change_data = download_file(file_data['changesurl']) # download file with document versions differences + save_file(change_data, File.join(ver_dir, 'diff.zip')) # save file with document versions differences - hist_data = file_data["changeshistory"] + hist_data = file_data['changeshistory'] unless hist_data # if there are no changes in the history - hist_data = file_data["history"].to_json # write the original history information to the history data + hist_data = file_data['history'].to_json # write the original history information to the history data end if hist_data - File.open(File.join(ver_dir, "changes.json"), 'wb') do |file| # open the file with document changes + File.open(File.join(ver_dir, 'changes.json'), 'wb') do |file| # open the file with document changes file.write(hist_data) # and write history data to this file end end # write the key value to the key.txt file - File.open(File.join(ver_dir, "key.txt"), 'wb') do |file| - file.write(file_data["key"]) + File.open(File.join(ver_dir, 'key.txt'), 'wb') do |file| + file.write(file_data['key']) end forcesave_path = DocumentHelper.forcesave_path(new_file_name, user_address, false) # get the path to the forcesaved file - unless forcesave_path.eql?("") # if this path is empty + unless forcesave_path.eql?('') # if this path is empty File.delete(forcesave_path) # remove it end @@ -184,7 +184,7 @@ def process_force_save(file_data, file_name, user_address) return saved end - download_ext = "." + file_data['filetype'] # get the extension of the downloaded file + download_ext = '.' + file_data['filetype'] # get the extension of the downloaded file cur_ext = File.extname(file_name).downcase # get current file extension @@ -213,13 +213,13 @@ def process_force_save(file_data, file_name, user_address) end begin - is_submit_form = file_data["forcesavetype"].to_i == 3 # check if the forcesave type is equal to 3 (the form was submitted) + is_submit_form = file_data['forcesavetype'].to_i == 3 # check if the forcesave type is equal to 3 (the form was submitted) if is_submit_form if new_file_name - file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + "-form" + download_ext, user_address) # get the correct file name if it already exists + file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + '-form' + download_ext, user_address) # get the correct file name if it already exists else - file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + "-form" + cur_ext, user_address) + file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + '-form' + cur_ext, user_address) end forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file else @@ -227,7 +227,7 @@ def process_force_save(file_data, file_name, user_address) file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) end forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, false) - if forcesave_path.eql?("") + if forcesave_path.eql?('') forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, true) # if the path to the new file doesn't exist, create it end end @@ -236,7 +236,7 @@ def process_force_save(file_data, file_name, user_address) if is_submit_form uid = file_data['actions'][0]['userid'] - DocumentHelper.create_meta(file_name, uid, "Filling Form", user_address) # create file meta information with the Filling form tag instead of user name + DocumentHelper.create_meta(file_name, uid, 'Filling Form', user_address) # create file meta information with the Filling form tag instead of user name end saved = 0 @@ -267,10 +267,10 @@ def command_request(method, key, meta = nil) DocumentHelper.verify_ssl(@@document_command_url, http) req = Net::HTTP::Post.new(uri.request_uri) # create the post request - req.add_field("Content-Type", "application/json") # set headers + req.add_field('Content-Type', 'application/json') # set headers if JwtHelper.is_enabled && JwtHelper.use_for_request # if the signature is enabled - payload["token"] = JwtHelper.encode(payload) # get token and save it to the payload + payload['token'] = JwtHelper.encode(payload) # get token and save it to the payload jwtHeader = TrackHelper.config_manager.jwt_header; # get signature authorization header req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ :payload => payload })}") # set it to the request with the Bearer prefix end diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index a7c367ba9..8d85b376d 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -37,76 +37,76 @@ def initialize(id, name, email, group, reviewGroups, commentGroups, userInfoGrou class Users @@descr_user_1 = [ - "File author by default", - "Doesn’t belong to any group", - "Can review all the changes", - "Can perform all actions with comments", - "The file favorite state is undefined", - "Can create files from templates using data from the editor", - "Can see the information about all users", - "Has an avatar", + 'File author by default', + 'Doesn’t belong to any group', + 'Can review all the changes', + 'Can perform all actions with comments', + 'The file favorite state is undefined', + 'Can create files from templates using data from the editor', + 'Can see the information about all users', + 'Has an avatar', ]; @@descr_user_2 = [ - "Belongs to Group2", - "Can review only his own changes or changes made by users with no group", - "Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only", - "This file is marked as favorite", - "Can create new files from the editor", - "Can see the information about users from Group2 and users who don’t belong to any group", - "Has an avatar", + 'Belongs to Group2', + 'Can review only his own changes or changes made by users with no group', + 'Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only', + 'This file is marked as favorite', + 'Can create new files from the editor', + 'Can see the information about users from Group2 and users who don’t belong to any group', + 'Has an avatar', ]; @@descr_user_3 = [ - "Belongs to Group3", - "Can review changes made by Group2 users", - "Can view comments left by Group2 and Group3 users. Can edit comments left by the Group2 users", - "This file isn’t marked as favorite", - "Can’t copy data from the file to clipboard", - "Can’t download the file", - "Can’t print the file", - "Can create new files from the editor", - "Can see the information about Group2 users", + 'Belongs to Group3', + 'Can review changes made by Group2 users', + 'Can view comments left by Group2 and Group3 users. Can edit comments left by the Group2 users', + 'This file isn’t marked as favorite', + 'Can’t copy data from the file to clipboard', + 'Can’t download the file', + 'Can’t print the file', + 'Can create new files from the editor', + 'Can see the information about Group2 users', ]; @@descr_user_0 = [ - "The name is requested when the editor is opened", - "Doesn’t belong to any group", - "Can review all the changes", - "Can perform all actions with comments", - "The file favorite state is undefined", + 'The name is requested when the editor is opened', + 'Doesn’t belong to any group', + 'Can review all the changes', + 'Can perform all actions with comments', + 'The file favorite state is undefined', "Can't mention others in comments", "Can't create new files from the editor", - "Can’t see anyone’s information", + 'Can’t see anyone’s information', "Can't rename files from the editor", "Can't view chat", "Can't protect file", - "View file without collaboration" + 'View file without collaboration' ]; @@users = [ - User.new("uid-1", "John Smith", "smith@example.com", - "", nil, {}, nil, + User.new('uid-1', 'John Smith', 'smith@example.com', + '', nil, {}, nil, nil, [], @@descr_user_1, true, true), - User.new("uid-2", "Mark Pottato", "pottato@example.com", - "group-2", ["group-2", ""], { - :view => "", - :edit => ["group-2", ""], - :remove => ["group-2"] + User.new('uid-2', 'Mark Pottato', 'pottato@example.com', + 'group-2', ['group-2', ''], { + :view => '', + :edit => ['group-2', ''], + :remove => ['group-2'] }, - ["group-2", ""], + ['group-2', ''], true, [], @@descr_user_2, false, true), - User.new("uid-3", "Hamish Mitchell", nil, - "group-3", ["group-2"], { - :view => ["group-3", "group-2"], - :edit => ["group-2"], + User.new('uid-3', 'Hamish Mitchell', nil, + 'group-3', ['group-2'], { + :view => ['group-3', 'group-2'], + :edit => ['group-2'], :remove => [] }, - ["group-2"], - false, ["copy", "download", "print"], @@descr_user_3, false, false), - User.new("uid-0", nil, nil, - "", nil, {}, [], - nil, ["protect"], @@descr_user_0, false, false) + ['group-2'], + false, ['copy', 'download', 'print'], @@descr_user_3, false, false), + User.new('uid-0', nil, nil, + '', nil, {}, [], + nil, ['protect'], @@descr_user_0, false, false) ] class << self From 5255f0e4628a8066b016b7b77d87682094ef3b3a Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 14:46:08 +0300 Subject: [PATCH 274/488] ruby: Style/SymbolArray correct --- web/documentserver-example/ruby/Gemfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/documentserver-example/ruby/Gemfile b/web/documentserver-example/ruby/Gemfile index 43adf6cd6..656c32569 100644 --- a/web/documentserver-example/ruby/Gemfile +++ b/web/documentserver-example/ruby/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'byebug', '~> 11.1', :groups => [:development, :test] +gem 'byebug', '~> 11.1', :groups => %i[development test] gem 'coffee-rails', '~> 5.0' gem 'dalli', '~> 3.2', :group => :development gem 'jbuilder', '~> 2.11' @@ -13,12 +13,12 @@ gem 'rubocop', '~> 1.52', :group => :development gem 'sass-rails', '~> 6.0' gem 'sdoc', '~> 2.6', :group => :doc gem 'sorbet-runtime', '~> 0.5.10871' -gem 'test-unit', '~> 3.6', :groups => [:development, :test] +gem 'test-unit', '~> 3.6', :groups => %i[development test] gem 'turbolinks', '~> 5.2' gem 'tzinfo-data', '~> 1.2023' gem 'uglifier', '~> 4.2' gem 'uuid', '~> 2.3' -gem 'web-console', '~> 4.2', :groups => [:development, :test] +gem 'web-console', '~> 4.2', :groups => %i[development test] gem 'webrick', '~> 1.8' # Unfortunately, Sorbet only supports Darwin and Linux-based systems. From 15b905613c0ebc6ce4f8daf45e7a50868982bbd5 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 14:47:16 +0300 Subject: [PATCH 275/488] ruby: Style/EmptyMethod correct --- .../ruby/app/controllers/home_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index b968b45bb..6215583e0 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -26,8 +26,7 @@ class << self attr_reader :config_manager end - def index - end + def index; end def editor DocumentHelper.init(request.remote_ip, request.base_url) From f5801a7f8cb357c5be433ca73b830d03e72f4376 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 14:53:05 +0300 Subject: [PATCH 276/488] ruby: Style/IfUnlessModifier correct --- .../ruby/app/controllers/home_controller.rb | 36 +++++------------ .../ruby/app/models/document_helper.rb | 20 +++------- .../ruby/app/models/service_converter.rb | 8 +--- .../ruby/app/models/track_helper.rb | 40 +++++-------------- .../ruby/app/models/users.rb | 12 ++---- 5 files changed, 29 insertions(+), 87 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 6215583e0..d8c5652ea 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -52,16 +52,12 @@ def upload cur_size = http_posted_file.size # check if the file size exceeds the maximum file size - if DocumentHelper.file_size_max < cur_size || cur_size <= 0 - raise 'File size is incorrect' - end + raise 'File size is incorrect' if DocumentHelper.file_size_max < cur_size || cur_size <= 0 cur_ext = File.extname(file_name).downcase # check if the file extension is supported by the editor - unless DocumentHelper.file_exts.include? cur_ext - raise 'File type is not supported' - end + raise 'File type is not supported' unless DocumentHelper.file_exts.include? cur_ext # get the correct file name if such a name already exists file_name = DocumentHelper.get_correct_name(file_name, nil) @@ -87,9 +83,7 @@ def upload def convert begin file_data = request.body.read - if file_data == nil || file_data.empty? - return '' - end + return '' if file_data == nil || file_data.empty? body = JSON.parse(file_data) @@ -122,9 +116,7 @@ def convert res = http.request(req) data = res.body - if data == nil - raise 'stream is null' - end + raise 'stream is null' if data == nil # write a file with a new extension, but with the content from the origin file File.open(DocumentHelper.storage_path(correct_name, nil), 'wb') do |file| @@ -132,9 +124,7 @@ def convert end old_storage_path = DocumentHelper.storage_path(file_name, nil) - if File.exist?(old_storage_path) - File.delete(old_storage_path) - end + File.delete(old_storage_path) if File.exist?(old_storage_path) file_name = correct_name user = Users.get_user(params[:userId]) @@ -356,9 +346,7 @@ def rename orig_ext = '.' + body['ext'] cur_ext = File.extname(newfilename).downcase - if orig_ext != cur_ext - newfilename += orig_ext - end + newfilename += orig_ext if orig_ext != cur_ext meta = { :title => newfilename @@ -380,9 +368,7 @@ def reference if instanceId == DocumentHelper.get_server_url(false) fileKey = JSON.parse(referenceData['fileKey']) userAddress = fileKey['userAddress'] - if userAddress == DocumentHelper.cur_user_host_address(nil) - fileName = fileKey['fileName'] - end + fileName = fileKey['fileName'] if userAddress == DocumentHelper.cur_user_host_address(nil) end end @@ -408,9 +394,7 @@ def reference if fileName.empty? and body.key?('path') path = File.basename(body['path']) - if File.exist?(DocumentHelper.storage_path(path, nil)) - fileName = path - end + fileName = path if File.exist?(DocumentHelper.storage_path(path, nil)) end if fileName.empty? @@ -431,9 +415,7 @@ def reference :link => DocumentHelper.get_server_url(false) + '/editor?fileName=' + fileName } - if JwtHelper.is_enabled - data['token'] = JwtHelper.encode(data) - end + data['token'] = JwtHelper.encode(data) if JwtHelper.is_enabled render plain: data.to_json end diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 445deddd6..ca9546972 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -75,9 +75,7 @@ def storage_path(file_name, user_address) directory = DocumentHelper.config_manager.storage_path.join(cur_user_host_address(user_address)) # create a new directory if it doesn't exist - unless File.directory?(directory) - FileUtils.mkdir_p(directory) - end + FileUtils.mkdir_p(directory) unless File.directory?(directory) # put the given file to this directory File.join(directory, File.basename(file_name)) @@ -88,9 +86,7 @@ def forcesave_path(file_name, user_address, create) directory = DocumentHelper.config_manager.storage_path.join(cur_user_host_address(user_address)) # the directory with host address doesn't exist - unless File.directory?(directory) - return '' - end + return '' unless File.directory?(directory) directory = File.join(directory, "#{File.basename(file_name)}-hist") # get the path to the history of the given file unless File.directory?(directory) @@ -103,9 +99,7 @@ def forcesave_path(file_name, user_address, create) directory = File.join(directory, File.basename(file_name)) # get the path to the given file unless File.file?(directory) - if !create - return '' - end + return '' if !create end return directory.to_s @@ -116,9 +110,7 @@ def history_dir(storage_path) directory = "#{storage_path}-hist" # create history directory if it doesn't exist - unless File.directory?(directory) - FileUtils.mkdir_p(directory) - end + FileUtils.mkdir_p(directory) unless File.directory?(directory) return directory end @@ -130,9 +122,7 @@ def version_dir(hist_dir, ver) # get the last file version def get_file_version(hist_dir) - if !Dir.exist?(hist_dir) - return 1 - end + return 1 if !Dir.exist?(hist_dir) ver = 1 Dir.foreach(hist_dir) { |e| # run through all the file versions diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index 10bd71691..2200cc164 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -73,9 +73,7 @@ def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_ res = http.request(req) # get the response status_code = res.code.to_i - if status_code != 200 # checking status code - raise "Conversion service returned status: #{status_code}" - end + raise "Conversion service returned status: #{status_code}" if status_code != 200 # checking status code data = res.body # and take its body rescue Timeout::Error @@ -163,9 +161,7 @@ def get_response_data(json_data) percent_element = file_result['percent'] # get the percentage value - if percent_element != nil - result_percent = percent_element.to_i - end + result_percent = percent_element.to_i if percent_element != nil result_percent = result_percent >= 100 ? 99 : result_percent diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 1b61fe9e3..2e436d1a9 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -35,9 +35,7 @@ class << self def read_body(request) body = request.body.read - if body == nil || body.empty? - return '' - end + return '' if body == nil || body.empty? file_data = JSON.parse(body) # parse file data @@ -57,15 +55,11 @@ def read_body(request) raise 'Expected JWT' # token missing error message end - if !token || token.eql?('') - raise 'Invalid JWT signature' - end + raise 'Invalid JWT signature' if !token || token.eql?('') file_data = JSON.parse(token) - if inHeader - file_data = file_data['payload'] - end + file_data = file_data['payload'] if inHeader end return file_data @@ -89,9 +83,7 @@ def resolve_process_save_body(body) end home = copied['home'] - if home - copied['home'] = resolve_process_save_body(home) - end + copied['home'] = resolve_process_save_body(home) if home copied end @@ -129,9 +121,7 @@ def process_save(raw_file_data, file_name, user_address) saved = 1 data = download_file(download_uri) # download document file - if data.eql?(nil) - return saved - end + return saved if data.eql?(nil) begin storage_path = DocumentHelper.storage_path(new_file_name, user_address) # get the storage directory of the new file @@ -208,9 +198,7 @@ def process_force_save(file_data, file_name, user_address) saved = 1 data = download_file(download_uri) # download document file - if data.eql?(nil) - return saved - end + return saved if data.eql?(nil) begin is_submit_form = file_data['forcesavetype'].to_i == 3 # check if the forcesave type is equal to 3 (the form was submitted) @@ -223,9 +211,7 @@ def process_force_save(file_data, file_name, user_address) end forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file else - if new_file_name - file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) - end + file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) if new_file_name forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, false) if forcesave_path.eql?('') forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, true) # if the path to the new file doesn't exist, create it @@ -255,9 +241,7 @@ def command_request(method, key, meta = nil) :key => key } - if (meta != nil) - payload.merge!({ :meta => meta }) - end + payload.merge!({ :meta => meta }) if (meta != nil) data = nil begin @@ -298,15 +282,11 @@ def download_file(uristr) res = http.request(req) # get the response status_code = res.code - if status_code != '200' # checking status code - raise "Document editing service returned status: #{status_code}" - end + raise "Document editing service returned status: #{status_code}" if status_code != '200' # checking status code data = res.body # and take its body - if data == nil - raise 'stream is null' - end + raise 'stream is null' if data == nil data end diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 8d85b376d..17703e2e4 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -116,9 +116,7 @@ def get_all_users() # get a list of all the users def get_user(id) # get a user by id specified for user in @@users do - if user.id.eql?(id) - return user - end + return user if user.id.eql?(id) end return @@users[0] end @@ -126,9 +124,7 @@ def get_user(id) # get a user by id specified def get_users_for_mentions(id) # get a list of users with their names and emails for mentions usersData = [] for user in @@users do - if (!user.id.eql?(id) && user.name != nil && user.email != nil) - usersData.push({ :name => user.name, :email => user.email }) - end + usersData.push({ :name => user.name, :email => user.email }) if (!user.id.eql?(id) && user.name != nil && user.email != nil) end return usersData end @@ -136,9 +132,7 @@ def get_users_for_mentions(id) # get a list of users with their names and emails def get_users_for_protect(id) # get a list of users with their id, names and emails for protect users_data = [] for user in @@users do - if (!user.id.eql?(id) && user.name != nil) - users_data.push({ id: user.id, name: user.name, email: user.email }) - end + users_data.push({ id: user.id, name: user.name, email: user.email }) if (!user.id.eql?(id) && user.name != nil) end return users_data end From eb6861059efd414da13193cd6727e31f20d585d8 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 15:00:52 +0300 Subject: [PATCH 277/488] ruby: Style/StringConcatenation correct --- .../ruby/app/controllers/home_controller.rb | 36 +++++++++---------- .../ruby/app/models/document_helper.rb | 28 +++++++-------- .../ruby/app/models/file_model.rb | 24 ++++++------- .../ruby/app/models/service_converter.rb | 2 +- .../ruby/app/models/track_helper.rb | 8 ++--- 5 files changed, 49 insertions(+), 49 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index d8c5652ea..6bd15d332 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -73,9 +73,9 @@ def upload DocumentHelper.create_meta(file_name, user.id, user.name, nil) - render plain: '{ "filename": "' + file_name + '", "documentType": "' + document_type + '"}' # write a new file name to the response + render plain: "{ \"filename\": \"#{file_name}\", \"documentType\": \"#{document_type}\"}" # write a new file name to the response rescue => ex - render plain: '{ "error": "' + ex.message + '"}' # write an error message to the response + render plain: "{ \"error\": \"#{ex.message}\"}" # write an error message to the response end end @@ -100,12 +100,12 @@ def convert # if the conversion isn't completed, write file name and step values to the response if percent != 100 - render plain: '{ "step" : "' + percent.to_s + '", "filename" : "' + file_name + '"}' + render plain: "{ \"step\" : \"#{percent.to_s}\", \"filename\" : \"#{file_name}\"}" return end # get the correct file name if such a name already exists - correct_name = DocumentHelper.get_correct_name(File.basename(file_name, extension) + '.' + new_file_type, nil) + correct_name = DocumentHelper.get_correct_name("#{File.basename(file_name, extension)}.#{new_file_type}", nil) uri = URI.parse(new_file_uri) # create the request url http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server @@ -132,9 +132,9 @@ def convert DocumentHelper.create_meta(file_name, user.id, user.name, nil) # create meta data of the new file end - render plain: '{ "filename" : "' + file_name + '"}' + render plain: "{ \"filename\" : \"#{file_name}\"}" rescue => ex - render plain: '{ "error": "' + ex.message + '"}' + render plain: "{ \"error\": \"#{ex.message}\"}" end end @@ -162,14 +162,14 @@ def downloadhistory return end end - hist_path = DocumentHelper.storage_path(file_name, user_address) + '-hist' # or to the original document + hist_path = "#{DocumentHelper.storage_path(file_name, user_address)}-hist" # or to the original document file_path = File.join(hist_path, version, file) # add headers to the response to specify the page parameters response.headers['Content-Length'] = File.size(file_path).to_s response.headers['Content-Type'] = MimeMagic.by_path(file_path).eql?(nil) ? nil : MimeMagic.by_path(file_path).type - response.headers['Content-Disposition'] = "attachment;filename*=UTF-8\'\'" + ERB::Util.url_encode(file) + response.headers['Content-Disposition'] = "attachment;filename*=UTF-8''#{ERB::Util.url_encode(file)}" send_file file_path, :x_sendfile => true rescue => ex @@ -201,13 +201,13 @@ def track if status == 2 || status == 3 # MustSave, Corrupted saved = TrackHelper.process_save(file_data, file_name, user_address) # save file - render plain: '{"error":' + saved.to_s + '}' + render plain: "{\"error\":#{saved.to_s}}" return end if status == 6 || status == 7 # MustForceave, CorruptedForcesave saved = TrackHelper.process_force_save(file_data, file_name, user_address) # force save file - render plain: '{"error":' + saved.to_s + '}' + render plain: "{\"error\":#{saved.to_s}}" return end @@ -254,7 +254,7 @@ def csv # add headers to the response to specify the page parameters response.headers['Content-Length'] = File.size(csvPath).to_s response.headers['Content-Type'] = MimeMagic.by_path(csvPath).type - response.headers['Content-Disposition'] = "attachment;filename*=UTF-8\'\'" + ERB::Util.url_encode(file_name) + response.headers['Content-Disposition'] = "attachment;filename*=UTF-8''#{ERB::Util.url_encode(file_name)}" send_file csvPath, :x_sendfile => true end @@ -287,7 +287,7 @@ def download # add headers to the response to specify the page parameters response.headers['Content-Length'] = File.size(file_path).to_s response.headers['Content-Type'] = MimeMagic.by_path(file_path).eql?(nil) ? nil : MimeMagic.by_path(file_path).type - response.headers['Content-Disposition'] = "attachment;filename*=UTF-8\'\'" + ERB::Util.url_encode(file_name) + response.headers['Content-Disposition'] = "attachment;filename*=UTF-8''#{ERB::Util.url_encode(file_name)}" send_file file_path, :x_sendfile => true rescue => ex @@ -330,10 +330,10 @@ def saveas user = Users.get_user(params[:userId]) DocumentHelper.create_meta(file_name, user.id, user.name, nil) # create meta data of the new file - render plain: '{"file" : "' + file_name + '"}' + render plain: "{\"file\" : \"#{file_name}\"}" return rescue => ex - render plain: '{"error":1, "message": "' + ex.message + '"}' + render plain: "{\"error\":1, \"message\": \"#{ex.message}\"}" return end end @@ -344,7 +344,7 @@ def rename dockey = body['dockey'] newfilename = body['newfilename'] - orig_ext = '.' + body['ext'] + orig_ext = ".#{body['ext']}" cur_ext = File.extname(newfilename).downcase newfilename += orig_ext if orig_ext != cur_ext @@ -353,7 +353,7 @@ def rename } json_data = TrackHelper.command_request('meta', dockey, meta) - render plain: '{ "result" : "' + JSON.dump(json_data) + '"}' + render plain: "{ \"result\" : \"#{JSON.dump(json_data)}\"}" end # ReferenceData @@ -404,7 +404,7 @@ def reference data = { :fileType => File.extname(fileName).downcase.delete('.'), - :key => ServiceConverter.generate_revision_id("#{DocumentHelper.cur_user_host_address(nil) + '/' + fileName}.#{File.mtime(DocumentHelper.storage_path(fileName, nil))}"), + :key => ServiceConverter.generate_revision_id("#{"#{DocumentHelper.cur_user_host_address(nil)}/#{fileName}"}.#{File.mtime(DocumentHelper.storage_path(fileName, nil))}"), :url => DocumentHelper.get_download_url(fileName), :directUrl => body['directUrl'] ? DocumentHelper.get_download_url(fileName, false) : nil, :referenceData => { @@ -412,7 +412,7 @@ def reference :fileKey => { :fileName => fileName, :userAddress => DocumentHelper.cur_user_host_address(nil) }.to_json }, :path => fileName, - :link => DocumentHelper.get_server_url(false) + '/editor?fileName=' + fileName + :link => "#{DocumentHelper.get_server_url(false)}/editor?fileName=#{fileName}" } data['token'] = JwtHelper.encode(data) if JwtHelper.is_enabled diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index ca9546972..e00806891 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -147,7 +147,7 @@ def get_correct_name(file_name, user_address) index = 1 while File.exist?(storage_path(name, user_address)) # if the file with such a name already exists in this directory - name = base_name + ' (' + index.to_s + ')' + ext.downcase # add an index after its base name + name = "#{base_name} (#{index.to_s})#{ext.downcase}" # add an index after its base name index = index + 1 end @@ -209,7 +209,7 @@ def create_demo(file_ext, sample, user) # get file url def get_file_uri(file_name, for_document_server) - uri = get_server_url(for_document_server) + '/' + DocumentHelper.config_manager.storage_path.to_s + '/' + cur_user_host_address(nil) + '/' + ERB::Util.url_encode(file_name) + uri = "#{get_server_url(for_document_server)}/#{DocumentHelper.config_manager.storage_path.to_s}/#{cur_user_host_address(nil)}/#{ERB::Util.url_encode(file_name)}" return uri end @@ -217,8 +217,8 @@ def get_file_uri(file_name, for_document_server) # get history path url def get_historypath_uri(file_name, version, file, is_serverUrl = true) # for redirection to my link - user_host = is_serverUrl ? '&userAddress=' + cur_user_host_address(nil) : '' - uri = get_server_url(is_serverUrl) + '/downloadhistory/?fileName=' + ERB::Util.url_encode(file_name) + '&ver=' + version.to_s + '&file=' + ERB::Util.url_encode(file) + user_host + user_host = is_serverUrl ? "&userAddress=#{cur_user_host_address(nil)}" : '' + uri = "#{get_server_url(is_serverUrl)}/downloadhistory/?fileName=#{ERB::Util.url_encode(file_name)}&ver=#{version.to_s}&file=#{ERB::Util.url_encode(file)}#{user_host}" return uri end @@ -233,18 +233,18 @@ def get_server_url(for_document_server) # get callback url def get_callback(file_name) - get_server_url(true) + '/track?fileName=' + ERB::Util.url_encode(file_name) + '&userAddress=' + cur_user_host_address(nil) + "#{get_server_url(true)}/track?fileName=#{ERB::Util.url_encode(file_name)}&userAddress=#{cur_user_host_address(nil)}" end # get url to the created file def get_create_url(document_type) - get_server_url(false) + '/sample?fileExt=' + get_internal_extension(document_type).delete('.') + "#{get_server_url(false)}/sample?fileExt=#{get_internal_extension(document_type).delete('.')}" end # get url to download a file def get_download_url(file_name, is_serverUrl = true) - user_host = is_serverUrl ? '&userAddress=' + cur_user_host_address(nil) : '' - get_server_url(is_serverUrl) + '/download?fileName=' + ERB::Util.url_encode(file_name) + user_host + user_host = is_serverUrl ? "&userAddress=#{cur_user_host_address(nil)}" : '' + "#{get_server_url(is_serverUrl)}/download?fileName=#{ERB::Util.url_encode(file_name)}#{user_host}" end # get internal file extension by its type @@ -265,16 +265,16 @@ def get_internal_extension(file_type) # get image url for templates def get_template_image_url(file_type) - path = get_server_url(true) + '/assets/' + path = "#{get_server_url(true)}/assets/" case file_type when 'word' # for word type - full_path = path + 'file_docx.svg' + full_path = "#{path}file_docx.svg" when 'cell' # .xlsx for cell type - full_path = path + 'file_xlsx.svg' + full_path = "#{path}file_xlsx.svg" when 'slide' # .pptx for slide type - full_path = path + 'file_pptx.svg' + full_path = "#{path}file_pptx.svg" else - full_path = path + 'file_docx.svg' # the default value is .docx + full_path = "#{path}file_docx.svg" # the default value is .docx end full_path @@ -286,7 +286,7 @@ def get_files_info(file_id) for fileName in get_stored_files(nil) # run through all the stored files from the folder directory = storage_path(fileName, nil) - uri = cur_user_host_address(nil) + '/' + fileName + uri = "#{cur_user_host_address(nil)}/#{fileName}" # write file parameters to the info object info = { diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index d0b1e531b..6de54e575 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -49,7 +49,7 @@ def file_uri # get file uri for document server def file_uri_user - @config_manager.storage_path.absolute? ? download_url + '&dmode=emb' : DocumentHelper.get_file_uri(@file_name, false) + @config_manager.storage_path.absolute? ? "#{download_url}&dmode=emb" : DocumentHelper.get_file_uri(@file_name, false) end # get document type from its name (word, cell or slide) @@ -59,7 +59,7 @@ def document_type # generate the document key value def key - uri = DocumentHelper.cur_user_host_address(nil) + '/' + @file_name # get current user host address + uri = "#{DocumentHelper.cur_user_host_address(nil)}/#{@file_name}" # get current user host address stat = File.mtime(DocumentHelper.storage_path(@file_name, nil)) # get the modification time of the given file return ServiceConverter.generate_revision_id("#{uri}.#{stat}") end @@ -104,7 +104,7 @@ def get_config { :image => templatesImageUrl, :title => 'With sample content', - :url => create_url + '&sample=true' + :url => "#{create_url}&sample=true" } ] @@ -294,11 +294,11 @@ def get_history def get_insert_image insert_image = is_enable_direct_url == true ? { :fileType => 'png', # image file type - :url => DocumentHelper.get_server_url(true) + '/assets/logo.png', # server url to the image - :directUrl => DocumentHelper.get_server_url(false) + '/assets/logo.png' # direct url to the image + :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png", # server url to the image + :directUrl => "#{DocumentHelper.get_server_url(false)}/assets/logo.png" # direct url to the image } : { :fileType => 'png', # image file type - :url => DocumentHelper.get_server_url(true) + '/assets/logo.png' # server url to the image + :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png" # server url to the image } if JwtHelper.is_enabled # check if a secret key to generate token exists or not @@ -312,11 +312,11 @@ def get_insert_image def dataDocument compare_file = is_enable_direct_url == true ? { :fileType => 'docx', # file type - :url => DocumentHelper.get_server_url(true) + '/asset?fileName=sample.docx', # server url to the compared file - :directUrl => DocumentHelper.get_server_url(false) + '/asset?fileName=sample.docx' # direct url to the compared file + :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx", # server url to the compared file + :directUrl => "#{DocumentHelper.get_server_url(false)}/asset?fileName=sample.docx" # direct url to the compared file } : { :fileType => 'docx', # file type - :url => DocumentHelper.get_server_url(true) + '/asset?fileName=sample.docx' # server url to the compared file + :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx" # server url to the compared file } if JwtHelper.is_enabled # check if a secret key to generate token exists or not @@ -330,11 +330,11 @@ def dataDocument def dataSpreadsheet dataSpreadsheet = is_enable_direct_url == true ? { :fileType => 'csv', # file type - :url => DocumentHelper.get_server_url(true) + '/csv', # server url to the mail merge recipients file - :directUrl => DocumentHelper.get_server_url(false) + '/csv' # direct url to the mail merge recipients file + :url => "#{DocumentHelper.get_server_url(true)}/csv", # server url to the mail merge recipients file + :directUrl => "#{DocumentHelper.get_server_url(false)}/csv" # direct url to the mail merge recipients file } : { :fileType => 'csv', # file type - :url => DocumentHelper.get_server_url(true) + '/csv' # server url to the mail merge recipients file + :url => "#{DocumentHelper.get_server_url(true)}/csv" # server url to the mail merge recipients file } if JwtHelper.is_enabled # check if a secret key to generate token exists or not diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index 2200cc164..243bbf17d 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -123,7 +123,7 @@ def process_convert_service_responce_error(error_code) when 0 # public const int c_nErrorNo = 0 else - error_message = 'ErrorCode = ' + error_code.to_s # default value for the error message + error_message = "ErrorCode = #{error_code.to_s}" # default value for the error message end raise error_message diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 2e436d1a9..c1403c06e 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -99,7 +99,7 @@ def process_save(raw_file_data, file_name, user_address) end new_file_name = file_name - download_ext = '.' + file_data['filetype'] # get the extension of the downloaded file + download_ext = ".#{file_data['filetype']}" # get the extension of the downloaded file cur_ext = File.extname(file_name).downcase # get current file extension @@ -174,7 +174,7 @@ def process_force_save(file_data, file_name, user_address) return saved end - download_ext = '.' + file_data['filetype'] # get the extension of the downloaded file + download_ext = ".#{file_data['filetype']}" # get the extension of the downloaded file cur_ext = File.extname(file_name).downcase # get current file extension @@ -205,9 +205,9 @@ def process_force_save(file_data, file_name, user_address) if is_submit_form if new_file_name - file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + '-form' + download_ext, user_address) # get the correct file name if it already exists + file_name = DocumentHelper.get_correct_name("#{File.basename(file_name, cur_ext)}-form#{download_ext}", user_address) # get the correct file name if it already exists else - file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + '-form' + cur_ext, user_address) + file_name = DocumentHelper.get_correct_name("#{File.basename(file_name, cur_ext)}-form#{cur_ext}", user_address) end forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file else From 519f6d6f3209126c5f0a93c279bff614b48b99dc Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 15:54:50 +0300 Subject: [PATCH 278/488] ruby: Style/NilComparison correct --- .../ruby/app/controllers/home_controller.rb | 8 ++++---- .../ruby/app/models/document_helper.rb | 4 ++-- .../ruby/app/models/service_converter.rb | 6 +++--- .../ruby/app/models/track_helper.rb | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 6bd15d332..7be7789b9 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -83,7 +83,7 @@ def upload def convert begin file_data = request.body.read - return '' if file_data == nil || file_data.empty? + return '' if file_data.nil? || file_data.empty? body = JSON.parse(file_data) @@ -116,7 +116,7 @@ def convert res = http.request(req) data = res.body - raise 'stream is null' if data == nil + raise 'stream is null' if data.nil? # write a file with a new extension, but with the content from the origin file File.open(DocumentHelper.storage_path(correct_name, nil), 'wb') do |file| @@ -180,7 +180,7 @@ def downloadhistory # tracking file changes def track file_data = TrackHelper.read_body(request) # read the request body - if file_data == nil || file_data.empty? + if file_data.nil? || file_data.empty? render plain: '{"error":1}' # an error occurs if the file is empty return end @@ -266,7 +266,7 @@ def download user_address = params[:userAddress] isEmbedded = params[:dmode] - if JwtHelper.is_enabled && isEmbedded == nil && user_address != nil && JwtHelper.use_for_request + if JwtHelper.is_enabled && isEmbedded.nil? && user_address != nil && JwtHelper.use_for_request jwtHeader = HomeController.config_manager.jwt_header; if request.headers[jwtHeader] hdr = request.headers[jwtHeader] diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index e00806891..c1bea5a5e 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -67,7 +67,7 @@ def convert_exts # get current user host address def cur_user_host_address(user_address) - (user_address == nil ? @@remote_ip : user_address).gsub(/[^0-9\-.a-zA-Z_=]/, '_'); + (user_address.nil? ? @@remote_ip : user_address).gsub(/[^0-9\-.a-zA-Z_=]/, '_'); end # get the storage path of the given file @@ -298,7 +298,7 @@ def get_files_info(file_id) 'updated' => File.mtime(directory) } - if file_id == nil # if file id is undefined + if file_id.nil? # if file id is undefined result.push(info) # push info object to the response array else # if file id is defined if file_id.eql?(info['id']) # and it is equal to the document key value diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index 243bbf17d..d2c66ab71 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -29,11 +29,11 @@ class << self class << self # get the url of the converted file def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_async, file_pass, lang = nil) - from_ext = from_ext == nil ? File.extname(document_uri).downcase : from_ext # get the current document extension + from_ext = from_ext.nil? ? File.extname(document_uri).downcase : from_ext # get the current document extension # get the current document name or uuid title = File.basename(URI.parse(document_uri).path) - title = title == nil ? UUID.generate.to_s : title + title = title.nil? ? UUID.generate.to_s : title # get the document key document_revision_id = document_revision_id.empty? ? document_uri : document_revision_id @@ -149,7 +149,7 @@ def get_response_data(json_data) file_url_element = file_result['fileUrl'] file_type_element = file_result['fileType'] - if file_url_element == nil # and the file url doesn't exist + if file_url_element.nil? # and the file url doesn't exist raise 'Invalid answer format' # get ann error message end diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index c1403c06e..da26e9239 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -35,7 +35,7 @@ class << self def read_body(request) body = request.body.read - return '' if body == nil || body.empty? + return '' if body.nil? || body.empty? file_data = JSON.parse(body) # parse file data @@ -108,7 +108,7 @@ def process_save(raw_file_data, file_name, user_address) key = ServiceConverter.generate_revision_id(download_uri) # get the document key begin percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data(download_uri, download_ext.delete('.'), cur_ext.delete('.'), key, false, nil) # get the url of the converted file - if new_file_uri == nil || new_file_uri.empty? + if new_file_uri.nil? || new_file_uri.empty? new_file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) # get the correct file name if it already exists else download_uri = new_file_uri @@ -185,7 +185,7 @@ def process_force_save(file_data, file_name, user_address) key = ServiceConverter.generate_revision_id(download_uri) # get the document key begin percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data(download_uri, download_ext.delete('.'), cur_ext.delete('.'), key, false, nil) # get the url of the converted file - if new_file_uri == nil || new_file_uri.empty? + if new_file_uri.nil? || new_file_uri.empty? new_file_name = true else download_uri = new_file_uri @@ -286,7 +286,7 @@ def download_file(uristr) data = res.body # and take its body - raise 'stream is null' if data == nil + raise 'stream is null' if data.nil? data end From 52d72371d5856138f4a035ebda4723e132bff86f Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 15:58:46 +0300 Subject: [PATCH 279/488] ruby: Style/Semicolon correct --- .../ruby/app/controllers/home_controller.rb | 4 ++-- .../ruby/app/models/document_helper.rb | 6 +++--- web/documentserver-example/ruby/app/models/users.rb | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 7be7789b9..921c66db8 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -148,7 +148,7 @@ def downloadhistory isEmbedded = params[:dmode] if JwtHelper.is_enabled && JwtHelper.use_for_request - jwtHeader = HomeController.config_manager.jwt_header; + jwtHeader = HomeController.config_manager.jwt_header if request.headers[jwtHeader] hdr = request.headers[jwtHeader] hdr.slice!(0, 'Bearer '.length) @@ -267,7 +267,7 @@ def download isEmbedded = params[:dmode] if JwtHelper.is_enabled && isEmbedded.nil? && user_address != nil && JwtHelper.use_for_request - jwtHeader = HomeController.config_manager.jwt_header; + jwtHeader = HomeController.config_manager.jwt_header if request.headers[jwtHeader] hdr = request.headers[jwtHeader] hdr.slice!(0, 'Bearer '.length) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index c1bea5a5e..271765acd 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -67,7 +67,7 @@ def convert_exts # get current user host address def cur_user_host_address(user_address) - (user_address.nil? ? @@remote_ip : user_address).gsub(/[^0-9\-.a-zA-Z_=]/, '_'); + (user_address.nil? ? @@remote_ip : user_address).gsub(/[^0-9\-.a-zA-Z_=]/, '_') end # get the storage path of the given file @@ -158,7 +158,7 @@ def get_correct_name(file_name, user_address) def get_stored_files(user_address) directory = DocumentHelper.config_manager.storage_path.join(cur_user_host_address(user_address)) - arr = []; + arr = [] if Dir.exist?(directory) Dir.foreach(directory) { |e| # run through all the elements from the folder @@ -282,7 +282,7 @@ def get_template_image_url(file_type) # get files information def get_files_info(file_id) - result = []; + result = [] for fileName in get_stored_files(nil) # run through all the stored files from the folder directory = storage_path(fileName, nil) diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 17703e2e4..3c5ed65cd 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -45,7 +45,7 @@ class Users 'Can create files from templates using data from the editor', 'Can see the information about all users', 'Has an avatar', - ]; + ] @@descr_user_2 = [ 'Belongs to Group2', @@ -55,7 +55,7 @@ class Users 'Can create new files from the editor', 'Can see the information about users from Group2 and users who don’t belong to any group', 'Has an avatar', - ]; + ] @@descr_user_3 = [ 'Belongs to Group3', @@ -67,7 +67,7 @@ class Users 'Can’t print the file', 'Can create new files from the editor', 'Can see the information about Group2 users', - ]; + ] @@descr_user_0 = [ 'The name is requested when the editor is opened', @@ -82,7 +82,7 @@ class Users "Can't view chat", "Can't protect file", 'View file without collaboration' - ]; + ] @@users = [ User.new('uid-1', 'John Smith', 'smith@example.com', From f9375a74148b50bc93cb2d854fd79e4c7a8c5798 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 15:59:48 +0300 Subject: [PATCH 280/488] ruby: Style/SoleNestedConditional correct --- .../ruby/app/controllers/home_controller.rb | 4 +--- web/documentserver-example/ruby/app/models/document_helper.rb | 4 ++-- web/documentserver-example/ruby/app/models/file_model.rb | 4 +--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 921c66db8..3e87e5a2a 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -190,14 +190,12 @@ def track user_address = params[:userAddress] file_name = File.basename(params[:fileName]) - if status == 1 # editing - if file_data['actions'][0]['type'] == 0 # finished edit + if status == 1 && (file_data['actions'][0]['type'] == 0) # finished edit user = file_data['actions'][0]['userid'] # get the user id if !file_data['users'].index(user) json_data = TrackHelper.command_request('forcesave', file_data['key']) # call the forcesave command end end - end if status == 2 || status == 3 # MustSave, Corrupted saved = TrackHelper.process_save(file_data, file_name, user_address) # save file diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 271765acd..746e921a8 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -98,8 +98,8 @@ def forcesave_path(file_name, user_address, create) end directory = File.join(directory, File.basename(file_name)) # get the path to the given file - unless File.file?(directory) - return '' if !create + if !File.file?(directory) && !create + return '' end return directory.to_s diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 6de54e575..1d9731cb8 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -215,8 +215,7 @@ def get_history obj['key'] = cur_key obj['version'] = i - if (i == 1) # check if the version number is equal to 1 - if File.file?(File.join(hist_dir, 'createdInfo.json')) # check if the createdInfo.json file with meta data exists + if (i == 1) && File.file?(File.join(hist_dir, 'createdInfo.json')) # check if the createdInfo.json file with meta data exists File.open(File.join(hist_dir, 'createdInfo.json'), 'r') do |file| # open it cr_info = JSON.parse(file.read()) # parse the file content @@ -228,7 +227,6 @@ def get_history } end end - end # get the history data from the previous file version and write key and url information about it dataObj['fileType'] = file_ext[1..file_ext.length] From b630764daf6dbaa43e41d3ca9d045b527eba2fea Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:02:59 +0300 Subject: [PATCH 281/488] ruby: Style/NegatedIf correct --- .../ruby/app/controllers/home_controller.rb | 8 ++++---- .../ruby/app/models/document_helper.rb | 2 +- web/documentserver-example/ruby/app/models/file_model.rb | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 3e87e5a2a..d1d9bf1c0 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -192,7 +192,7 @@ def track if status == 1 && (file_data['actions'][0]['type'] == 0) # finished edit user = file_data['actions'][0]['userid'] # get the user id - if !file_data['users'].index(user) + unless file_data['users'].index(user) json_data = TrackHelper.command_request('forcesave', file_data['key']) # call the forcesave command end end @@ -216,7 +216,7 @@ def track # removing a file def remove file_name = File.basename(params[:filename]) # get the file name - if !file_name # if it doesn't exist + unless file_name # if it doesn't exist render plain: '{"success":false}' # report that the operation is unsuccessful return end @@ -372,7 +372,7 @@ def reference link = body['link'] if fileName.empty? and body.key?('link') - if !link.include?(DocumentHelper.get_server_url(false)) + unless link.include?(DocumentHelper.get_server_url(false)) data = { url: link, directUrl: link @@ -384,7 +384,7 @@ def reference url_obj = URI(link) query_params = CGI.parse(url_obj.query) fileName = query_params['fileName'].first - if !File.exist?(DocumentHelper.storage_path(fileName, nil)) + unless File.exist?(DocumentHelper.storage_path(fileName, nil)) render plain: '{ "error": "File is not exist"}' return end diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 746e921a8..d72710771 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -122,7 +122,7 @@ def version_dir(hist_dir, ver) # get the last file version def get_file_version(hist_dir) - return 1 if !Dir.exist?(hist_dir) + return 1 unless Dir.exist?(hist_dir) ver = 1 Dir.foreach(hist_dir) { |e| # run through all the file versions diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 1d9731cb8..471f75afa 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -349,7 +349,7 @@ def get_users_mentions def get_users_info users_info = [] - if !@user.id.eql?('uid-0') + unless @user.id.eql?('uid-0') Users.get_all_users().each do |user_info| u = { id: user_info.id, From 21d75418c251eb25f8817ea7d52a6474933de826 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:03:32 +0300 Subject: [PATCH 282/488] ruby: Style/MultipleComparison correct --- .../ruby/app/controllers/home_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index d1d9bf1c0..6372fc3fb 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -197,13 +197,13 @@ def track end end - if status == 2 || status == 3 # MustSave, Corrupted + if [2, 3].include?(status) # MustSave, Corrupted saved = TrackHelper.process_save(file_data, file_name, user_address) # save file render plain: "{\"error\":#{saved.to_s}}" return end - if status == 6 || status == 7 # MustForceave, CorruptedForcesave + if [6, 7].include?(status) # MustForceave, CorruptedForcesave saved = TrackHelper.process_force_save(file_data, file_name, user_address) # force save file render plain: "{\"error\":#{saved.to_s}}" return From 23193739f798e6e1672e84472973e45049136475 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:04:41 +0300 Subject: [PATCH 283/488] ruby: Style/NonNilCheck correct --- .../ruby/app/controllers/home_controller.rb | 2 +- web/documentserver-example/ruby/app/models/document_helper.rb | 2 +- web/documentserver-example/ruby/app/models/file_model.rb | 2 +- .../ruby/app/models/service_converter.rb | 4 ++-- web/documentserver-example/ruby/app/models/track_helper.rb | 2 +- web/documentserver-example/ruby/app/models/users.rb | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 6372fc3fb..e4949316e 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -264,7 +264,7 @@ def download user_address = params[:userAddress] isEmbedded = params[:dmode] - if JwtHelper.is_enabled && isEmbedded.nil? && user_address != nil && JwtHelper.use_for_request + if JwtHelper.is_enabled && isEmbedded.nil? && !user_address.nil? && JwtHelper.use_for_request jwtHeader = HomeController.config_manager.jwt_header if request.headers[jwtHeader] hdr = request.headers[jwtHeader] diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index d72710771..b0f1e463a 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -308,7 +308,7 @@ def get_files_info(file_id) end end - if file_id != nil + if !file_id.nil? return '"File not found"' else return result diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 471f75afa..5d9367182 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -379,6 +379,6 @@ def get_users_protect # get direct url existence flag def is_enable_direct_url - return @direct_url != nil && @direct_url == 'true' + return !@direct_url.nil? && @direct_url == 'true' end end diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index d2c66ab71..a53a939a1 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -134,7 +134,7 @@ def get_response_data(json_data) file_result = json_data error_element = file_result['error'] - if error_element != nil # if an error occurs + if !error_element.nil? # if an error occurs process_convert_service_responce_error(error_element.to_i) # get an error message end @@ -161,7 +161,7 @@ def get_response_data(json_data) percent_element = file_result['percent'] # get the percentage value - result_percent = percent_element.to_i if percent_element != nil + result_percent = percent_element.to_i if !percent_element.nil? result_percent = result_percent >= 100 ? 99 : result_percent diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index da26e9239..097b7c370 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -241,7 +241,7 @@ def command_request(method, key, meta = nil) :key => key } - payload.merge!({ :meta => meta }) if (meta != nil) + payload.merge!({ :meta => meta }) if (!meta.nil?) data = nil begin diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 3c5ed65cd..f5eda73f1 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -124,7 +124,7 @@ def get_user(id) # get a user by id specified def get_users_for_mentions(id) # get a list of users with their names and emails for mentions usersData = [] for user in @@users do - usersData.push({ :name => user.name, :email => user.email }) if (!user.id.eql?(id) && user.name != nil && user.email != nil) + usersData.push({ :name => user.name, :email => user.email }) if (!user.id.eql?(id) && !user.name.nil? && !user.email.nil?) end return usersData end @@ -132,7 +132,7 @@ def get_users_for_mentions(id) # get a list of users with their names and emails def get_users_for_protect(id) # get a list of users with their id, names and emails for protect users_data = [] for user in @@users do - users_data.push({ id: user.id, name: user.name, email: user.email }) if (!user.id.eql?(id) && user.name != nil) + users_data.push({ id: user.id, name: user.name, email: user.email }) if (!user.id.eql?(id) && !user.name.nil?) end return users_data end From 1989c5f44d0095c87a7a3e2df6ca8665ca036229 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:05:53 +0300 Subject: [PATCH 284/488] ruby: Style/AccessorGrouping correct --- web/documentserver-example/ruby/app/models/document_helper.rb | 3 +-- web/documentserver-example/ruby/app/models/track_helper.rb | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index b0f1e463a..eeae3083e 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -22,8 +22,7 @@ class DocumentHelper @format_manager = FormatManager.new class << self - attr_reader :config_manager - attr_reader :format_manager + attr_reader :config_manager, :format_manager end @@runtime_cache = {} diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 097b7c370..9759af987 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -24,8 +24,7 @@ class TrackHelper @proxy_manager = ProxyManager.new(config_manager: @config_manager) class << self - attr_reader :config_manager - attr_reader :proxy_manager + attr_reader :config_manager, :proxy_manager end @@document_command_url = TrackHelper.config_manager.document_server_command_uri.to_s From e9b4fce50b67c14ec2fc9f1aa5e8b00037e3f69c Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:06:55 +0300 Subject: [PATCH 285/488] ruby: Style/GuardClause correct --- .../ruby/app/models/document_helper.rb | 28 +++++++++---------- .../ruby/app/models/file_model.rb | 4 +-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index eeae3083e..7ea2b0a67 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -89,11 +89,11 @@ def forcesave_path(file_name, user_address, create) directory = File.join(directory, "#{File.basename(file_name)}-hist") # get the path to the history of the given file unless File.directory?(directory) - if create + return '' unless create FileUtils.mkdir_p(directory) # create history directory if it doesn't exist - else - return '' # the history directory doesn't exist and we are not supposed to create it - end + + # the history directory doesn't exist and we are not supposed to create it + end directory = File.join(directory, File.basename(file_name)) # get the path to the given file @@ -223,11 +223,11 @@ def get_historypath_uri(file_name, version, file, is_serverUrl = true) # get server url def get_server_url(for_document_server) - if for_document_server && DocumentHelper.config_manager.example_uri - return DocumentHelper.config_manager.example_uri.to_s - else + return DocumentHelper.config_manager.example_uri.to_s if for_document_server && DocumentHelper.config_manager.example_uri + + return @@base_url - end + end # get callback url @@ -307,19 +307,19 @@ def get_files_info(file_id) end end - if !file_id.nil? - return '"File not found"' - else + return '"File not found"' if !file_id.nil? + + return result - end + end # enable ignore certificate def verify_ssl(file_uri, http) - if file_uri.start_with?('https') && DocumentHelper.config_manager.ssl_verify_peer_mode_enabled + return unless file_uri.start_with?('https') && DocumentHelper.config_manager.ssl_verify_peer_mode_enabled http.use_ssl = true http.verify_mode = OpenSSL::SSL::VERIFY_NONE # set the flags for the server certificate verification at the beginning of SSL session - end + end end end diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 5d9367182..22038f819 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -349,7 +349,7 @@ def get_users_mentions def get_users_info users_info = [] - unless @user.id.eql?('uid-0') + return if @user.id.eql?('uid-0') Users.get_all_users().each do |user_info| u = { id: user_info.id, @@ -369,7 +369,7 @@ def get_users_info users_info.push(u) end return users_info - end + end # get users data for protect From 3df552b4b274bd8a0dd2f99231394c6de318f115 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:08:14 +0300 Subject: [PATCH 286/488] ruby: Style/BlockDelimiters correct --- .../ruby/app/models/document_helper.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 7ea2b0a67..ff45ed5f6 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -124,14 +124,14 @@ def get_file_version(hist_dir) return 1 unless Dir.exist?(hist_dir) ver = 1 - Dir.foreach(hist_dir) { |e| # run through all the file versions + Dir.foreach(hist_dir) do |e| # run through all the file versions next if e.eql?('.') next if e.eql?('..') if File.directory?(File.join(hist_dir, e)) ver += 1 # and count them end - } + end return ver end @@ -160,13 +160,13 @@ def get_stored_files(user_address) arr = [] if Dir.exist?(directory) - Dir.foreach(directory) { |e| # run through all the elements from the folder + Dir.foreach(directory) do |e| # run through all the elements from the folder next if e.eql?('.') next if e.eql?('..') next if File.directory?(File.join(directory, e)) # if the element is a directory, skip it arr.push(e) # push the file to the array - } + end end return arr From 81a43656b2d411aa07825f8bacbd0792b469b5e2 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:08:52 +0300 Subject: [PATCH 287/488] ruby: Style/SelfAssignment correct --- web/documentserver-example/ruby/app/models/document_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index ff45ed5f6..68ca003b9 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -147,7 +147,7 @@ def get_correct_name(file_name, user_address) while File.exist?(storage_path(name, user_address)) # if the file with such a name already exists in this directory name = "#{base_name} (#{index.to_s})#{ext.downcase}" # add an index after its base name - index = index + 1 + index += 1 end name From 3247a75318e173d4766d2256e73d70cbd4ebe74e Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:09:49 +0300 Subject: [PATCH 288/488] ruby: Style/ConditionalAssignment correct --- .../ruby/app/models/document_helper.rb | 24 +++++++++---------- .../ruby/app/models/track_helper.rb | 8 +++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 68ca003b9..7fb0fd659 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -248,16 +248,16 @@ def get_download_url(file_name, is_serverUrl = true) # get internal file extension by its type def get_internal_extension(file_type) - case file_type + ext = case file_type when 'word' # .docx for word type - ext = '.docx' + '.docx' when 'cell' # .xlsx for cell type - ext = '.xlsx' + '.xlsx' when 'slide' # .pptx for slide type - ext = '.pptx' + '.pptx' else - ext = '.docx' # the default value is .docx - end + '.docx' # the default value is .docx + end ext end @@ -265,16 +265,16 @@ def get_internal_extension(file_type) # get image url for templates def get_template_image_url(file_type) path = "#{get_server_url(true)}/assets/" - case file_type + full_path = case file_type when 'word' # for word type - full_path = "#{path}file_docx.svg" + "#{path}file_docx.svg" when 'cell' # .xlsx for cell type - full_path = "#{path}file_xlsx.svg" + "#{path}file_xlsx.svg" when 'slide' # .pptx for slide type - full_path = "#{path}file_pptx.svg" + "#{path}file_pptx.svg" else - full_path = "#{path}file_docx.svg" # the default value is .docx - end + "#{path}file_docx.svg" # the default value is .docx + end full_path end diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 9759af987..0e3d2d2d6 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -203,11 +203,11 @@ def process_force_save(file_data, file_name, user_address) is_submit_form = file_data['forcesavetype'].to_i == 3 # check if the forcesave type is equal to 3 (the form was submitted) if is_submit_form - if new_file_name - file_name = DocumentHelper.get_correct_name("#{File.basename(file_name, cur_ext)}-form#{download_ext}", user_address) # get the correct file name if it already exists + file_name = if new_file_name + DocumentHelper.get_correct_name("#{File.basename(file_name, cur_ext)}-form#{download_ext}", user_address) # get the correct file name if it already exists else - file_name = DocumentHelper.get_correct_name("#{File.basename(file_name, cur_ext)}-form#{cur_ext}", user_address) - end + DocumentHelper.get_correct_name("#{File.basename(file_name, cur_ext)}-form#{cur_ext}", user_address) + end forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file else file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) if new_file_name From 5171624adc402153913dbd4dd27231d087dcc649 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:10:50 +0300 Subject: [PATCH 289/488] ruby: Style/IfInsideElse correct --- .../ruby/app/models/document_helper.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 7fb0fd659..826aee305 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -299,11 +299,9 @@ def get_files_info(file_id) if file_id.nil? # if file id is undefined result.push(info) # push info object to the response array - else # if file id is defined - if file_id.eql?(info['id']) # and it is equal to the document key value - result.push(info) # response object will be equal to the info object - return result - end + elsif file_id.eql?(info['id']) # if file id is defined + result.push(info) # response object will be equal to the info object + return result # and it is equal to the document key value end end From 9b010f8315042adad1eb245306a143066b6436f2 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:11:23 +0300 Subject: [PATCH 290/488] ruby: Style/MethodCallWithoutArgsParentheses correct --- .../ruby/app/models/file_model.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 22038f819..6c2aa1c6e 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -109,7 +109,7 @@ def get_config ] config = { - :type => type(), + :type => type, :documentType => document_type, :document => { :title => @file_name, @@ -190,8 +190,8 @@ def get_config def get_history file_name = @file_name file_ext = File.extname(file_name).downcase - doc_key = key() - doc_uri = file_uri() + doc_key = key + doc_uri = file_uri hist_dir = DocumentHelper.history_dir(DocumentHelper.storage_path(@file_name, nil)) # get the path to the file history cur_ver = DocumentHelper.get_file_version(hist_dir) # get the file version @@ -209,7 +209,7 @@ def get_history cur_key = doc_key if (i != cur_ver) File.open(File.join(ver_dir, 'key.txt'), 'r') do |file| - cur_key = file.read() + cur_key = file.read end end obj['key'] = cur_key @@ -217,7 +217,7 @@ def get_history if (i == 1) && File.file?(File.join(hist_dir, 'createdInfo.json')) # check if the createdInfo.json file with meta data exists File.open(File.join(hist_dir, 'createdInfo.json'), 'r') do |file| # open it - cr_info = JSON.parse(file.read()) # parse the file content + cr_info = JSON.parse(file.read) # parse the file content # write information about changes to the object obj['created'] = cr_info['created'] @@ -241,7 +241,7 @@ def get_history changes = nil change = nil File.open(File.join(DocumentHelper.version_dir(hist_dir, i - 1), 'changes.json'), 'r') do |file| # get the path to the changes.json file - changes = JSON.parse(file.read()) # and parse its content + changes = JSON.parse(file.read) # and parse its content end change = changes['changes'][0] @@ -350,7 +350,7 @@ def get_users_mentions def get_users_info users_info = [] return if @user.id.eql?('uid-0') - Users.get_all_users().each do |user_info| + Users.get_all_users.each do |user_info| u = { id: user_info.id, name: user_info.name, From f3cfdc353ed435e31fd98e1f255cdb1ea8bc1107 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:11:54 +0300 Subject: [PATCH 291/488] ruby: Style/MultilineTernaryOperator correct --- .../ruby/app/models/file_model.rb | 50 +++++++++++++++---- 1 file changed, 40 insertions(+), 10 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 6c2aa1c6e..1a1e99615 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -148,10 +148,14 @@ def get_config :mode => mode, :lang => @lang ? @lang : 'en', :callbackUrl => callback_url, # absolute URL to the document storage service - :coEditing => editorsmode.eql?('view') && @user.id.eql?('uid-0') ? { + :coEditing => if editorsmode.eql?('view') && @user.id.eql?('uid-0') + { :mode => 'strict', :change => false - } : nil, + } +else + nil +end, :createUrl => !@user.id.eql?('uid-0') ? create_url : nil, :templates => @user.templates ? templates : nil, :user => { # the user currently viewing or editing the document @@ -253,16 +257,21 @@ def get_history obj['user'] = change ? change['user'] : nil prev = histData[(i - 2).to_s] # get the history data from the previous file version - dataObj['previous'] = is_enable_direct_url == true ? { # write key and url information about previous file version with optional direct url + # write key and url information about previous file version with optional direct url +dataObj['previous'] = if is_enable_direct_url == true + { # write key and url information about previous file version with optional direct url :fileType => prev['fileType'], :key => prev['key'], :url => prev['url'], :directUrl => prev['directUrl'] - } : { + } +else + { :fileType => prev['fileType'], :key => prev['key'], :url => prev['url'] } +end # write the path to the diff.zip archive with differences in this file version dataObj['changesUrl'] = DocumentHelper.get_historypath_uri(file_name, i - 1, 'diff.zip') @@ -290,14 +299,21 @@ def get_history # get image information def get_insert_image - insert_image = is_enable_direct_url == true ? { + # image file type +# server url to the image +# direct url to the image +insert_image = if is_enable_direct_url == true + { :fileType => 'png', # image file type :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png", # server url to the image :directUrl => "#{DocumentHelper.get_server_url(false)}/assets/logo.png" # direct url to the image - } : { + } +else + { :fileType => 'png', # image file type :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png" # server url to the image } +end if JwtHelper.is_enabled # check if a secret key to generate token exists or not insert_image['token'] = JwtHelper.encode(insert_image) # encode a payload object into a token and write it to the insert_image object @@ -308,14 +324,21 @@ def get_insert_image # get compared file information def dataDocument - compare_file = is_enable_direct_url == true ? { + # file type +# server url to the compared file +# direct url to the compared file +compare_file = if is_enable_direct_url == true + { :fileType => 'docx', # file type :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx", # server url to the compared file :directUrl => "#{DocumentHelper.get_server_url(false)}/asset?fileName=sample.docx" # direct url to the compared file - } : { + } +else + { :fileType => 'docx', # file type :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx" # server url to the compared file } +end if JwtHelper.is_enabled # check if a secret key to generate token exists or not compare_file['token'] = JwtHelper.encode(compare_file) # encode a payload object into a token and write it to the compare_file object @@ -326,14 +349,21 @@ def dataDocument # get mail merge recipients information def dataSpreadsheet - dataSpreadsheet = is_enable_direct_url == true ? { + # file type +# server url to the mail merge recipients file +# direct url to the mail merge recipients file +dataSpreadsheet = if is_enable_direct_url == true + { :fileType => 'csv', # file type :url => "#{DocumentHelper.get_server_url(true)}/csv", # server url to the mail merge recipients file :directUrl => "#{DocumentHelper.get_server_url(false)}/csv" # direct url to the mail merge recipients file - } : { + } +else + { :fileType => 'csv', # file type :url => "#{DocumentHelper.get_server_url(true)}/csv" # server url to the mail merge recipients file } +end if JwtHelper.is_enabled # check if a secret key to generate token exists or not dataSpreadsheet['token'] = JwtHelper.encode(dataSpreadsheet) # encode a payload object into a token and write it to the dataSpreadsheet object From c350dd022fc52d82979293cd5beacca31ba804bd Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:12:30 +0300 Subject: [PATCH 292/488] ruby: Style/TrailingCommaInHashLiteral correct --- web/documentserver-example/ruby/app/models/file_model.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 1a1e99615..b79f467d7 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -178,7 +178,7 @@ def get_config :submitForm => submitForm, # the Submit form button state :goback => { :url => DocumentHelper.get_server_url(false) - }, + } } } } From bd922d202e635f29baa40feef0944ff9b6fe337d Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:13:10 +0300 Subject: [PATCH 293/488] ruby: Style/ParenthesesAroundCondition correct --- web/documentserver-example/ruby/app/models/file_model.rb | 6 +++--- web/documentserver-example/ruby/app/models/track_helper.rb | 2 +- web/documentserver-example/ruby/app/models/users.rb | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index b79f467d7..a58986773 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -200,7 +200,7 @@ def get_history hist_dir = DocumentHelper.history_dir(DocumentHelper.storage_path(@file_name, nil)) # get the path to the file history cur_ver = DocumentHelper.get_file_version(hist_dir) # get the file version - if (cur_ver > 0) # if file was modified + if cur_ver > 0 # if file was modified hist = [] histData = {} @@ -211,7 +211,7 @@ def get_history # get document key cur_key = doc_key - if (i != cur_ver) + if i != cur_ver File.open(File.join(ver_dir, 'key.txt'), 'r') do |file| cur_key = file.read end @@ -241,7 +241,7 @@ def get_history end dataObj['version'] = i - if (i > 1) # check if the version number is greater than 1 + if i > 1 # check if the version number is greater than 1 changes = nil change = nil File.open(File.join(DocumentHelper.version_dir(hist_dir, i - 1), 'changes.json'), 'r') do |file| # get the path to the changes.json file diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 0e3d2d2d6..4679d4b15 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -240,7 +240,7 @@ def command_request(method, key, meta = nil) :key => key } - payload.merge!({ :meta => meta }) if (!meta.nil?) + payload.merge!({ :meta => meta }) if !meta.nil? data = nil begin diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index f5eda73f1..0064e95e4 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -124,7 +124,7 @@ def get_user(id) # get a user by id specified def get_users_for_mentions(id) # get a list of users with their names and emails for mentions usersData = [] for user in @@users do - usersData.push({ :name => user.name, :email => user.email }) if (!user.id.eql?(id) && !user.name.nil? && !user.email.nil?) + usersData.push({ :name => user.name, :email => user.email }) if !user.id.eql?(id) && !user.name.nil? && !user.email.nil? end return usersData end @@ -132,7 +132,7 @@ def get_users_for_mentions(id) # get a list of users with their names and emails def get_users_for_protect(id) # get a list of users with their id, names and emails for protect users_data = [] for user in @@users do - users_data.push({ id: user.id, name: user.name, email: user.email }) if (!user.id.eql?(id) && !user.name.nil?) + users_data.push({ id: user.id, name: user.name, email: user.email }) if !user.id.eql?(id) && !user.name.nil? end return users_data end From 26fc316cee8b731c1b941adb06f7e8b31d49e806 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:15:09 +0300 Subject: [PATCH 294/488] ruby: Style/OrAssignment correct --- web/documentserver-example/ruby/app/models/track_helper.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 4679d4b15..c78eca5c7 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -138,9 +138,7 @@ def process_save(raw_file_data, file_name, user_address) save_file(change_data, File.join(ver_dir, 'diff.zip')) # save file with document versions differences hist_data = file_data['changeshistory'] - unless hist_data # if there are no changes in the history - hist_data = file_data['history'].to_json # write the original history information to the history data - end + hist_data ||= file_data['history'].to_json if hist_data File.open(File.join(ver_dir, 'changes.json'), 'wb') do |file| # open the file with document changes file.write(hist_data) # and write history data to this file From 7d6933803f5c3cdf4cecbae09370dbeee7957773 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:17:39 +0300 Subject: [PATCH 295/488] ruby: Style/TrailingCommaInArrayLiteral correct --- web/documentserver-example/ruby/app/models/users.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 0064e95e4..5e8f2c617 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -44,7 +44,7 @@ class Users 'The file favorite state is undefined', 'Can create files from templates using data from the editor', 'Can see the information about all users', - 'Has an avatar', + 'Has an avatar' ] @@descr_user_2 = [ @@ -54,7 +54,7 @@ class Users 'This file is marked as favorite', 'Can create new files from the editor', 'Can see the information about users from Group2 and users who don’t belong to any group', - 'Has an avatar', + 'Has an avatar' ] @@descr_user_3 = [ @@ -66,7 +66,7 @@ class Users 'Can’t download the file', 'Can’t print the file', 'Can create new files from the editor', - 'Can see the information about Group2 users', + 'Can see the information about Group2 users' ] @@descr_user_0 = [ From dd3b7ab07755d20903c18bfeff2fb2bc8d05c95a Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:18:25 +0300 Subject: [PATCH 296/488] ruby: Style/WordArray correct --- web/documentserver-example/ruby/app/models/users.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 5e8f2c617..c3558f97f 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -98,12 +98,12 @@ class Users true, [], @@descr_user_2, false, true), User.new('uid-3', 'Hamish Mitchell', nil, 'group-3', ['group-2'], { - :view => ['group-3', 'group-2'], + :view => %w[group-3 group-2], :edit => ['group-2'], :remove => [] }, ['group-2'], - false, ['copy', 'download', 'print'], @@descr_user_3, false, false), + false, %w[copy download print], @@descr_user_3, false, false), User.new('uid-0', nil, nil, '', nil, {}, [], nil, ['protect'], @@descr_user_0, false, false) From d06bb98a6120d47e679c1e5947f02234d0d37b1a Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:18:58 +0300 Subject: [PATCH 297/488] ruby: Style/DefWithParentheses correct --- web/documentserver-example/ruby/app/models/users.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index c3558f97f..830746369 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -110,7 +110,7 @@ class Users ] class << self - def get_all_users() # get a list of all the users + def get_all_users # get a list of all the users @@users end From c0d8e0e339215d988d172c9fe7a232c71b140616 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:52:29 +0300 Subject: [PATCH 298/488] ruby: Layout/IndentationWidth correct --- .../ruby/app/controllers/home_controller.rb | 2 +- .../ruby/app/models/document_helper.rb | 16 +-- .../ruby/app/models/file_model.rb | 112 +++++++++--------- .../ruby/app/models/service_converter.rb | 18 +-- .../ruby/app/models/track_helper.rb | 2 +- 5 files changed, 75 insertions(+), 75 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index e4949316e..9c7c6b9ae 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -191,7 +191,7 @@ def track file_name = File.basename(params[:fileName]) if status == 1 && (file_data['actions'][0]['type'] == 0) # finished edit - user = file_data['actions'][0]['userid'] # get the user id + user = file_data['actions'][0]['userid'] # get the user id unless file_data['users'].index(user) json_data = TrackHelper.command_request('forcesave', file_data['key']) # call the forcesave command end diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 826aee305..58514a948 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -250,13 +250,13 @@ def get_download_url(file_name, is_serverUrl = true) def get_internal_extension(file_type) ext = case file_type when 'word' # .docx for word type - '.docx' + '.docx' when 'cell' # .xlsx for cell type - '.xlsx' + '.xlsx' when 'slide' # .pptx for slide type - '.pptx' + '.pptx' else - '.docx' # the default value is .docx + '.docx' # the default value is .docx end ext @@ -267,13 +267,13 @@ def get_template_image_url(file_type) path = "#{get_server_url(true)}/assets/" full_path = case file_type when 'word' # for word type - "#{path}file_docx.svg" + "#{path}file_docx.svg" when 'cell' # .xlsx for cell type - "#{path}file_xlsx.svg" + "#{path}file_xlsx.svg" when 'slide' # .pptx for slide type - "#{path}file_pptx.svg" + "#{path}file_pptx.svg" else - "#{path}file_docx.svg" # the default value is .docx + "#{path}file_docx.svg" # the default value is .docx end full_path diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index a58986773..8fe62f0f7 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -149,10 +149,10 @@ def get_config :lang => @lang ? @lang : 'en', :callbackUrl => callback_url, # absolute URL to the document storage service :coEditing => if editorsmode.eql?('view') && @user.id.eql?('uid-0') - { - :mode => 'strict', - :change => false - } + { + :mode => 'strict', + :change => false + } else nil end, @@ -220,16 +220,16 @@ def get_history obj['version'] = i if (i == 1) && File.file?(File.join(hist_dir, 'createdInfo.json')) # check if the createdInfo.json file with meta data exists - File.open(File.join(hist_dir, 'createdInfo.json'), 'r') do |file| # open it - cr_info = JSON.parse(file.read) # parse the file content - - # write information about changes to the object - obj['created'] = cr_info['created'] - obj['user'] = { - :id => cr_info['uid'], - :name => cr_info['uname'] - } - end + File.open(File.join(hist_dir, 'createdInfo.json'), 'r') do |file| # open it + cr_info = JSON.parse(file.read) # parse the file content + + # write information about changes to the object + obj['created'] = cr_info['created'] + obj['user'] = { + :id => cr_info['uid'], + :name => cr_info['uname'] + } + end end # get the history data from the previous file version and write key and url information about it @@ -259,12 +259,12 @@ def get_history prev = histData[(i - 2).to_s] # get the history data from the previous file version # write key and url information about previous file version with optional direct url dataObj['previous'] = if is_enable_direct_url == true - { # write key and url information about previous file version with optional direct url - :fileType => prev['fileType'], - :key => prev['key'], - :url => prev['url'], - :directUrl => prev['directUrl'] - } + { # write key and url information about previous file version with optional direct url + :fileType => prev['fileType'], + :key => prev['key'], + :url => prev['url'], + :directUrl => prev['directUrl'] + } else { :fileType => prev['fileType'], @@ -302,18 +302,18 @@ def get_insert_image # image file type # server url to the image # direct url to the image -insert_image = if is_enable_direct_url == true - { - :fileType => 'png', # image file type - :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png", # server url to the image - :directUrl => "#{DocumentHelper.get_server_url(false)}/assets/logo.png" # direct url to the image - } -else - { - :fileType => 'png', # image file type - :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png" # server url to the image - } -end + insert_image = if is_enable_direct_url == true + { + :fileType => 'png', # image file type + :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png", # server url to the image + :directUrl => "#{DocumentHelper.get_server_url(false)}/assets/logo.png" # direct url to the image + } + else + { + :fileType => 'png', # image file type + :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png" # server url to the image + } + end if JwtHelper.is_enabled # check if a secret key to generate token exists or not insert_image['token'] = JwtHelper.encode(insert_image) # encode a payload object into a token and write it to the insert_image object @@ -327,18 +327,18 @@ def dataDocument # file type # server url to the compared file # direct url to the compared file -compare_file = if is_enable_direct_url == true - { - :fileType => 'docx', # file type - :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx", # server url to the compared file - :directUrl => "#{DocumentHelper.get_server_url(false)}/asset?fileName=sample.docx" # direct url to the compared file - } -else - { - :fileType => 'docx', # file type - :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx" # server url to the compared file - } -end + compare_file = if is_enable_direct_url == true + { + :fileType => 'docx', # file type + :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx", # server url to the compared file + :directUrl => "#{DocumentHelper.get_server_url(false)}/asset?fileName=sample.docx" # direct url to the compared file + } + else + { + :fileType => 'docx', # file type + :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx" # server url to the compared file + } + end if JwtHelper.is_enabled # check if a secret key to generate token exists or not compare_file['token'] = JwtHelper.encode(compare_file) # encode a payload object into a token and write it to the compare_file object @@ -352,18 +352,18 @@ def dataSpreadsheet # file type # server url to the mail merge recipients file # direct url to the mail merge recipients file -dataSpreadsheet = if is_enable_direct_url == true - { - :fileType => 'csv', # file type - :url => "#{DocumentHelper.get_server_url(true)}/csv", # server url to the mail merge recipients file - :directUrl => "#{DocumentHelper.get_server_url(false)}/csv" # direct url to the mail merge recipients file - } -else - { - :fileType => 'csv', # file type - :url => "#{DocumentHelper.get_server_url(true)}/csv" # server url to the mail merge recipients file - } -end + dataSpreadsheet = if is_enable_direct_url == true + { + :fileType => 'csv', # file type + :url => "#{DocumentHelper.get_server_url(true)}/csv", # server url to the mail merge recipients file + :directUrl => "#{DocumentHelper.get_server_url(false)}/csv" # direct url to the mail merge recipients file + } + else + { + :fileType => 'csv', # file type + :url => "#{DocumentHelper.get_server_url(true)}/csv" # server url to the mail merge recipients file + } + end if JwtHelper.is_enabled # check if a secret key to generate token exists or not dataSpreadsheet['token'] = JwtHelper.encode(dataSpreadsheet) # encode a payload object into a token and write it to the dataSpreadsheet object diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index a53a939a1..18f6b4996 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -105,25 +105,25 @@ def process_convert_service_responce_error(error_code) # add an error message to the error message template depending on the error code case error_code when -8 - error_message = 'Error occurred in the ConvertService.ashx: Error document VKey' + error_message = 'Error occurred in the ConvertService.ashx: Error document VKey' when -7 - error_message = 'Error occurred in the ConvertService.ashx: Error document request' + error_message = 'Error occurred in the ConvertService.ashx: Error document request' when -6 - error_message = 'Error occurred in the ConvertService.ashx: Error database' + error_message = 'Error occurred in the ConvertService.ashx: Error database' when -5 - error_message = 'Error occurred in the ConvertService.ashx: Incorrect password' + error_message = 'Error occurred in the ConvertService.ashx: Incorrect password' when -4 - error_message = 'Error occurred in the ConvertService.ashx: Error download error' + error_message = 'Error occurred in the ConvertService.ashx: Error download error' when -3 - error_message = 'Error occurred in the ConvertService.ashx: Error convertation error' + error_message = 'Error occurred in the ConvertService.ashx: Error convertation error' when -2 - error_message = 'Error occurred in the ConvertService.ashx: Error convertation timeout' + error_message = 'Error occurred in the ConvertService.ashx: Error convertation timeout' when -1 - error_message = 'Error occurred in the ConvertService.ashx: Error convertation unknown' + error_message = 'Error occurred in the ConvertService.ashx: Error convertation unknown' when 0 # public const int c_nErrorNo = 0 else - error_message = "ErrorCode = #{error_code.to_s}" # default value for the error message + error_message = "ErrorCode = #{error_code.to_s}" # default value for the error message end raise error_message diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index c78eca5c7..a72041aba 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -202,7 +202,7 @@ def process_force_save(file_data, file_name, user_address) if is_submit_form file_name = if new_file_name - DocumentHelper.get_correct_name("#{File.basename(file_name, cur_ext)}-form#{download_ext}", user_address) # get the correct file name if it already exists + DocumentHelper.get_correct_name("#{File.basename(file_name, cur_ext)}-form#{download_ext}", user_address) # get the correct file name if it already exists else DocumentHelper.get_correct_name("#{File.basename(file_name, cur_ext)}-form#{cur_ext}", user_address) end From 42c2c93e8111e99830ab5c00babd0862098fc322 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:53:34 +0300 Subject: [PATCH 299/488] ruby: Layout/EndAlignment correct --- .../ruby/app/controllers/home_controller.rb | 2 +- .../ruby/app/models/file_model.rb | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 9c7c6b9ae..1fe090c58 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -195,7 +195,7 @@ def track unless file_data['users'].index(user) json_data = TrackHelper.command_request('forcesave', file_data['key']) # call the forcesave command end - end + end if [2, 3].include?(status) # MustSave, Corrupted saved = TrackHelper.process_save(file_data, file_name, user_address) # save file diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 8fe62f0f7..5c5f1b7f6 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -155,7 +155,7 @@ def get_config } else nil -end, + end, :createUrl => !@user.id.eql?('uid-0') ? create_url : nil, :templates => @user.templates ? templates : nil, :user => { # the user currently viewing or editing the document @@ -230,7 +230,7 @@ def get_history :name => cr_info['uname'] } end - end + end # get the history data from the previous file version and write key and url information about it dataObj['fileType'] = file_ext[1..file_ext.length] @@ -271,7 +271,7 @@ def get_history :key => prev['key'], :url => prev['url'] } -end + end # write the path to the diff.zip archive with differences in this file version dataObj['changesUrl'] = DocumentHelper.get_historypath_uri(file_name, i - 1, 'diff.zip') @@ -313,7 +313,7 @@ def get_insert_image :fileType => 'png', # image file type :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png" # server url to the image } - end + end if JwtHelper.is_enabled # check if a secret key to generate token exists or not insert_image['token'] = JwtHelper.encode(insert_image) # encode a payload object into a token and write it to the insert_image object @@ -338,7 +338,7 @@ def dataDocument :fileType => 'docx', # file type :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx" # server url to the compared file } - end + end if JwtHelper.is_enabled # check if a secret key to generate token exists or not compare_file['token'] = JwtHelper.encode(compare_file) # encode a payload object into a token and write it to the compare_file object @@ -363,7 +363,7 @@ def dataSpreadsheet :fileType => 'csv', # file type :url => "#{DocumentHelper.get_server_url(true)}/csv" # server url to the mail merge recipients file } - end + end if JwtHelper.is_enabled # check if a secret key to generate token exists or not dataSpreadsheet['token'] = JwtHelper.encode(dataSpreadsheet) # encode a payload object into a token and write it to the dataSpreadsheet object From 97478679356a22ebf9cc7b12d8af9c3bf57c2665 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:54:06 +0300 Subject: [PATCH 300/488] ruby: Layout/CommentIndentation correct --- .../ruby/app/controllers/home_controller.rb | 4 ++-- .../ruby/app/models/document_helper.rb | 2 +- .../ruby/app/models/file_model.rb | 14 +++++++------- .../ruby/app/models/jwt_helper.rb | 12 ++++++------ .../ruby/app/models/track_helper.rb | 18 +++++++++--------- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 1fe090c58..fa50be5f3 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -336,7 +336,7 @@ def saveas end end - # Rename... + # Rename... def rename body = JSON.parse(request.body.read) dockey = body['dockey'] @@ -354,7 +354,7 @@ def rename render plain: "{ \"result\" : \"#{JSON.dump(json_data)}\"}" end - # ReferenceData + # ReferenceData def reference body = JSON.parse(request.body.read) fileName = '' diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 58514a948..6024ffae7 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -92,7 +92,7 @@ def forcesave_path(file_name, user_address, create) return '' unless create FileUtils.mkdir_p(directory) # create history directory if it doesn't exist - # the history directory doesn't exist and we are not supposed to create it + # the history directory doesn't exist and we are not supposed to create it end diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 5c5f1b7f6..fb27ce922 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -257,7 +257,7 @@ def get_history obj['user'] = change ? change['user'] : nil prev = histData[(i - 2).to_s] # get the history data from the previous file version - # write key and url information about previous file version with optional direct url +# write key and url information about previous file version with optional direct url dataObj['previous'] = if is_enable_direct_url == true { # write key and url information about previous file version with optional direct url :fileType => prev['fileType'], @@ -300,8 +300,8 @@ def get_history # get image information def get_insert_image # image file type -# server url to the image -# direct url to the image + # server url to the image + # direct url to the image insert_image = if is_enable_direct_url == true { :fileType => 'png', # image file type @@ -325,8 +325,8 @@ def get_insert_image # get compared file information def dataDocument # file type -# server url to the compared file -# direct url to the compared file + # server url to the compared file + # direct url to the compared file compare_file = if is_enable_direct_url == true { :fileType => 'docx', # file type @@ -350,8 +350,8 @@ def dataDocument # get mail merge recipients information def dataSpreadsheet # file type -# server url to the mail merge recipients file -# direct url to the mail merge recipients file + # server url to the mail merge recipients file + # direct url to the mail merge recipients file dataSpreadsheet = if is_enable_direct_url == true { :fileType => 'csv', # file type diff --git a/web/documentserver-example/ruby/app/models/jwt_helper.rb b/web/documentserver-example/ruby/app/models/jwt_helper.rb index 6951c6ced..d50090c79 100644 --- a/web/documentserver-example/ruby/app/models/jwt_helper.rb +++ b/web/documentserver-example/ruby/app/models/jwt_helper.rb @@ -22,30 +22,30 @@ class JwtHelper @token_use_for_request = ConfigurationManager.new.jwt_use_for_request class << self - # check if a secret key to generate token exists or not + # check if a secret key to generate token exists or not def is_enabled return @jwt_secret && !@jwt_secret.empty? ? true : false end - # check if a secret key used for request + # check if a secret key used for request def use_for_request return @token_use_for_request end - # encode a payload object into a token using a secret key + # encode a payload object into a token using a secret key def encode(payload) return JWT.encode payload, @jwt_secret, 'HS256' # define the hashing algorithm and get token end - # decode a token into a payload object using a secret key + # decode a token into a payload object using a secret key def decode(token) begin decoded = JWT.decode token, @jwt_secret, true, { algorithm: 'HS256' } rescue return '' end - # decoded = Array [ {"data"=>"test"}, # payload - # {"alg"=>"HS256"} # header ] + # decoded = Array [ {"data"=>"test"}, # payload + # {"alg"=>"HS256"} # header ] return decoded[0].to_json # get json payload end end diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index a72041aba..d5ab0d6b9 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -30,7 +30,7 @@ class << self @@document_command_url = TrackHelper.config_manager.document_server_command_uri.to_s class << self - # read the request body + # read the request body def read_body(request) body = request.body.read @@ -38,7 +38,7 @@ def read_body(request) file_data = JSON.parse(body) # parse file data - # check if a secret key to generate token exists or not + # check if a secret key to generate token exists or not if JwtHelper.is_enabled && JwtHelper.use_for_request inHeader = false token = nil @@ -87,7 +87,7 @@ def resolve_process_save_body(body) copied end - # file saving process + # file saving process def process_save(raw_file_data, file_name, user_address) file_data = resolve_process_save_body(raw_file_data) @@ -102,7 +102,7 @@ def process_save(raw_file_data, file_name, user_address) cur_ext = File.extname(file_name).downcase # get current file extension - # convert downloaded file to the file with the current extension if these extensions aren't equal + # convert downloaded file to the file with the current extension if these extensions aren't equal unless cur_ext.eql?(download_ext) key = ServiceConverter.generate_revision_id(download_uri) # get the document key begin @@ -163,7 +163,7 @@ def process_save(raw_file_data, file_name, user_address) saved end - # file force saving process + # file force saving process def process_force_save(file_data, file_name, user_address) download_uri = file_data['url'] if download_uri.eql?(nil) @@ -177,7 +177,7 @@ def process_force_save(file_data, file_name, user_address) new_file_name = false - # convert downloaded file to the file with the current extension if these extensions aren't equal + # convert downloaded file to the file with the current extension if these extensions aren't equal unless cur_ext.eql?(download_ext) key = ServiceConverter.generate_revision_id(download_uri) # get the document key begin @@ -230,9 +230,9 @@ def process_force_save(file_data, file_name, user_address) saved end - # send the command request + # send the command request def command_request(method, key, meta = nil) - # create a payload object with the method and key + # create a payload object with the method and key payload = { :c => method, :key => key @@ -267,7 +267,7 @@ def command_request(method, key, meta = nil) return json_data end - # save file from the url + # save file from the url def download_file(uristr) uri = URI.parse(uristr) # parse the url string http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server From 6ff7b4fa8f8be66682dec0eb202d74ac500e5803 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:56:34 +0300 Subject: [PATCH 301/488] ruby: Layout/EmptyLines correct --- .../ruby/app/controllers/home_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index fa50be5f3..1fd3a0c14 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -359,7 +359,6 @@ def reference body = JSON.parse(request.body.read) fileName = '' - if body.key?('referenceData') referenceData = body['referenceData'] instanceId = referenceData['instanceId'] From 8527ac602f315bc0f215ff5d9ce4d153a1fee4dc Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:57:05 +0300 Subject: [PATCH 302/488] ruby: Layout/EmptyLineAfterGuardClause correct --- web/documentserver-example/ruby/app/models/document_helper.rb | 2 ++ web/documentserver-example/ruby/app/models/file_model.rb | 1 + 2 files changed, 3 insertions(+) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 6024ffae7..41b9a5e8e 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -90,6 +90,7 @@ def forcesave_path(file_name, user_address, create) directory = File.join(directory, "#{File.basename(file_name)}-hist") # get the path to the history of the given file unless File.directory?(directory) return '' unless create + FileUtils.mkdir_p(directory) # create history directory if it doesn't exist # the history directory doesn't exist and we are not supposed to create it @@ -315,6 +316,7 @@ def get_files_info(file_id) # enable ignore certificate def verify_ssl(file_uri, http) return unless file_uri.start_with?('https') && DocumentHelper.config_manager.ssl_verify_peer_mode_enabled + http.use_ssl = true http.verify_mode = OpenSSL::SSL::VERIFY_NONE # set the flags for the server certificate verification at the beginning of SSL session diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index fb27ce922..3369a6bfd 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -380,6 +380,7 @@ def get_users_mentions def get_users_info users_info = [] return if @user.id.eql?('uid-0') + Users.get_all_users.each do |user_info| u = { id: user_info.id, From 5259cc19fa0e75184882ba97ead7ecd6ed9ba89e Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:57:29 +0300 Subject: [PATCH 303/488] ruby: Layout/IndentationConsistency correct --- .../ruby/app/controllers/home_controller.rb | 6 +- .../ruby/app/models/document_helper.rb | 12 ++-- .../ruby/app/models/file_model.rb | 66 +++++++++---------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 1fd3a0c14..caa8354d9 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -192,9 +192,9 @@ def track if status == 1 && (file_data['actions'][0]['type'] == 0) # finished edit user = file_data['actions'][0]['userid'] # get the user id - unless file_data['users'].index(user) - json_data = TrackHelper.command_request('forcesave', file_data['key']) # call the forcesave command - end + unless file_data['users'].index(user) + json_data = TrackHelper.command_request('forcesave', file_data['key']) # call the forcesave command + end end if [2, 3].include?(status) # MustSave, Corrupted diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 41b9a5e8e..256696bf2 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -91,7 +91,7 @@ def forcesave_path(file_name, user_address, create) unless File.directory?(directory) return '' unless create - FileUtils.mkdir_p(directory) # create history directory if it doesn't exist + FileUtils.mkdir_p(directory) # create history directory if it doesn't exist # the history directory doesn't exist and we are not supposed to create it @@ -227,7 +227,7 @@ def get_server_url(for_document_server) return DocumentHelper.config_manager.example_uri.to_s if for_document_server && DocumentHelper.config_manager.example_uri - return @@base_url + return @@base_url end @@ -302,14 +302,14 @@ def get_files_info(file_id) result.push(info) # push info object to the response array elsif file_id.eql?(info['id']) # if file id is defined result.push(info) # response object will be equal to the info object - return result # and it is equal to the document key value + return result # and it is equal to the document key value end end return '"File not found"' if !file_id.nil? - return result + return result end @@ -317,8 +317,8 @@ def get_files_info(file_id) def verify_ssl(file_uri, http) return unless file_uri.start_with?('https') && DocumentHelper.config_manager.ssl_verify_peer_mode_enabled - http.use_ssl = true - http.verify_mode = OpenSSL::SSL::VERIFY_NONE # set the flags for the server certificate verification at the beginning of SSL session + http.use_ssl = true + http.verify_mode = OpenSSL::SSL::VERIFY_NONE # set the flags for the server certificate verification at the beginning of SSL session end end diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 3369a6bfd..e26a7da59 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -258,20 +258,20 @@ def get_history prev = histData[(i - 2).to_s] # get the history data from the previous file version # write key and url information about previous file version with optional direct url -dataObj['previous'] = if is_enable_direct_url == true - { # write key and url information about previous file version with optional direct url - :fileType => prev['fileType'], - :key => prev['key'], - :url => prev['url'], - :directUrl => prev['directUrl'] - } -else - { - :fileType => prev['fileType'], - :key => prev['key'], - :url => prev['url'] - } - end + dataObj['previous'] = if is_enable_direct_url == true + { # write key and url information about previous file version with optional direct url + :fileType => prev['fileType'], + :key => prev['key'], + :url => prev['url'], + :directUrl => prev['directUrl'] + } + else + { + :fileType => prev['fileType'], + :key => prev['key'], + :url => prev['url'] + } + end # write the path to the diff.zip archive with differences in this file version dataObj['changesUrl'] = DocumentHelper.get_historypath_uri(file_name, i - 1, 'diff.zip') @@ -381,25 +381,25 @@ def get_users_info users_info = [] return if @user.id.eql?('uid-0') - Users.get_all_users.each do |user_info| - u = { - id: user_info.id, - name: user_info.name, - email: user_info.email, - group: user_info.group, - reviewGroups: user_info.reviewGroups, - commentGroups: user_info.commentGroups, - userInfoGroups: user_info.userInfoGroups, - favorite: user_info.favorite, - deniedPermissions: user_info.deniedPermissions, - descriptions: user_info.descriptions, - templates: user_info.templates, - avatar: user_info.avatar - } - u['image'] = user_info.avatar ? "#{DocumentHelper.get_server_url(true)}/assets/#{user_info.id}.png" : nil - users_info.push(u) - end - return users_info + Users.get_all_users.each do |user_info| + u = { + id: user_info.id, + name: user_info.name, + email: user_info.email, + group: user_info.group, + reviewGroups: user_info.reviewGroups, + commentGroups: user_info.commentGroups, + userInfoGroups: user_info.userInfoGroups, + favorite: user_info.favorite, + deniedPermissions: user_info.deniedPermissions, + descriptions: user_info.descriptions, + templates: user_info.templates, + avatar: user_info.avatar + } + u['image'] = user_info.avatar ? "#{DocumentHelper.get_server_url(true)}/assets/#{user_info.id}.png" : nil + users_info.push(u) + end + return users_info end From dccc970fa16baaedd949a06d43a97b10985684f7 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:58:00 +0300 Subject: [PATCH 304/488] ruby: Layout/TrailingWhitespace correct --- .../ruby/app/models/document_helper.rb | 18 +++++++++--------- .../ruby/app/models/file_model.rb | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 256696bf2..64fa559a6 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -92,9 +92,9 @@ def forcesave_path(file_name, user_address, create) return '' unless create FileUtils.mkdir_p(directory) # create history directory if it doesn't exist - + # the history directory doesn't exist and we are not supposed to create it - + end directory = File.join(directory, File.basename(file_name)) # get the path to the given file @@ -225,10 +225,10 @@ def get_historypath_uri(file_name, version, file, is_serverUrl = true) # get server url def get_server_url(for_document_server) return DocumentHelper.config_manager.example_uri.to_s if for_document_server && DocumentHelper.config_manager.example_uri - - + + return @@base_url - + end # get callback url @@ -307,10 +307,10 @@ def get_files_info(file_id) end return '"File not found"' if !file_id.nil? - - + + return result - + end # enable ignore certificate @@ -319,7 +319,7 @@ def verify_ssl(file_uri, http) http.use_ssl = true http.verify_mode = OpenSSL::SSL::VERIFY_NONE # set the flags for the server certificate verification at the beginning of SSL session - + end end end diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index e26a7da59..5c3687057 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -400,7 +400,7 @@ def get_users_info users_info.push(u) end return users_info - + end # get users data for protect From de5fc508f2d2b3590a2d84b8370500b09ebc4ab2 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:58:24 +0300 Subject: [PATCH 305/488] ruby: Layout/CaseIndentation correct --- .../ruby/app/models/document_helper.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 64fa559a6..847c4dda0 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -250,11 +250,11 @@ def get_download_url(file_name, is_serverUrl = true) # get internal file extension by its type def get_internal_extension(file_type) ext = case file_type - when 'word' # .docx for word type + when 'word' # .docx for word type '.docx' - when 'cell' # .xlsx for cell type + when 'cell' # .xlsx for cell type '.xlsx' - when 'slide' # .pptx for slide type + when 'slide' # .pptx for slide type '.pptx' else '.docx' # the default value is .docx @@ -267,11 +267,11 @@ def get_internal_extension(file_type) def get_template_image_url(file_type) path = "#{get_server_url(true)}/assets/" full_path = case file_type - when 'word' # for word type + when 'word' # for word type "#{path}file_docx.svg" - when 'cell' # .xlsx for cell type + when 'cell' # .xlsx for cell type "#{path}file_xlsx.svg" - when 'slide' # .pptx for slide type + when 'slide' # .pptx for slide type "#{path}file_pptx.svg" else "#{path}file_docx.svg" # the default value is .docx From 27267e2d5bedc8a8fd85b35560e63ba594cf0cc3 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:58:59 +0300 Subject: [PATCH 306/488] ruby: Layout/ElseAlignment correct --- .../ruby/app/models/document_helper.rb | 4 ++-- .../ruby/app/models/file_model.rb | 10 +++++----- .../ruby/app/models/service_converter.rb | 2 +- .../ruby/app/models/track_helper.rb | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 847c4dda0..4db34c642 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -256,7 +256,7 @@ def get_internal_extension(file_type) '.xlsx' when 'slide' # .pptx for slide type '.pptx' - else + else '.docx' # the default value is .docx end @@ -273,7 +273,7 @@ def get_template_image_url(file_type) "#{path}file_xlsx.svg" when 'slide' # .pptx for slide type "#{path}file_pptx.svg" - else + else "#{path}file_docx.svg" # the default value is .docx end diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 5c3687057..6645ab828 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -153,7 +153,7 @@ def get_config :mode => 'strict', :change => false } -else + else nil end, :createUrl => !@user.id.eql?('uid-0') ? create_url : nil, @@ -265,7 +265,7 @@ def get_history :url => prev['url'], :directUrl => prev['directUrl'] } - else + else { :fileType => prev['fileType'], :key => prev['key'], @@ -308,7 +308,7 @@ def get_insert_image :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png", # server url to the image :directUrl => "#{DocumentHelper.get_server_url(false)}/assets/logo.png" # direct url to the image } - else + else { :fileType => 'png', # image file type :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png" # server url to the image @@ -333,7 +333,7 @@ def dataDocument :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx", # server url to the compared file :directUrl => "#{DocumentHelper.get_server_url(false)}/asset?fileName=sample.docx" # direct url to the compared file } - else + else { :fileType => 'docx', # file type :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx" # server url to the compared file @@ -358,7 +358,7 @@ def dataSpreadsheet :url => "#{DocumentHelper.get_server_url(true)}/csv", # server url to the mail merge recipients file :directUrl => "#{DocumentHelper.get_server_url(false)}/csv" # direct url to the mail merge recipients file } - else + else { :fileType => 'csv', # file type :url => "#{DocumentHelper.get_server_url(true)}/csv" # server url to the mail merge recipients file diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index 18f6b4996..c325b3bef 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -122,7 +122,7 @@ def process_convert_service_responce_error(error_code) error_message = 'Error occurred in the ConvertService.ashx: Error convertation unknown' when 0 # public const int c_nErrorNo = 0 - else + else error_message = "ErrorCode = #{error_code.to_s}" # default value for the error message end diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index d5ab0d6b9..83e32577b 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -203,7 +203,7 @@ def process_force_save(file_data, file_name, user_address) if is_submit_form file_name = if new_file_name DocumentHelper.get_correct_name("#{File.basename(file_name, cur_ext)}-form#{download_ext}", user_address) # get the correct file name if it already exists - else + else DocumentHelper.get_correct_name("#{File.basename(file_name, cur_ext)}-form#{cur_ext}", user_address) end forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file From 79b98bed53cd4912141814321d13ac544cc29ab0 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 16:59:24 +0300 Subject: [PATCH 307/488] ruby: Layout/FirstHashElementIndentation correct --- .../ruby/app/models/file_model.rb | 36 +++++++++---------- .../ruby/app/models/users.rb | 8 ++--- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 6645ab828..4ff4c56a4 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -150,9 +150,9 @@ def get_config :callbackUrl => callback_url, # absolute URL to the document storage service :coEditing => if editorsmode.eql?('view') && @user.id.eql?('uid-0') { - :mode => 'strict', + :mode => 'strict', :change => false - } + } else nil end, @@ -260,17 +260,17 @@ def get_history # write key and url information about previous file version with optional direct url dataObj['previous'] = if is_enable_direct_url == true { # write key and url information about previous file version with optional direct url - :fileType => prev['fileType'], + :fileType => prev['fileType'], :key => prev['key'], :url => prev['url'], :directUrl => prev['directUrl'] - } + } else { - :fileType => prev['fileType'], + :fileType => prev['fileType'], :key => prev['key'], :url => prev['url'] - } + } end # write the path to the diff.zip archive with differences in this file version @@ -304,15 +304,15 @@ def get_insert_image # direct url to the image insert_image = if is_enable_direct_url == true { - :fileType => 'png', # image file type + :fileType => 'png', # image file type :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png", # server url to the image :directUrl => "#{DocumentHelper.get_server_url(false)}/assets/logo.png" # direct url to the image - } + } else { - :fileType => 'png', # image file type + :fileType => 'png', # image file type :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png" # server url to the image - } + } end if JwtHelper.is_enabled # check if a secret key to generate token exists or not @@ -329,15 +329,15 @@ def dataDocument # direct url to the compared file compare_file = if is_enable_direct_url == true { - :fileType => 'docx', # file type + :fileType => 'docx', # file type :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx", # server url to the compared file :directUrl => "#{DocumentHelper.get_server_url(false)}/asset?fileName=sample.docx" # direct url to the compared file - } + } else { - :fileType => 'docx', # file type + :fileType => 'docx', # file type :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx" # server url to the compared file - } + } end if JwtHelper.is_enabled # check if a secret key to generate token exists or not @@ -354,15 +354,15 @@ def dataSpreadsheet # direct url to the mail merge recipients file dataSpreadsheet = if is_enable_direct_url == true { - :fileType => 'csv', # file type + :fileType => 'csv', # file type :url => "#{DocumentHelper.get_server_url(true)}/csv", # server url to the mail merge recipients file :directUrl => "#{DocumentHelper.get_server_url(false)}/csv" # direct url to the mail merge recipients file - } + } else { - :fileType => 'csv', # file type + :fileType => 'csv', # file type :url => "#{DocumentHelper.get_server_url(true)}/csv" # server url to the mail merge recipients file - } + } end if JwtHelper.is_enabled # check if a secret key to generate token exists or not diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 830746369..d11934c62 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -90,18 +90,18 @@ class Users nil, [], @@descr_user_1, true, true), User.new('uid-2', 'Mark Pottato', 'pottato@example.com', 'group-2', ['group-2', ''], { - :view => '', + :view => '', :edit => ['group-2', ''], :remove => ['group-2'] - }, + }, ['group-2', ''], true, [], @@descr_user_2, false, true), User.new('uid-3', 'Hamish Mitchell', nil, 'group-3', ['group-2'], { - :view => %w[group-3 group-2], + :view => %w[group-3 group-2], :edit => ['group-2'], :remove => [] - }, + }, ['group-2'], false, %w[copy download print], @@descr_user_3, false, false), User.new('uid-0', nil, nil, From a17819efb22625533a5b90e3e9a92e725c8c2a37 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 17:03:09 +0300 Subject: [PATCH 308/488] ruby: Layout/RescueEnsureAlignment correct --- .../ruby/app/models/jwt_helper.rb | 2 +- .../ruby/app/models/track_helper.rb | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/jwt_helper.rb b/web/documentserver-example/ruby/app/models/jwt_helper.rb index d50090c79..d206d5fbb 100644 --- a/web/documentserver-example/ruby/app/models/jwt_helper.rb +++ b/web/documentserver-example/ruby/app/models/jwt_helper.rb @@ -41,7 +41,7 @@ def encode(payload) def decode(token) begin decoded = JWT.decode token, @jwt_secret, true, { algorithm: 'HS256' } - rescue + rescue return '' end # decoded = Array [ {"data"=>"test"}, # payload diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 83e32577b..a287aa90c 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -112,7 +112,7 @@ def process_save(raw_file_data, file_name, user_address) else download_uri = new_file_uri end - rescue StandardError => msg + rescue StandardError => msg new_file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) end end @@ -156,7 +156,7 @@ def process_save(raw_file_data, file_name, user_address) end saved = 0 - rescue StandardError => msg + rescue StandardError => msg saved = 1 end @@ -187,7 +187,7 @@ def process_force_save(file_data, file_name, user_address) else download_uri = new_file_uri end - rescue StandardError => msg + rescue StandardError => msg new_file_name = true end end @@ -223,7 +223,7 @@ def process_force_save(file_data, file_name, user_address) end saved = 0 - rescue StandardError => msg + rescue StandardError => msg saved = 1 end @@ -259,7 +259,7 @@ def command_request(method, key, meta = nil) req.body = payload.to_json # convert the payload object into the json format res = http.request(req) # get the response data = res.body # and take its body - rescue => ex + rescue => ex raise ex.message end From d1b972fb1826abc2c06ab4d403c1779f8b242611 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 17:03:44 +0300 Subject: [PATCH 309/488] ruby: Layout/HashAlignment correct --- .../ruby/app/models/file_model.rb | 30 +++++++++---------- .../ruby/app/models/track_helper.rb | 2 +- .../ruby/app/models/users.rb | 8 ++--- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 4ff4c56a4..bac883289 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -151,7 +151,7 @@ def get_config :coEditing => if editorsmode.eql?('view') && @user.id.eql?('uid-0') { :mode => 'strict', - :change => false + :change => false } else nil @@ -261,15 +261,15 @@ def get_history dataObj['previous'] = if is_enable_direct_url == true { # write key and url information about previous file version with optional direct url :fileType => prev['fileType'], - :key => prev['key'], - :url => prev['url'], - :directUrl => prev['directUrl'] + :key => prev['key'], + :url => prev['url'], + :directUrl => prev['directUrl'] } else { :fileType => prev['fileType'], - :key => prev['key'], - :url => prev['url'] + :key => prev['key'], + :url => prev['url'] } end @@ -305,13 +305,13 @@ def get_insert_image insert_image = if is_enable_direct_url == true { :fileType => 'png', # image file type - :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png", # server url to the image - :directUrl => "#{DocumentHelper.get_server_url(false)}/assets/logo.png" # direct url to the image + :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png", # server url to the image + :directUrl => "#{DocumentHelper.get_server_url(false)}/assets/logo.png" # direct url to the image } else { :fileType => 'png', # image file type - :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png" # server url to the image + :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png" # server url to the image } end @@ -330,13 +330,13 @@ def dataDocument compare_file = if is_enable_direct_url == true { :fileType => 'docx', # file type - :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx", # server url to the compared file - :directUrl => "#{DocumentHelper.get_server_url(false)}/asset?fileName=sample.docx" # direct url to the compared file + :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx", # server url to the compared file + :directUrl => "#{DocumentHelper.get_server_url(false)}/asset?fileName=sample.docx" # direct url to the compared file } else { :fileType => 'docx', # file type - :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx" # server url to the compared file + :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx" # server url to the compared file } end @@ -355,13 +355,13 @@ def dataSpreadsheet dataSpreadsheet = if is_enable_direct_url == true { :fileType => 'csv', # file type - :url => "#{DocumentHelper.get_server_url(true)}/csv", # server url to the mail merge recipients file - :directUrl => "#{DocumentHelper.get_server_url(false)}/csv" # direct url to the mail merge recipients file + :url => "#{DocumentHelper.get_server_url(true)}/csv", # server url to the mail merge recipients file + :directUrl => "#{DocumentHelper.get_server_url(false)}/csv" # direct url to the mail merge recipients file } else { :fileType => 'csv', # file type - :url => "#{DocumentHelper.get_server_url(true)}/csv" # server url to the mail merge recipients file + :url => "#{DocumentHelper.get_server_url(true)}/csv" # server url to the mail merge recipients file } end diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index a287aa90c..271139021 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -235,7 +235,7 @@ def command_request(method, key, meta = nil) # create a payload object with the method and key payload = { :c => method, - :key => key + :key => key } payload.merge!({ :meta => meta }) if !meta.nil? diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index d11934c62..480cd6bcf 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -91,16 +91,16 @@ class Users User.new('uid-2', 'Mark Pottato', 'pottato@example.com', 'group-2', ['group-2', ''], { :view => '', - :edit => ['group-2', ''], - :remove => ['group-2'] + :edit => ['group-2', ''], + :remove => ['group-2'] }, ['group-2', ''], true, [], @@descr_user_2, false, true), User.new('uid-3', 'Hamish Mitchell', nil, 'group-3', ['group-2'], { :view => %w[group-3 group-2], - :edit => ['group-2'], - :remove => [] + :edit => ['group-2'], + :remove => [] }, ['group-2'], false, %w[copy download print], @@descr_user_3, false, false), From bb4e2b3b465f83f863abb9cb6df4eee57271edb0 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 17:04:08 +0300 Subject: [PATCH 310/488] ruby: Layout/ExtraSpacing correct --- web/documentserver-example/ruby/app/models/track_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 271139021..59ce970ab 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -276,7 +276,7 @@ def download_file(uristr) DocumentHelper.verify_ssl(uristr, http) req = Net::HTTP::Get.new(uri) - res = http.request(req) # get the response + res = http.request(req) # get the response status_code = res.code raise "Document editing service returned status: #{status_code}" if status_code != '200' # checking status code From 4e685d9eabff68181587e94b7f020005e4400c09 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 17:04:34 +0300 Subject: [PATCH 311/488] ruby: Layout/ArrayAlignment correct --- .../ruby/app/models/users.rb | 102 +++++++++--------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 480cd6bcf..85a019a04 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -38,75 +38,75 @@ def initialize(id, name, email, group, reviewGroups, commentGroups, userInfoGrou class Users @@descr_user_1 = [ 'File author by default', - 'Doesn’t belong to any group', - 'Can review all the changes', - 'Can perform all actions with comments', - 'The file favorite state is undefined', - 'Can create files from templates using data from the editor', - 'Can see the information about all users', - 'Has an avatar' + 'Doesn’t belong to any group', + 'Can review all the changes', + 'Can perform all actions with comments', + 'The file favorite state is undefined', + 'Can create files from templates using data from the editor', + 'Can see the information about all users', + 'Has an avatar' ] @@descr_user_2 = [ 'Belongs to Group2', - 'Can review only his own changes or changes made by users with no group', - 'Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only', - 'This file is marked as favorite', - 'Can create new files from the editor', - 'Can see the information about users from Group2 and users who don’t belong to any group', - 'Has an avatar' + 'Can review only his own changes or changes made by users with no group', + 'Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only', + 'This file is marked as favorite', + 'Can create new files from the editor', + 'Can see the information about users from Group2 and users who don’t belong to any group', + 'Has an avatar' ] @@descr_user_3 = [ 'Belongs to Group3', - 'Can review changes made by Group2 users', - 'Can view comments left by Group2 and Group3 users. Can edit comments left by the Group2 users', - 'This file isn’t marked as favorite', - 'Can’t copy data from the file to clipboard', - 'Can’t download the file', - 'Can’t print the file', - 'Can create new files from the editor', - 'Can see the information about Group2 users' + 'Can review changes made by Group2 users', + 'Can view comments left by Group2 and Group3 users. Can edit comments left by the Group2 users', + 'This file isn’t marked as favorite', + 'Can’t copy data from the file to clipboard', + 'Can’t download the file', + 'Can’t print the file', + 'Can create new files from the editor', + 'Can see the information about Group2 users' ] @@descr_user_0 = [ 'The name is requested when the editor is opened', - 'Doesn’t belong to any group', - 'Can review all the changes', - 'Can perform all actions with comments', - 'The file favorite state is undefined', - "Can't mention others in comments", - "Can't create new files from the editor", - 'Can’t see anyone’s information', - "Can't rename files from the editor", - "Can't view chat", - "Can't protect file", - 'View file without collaboration' + 'Doesn’t belong to any group', + 'Can review all the changes', + 'Can perform all actions with comments', + 'The file favorite state is undefined', + "Can't mention others in comments", + "Can't create new files from the editor", + 'Can’t see anyone’s information', + "Can't rename files from the editor", + "Can't view chat", + "Can't protect file", + 'View file without collaboration' ] @@users = [ User.new('uid-1', 'John Smith', 'smith@example.com', '', nil, {}, nil, nil, [], @@descr_user_1, true, true), - User.new('uid-2', 'Mark Pottato', 'pottato@example.com', - 'group-2', ['group-2', ''], { - :view => '', - :edit => ['group-2', ''], - :remove => ['group-2'] - }, - ['group-2', ''], - true, [], @@descr_user_2, false, true), - User.new('uid-3', 'Hamish Mitchell', nil, - 'group-3', ['group-2'], { - :view => %w[group-3 group-2], - :edit => ['group-2'], - :remove => [] - }, - ['group-2'], - false, %w[copy download print], @@descr_user_3, false, false), - User.new('uid-0', nil, nil, - '', nil, {}, [], - nil, ['protect'], @@descr_user_0, false, false) + User.new('uid-2', 'Mark Pottato', 'pottato@example.com', + 'group-2', ['group-2', ''], { + :view => '', + :edit => ['group-2', ''], + :remove => ['group-2'] + }, + ['group-2', ''], + true, [], @@descr_user_2, false, true), + User.new('uid-3', 'Hamish Mitchell', nil, + 'group-3', ['group-2'], { + :view => %w[group-3 group-2], + :edit => ['group-2'], + :remove => [] + }, + ['group-2'], + false, %w[copy download print], @@descr_user_3, false, false), + User.new('uid-0', nil, nil, + '', nil, {}, [], + nil, ['protect'], @@descr_user_0, false, false) ] class << self From 4c92c1c750d9bd4e44a28028b14d3fa17ea1ce0e Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 17:08:38 +0300 Subject: [PATCH 312/488] ruby: Layout/IndentationWidth correct --- .../ruby/app/models/document_helper.rb | 16 ++++----- .../ruby/app/models/file_model.rb | 36 +++++++++---------- .../ruby/app/models/jwt_helper.rb | 2 +- .../ruby/app/models/track_helper.rb | 12 +++---- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 4db34c642..a3a6d9f47 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -251,13 +251,13 @@ def get_download_url(file_name, is_serverUrl = true) def get_internal_extension(file_type) ext = case file_type when 'word' # .docx for word type - '.docx' + '.docx' when 'cell' # .xlsx for cell type - '.xlsx' + '.xlsx' when 'slide' # .pptx for slide type - '.pptx' + '.pptx' else - '.docx' # the default value is .docx + '.docx' # the default value is .docx end ext @@ -268,13 +268,13 @@ def get_template_image_url(file_type) path = "#{get_server_url(true)}/assets/" full_path = case file_type when 'word' # for word type - "#{path}file_docx.svg" + "#{path}file_docx.svg" when 'cell' # .xlsx for cell type - "#{path}file_xlsx.svg" + "#{path}file_xlsx.svg" when 'slide' # .pptx for slide type - "#{path}file_pptx.svg" + "#{path}file_pptx.svg" else - "#{path}file_docx.svg" # the default value is .docx + "#{path}file_docx.svg" # the default value is .docx end full_path diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index bac883289..764bf5cc4 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -154,7 +154,7 @@ def get_config :change => false } else - nil + nil end, :createUrl => !@user.id.eql?('uid-0') ? create_url : nil, :templates => @user.templates ? templates : nil, @@ -266,11 +266,11 @@ def get_history :directUrl => prev['directUrl'] } else - { - :fileType => prev['fileType'], - :key => prev['key'], - :url => prev['url'] - } + { + :fileType => prev['fileType'], + :key => prev['key'], + :url => prev['url'] + } end # write the path to the diff.zip archive with differences in this file version @@ -309,10 +309,10 @@ def get_insert_image :directUrl => "#{DocumentHelper.get_server_url(false)}/assets/logo.png" # direct url to the image } else - { - :fileType => 'png', # image file type - :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png" # server url to the image - } + { + :fileType => 'png', # image file type + :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png" # server url to the image + } end if JwtHelper.is_enabled # check if a secret key to generate token exists or not @@ -334,10 +334,10 @@ def dataDocument :directUrl => "#{DocumentHelper.get_server_url(false)}/asset?fileName=sample.docx" # direct url to the compared file } else - { - :fileType => 'docx', # file type - :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx" # server url to the compared file - } + { + :fileType => 'docx', # file type + :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx" # server url to the compared file + } end if JwtHelper.is_enabled # check if a secret key to generate token exists or not @@ -359,10 +359,10 @@ def dataSpreadsheet :directUrl => "#{DocumentHelper.get_server_url(false)}/csv" # direct url to the mail merge recipients file } else - { - :fileType => 'csv', # file type - :url => "#{DocumentHelper.get_server_url(true)}/csv" # server url to the mail merge recipients file - } + { + :fileType => 'csv', # file type + :url => "#{DocumentHelper.get_server_url(true)}/csv" # server url to the mail merge recipients file + } end if JwtHelper.is_enabled # check if a secret key to generate token exists or not diff --git a/web/documentserver-example/ruby/app/models/jwt_helper.rb b/web/documentserver-example/ruby/app/models/jwt_helper.rb index d206d5fbb..a31e8b025 100644 --- a/web/documentserver-example/ruby/app/models/jwt_helper.rb +++ b/web/documentserver-example/ruby/app/models/jwt_helper.rb @@ -42,7 +42,7 @@ def decode(token) begin decoded = JWT.decode token, @jwt_secret, true, { algorithm: 'HS256' } rescue - return '' + return '' end # decoded = Array [ {"data"=>"test"}, # payload # {"alg"=>"HS256"} # header ] diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 59ce970ab..4920631c0 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -113,7 +113,7 @@ def process_save(raw_file_data, file_name, user_address) download_uri = new_file_uri end rescue StandardError => msg - new_file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) + new_file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) end end @@ -157,7 +157,7 @@ def process_save(raw_file_data, file_name, user_address) saved = 0 rescue StandardError => msg - saved = 1 + saved = 1 end saved @@ -188,7 +188,7 @@ def process_force_save(file_data, file_name, user_address) download_uri = new_file_uri end rescue StandardError => msg - new_file_name = true + new_file_name = true end end @@ -204,7 +204,7 @@ def process_force_save(file_data, file_name, user_address) file_name = if new_file_name DocumentHelper.get_correct_name("#{File.basename(file_name, cur_ext)}-form#{download_ext}", user_address) # get the correct file name if it already exists else - DocumentHelper.get_correct_name("#{File.basename(file_name, cur_ext)}-form#{cur_ext}", user_address) + DocumentHelper.get_correct_name("#{File.basename(file_name, cur_ext)}-form#{cur_ext}", user_address) end forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file else @@ -224,7 +224,7 @@ def process_force_save(file_data, file_name, user_address) saved = 0 rescue StandardError => msg - saved = 1 + saved = 1 end saved @@ -260,7 +260,7 @@ def command_request(method, key, meta = nil) res = http.request(req) # get the response data = res.body # and take its body rescue => ex - raise ex.message + raise ex.message end json_data = JSON.parse(data) # convert the response body into the json format From 12aba3d66d4917a88ca047616033e94dc40e10f4 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 17:12:39 +0300 Subject: [PATCH 313/488] ruby: Layout/EmptyLines correct --- web/documentserver-example/ruby/app/models/document_helper.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index a3a6d9f47..613973e11 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -226,7 +226,6 @@ def get_historypath_uri(file_name, version, file, is_serverUrl = true) def get_server_url(for_document_server) return DocumentHelper.config_manager.example_uri.to_s if for_document_server && DocumentHelper.config_manager.example_uri - return @@base_url end @@ -308,7 +307,6 @@ def get_files_info(file_id) return '"File not found"' if !file_id.nil? - return result end From 986eeefb4d405dacce709417e115ce6fc0a06eec Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 17:13:28 +0300 Subject: [PATCH 314/488] ruby: Layout/EmptyLinesAroundMethodBody correct --- web/documentserver-example/ruby/app/models/document_helper.rb | 3 --- web/documentserver-example/ruby/app/models/file_model.rb | 1 - 2 files changed, 4 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 613973e11..f259e7470 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -227,7 +227,6 @@ def get_server_url(for_document_server) return DocumentHelper.config_manager.example_uri.to_s if for_document_server && DocumentHelper.config_manager.example_uri return @@base_url - end # get callback url @@ -308,7 +307,6 @@ def get_files_info(file_id) return '"File not found"' if !file_id.nil? return result - end # enable ignore certificate @@ -317,7 +315,6 @@ def verify_ssl(file_uri, http) http.use_ssl = true http.verify_mode = OpenSSL::SSL::VERIFY_NONE # set the flags for the server certificate verification at the beginning of SSL session - end end end diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 764bf5cc4..12388a0c0 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -400,7 +400,6 @@ def get_users_info users_info.push(u) end return users_info - end # get users data for protect From 44445de6e7d528a2546dab186a3c217e5fa5eb25 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 14 Nov 2023 17:17:04 +0300 Subject: [PATCH 315/488] ruby: Layout/CommentIndentation correct --- web/documentserver-example/ruby/app/models/file_model.rb | 2 +- web/documentserver-example/ruby/app/models/service_converter.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 12388a0c0..1d314efe6 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -257,7 +257,7 @@ def get_history obj['user'] = change ? change['user'] : nil prev = histData[(i - 2).to_s] # get the history data from the previous file version -# write key and url information about previous file version with optional direct url + # write key and url information about previous file version with optional direct url dataObj['previous'] = if is_enable_direct_url == true { # write key and url information about previous file version with optional direct url :fileType => prev['fileType'], diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index c325b3bef..690e557a8 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -121,7 +121,7 @@ def process_convert_service_responce_error(error_code) when -1 error_message = 'Error occurred in the ConvertService.ashx: Error convertation unknown' when 0 - # public const int c_nErrorNo = 0 + # public const int c_nErrorNo = 0 else error_message = "ErrorCode = #{error_code.to_s}" # default value for the error message end From 286fb47fb86af04a87114d9f257fab6e013a878b Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 10:44:48 +0300 Subject: [PATCH 316/488] ruby: Lint/RedundantStringCoercion correct --- .../ruby/app/controllers/home_controller.rb | 6 +++--- .../ruby/app/models/document_helper.rb | 6 +++--- .../ruby/app/models/service_converter.rb | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index caa8354d9..46bc638c3 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -100,7 +100,7 @@ def convert # if the conversion isn't completed, write file name and step values to the response if percent != 100 - render plain: "{ \"step\" : \"#{percent.to_s}\", \"filename\" : \"#{file_name}\"}" + render plain: "{ \"step\" : \"#{percent}\", \"filename\" : \"#{file_name}\"}" return end @@ -199,13 +199,13 @@ def track if [2, 3].include?(status) # MustSave, Corrupted saved = TrackHelper.process_save(file_data, file_name, user_address) # save file - render plain: "{\"error\":#{saved.to_s}}" + render plain: "{\"error\":#{saved}}" return end if [6, 7].include?(status) # MustForceave, CorruptedForcesave saved = TrackHelper.process_force_save(file_data, file_name, user_address) # force save file - render plain: "{\"error\":#{saved.to_s}}" + render plain: "{\"error\":#{saved}}" return end diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index f259e7470..cbe4141b6 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -147,7 +147,7 @@ def get_correct_name(file_name, user_address) index = 1 while File.exist?(storage_path(name, user_address)) # if the file with such a name already exists in this directory - name = "#{base_name} (#{index.to_s})#{ext.downcase}" # add an index after its base name + name = "#{base_name} (#{index})#{ext.downcase}" # add an index after its base name index += 1 end @@ -209,7 +209,7 @@ def create_demo(file_ext, sample, user) # get file url def get_file_uri(file_name, for_document_server) - uri = "#{get_server_url(for_document_server)}/#{DocumentHelper.config_manager.storage_path.to_s}/#{cur_user_host_address(nil)}/#{ERB::Util.url_encode(file_name)}" + uri = "#{get_server_url(for_document_server)}/#{DocumentHelper.config_manager.storage_path}/#{cur_user_host_address(nil)}/#{ERB::Util.url_encode(file_name)}" return uri end @@ -218,7 +218,7 @@ def get_file_uri(file_name, for_document_server) def get_historypath_uri(file_name, version, file, is_serverUrl = true) # for redirection to my link user_host = is_serverUrl ? "&userAddress=#{cur_user_host_address(nil)}" : '' - uri = "#{get_server_url(is_serverUrl)}/downloadhistory/?fileName=#{ERB::Util.url_encode(file_name)}&ver=#{version.to_s}&file=#{ERB::Util.url_encode(file)}#{user_host}" + uri = "#{get_server_url(is_serverUrl)}/downloadhistory/?fileName=#{ERB::Util.url_encode(file_name)}&ver=#{version}&file=#{ERB::Util.url_encode(file)}#{user_host}" return uri end diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index 690e557a8..e4111907a 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -123,7 +123,7 @@ def process_convert_service_responce_error(error_code) when 0 # public const int c_nErrorNo = 0 else - error_message = "ErrorCode = #{error_code.to_s}" # default value for the error message + error_message = "ErrorCode = #{error_code}" # default value for the error message end raise error_message From 3197702d7bb5b52ce15193bd48f18dd326b5586c Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 10:51:15 +0300 Subject: [PATCH 317/488] ruby: Style/CommentedKeyword correct --- web/documentserver-example/ruby/app/models/users.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 85a019a04..3b886a272 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -110,26 +110,29 @@ class Users ] class << self - def get_all_users # get a list of all the users + def get_all_users @@users end - def get_user(id) # get a user by id specified + # get a user by id specified + def get_user(id) for user in @@users do return user if user.id.eql?(id) end return @@users[0] end - def get_users_for_mentions(id) # get a list of users with their names and emails for mentions + # get a list of users with their names and emails for mentions + def get_users_for_mentions(id) usersData = [] for user in @@users do usersData.push({ :name => user.name, :email => user.email }) if !user.id.eql?(id) && !user.name.nil? && !user.email.nil? end return usersData end - - def get_users_for_protect(id) # get a list of users with their id, names and emails for protect + + # get a list of users with their id, names and emails for protect + def get_users_for_protect(id) users_data = [] for user in @@users do users_data.push({ id: user.id, name: user.name, email: user.email }) if !user.id.eql?(id) && !user.name.nil? From 6525c29107b02edcfb5a872c40caf9abe4aacd48 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 10:59:58 +0300 Subject: [PATCH 318/488] ruby: Style/NumericPredicate correct --- .../ruby/app/controllers/home_controller.rb | 2 +- web/documentserver-example/ruby/app/models/file_model.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 46bc638c3..c7a6b4aa2 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -190,7 +190,7 @@ def track user_address = params[:userAddress] file_name = File.basename(params[:fileName]) - if status == 1 && (file_data['actions'][0]['type'] == 0) # finished edit + if status == 1 && ((file_data['actions'][0]['type']).zero?) # finished edit user = file_data['actions'][0]['userid'] # get the user id unless file_data['users'].index(user) json_data = TrackHelper.command_request('forcesave', file_data['key']) # call the forcesave command diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 1d314efe6..337ab3676 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -200,7 +200,7 @@ def get_history hist_dir = DocumentHelper.history_dir(DocumentHelper.storage_path(@file_name, nil)) # get the path to the file history cur_ver = DocumentHelper.get_file_version(hist_dir) # get the file version - if cur_ver > 0 # if file was modified + if cur_ver.positive? # if file was modified hist = [] histData = {} From 56e96eeac169f92e1490d665c997b1047f512284 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 11:01:38 +0300 Subject: [PATCH 319/488] ruby: Style/Redundant correct --- .../ruby/app/controllers/home_controller.rb | 28 +++++++++---------- .../ruby/app/models/document_helper.rb | 18 ++++++------ .../ruby/app/models/file_model.rb | 26 ++++++++--------- .../ruby/app/models/jwt_helper.rb | 8 +++--- .../ruby/app/models/service_converter.rb | 4 +-- .../ruby/app/models/track_helper.rb | 4 +-- .../ruby/app/models/users.rb | 6 ++-- 7 files changed, 47 insertions(+), 47 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index c7a6b4aa2..3170a9887 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -81,15 +81,15 @@ def upload # converting a file def convert - begin + file_data = request.body.read return '' if file_data.nil? || file_data.empty? body = JSON.parse(file_data) file_name = File.basename(body['filename']) - lang = cookies[:ulang] ? cookies[:ulang] : 'en' - file_pass = body['filePass'] ? body['filePass'] : nil + lang = cookies[:ulang] || 'en' + file_pass = body['filePass'] || nil file_uri = DocumentHelper.get_download_url(file_name) extension = File.extname(file_name).downcase internal_extension = 'ooxml' @@ -135,12 +135,12 @@ def convert render plain: "{ \"filename\" : \"#{file_name}\"}" rescue => ex render plain: "{ \"error\": \"#{ex.message}\"}" - end + end # downloading a history file from public def downloadhistory - begin + file_name = File.basename(params[:fileName]) user_address = params[:userAddress] version = params[:ver] @@ -174,7 +174,7 @@ def downloadhistory send_file file_path, :x_sendfile => true rescue => ex render plain: '{ "error": "File not found"}' - end + end # tracking file changes @@ -210,7 +210,7 @@ def track end render plain: '{"error":0}' - return + nil end # removing a file @@ -234,7 +234,7 @@ def remove end render plain: '{"success":true}' # report that the operation is successful - return + nil end # getting files information @@ -259,7 +259,7 @@ def csv # downloading a file def download - begin + file_name = File.basename(params[:fileName]) user_address = params[:userAddress] isEmbedded = params[:dmode] @@ -290,12 +290,12 @@ def download send_file file_path, :x_sendfile => true rescue => ex render plain: '{ "error": "File not found"}' - end + end # Save Copy as... def saveas - begin + body = JSON.parse(request.body.read) file_url = body['url'] title = body['title'] @@ -329,11 +329,11 @@ def saveas DocumentHelper.create_meta(file_name, user.id, user.name, nil) # create meta data of the new file render plain: "{\"file\" : \"#{file_name}\"}" - return + nil rescue => ex render plain: "{\"error\":1, \"message\": \"#{ex.message}\"}" - return - end + nil + end # Rename... diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index cbe4141b6..fa1adcbb8 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -102,7 +102,7 @@ def forcesave_path(file_name, user_address, create) return '' end - return directory.to_s + directory.to_s end # get the path to the file history @@ -112,12 +112,12 @@ def history_dir(storage_path) # create history directory if it doesn't exist FileUtils.mkdir_p(directory) unless File.directory?(directory) - return directory + directory end # get the path to the specified file version def version_dir(hist_dir, ver) - return File.join(hist_dir, ver.to_s) + File.join(hist_dir, ver.to_s) end # get the last file version @@ -134,7 +134,7 @@ def get_file_version(hist_dir) end end - return ver + ver end # get the correct file name if such a name already exists @@ -170,7 +170,7 @@ def get_stored_files(user_address) end end - return arr + arr end # create file meta information @@ -211,7 +211,7 @@ def create_demo(file_ext, sample, user) def get_file_uri(file_name, for_document_server) uri = "#{get_server_url(for_document_server)}/#{DocumentHelper.config_manager.storage_path}/#{cur_user_host_address(nil)}/#{ERB::Util.url_encode(file_name)}" - return uri + uri end # get history path url @@ -219,14 +219,14 @@ def get_historypath_uri(file_name, version, file, is_serverUrl = true) # for redirection to my link user_host = is_serverUrl ? "&userAddress=#{cur_user_host_address(nil)}" : '' uri = "#{get_server_url(is_serverUrl)}/downloadhistory/?fileName=#{ERB::Util.url_encode(file_name)}&ver=#{version}&file=#{ERB::Util.url_encode(file)}#{user_host}" - return uri + uri end # get server url def get_server_url(for_document_server) return DocumentHelper.config_manager.example_uri.to_s if for_document_server && DocumentHelper.config_manager.example_uri - return @@base_url + @@base_url end # get callback url @@ -306,7 +306,7 @@ def get_files_info(file_id) return '"File not found"' if !file_id.nil? - return result + result end # enable ignore certificate diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 337ab3676..8f16e0fb8 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -34,7 +34,7 @@ def initialize(attributes = {}) end def type - @type ? @type : 'desktop' # the default platform type is desktop + @type || 'desktop' # the default platform type is desktop end # get file extension from its name @@ -61,7 +61,7 @@ def document_type def key uri = "#{DocumentHelper.cur_user_host_address(nil)}/#{@file_name}" # get current user host address stat = File.mtime(DocumentHelper.storage_path(@file_name, nil)) # get the modification time of the given file - return ServiceConverter.generate_revision_id("#{uri}.#{stat}") + ServiceConverter.generate_revision_id("#{uri}.#{stat}") end # get callback url @@ -86,7 +86,7 @@ def cur_user_host_address # get config parameters def get_config - editorsmode = @mode ? @mode : 'edit' # mode: view/edit/review/comment/fillForms/embedded + editorsmode = @mode || 'edit' # mode: view/edit/review/comment/fillForms/embedded canEdit = DocumentHelper.edited_exts.include?(file_ext) # check if the document can be edited if (!canEdit && editorsmode.eql?('edit') || editorsmode.eql?('fillForms')) && DocumentHelper.fill_forms_exts.include?(file_ext) editorsmode = 'fillForms' @@ -146,7 +146,7 @@ def get_config :editorConfig => { :actionLink => @action_data ? JSON.parse(@action_data) : nil, :mode => mode, - :lang => @lang ? @lang : 'en', + :lang => @lang || 'en', :callbackUrl => callback_url, # absolute URL to the document storage service :coEditing => if editorsmode.eql?('view') && @user.id.eql?('uid-0') { @@ -187,7 +187,7 @@ def get_config config['token'] = JwtHelper.encode(config) # encode a payload object into a token and write it to the config end - return config + config end # get document history @@ -294,7 +294,7 @@ def get_history } end - return nil + nil end # get image information @@ -319,7 +319,7 @@ def get_insert_image insert_image['token'] = JwtHelper.encode(insert_image) # encode a payload object into a token and write it to the insert_image object end - return insert_image.to_json.tr('{', '').tr('}', '') + insert_image.to_json.tr('{', '').tr('}', '') end # get compared file information @@ -344,7 +344,7 @@ def dataDocument compare_file['token'] = JwtHelper.encode(compare_file) # encode a payload object into a token and write it to the compare_file object end - return compare_file + compare_file end # get mail merge recipients information @@ -369,12 +369,12 @@ def dataSpreadsheet dataSpreadsheet['token'] = JwtHelper.encode(dataSpreadsheet) # encode a payload object into a token and write it to the dataSpreadsheet object end - return dataSpreadsheet + dataSpreadsheet end # get users data for mentions def get_users_mentions - return !@user.id.eql?('uid-0') ? Users.get_users_for_mentions(@user.id) : nil + !@user.id.eql?('uid-0') ? Users.get_users_for_mentions(@user.id) : nil end def get_users_info @@ -399,16 +399,16 @@ def get_users_info u['image'] = user_info.avatar ? "#{DocumentHelper.get_server_url(true)}/assets/#{user_info.id}.png" : nil users_info.push(u) end - return users_info + users_info end # get users data for protect def get_users_protect - return !@user.id.eql?('uid-0') ? Users.get_users_for_protect(@user.id) : nil + !@user.id.eql?('uid-0') ? Users.get_users_for_protect(@user.id) : nil end # get direct url existence flag def is_enable_direct_url - return !@direct_url.nil? && @direct_url == 'true' + !@direct_url.nil? && @direct_url == 'true' end end diff --git a/web/documentserver-example/ruby/app/models/jwt_helper.rb b/web/documentserver-example/ruby/app/models/jwt_helper.rb index a31e8b025..bdf2ea9a8 100644 --- a/web/documentserver-example/ruby/app/models/jwt_helper.rb +++ b/web/documentserver-example/ruby/app/models/jwt_helper.rb @@ -24,17 +24,17 @@ class JwtHelper class << self # check if a secret key to generate token exists or not def is_enabled - return @jwt_secret && !@jwt_secret.empty? ? true : false + @jwt_secret && !@jwt_secret.empty? ? true : false end # check if a secret key used for request def use_for_request - return @token_use_for_request + @token_use_for_request end # encode a payload object into a token using a secret key def encode(payload) - return JWT.encode payload, @jwt_secret, 'HS256' # define the hashing algorithm and get token + JWT.encode payload, @jwt_secret, 'HS256' # define the hashing algorithm and get token end # decode a token into a payload object using a secret key @@ -46,7 +46,7 @@ def decode(token) end # decoded = Array [ {"data"=>"test"}, # payload # {"alg"=>"HS256"} # header ] - return decoded[0].to_json # get json payload + decoded[0].to_json # get json payload end end end diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index e4111907a..6d51af984 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -83,7 +83,7 @@ def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_ end json_data = JSON.parse(data) # parse response body - return get_response_data(json_data) # get response url + get_response_data(json_data) # get response url end # generate the document key value @@ -167,7 +167,7 @@ def get_response_data(json_data) end - return result_percent, response_uri, response_file_type + [result_percent, response_uri, response_file_type] end end end diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 4920631c0..88e94d523 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -61,7 +61,7 @@ def read_body(request) file_data = file_data['payload'] if inHeader end - return file_data + file_data end def resolve_process_save_body(body) @@ -264,7 +264,7 @@ def command_request(method, key, meta = nil) end json_data = JSON.parse(data) # convert the response body into the json format - return json_data + json_data end # save file from the url diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 3b886a272..719a9a24c 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -119,7 +119,7 @@ def get_user(id) for user in @@users do return user if user.id.eql?(id) end - return @@users[0] + @@users[0] end # get a list of users with their names and emails for mentions @@ -128,7 +128,7 @@ def get_users_for_mentions(id) for user in @@users do usersData.push({ :name => user.name, :email => user.email }) if !user.id.eql?(id) && !user.name.nil? && !user.email.nil? end - return usersData + usersData end # get a list of users with their id, names and emails for protect @@ -137,7 +137,7 @@ def get_users_for_protect(id) for user in @@users do users_data.push({ id: user.id, name: user.name, email: user.email }) if !user.id.eql?(id) && !user.name.nil? end - return users_data + users_data end end end From 821df5c700a812fc57048bd31a509c15c8e432a1 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 11:03:48 +0300 Subject: [PATCH 320/488] ruby: Style/RescueStandardError correct --- .../ruby/app/controllers/home_controller.rb | 12 ++++++------ .../ruby/app/models/jwt_helper.rb | 2 +- .../ruby/app/models/service_converter.rb | 2 +- .../ruby/app/models/track_helper.rb | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 3170a9887..4ccf358ed 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -74,7 +74,7 @@ def upload DocumentHelper.create_meta(file_name, user.id, user.name, nil) render plain: "{ \"filename\": \"#{file_name}\", \"documentType\": \"#{document_type}\"}" # write a new file name to the response - rescue => ex + rescue StandardError => ex render plain: "{ \"error\": \"#{ex.message}\"}" # write an error message to the response end end @@ -133,7 +133,7 @@ def convert end render plain: "{ \"filename\" : \"#{file_name}\"}" - rescue => ex + rescue StandardError => ex render plain: "{ \"error\": \"#{ex.message}\"}" end @@ -172,7 +172,7 @@ def downloadhistory response.headers['Content-Disposition'] = "attachment;filename*=UTF-8''#{ERB::Util.url_encode(file)}" send_file file_path, :x_sendfile => true - rescue => ex + rescue StandardError => ex render plain: '{ "error": "File not found"}' end @@ -288,7 +288,7 @@ def download response.headers['Content-Disposition'] = "attachment;filename*=UTF-8''#{ERB::Util.url_encode(file_name)}" send_file file_path, :x_sendfile => true - rescue => ex + rescue StandardError => ex render plain: '{ "error": "File not found"}' end @@ -330,7 +330,7 @@ def saveas render plain: "{\"file\" : \"#{file_name}\"}" nil - rescue => ex + rescue StandardError => ex render plain: "{\"error\":1, \"message\": \"#{ex.message}\"}" nil @@ -477,7 +477,7 @@ def restore error: nil, success: true } - rescue => error + rescue StandardError => error response.status = :internal_server_error render json: { error: error.message, diff --git a/web/documentserver-example/ruby/app/models/jwt_helper.rb b/web/documentserver-example/ruby/app/models/jwt_helper.rb index bdf2ea9a8..f97ebe801 100644 --- a/web/documentserver-example/ruby/app/models/jwt_helper.rb +++ b/web/documentserver-example/ruby/app/models/jwt_helper.rb @@ -41,7 +41,7 @@ def encode(payload) def decode(token) begin decoded = JWT.decode token, @jwt_secret, true, { algorithm: 'HS256' } - rescue + rescue StandardError return '' end # decoded = Array [ {"data"=>"test"}, # payload diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index 6d51af984..9d33397f8 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -78,7 +78,7 @@ def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_ data = res.body # and take its body rescue Timeout::Error # try again - rescue => ex + rescue StandardError => ex raise ex.message end diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 88e94d523..6ed253089 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -259,7 +259,7 @@ def command_request(method, key, meta = nil) req.body = payload.to_json # convert the payload object into the json format res = http.request(req) # get the response data = res.body # and take its body - rescue => ex + rescue StandardError => ex raise ex.message end From b29b0c3fa59abb84ca5dedc1a2d60d3e3ee103c7 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 11:05:19 +0300 Subject: [PATCH 321/488] ruby: Style/AndOr correct --- .../ruby/app/controllers/home_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 4ccf358ed..76501b7bd 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -370,7 +370,7 @@ def reference end link = body['link'] - if fileName.empty? and body.key?('link') + if fileName.empty? && body.key?('link') unless link.include?(DocumentHelper.get_server_url(false)) data = { url: link, @@ -389,7 +389,7 @@ def reference end end - if fileName.empty? and body.key?('path') + if fileName.empty? && body.key?('path') path = File.basename(body['path']) fileName = path if File.exist?(DocumentHelper.storage_path(path, nil)) end From a407b2b9c77d9f350fa58cab1997c662ccc42c7a Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 11:06:03 +0300 Subject: [PATCH 322/488] ruby: Style/For correct --- .../ruby/app/models/document_helper.rb | 2 +- web/documentserver-example/ruby/app/models/file_model.rb | 2 +- web/documentserver-example/ruby/app/models/users.rb | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index fa1adcbb8..fd65c8422 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -282,7 +282,7 @@ def get_template_image_url(file_type) def get_files_info(file_id) result = [] - for fileName in get_stored_files(nil) # run through all the stored files from the folder + get_stored_files(nil).each do |fileName| # run through all the stored files from the folder directory = storage_path(fileName, nil) uri = "#{cur_user_host_address(nil)}/#{fileName}" diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 8f16e0fb8..2473427dd 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -204,7 +204,7 @@ def get_history hist = [] histData = {} - for i in 1..cur_ver # run through all the file versions + (1..cur_ver).each do |i| # run through all the file versions obj = {} dataObj = {} ver_dir = DocumentHelper.version_dir(hist_dir, i) # get the path to the given file version diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 719a9a24c..85fb40df2 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -116,7 +116,7 @@ def get_all_users # get a user by id specified def get_user(id) - for user in @@users do + @@users.each do |user| return user if user.id.eql?(id) end @@users[0] @@ -125,7 +125,7 @@ def get_user(id) # get a list of users with their names and emails for mentions def get_users_for_mentions(id) usersData = [] - for user in @@users do + @@users.each do |user| usersData.push({ :name => user.name, :email => user.email }) if !user.id.eql?(id) && !user.name.nil? && !user.email.nil? end usersData @@ -134,7 +134,7 @@ def get_users_for_mentions(id) # get a list of users with their id, names and emails for protect def get_users_for_protect(id) users_data = [] - for user in @@users do + @@users.each do |user| users_data.push({ id: user.id, name: user.name, email: user.email }) if !user.id.eql?(id) && !user.name.nil? end users_data From 83843342d4e3926972a5b0759d49eb61855a61e3 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 11:07:09 +0300 Subject: [PATCH 323/488] ruby: Style/HashSyntax correct --- web/documentserver-example/ruby/Gemfile | 16 +- .../ruby/app/controllers/home_controller.rb | 36 ++-- .../ruby/app/models/document_helper.rb | 6 +- .../ruby/app/models/file_model.rb | 184 +++++++++--------- .../ruby/app/models/service_converter.rb | 18 +- .../ruby/app/models/track_helper.rb | 8 +- .../ruby/app/models/users.rb | 14 +- 7 files changed, 141 insertions(+), 141 deletions(-) diff --git a/web/documentserver-example/ruby/Gemfile b/web/documentserver-example/ruby/Gemfile index 656c32569..a31eca56b 100644 --- a/web/documentserver-example/ruby/Gemfile +++ b/web/documentserver-example/ruby/Gemfile @@ -1,24 +1,24 @@ source 'https://rubygems.org' -gem 'byebug', '~> 11.1', :groups => %i[development test] +gem 'byebug', '~> 11.1', groups: %i[development test] gem 'coffee-rails', '~> 5.0' -gem 'dalli', '~> 3.2', :group => :development +gem 'dalli', '~> 3.2', group: :development gem 'jbuilder', '~> 2.11' gem 'jquery-rails', '~> 4.5' gem 'jwt', '~> 2.7' gem 'mimemagic', github: 'mimemagicrb/mimemagic', ref: '01f92d86d15d85cfd0f20dabd025dcbd36a8a60f' gem 'rack-cors', '~> 2.0' gem 'rails', '~> 7.0.8' -gem 'rubocop', '~> 1.52', :group => :development +gem 'rubocop', '~> 1.52', group: :development gem 'sass-rails', '~> 6.0' -gem 'sdoc', '~> 2.6', :group => :doc +gem 'sdoc', '~> 2.6', group: :doc gem 'sorbet-runtime', '~> 0.5.10871' -gem 'test-unit', '~> 3.6', :groups => %i[development test] +gem 'test-unit', '~> 3.6', groups: %i[development test] gem 'turbolinks', '~> 5.2' gem 'tzinfo-data', '~> 1.2023' gem 'uglifier', '~> 4.2' gem 'uuid', '~> 2.3' -gem 'web-console', '~> 4.2', :groups => %i[development test] +gem 'web-console', '~> 4.2', groups: %i[development test] gem 'webrick', '~> 1.8' # Unfortunately, Sorbet only supports Darwin and Linux-based systems. @@ -28,6 +28,6 @@ gem 'webrick', '~> 1.8' # https://github.com/sorbet/sorbet/issues/4011 # https://github.com/sorbet/sorbet/issues/4119 install_if -> { RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /x86_64/ } do - gem 'sorbet', '~> 0.5.10871', :group => :development - gem 'tapioca', '~> 0.11.6', :group => :development + gem 'sorbet', '~> 0.5.10871', group: :development + gem 'tapioca', '~> 0.11.6', group: :development end diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 76501b7bd..246759ba6 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -31,7 +31,7 @@ def index; end def editor DocumentHelper.init(request.remote_ip, request.base_url) user = Users.get_user(params[:userId]) - @file = FileModel.new(:file_name => File.basename(params[:fileName]), :mode => params[:editorsMode], :type => params[:editorsType], :user_ip => request.remote_ip, :lang => cookies[:ulang], :user => user, :action_data => params[:actionLink], :direct_url => params[:directUrl]) + @file = FileModel.new(file_name: File.basename(params[:fileName]), mode: params[:editorsMode], type: params[:editorsType], user_ip: request.remote_ip, lang: cookies[:ulang], user:, action_data: params[:actionLink], direct_url: params[:directUrl]) end # creating a sample document @@ -39,7 +39,7 @@ def sample DocumentHelper.init(request.remote_ip, request.base_url) user = Users.get_user(params[:userId]) file_name = DocumentHelper.create_demo(params[:fileExt], params[:sample], user) - redirect_to :controller => 'home', :action => 'editor', :fileName => file_name, :userId => user.id + redirect_to controller: 'home', action: 'editor', fileName: file_name, userId: user.id end # uploading a file @@ -154,11 +154,11 @@ def downloadhistory hdr.slice!(0, 'Bearer '.length) token = JwtHelper.decode(hdr) if !token || token.eql?('') - render plain: 'JWT validation failed', :status => 403 + render plain: 'JWT validation failed', status: 403 return end else - render plain: 'JWT validation failed', :status => 403 + render plain: 'JWT validation failed', status: 403 return end end @@ -171,7 +171,7 @@ def downloadhistory response.headers['Content-Type'] = MimeMagic.by_path(file_path).eql?(nil) ? nil : MimeMagic.by_path(file_path).type response.headers['Content-Disposition'] = "attachment;filename*=UTF-8''#{ERB::Util.url_encode(file)}" - send_file file_path, :x_sendfile => true + send_file file_path, x_sendfile: true rescue StandardError => ex render plain: '{ "error": "File not found"}' @@ -254,7 +254,7 @@ def csv response.headers['Content-Type'] = MimeMagic.by_path(csvPath).type response.headers['Content-Disposition'] = "attachment;filename*=UTF-8''#{ERB::Util.url_encode(file_name)}" - send_file csvPath, :x_sendfile => true + send_file csvPath, x_sendfile: true end # downloading a file @@ -272,7 +272,7 @@ def download token = JwtHelper.decode(hdr) end if !token || token.eql?('') - render plain: 'JWT validation failed', :status => 403 + render plain: 'JWT validation failed', status: 403 return end end @@ -287,7 +287,7 @@ def download response.headers['Content-Type'] = MimeMagic.by_path(file_path).eql?(nil) ? nil : MimeMagic.by_path(file_path).type response.headers['Content-Disposition'] = "attachment;filename*=UTF-8''#{ERB::Util.url_encode(file_name)}" - send_file file_path, :x_sendfile => true + send_file file_path, x_sendfile: true rescue StandardError => ex render plain: '{ "error": "File not found"}' @@ -347,7 +347,7 @@ def rename newfilename += orig_ext if orig_ext != cur_ext meta = { - :title => newfilename + title: newfilename } json_data = TrackHelper.command_request('meta', dockey, meta) @@ -400,16 +400,16 @@ def reference end data = { - :fileType => File.extname(fileName).downcase.delete('.'), - :key => ServiceConverter.generate_revision_id("#{"#{DocumentHelper.cur_user_host_address(nil)}/#{fileName}"}.#{File.mtime(DocumentHelper.storage_path(fileName, nil))}"), - :url => DocumentHelper.get_download_url(fileName), - :directUrl => body['directUrl'] ? DocumentHelper.get_download_url(fileName, false) : nil, - :referenceData => { - :instanceId => DocumentHelper.get_server_url(false), - :fileKey => { :fileName => fileName, :userAddress => DocumentHelper.cur_user_host_address(nil) }.to_json + fileType: File.extname(fileName).downcase.delete('.'), + key: ServiceConverter.generate_revision_id("#{"#{DocumentHelper.cur_user_host_address(nil)}/#{fileName}"}.#{File.mtime(DocumentHelper.storage_path(fileName, nil))}"), + url: DocumentHelper.get_download_url(fileName), + directUrl: body['directUrl'] ? DocumentHelper.get_download_url(fileName, false) : nil, + referenceData: { + instanceId: DocumentHelper.get_server_url(false), + fileKey: { fileName:, userAddress: DocumentHelper.cur_user_host_address(nil) }.to_json }, - :path => fileName, - :link => "#{DocumentHelper.get_server_url(false)}/editor?fileName=#{fileName}" + path: fileName, + link: "#{DocumentHelper.get_server_url(false)}/editor?fileName=#{fileName}" } data['token'] = JwtHelper.encode(data) if JwtHelper.is_enabled diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index fd65c8422..96f9146e1 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -179,9 +179,9 @@ def create_meta(file_name, uid, uname, user_address) # write user name, user uid and the creation time to the json object json = { - :created => Time.now.to_formatted_s(:db), - :uid => uid, - :uname => uname + created: Time.now.to_formatted_s(:db), + uid:, + uname: } # write file meta information to the createdInfo.json file diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 2473427dd..b64825fef 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -97,87 +97,87 @@ def get_config templatesImageUrl = DocumentHelper.get_template_image_url(document_type) # templates image url in the "From Template" section templates = [ { - :image => '', - :title => 'Blank', - :url => create_url + image: '', + title: 'Blank', + url: create_url }, { - :image => templatesImageUrl, - :title => 'With sample content', - :url => "#{create_url}&sample=true" + image: templatesImageUrl, + title: 'With sample content', + url: "#{create_url}&sample=true" } ] config = { - :type => type, - :documentType => document_type, - :document => { - :title => @file_name, - :url => download_url, - :directUrl => is_enable_direct_url ? download_url(false) : '', - :fileType => file_ext.delete('.'), - :key => key, - :info => { - :owner => 'Me', - :uploaded => Time.now.to_s, - :favorite => @user.favorite + type:, + documentType: document_type, + document: { + title: @file_name, + url: download_url, + directUrl: is_enable_direct_url ? download_url(false) : '', + fileType: file_ext.delete('.'), + key:, + info: { + owner: 'Me', + uploaded: Time.now.to_s, + favorite: @user.favorite }, - :permissions => { # the permission for the document to be edited and downloaded or not - :comment => !editorsmode.eql?('view') && !editorsmode.eql?('fillForms') && !editorsmode.eql?('embedded') && !editorsmode.eql?('blockcontent'), - :copy => !@user.deniedPermissions.include?('copy'), - :download => !@user.deniedPermissions.include?('download'), - :edit => canEdit && (editorsmode.eql?('edit') || editorsmode.eql?('view') || editorsmode.eql?('filter') || editorsmode.eql?('blockcontent')), - :print => !@user.deniedPermissions.include?('print'), - :fillForms => !editorsmode.eql?('view') && !editorsmode.eql?('comment') && !editorsmode.eql?('embedded') && !editorsmode.eql?('blockcontent'), - :modifyFilter => !editorsmode.eql?('filter'), - :modifyContentControl => !editorsmode.eql?('blockcontent'), - :review => canEdit && (editorsmode.eql?('edit') || editorsmode.eql?('review')), - :chat => !@user.id.eql?('uid-0'), - :reviewGroups => @user.reviewGroups, - :commentGroups => @user.commentGroups, - :userInfoGroups => @user.userInfoGroups, - :protect => !@user.deniedPermissions.include?('protect') + permissions: { # the permission for the document to be edited and downloaded or not + comment: !editorsmode.eql?('view') && !editorsmode.eql?('fillForms') && !editorsmode.eql?('embedded') && !editorsmode.eql?('blockcontent'), + copy: !@user.deniedPermissions.include?('copy'), + download: !@user.deniedPermissions.include?('download'), + edit: canEdit && (editorsmode.eql?('edit') || editorsmode.eql?('view') || editorsmode.eql?('filter') || editorsmode.eql?('blockcontent')), + print: !@user.deniedPermissions.include?('print'), + fillForms: !editorsmode.eql?('view') && !editorsmode.eql?('comment') && !editorsmode.eql?('embedded') && !editorsmode.eql?('blockcontent'), + modifyFilter: !editorsmode.eql?('filter'), + modifyContentControl: !editorsmode.eql?('blockcontent'), + review: canEdit && (editorsmode.eql?('edit') || editorsmode.eql?('review')), + chat: !@user.id.eql?('uid-0'), + reviewGroups: @user.reviewGroups, + commentGroups: @user.commentGroups, + userInfoGroups: @user.userInfoGroups, + protect: !@user.deniedPermissions.include?('protect') }, - :referenceData => { - :instanceId => DocumentHelper.get_server_url(false), - :fileKey => !@user.id.eql?('uid-0') ? { :fileName => @file_name, :userAddress => DocumentHelper.cur_user_host_address(nil) }.to_json : nil + referenceData: { + instanceId: DocumentHelper.get_server_url(false), + fileKey: !@user.id.eql?('uid-0') ? { fileName: @file_name, userAddress: DocumentHelper.cur_user_host_address(nil) }.to_json : nil } }, - :editorConfig => { - :actionLink => @action_data ? JSON.parse(@action_data) : nil, - :mode => mode, - :lang => @lang || 'en', - :callbackUrl => callback_url, # absolute URL to the document storage service - :coEditing => if editorsmode.eql?('view') && @user.id.eql?('uid-0') + editorConfig: { + actionLink: @action_data ? JSON.parse(@action_data) : nil, + mode:, + lang: @lang || 'en', + callbackUrl: callback_url, # absolute URL to the document storage service + coEditing: if editorsmode.eql?('view') && @user.id.eql?('uid-0') { - :mode => 'strict', - :change => false + mode: 'strict', + change: false } else nil end, - :createUrl => !@user.id.eql?('uid-0') ? create_url : nil, - :templates => @user.templates ? templates : nil, - :user => { # the user currently viewing or editing the document - :id => !@user.id.eql?('uid-0') ? @user.id : nil, - :name => @user.name, - :group => @user.group, - :image => @user.avatar ? "#{DocumentHelper.get_server_url(true)}/assets/#{@user.id}.png" : nil + createUrl: !@user.id.eql?('uid-0') ? create_url : nil, + templates: @user.templates ? templates : nil, + user: { # the user currently viewing or editing the document + id: !@user.id.eql?('uid-0') ? @user.id : nil, + name: @user.name, + group: @user.group, + image: @user.avatar ? "#{DocumentHelper.get_server_url(true)}/assets/#{@user.id}.png" : nil }, - :embedded => { # the parameters for the embedded document type - :saveUrl => download_url(false), # the absolute URL that will allow the document to be saved onto the user personal computer - :embedUrl => download_url(false), # the absolute URL to the document serving as a source file for the document embedded into the web page - :shareUrl => download_url(false), # the absolute URL that will allow other users to share this document - :toolbarDocked => 'top' # the place for the embedded viewer toolbar (top or bottom) + embedded: { # the parameters for the embedded document type + saveUrl: download_url(false), # the absolute URL that will allow the document to be saved onto the user personal computer + embedUrl: download_url(false), # the absolute URL to the document serving as a source file for the document embedded into the web page + shareUrl: download_url(false), # the absolute URL that will allow other users to share this document + toolbarDocked: 'top' # the place for the embedded viewer toolbar (top or bottom) }, - :customization => { # the parameters for the editor interface - :about => true, # the About section display - :comments => true, - :feedback => true, # the Feedback & Support menu button display - :forcesave => false, # adding the request for the forced file saving to the callback handler - :submitForm => submitForm, # the Submit form button state - :goback => { - :url => DocumentHelper.get_server_url(false) + customization: { # the parameters for the editor interface + about: true, # the About section display + comments: true, + feedback: true, # the Feedback & Support menu button display + forcesave: false, # adding the request for the forced file saving to the callback handler + submitForm:, # the Submit form button state + goback: { + url: DocumentHelper.get_server_url(false) } } } @@ -226,8 +226,8 @@ def get_history # write information about changes to the object obj['created'] = cr_info['created'] obj['user'] = { - :id => cr_info['uid'], - :name => cr_info['uname'] + id: cr_info['uid'], + name: cr_info['uname'] } end end @@ -260,16 +260,16 @@ def get_history # write key and url information about previous file version with optional direct url dataObj['previous'] = if is_enable_direct_url == true { # write key and url information about previous file version with optional direct url - :fileType => prev['fileType'], - :key => prev['key'], - :url => prev['url'], - :directUrl => prev['directUrl'] + fileType: prev['fileType'], + key: prev['key'], + url: prev['url'], + directUrl: prev['directUrl'] } else { - :fileType => prev['fileType'], - :key => prev['key'], - :url => prev['url'] + fileType: prev['fileType'], + key: prev['key'], + url: prev['url'] } end @@ -286,11 +286,11 @@ def get_history end return { - :hist => { # write history information about the current file version to the hist - :currentVersion => cur_ver, - :history => hist + hist: { # write history information about the current file version to the hist + currentVersion: cur_ver, + history: hist }, - :histData => histData + histData: } end @@ -304,14 +304,14 @@ def get_insert_image # direct url to the image insert_image = if is_enable_direct_url == true { - :fileType => 'png', # image file type - :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png", # server url to the image - :directUrl => "#{DocumentHelper.get_server_url(false)}/assets/logo.png" # direct url to the image + fileType: 'png', # image file type + url: "#{DocumentHelper.get_server_url(true)}/assets/logo.png", # server url to the image + directUrl: "#{DocumentHelper.get_server_url(false)}/assets/logo.png" # direct url to the image } else { - :fileType => 'png', # image file type - :url => "#{DocumentHelper.get_server_url(true)}/assets/logo.png" # server url to the image + fileType: 'png', # image file type + url: "#{DocumentHelper.get_server_url(true)}/assets/logo.png" # server url to the image } end @@ -329,14 +329,14 @@ def dataDocument # direct url to the compared file compare_file = if is_enable_direct_url == true { - :fileType => 'docx', # file type - :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx", # server url to the compared file - :directUrl => "#{DocumentHelper.get_server_url(false)}/asset?fileName=sample.docx" # direct url to the compared file + fileType: 'docx', # file type + url: "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx", # server url to the compared file + directUrl: "#{DocumentHelper.get_server_url(false)}/asset?fileName=sample.docx" # direct url to the compared file } else { - :fileType => 'docx', # file type - :url => "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx" # server url to the compared file + fileType: 'docx', # file type + url: "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx" # server url to the compared file } end @@ -354,14 +354,14 @@ def dataSpreadsheet # direct url to the mail merge recipients file dataSpreadsheet = if is_enable_direct_url == true { - :fileType => 'csv', # file type - :url => "#{DocumentHelper.get_server_url(true)}/csv", # server url to the mail merge recipients file - :directUrl => "#{DocumentHelper.get_server_url(false)}/csv" # direct url to the mail merge recipients file + fileType: 'csv', # file type + url: "#{DocumentHelper.get_server_url(true)}/csv", # server url to the mail merge recipients file + directUrl: "#{DocumentHelper.get_server_url(false)}/csv" # direct url to the mail merge recipients file } else { - :fileType => 'csv', # file type - :url => "#{DocumentHelper.get_server_url(true)}/csv" # server url to the mail merge recipients file + fileType: 'csv', # file type + url: "#{DocumentHelper.get_server_url(true)}/csv" # server url to the mail merge recipients file } end diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index 9d33397f8..4df9605d9 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -40,14 +40,14 @@ def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_ document_revision_id = generate_revision_id(document_revision_id) payload = { # write all the conversion parameters to the payload - :async => is_async ? true : false, - :url => document_uri, - :outputtype => to_ext.delete('.'), - :filetype => from_ext.delete('.'), - :title => title, - :key => document_revision_id, - :password => file_pass, - :region => lang + async: is_async ? true : false, + url: document_uri, + outputtype: to_ext.delete('.'), + filetype: from_ext.delete('.'), + title:, + key: document_revision_id, + password: file_pass, + region: lang } data = nil @@ -66,7 +66,7 @@ def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_ if JwtHelper.is_enabled && JwtHelper.use_for_request # if the signature is enabled payload['token'] = JwtHelper.encode(payload) # get token and save it to the payload jwtHeader = ServiceConverter.config_manager.jwt_header; # get signature authorization header - req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ :payload => payload })}") # set it to the request with the Bearer prefix + req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ payload: })}") # set it to the request with the Bearer prefix end req.body = payload.to_json diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 6ed253089..8f8749861 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -234,11 +234,11 @@ def process_force_save(file_data, file_name, user_address) def command_request(method, key, meta = nil) # create a payload object with the method and key payload = { - :c => method, - :key => key + c: method, + key: } - payload.merge!({ :meta => meta }) if !meta.nil? + payload.merge!({ meta: }) if !meta.nil? data = nil begin @@ -253,7 +253,7 @@ def command_request(method, key, meta = nil) if JwtHelper.is_enabled && JwtHelper.use_for_request # if the signature is enabled payload['token'] = JwtHelper.encode(payload) # get token and save it to the payload jwtHeader = TrackHelper.config_manager.jwt_header; # get signature authorization header - req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ :payload => payload })}") # set it to the request with the Bearer prefix + req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ payload: })}") # set it to the request with the Bearer prefix end req.body = payload.to_json # convert the payload object into the json format diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 85fb40df2..0f1d4e71e 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -90,17 +90,17 @@ class Users nil, [], @@descr_user_1, true, true), User.new('uid-2', 'Mark Pottato', 'pottato@example.com', 'group-2', ['group-2', ''], { - :view => '', - :edit => ['group-2', ''], - :remove => ['group-2'] + view: '', + edit: ['group-2', ''], + remove: ['group-2'] }, ['group-2', ''], true, [], @@descr_user_2, false, true), User.new('uid-3', 'Hamish Mitchell', nil, 'group-3', ['group-2'], { - :view => %w[group-3 group-2], - :edit => ['group-2'], - :remove => [] + view: %w[group-3 group-2], + edit: ['group-2'], + remove: [] }, ['group-2'], false, %w[copy download print], @@descr_user_3, false, false), @@ -126,7 +126,7 @@ def get_user(id) def get_users_for_mentions(id) usersData = [] @@users.each do |user| - usersData.push({ :name => user.name, :email => user.email }) if !user.id.eql?(id) && !user.name.nil? && !user.email.nil? + usersData.push({ name: user.name, email: user.email }) if !user.id.eql?(id) && !user.name.nil? && !user.email.nil? end usersData end From 7d09d87891403460c065658f300b9f390226f8c4 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 13:47:18 +0300 Subject: [PATCH 324/488] ruby: Layout/LineLength correct --- .../ruby/app/controllers/home_controller.rb | 295 ++++++++++-------- .../ruby/app/models/document_helper.rb | 31 +- .../ruby/app/models/file_model.rb | 86 +++-- .../ruby/app/models/service_converter.rb | 6 +- .../ruby/app/models/track_helper.rb | 59 +++- .../ruby/app/models/users.rb | 8 +- 6 files changed, 286 insertions(+), 199 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 246759ba6..d331e595d 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -31,7 +31,16 @@ def index; end def editor DocumentHelper.init(request.remote_ip, request.base_url) user = Users.get_user(params[:userId]) - @file = FileModel.new(file_name: File.basename(params[:fileName]), mode: params[:editorsMode], type: params[:editorsType], user_ip: request.remote_ip, lang: cookies[:ulang], user:, action_data: params[:actionLink], direct_url: params[:directUrl]) + @file = FileModel.new( + file_name: File.basename(params[:fileName]), + mode: params[:editorsMode], + type: params[:editorsType], + user_ip: request.remote_ip, + lang: cookies[:ulang], + user:, + action_data: params[:actionLink], + direct_url: params[:directUrl] + ) end # creating a sample document @@ -73,7 +82,8 @@ def upload DocumentHelper.create_meta(file_name, user.id, user.name, nil) - render plain: "{ \"filename\": \"#{file_name}\", \"documentType\": \"#{document_type}\"}" # write a new file name to the response + # write a new file name to the response + render plain: "{ \"filename\": \"#{file_name}\", \"documentType\": \"#{document_type}\"}" rescue StandardError => ex render plain: "{ \"error\": \"#{ex.message}\"}" # write an error message to the response end @@ -81,100 +91,105 @@ def upload # converting a file def convert - - file_data = request.body.read - return '' if file_data.nil? || file_data.empty? - - body = JSON.parse(file_data) - - file_name = File.basename(body['filename']) - lang = cookies[:ulang] || 'en' - file_pass = body['filePass'] || nil - file_uri = DocumentHelper.get_download_url(file_name) - extension = File.extname(file_name).downcase - internal_extension = 'ooxml' - - if DocumentHelper.convert_exts.include?(extension) # check if the file with such an extension can be converted - key = ServiceConverter.generate_revision_id(file_uri) # generate document key - percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data(file_uri, extension.delete('.'), internal_extension.delete('.'), key, true, file_pass, lang) # get the url and file type of the converted file and the conversion percentage - - # if the conversion isn't completed, write file name and step values to the response - if percent != 100 - render plain: "{ \"step\" : \"#{percent}\", \"filename\" : \"#{file_name}\"}" - return - end + file_data = request.body.read + return '' if file_data.nil? || file_data.empty? + + body = JSON.parse(file_data) + + file_name = File.basename(body['filename']) + lang = cookies[:ulang] || 'en' + file_pass = body['filePass'] || nil + file_uri = DocumentHelper.get_download_url(file_name) + extension = File.extname(file_name).downcase + internal_extension = 'ooxml' + + if DocumentHelper.convert_exts.include?(extension) # check if the file with such an extension can be converted + key = ServiceConverter.generate_revision_id(file_uri) # generate document key + percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data( + file_uri, + extension.delete('.'), + internal_extension.delete('.'), + key, + true, + file_pass, + lang + ) # get the url and file type of the converted file and the conversion percentage + + # if the conversion isn't completed, write file name and step values to the response + if percent != 100 + render plain: "{ \"step\" : \"#{percent}\", \"filename\" : \"#{file_name}\"}" + return + end - # get the correct file name if such a name already exists - correct_name = DocumentHelper.get_correct_name("#{File.basename(file_name, extension)}.#{new_file_type}", nil) + # get the correct file name if such a name already exists + correct_name = DocumentHelper.get_correct_name("#{File.basename(file_name, extension)}.#{new_file_type}", nil) - uri = URI.parse(new_file_uri) # create the request url - http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server + uri = URI.parse(new_file_uri) # create the request url + http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server - DocumentHelper.verify_ssl(new_file_uri, http) + DocumentHelper.verify_ssl(new_file_uri, http) - req = Net::HTTP::Get.new(uri.request_uri) # create the get requets - res = http.request(req) - data = res.body + req = Net::HTTP::Get.new(uri.request_uri) # create the get requets + res = http.request(req) + data = res.body - raise 'stream is null' if data.nil? + raise 'stream is null' if data.nil? - # write a file with a new extension, but with the content from the origin file - File.open(DocumentHelper.storage_path(correct_name, nil), 'wb') do |file| - file.write(data) - end + # write a file with a new extension, but with the content from the origin file + File.open(DocumentHelper.storage_path(correct_name, nil), 'wb') do |file| + file.write(data) + end - old_storage_path = DocumentHelper.storage_path(file_name, nil) - File.delete(old_storage_path) if File.exist?(old_storage_path) + old_storage_path = DocumentHelper.storage_path(file_name, nil) + File.delete(old_storage_path) if File.exist?(old_storage_path) - file_name = correct_name - user = Users.get_user(params[:userId]) + file_name = correct_name + user = Users.get_user(params[:userId]) - DocumentHelper.create_meta(file_name, user.id, user.name, nil) # create meta data of the new file - end + DocumentHelper.create_meta(file_name, user.id, user.name, nil) # create meta data of the new file + end - render plain: "{ \"filename\" : \"#{file_name}\"}" - rescue StandardError => ex - render plain: "{ \"error\": \"#{ex.message}\"}" - + render plain: "{ \"filename\" : \"#{file_name}\"}" + rescue StandardError => ex + render plain: "{ \"error\": \"#{ex.message}\"}" end # downloading a history file from public def downloadhistory - - file_name = File.basename(params[:fileName]) - user_address = params[:userAddress] - version = params[:ver] - file = params[:file] - isEmbedded = params[:dmode] - - if JwtHelper.is_enabled && JwtHelper.use_for_request - jwtHeader = HomeController.config_manager.jwt_header - if request.headers[jwtHeader] - hdr = request.headers[jwtHeader] - hdr.slice!(0, 'Bearer '.length) - token = JwtHelper.decode(hdr) - if !token || token.eql?('') - render plain: 'JWT validation failed', status: 403 - return - end - else + file_name = File.basename(params[:fileName]) + user_address = params[:userAddress] + version = params[:ver] + file = params[:file] + isEmbedded = params[:dmode] + + if JwtHelper.is_enabled && JwtHelper.use_for_request + jwtHeader = HomeController.config_manager.jwt_header + if request.headers[jwtHeader] + hdr = request.headers[jwtHeader] + hdr.slice!(0, 'Bearer '.length) + token = JwtHelper.decode(hdr) + if !token || token.eql?('') render plain: 'JWT validation failed', status: 403 return end + else + render plain: 'JWT validation failed', status: 403 + return end - hist_path = "#{DocumentHelper.storage_path(file_name, user_address)}-hist" # or to the original document - - file_path = File.join(hist_path, version, file) + end + hist_path = "#{DocumentHelper.storage_path(file_name, user_address)}-hist" # or to the original document - # add headers to the response to specify the page parameters - response.headers['Content-Length'] = File.size(file_path).to_s - response.headers['Content-Type'] = MimeMagic.by_path(file_path).eql?(nil) ? nil : MimeMagic.by_path(file_path).type - response.headers['Content-Disposition'] = "attachment;filename*=UTF-8''#{ERB::Util.url_encode(file)}" + file_path = File.join(hist_path, version, file) - send_file file_path, x_sendfile: true - rescue StandardError => ex - render plain: '{ "error": "File not found"}' - + # add headers to the response to specify the page parameters + response.headers['Content-Length'] = File.size(file_path).to_s + response.headers['Content-Type'] = + MimeMagic.by_path(file_path).eql?(nil) ? nil : MimeMagic.by_path(file_path).type + response.headers['Content-Disposition'] = "attachment;filename*=UTF-8''#{ERB::Util.url_encode(file)}" + + send_file file_path, x_sendfile: true + rescue StandardError => ex + render plain: '{ "error": "File not found"}' end # tracking file changes @@ -259,81 +274,82 @@ def csv # downloading a file def download - - file_name = File.basename(params[:fileName]) - user_address = params[:userAddress] - isEmbedded = params[:dmode] - - if JwtHelper.is_enabled && isEmbedded.nil? && !user_address.nil? && JwtHelper.use_for_request - jwtHeader = HomeController.config_manager.jwt_header - if request.headers[jwtHeader] - hdr = request.headers[jwtHeader] - hdr.slice!(0, 'Bearer '.length) - token = JwtHelper.decode(hdr) - end - if !token || token.eql?('') - render plain: 'JWT validation failed', status: 403 - return - end + file_name = File.basename(params[:fileName]) + user_address = params[:userAddress] + isEmbedded = params[:dmode] + + if JwtHelper.is_enabled && isEmbedded.nil? && !user_address.nil? && JwtHelper.use_for_request + jwtHeader = HomeController.config_manager.jwt_header + if request.headers[jwtHeader] + hdr = request.headers[jwtHeader] + hdr.slice!(0, 'Bearer '.length) + token = JwtHelper.decode(hdr) end - - file_path = DocumentHelper.forcesave_path(file_name, user_address, false) # get the path to the force saved document version - if file_path.eql?('') - file_path = DocumentHelper.storage_path(file_name, user_address) # or to the original document + if !token || token.eql?('') + render plain: 'JWT validation failed', status: 403 + return end + end - # add headers to the response to specify the page parameters - response.headers['Content-Length'] = File.size(file_path).to_s - response.headers['Content-Type'] = MimeMagic.by_path(file_path).eql?(nil) ? nil : MimeMagic.by_path(file_path).type - response.headers['Content-Disposition'] = "attachment;filename*=UTF-8''#{ERB::Util.url_encode(file_name)}" + # get the path to the force saved document version + file_path = DocumentHelper.forcesave_path(file_name, user_address, false) + if file_path.eql?('') + file_path = DocumentHelper.storage_path(file_name, user_address) # or to the original document + end - send_file file_path, x_sendfile: true - rescue StandardError => ex - render plain: '{ "error": "File not found"}' - + # add headers to the response to specify the page parameters + response.headers['Content-Length'] = File.size(file_path).to_s + response.headers['Content-Type'] = + MimeMagic.by_path(file_path).eql?(nil) ? nil : MimeMagic.by_path(file_path).type + response.headers['Content-Disposition'] = "attachment;filename*=UTF-8''#{ERB::Util.url_encode(file_name)}" + + send_file file_path, x_sendfile: true + rescue StandardError => ex + render plain: '{ "error": "File not found"}' end # Save Copy as... def saveas - - body = JSON.parse(request.body.read) - file_url = body['url'] - title = body['title'] - file_name = DocumentHelper.get_correct_name(title, nil) - extension = File.extname(file_name).downcase - all_exts = DocumentHelper.convert_exts + DocumentHelper.edited_exts + DocumentHelper.viewed_exts + DocumentHelper.fill_forms_exts - - unless all_exts.include?(extension) - render plain: '{"error": "File type is not supported"}' - return - end + body = JSON.parse(request.body.read) + file_url = body['url'] + title = body['title'] + file_name = DocumentHelper.get_correct_name(title, nil) + extension = File.extname(file_name).downcase + all_exts = DocumentHelper.convert_exts + + DocumentHelper.edited_exts + + DocumentHelper.viewed_exts + + DocumentHelper.fill_forms_exts + + unless all_exts.include?(extension) + render plain: '{"error": "File type is not supported"}' + return + end - uri = URI.parse(file_url) # create the request url - http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server + uri = URI.parse(file_url) # create the request url + http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server - DocumentHelper.verify_ssl(file_url, http) + DocumentHelper.verify_ssl(file_url, http) - req = Net::HTTP::Get.new(uri.request_uri) # create the get requets - res = http.request(req) - data = res.body + req = Net::HTTP::Get.new(uri.request_uri) # create the get requets + res = http.request(req) + data = res.body - if data.size <= 0 || data.size > HomeController.config_manager.maximum_file_size - render plain: '{"error": "File size is incorrect"}' - return - end + if data.size <= 0 || data.size > HomeController.config_manager.maximum_file_size + render plain: '{"error": "File size is incorrect"}' + return + end - File.open(DocumentHelper.storage_path(file_name, nil), 'wb') do |file| - file.write(data) - end - user = Users.get_user(params[:userId]) - DocumentHelper.create_meta(file_name, user.id, user.name, nil) # create meta data of the new file + File.open(DocumentHelper.storage_path(file_name, nil), 'wb') do |file| + file.write(data) + end + user = Users.get_user(params[:userId]) + DocumentHelper.create_meta(file_name, user.id, user.name, nil) # create meta data of the new file - render plain: "{\"file\" : \"#{file_name}\"}" - nil - rescue StandardError => ex - render plain: "{\"error\":1, \"message\": \"#{ex.message}\"}" - nil - + render plain: "{\"file\" : \"#{file_name}\"}" + nil + rescue StandardError => ex + render plain: "{\"error\":1, \"message\": \"#{ex.message}\"}" + nil end # Rename... @@ -401,7 +417,10 @@ def reference data = { fileType: File.extname(fileName).downcase.delete('.'), - key: ServiceConverter.generate_revision_id("#{"#{DocumentHelper.cur_user_host_address(nil)}/#{fileName}"}.#{File.mtime(DocumentHelper.storage_path(fileName, nil))}"), + key: ServiceConverter.generate_revision_id( + "#{DocumentHelper.cur_user_host_address(nil)}/#{fileName}" \ + ".#{File.mtime(DocumentHelper.storage_path(fileName, nil))}" + ), url: DocumentHelper.get_download_url(fileName), directUrl: body['directUrl'] ? DocumentHelper.get_download_url(fileName, false) : nil, referenceData: { diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 96f9146e1..e160abe89 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -87,7 +87,8 @@ def forcesave_path(file_name, user_address, create) # the directory with host address doesn't exist return '' unless File.directory?(directory) - directory = File.join(directory, "#{File.basename(file_name)}-hist") # get the path to the history of the given file + # get the path to the history of the given file + directory = File.join(directory, "#{File.basename(file_name)}-hist") unless File.directory?(directory) return '' unless create @@ -146,7 +147,8 @@ def get_correct_name(file_name, user_address) name = base_name + ext.downcase # get full file name index = 1 - while File.exist?(storage_path(name, user_address)) # if the file with such a name already exists in this directory + # if the file with such a name already exists in this directory + while File.exist?(storage_path(name, user_address)) name = "#{base_name} (#{index})#{ext.downcase}" # add an index after its base name index += 1 end @@ -195,7 +197,8 @@ def create_demo(file_ext, sample, user) demo_name = (sample == 'true' ? 'sample.' : 'new.') + file_ext file_name = get_correct_name(demo_name, nil) # get the correct file name if such a name already exists - src = Rails.root.join('assets', 'document-templates', sample == 'true' ? 'sample' : 'new', demo_name) # save sample document of a necessary extension to the storage directory + # save sample document of a necessary extension to the storage directory + src = Rails.root.join('assets', 'document-templates', sample == 'true' ? 'sample' : 'new', demo_name) dest = storage_path file_name, nil FileUtils.cp src, dest @@ -209,8 +212,10 @@ def create_demo(file_ext, sample, user) # get file url def get_file_uri(file_name, for_document_server) - uri = "#{get_server_url(for_document_server)}/#{DocumentHelper.config_manager.storage_path}/#{cur_user_host_address(nil)}/#{ERB::Util.url_encode(file_name)}" - + uri = "#{get_server_url(for_document_server)}/" \ + "#{DocumentHelper.config_manager.storage_path}/" \ + "#{cur_user_host_address(nil)}/" \ + "#{ERB::Util.url_encode(file_name)}" uri end @@ -218,20 +223,27 @@ def get_file_uri(file_name, for_document_server) def get_historypath_uri(file_name, version, file, is_serverUrl = true) # for redirection to my link user_host = is_serverUrl ? "&userAddress=#{cur_user_host_address(nil)}" : '' - uri = "#{get_server_url(is_serverUrl)}/downloadhistory/?fileName=#{ERB::Util.url_encode(file_name)}&ver=#{version}&file=#{ERB::Util.url_encode(file)}#{user_host}" + uri = "#{get_server_url(is_serverUrl)}/downloadhistory/?"\ + "fileName=#{ERB::Util.url_encode(file_name)}&ver=#{version}"\ + "&file=#{ERB::Util.url_encode(file)}#{user_host}" uri end # get server url def get_server_url(for_document_server) - return DocumentHelper.config_manager.example_uri.to_s if for_document_server && DocumentHelper.config_manager.example_uri + return DocumentHelper.config_manager.example_uri.to_s if ( + for_document_server && + DocumentHelper.config_manager.example_uri + ) @@base_url end # get callback url def get_callback(file_name) - "#{get_server_url(true)}/track?fileName=#{ERB::Util.url_encode(file_name)}&userAddress=#{cur_user_host_address(nil)}" + "#{get_server_url(true)}/track?" \ + "fileName=#{ERB::Util.url_encode(file_name)}&" \ + "userAddress=#{cur_user_host_address(nil)}" end # get url to the created file @@ -314,7 +326,8 @@ def verify_ssl(file_uri, http) return unless file_uri.start_with?('https') && DocumentHelper.config_manager.ssl_verify_peer_mode_enabled http.use_ssl = true - http.verify_mode = OpenSSL::SSL::VERIFY_NONE # set the flags for the server certificate verification at the beginning of SSL session + # set the flags for the server certificate verification at the beginning of SSL session + http.verify_mode = OpenSSL::SSL::VERIFY_NONE end end end diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index b64825fef..55e041796 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -49,7 +49,8 @@ def file_uri # get file uri for document server def file_uri_user - @config_manager.storage_path.absolute? ? "#{download_url}&dmode=emb" : DocumentHelper.get_file_uri(@file_name, false) + @config_manager.storage_path.absolute? ? "#{download_url}&dmode=emb" : DocumentHelper.get_file_uri(@file_name, + false) end # get document type from its name (word, cell or slide) @@ -88,13 +89,15 @@ def cur_user_host_address def get_config editorsmode = @mode || 'edit' # mode: view/edit/review/comment/fillForms/embedded canEdit = DocumentHelper.edited_exts.include?(file_ext) # check if the document can be edited - if (!canEdit && editorsmode.eql?('edit') || editorsmode.eql?('fillForms')) && DocumentHelper.fill_forms_exts.include?(file_ext) + if (!canEdit && editorsmode.eql?('edit') || editorsmode.eql?('fillForms')) && + DocumentHelper.fill_forms_exts.include?(file_ext) editorsmode = 'fillForms' canEdit = true end submitForm = editorsmode.eql?('fillForms') && @user.id.eql?('uid-1') && false # the Submit form button state mode = canEdit && !editorsmode.eql?('view') ? 'edit' : 'view' - templatesImageUrl = DocumentHelper.get_template_image_url(document_type) # templates image url in the "From Template" section + # templates image url in the "From Template" section + templatesImageUrl = DocumentHelper.get_template_image_url(document_type) templates = [ { image: '', @@ -123,12 +126,12 @@ def get_config favorite: @user.favorite }, permissions: { # the permission for the document to be edited and downloaded or not - comment: !editorsmode.eql?('view') && !editorsmode.eql?('fillForms') && !editorsmode.eql?('embedded') && !editorsmode.eql?('blockcontent'), + comment: !%w[view fillForms embedded blockcontent].include?(editorsmode), copy: !@user.deniedPermissions.include?('copy'), download: !@user.deniedPermissions.include?('download'), - edit: canEdit && (editorsmode.eql?('edit') || editorsmode.eql?('view') || editorsmode.eql?('filter') || editorsmode.eql?('blockcontent')), + edit: canEdit && %w[edit view filter blockcontent].include?(editorsmode), print: !@user.deniedPermissions.include?('print'), - fillForms: !editorsmode.eql?('view') && !editorsmode.eql?('comment') && !editorsmode.eql?('embedded') && !editorsmode.eql?('blockcontent'), + fillForms: !%w[view comment embedded blockcontent].include?(editorsmode), modifyFilter: !editorsmode.eql?('filter'), modifyContentControl: !editorsmode.eql?('blockcontent'), review: canEdit && (editorsmode.eql?('edit') || editorsmode.eql?('review')), @@ -140,7 +143,8 @@ def get_config }, referenceData: { instanceId: DocumentHelper.get_server_url(false), - fileKey: !@user.id.eql?('uid-0') ? { fileName: @file_name, userAddress: DocumentHelper.cur_user_host_address(nil) }.to_json : nil + fileKey: !@user.id.eql?('uid-0') ? { fileName: @file_name, + userAddress: DocumentHelper.cur_user_host_address(nil) }.to_json : nil } }, editorConfig: { @@ -149,13 +153,13 @@ def get_config lang: @lang || 'en', callbackUrl: callback_url, # absolute URL to the document storage service coEditing: if editorsmode.eql?('view') && @user.id.eql?('uid-0') - { - mode: 'strict', - change: false - } - else - nil - end, + { + mode: 'strict', + change: false + } + else + nil + end, createUrl: !@user.id.eql?('uid-0') ? create_url : nil, templates: @user.templates ? templates : nil, user: { # the user currently viewing or editing the document @@ -165,9 +169,12 @@ def get_config image: @user.avatar ? "#{DocumentHelper.get_server_url(true)}/assets/#{@user.id}.png" : nil }, embedded: { # the parameters for the embedded document type - saveUrl: download_url(false), # the absolute URL that will allow the document to be saved onto the user personal computer - embedUrl: download_url(false), # the absolute URL to the document serving as a source file for the document embedded into the web page - shareUrl: download_url(false), # the absolute URL that will allow other users to share this document + # the absolute URL that will allow the document to be saved onto the user personal computer + saveUrl: download_url(false), + # the absolute URL to the document serving as a source file for the document embedded into the web page + embedUrl: download_url(false), + # the absolute URL that will allow other users to share this document + shareUrl: download_url(false), toolbarDocked: 'top' # the place for the embedded viewer toolbar (top or bottom) }, customization: { # the parameters for the editor interface @@ -197,7 +204,8 @@ def get_history doc_key = key doc_uri = file_uri - hist_dir = DocumentHelper.history_dir(DocumentHelper.storage_path(@file_name, nil)) # get the path to the file history + # get the path to the file history + hist_dir = DocumentHelper.history_dir(DocumentHelper.storage_path(@file_name, nil)) cur_ver = DocumentHelper.get_file_version(hist_dir) # get the file version if cur_ver.positive? # if file was modified @@ -219,7 +227,8 @@ def get_history obj['key'] = cur_key obj['version'] = i - if (i == 1) && File.file?(File.join(hist_dir, 'createdInfo.json')) # check if the createdInfo.json file with meta data exists + # check if the createdInfo.json file with meta data exists + if (i == 1) && File.file?(File.join(hist_dir, 'createdInfo.json')) File.open(File.join(hist_dir, 'createdInfo.json'), 'r') do |file| # open it cr_info = JSON.parse(file.read) # parse the file content @@ -237,14 +246,17 @@ def get_history dataObj['key'] = cur_key dataObj['url'] = i == cur_ver ? doc_uri : DocumentHelper.get_historypath_uri(file_name, i, "prev#{file_ext}") if is_enable_direct_url == true - dataObj['directUrl'] = i == cur_ver ? download_url(false) : DocumentHelper.get_historypath_uri(file_name, i, "prev#{file_ext}", false) + dataObj['directUrl'] = + i == cur_ver ? download_url(false) : DocumentHelper.get_historypath_uri(file_name, i, "prev#{file_ext}", + false) end dataObj['version'] = i if i > 1 # check if the version number is greater than 1 changes = nil change = nil - File.open(File.join(DocumentHelper.version_dir(hist_dir, i - 1), 'changes.json'), 'r') do |file| # get the path to the changes.json file + # get the path to the changes.json file + File.open(File.join(DocumentHelper.version_dir(hist_dir, i - 1), 'changes.json'), 'r') do |file| changes = JSON.parse(file.read) # and parse its content end @@ -259,7 +271,7 @@ def get_history prev = histData[(i - 2).to_s] # get the history data from the previous file version # write key and url information about previous file version with optional direct url dataObj['previous'] = if is_enable_direct_url == true - { # write key and url information about previous file version with optional direct url + { # write key and url information about previous file version with optional directUrl fileType: prev['fileType'], key: prev['key'], url: prev['url'], @@ -278,7 +290,8 @@ def get_history end if JwtHelper.is_enabled # check if a secret key to generate token exists or not - dataObj['token'] = JwtHelper.encode(dataObj) # encode a payload object into a token and write it to the data object + # encode a payload object into a token and write it to the data object + dataObj['token'] = JwtHelper.encode(dataObj) end hist.push(obj) # add object dictionary to the hist list @@ -316,7 +329,8 @@ def get_insert_image end if JwtHelper.is_enabled # check if a secret key to generate token exists or not - insert_image['token'] = JwtHelper.encode(insert_image) # encode a payload object into a token and write it to the insert_image object + # encode a payload object into a token and write it to the insert_image object + insert_image['token'] = JwtHelper.encode(insert_image) end insert_image.to_json.tr('{', '').tr('}', '') @@ -330,18 +344,22 @@ def dataDocument compare_file = if is_enable_direct_url == true { fileType: 'docx', # file type - url: "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx", # server url to the compared file - directUrl: "#{DocumentHelper.get_server_url(false)}/asset?fileName=sample.docx" # direct url to the compared file + # server url to the compared file + url: "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx", + # direct url to the compared file + directUrl: "#{DocumentHelper.get_server_url(false)}/asset?fileName=sample.docx" } else { fileType: 'docx', # file type - url: "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx" # server url to the compared file + # server url to the compared file + url: "#{DocumentHelper.get_server_url(true)}/asset?fileName=sample.docx" } end if JwtHelper.is_enabled # check if a secret key to generate token exists or not - compare_file['token'] = JwtHelper.encode(compare_file) # encode a payload object into a token and write it to the compare_file object + # encode a payload object into a token and write it to the compare_file object + compare_file['token'] = JwtHelper.encode(compare_file) end compare_file @@ -355,18 +373,22 @@ def dataSpreadsheet dataSpreadsheet = if is_enable_direct_url == true { fileType: 'csv', # file type - url: "#{DocumentHelper.get_server_url(true)}/csv", # server url to the mail merge recipients file - directUrl: "#{DocumentHelper.get_server_url(false)}/csv" # direct url to the mail merge recipients file + # server url to the mail merge recipients file + url: "#{DocumentHelper.get_server_url(true)}/csv", + # direct url to the mail merge recipients file + directUrl: "#{DocumentHelper.get_server_url(false)}/csv" } else { fileType: 'csv', # file type - url: "#{DocumentHelper.get_server_url(true)}/csv" # server url to the mail merge recipients file + # server url to the mail merge recipients file + url: "#{DocumentHelper.get_server_url(true)}/csv" } end if JwtHelper.is_enabled # check if a secret key to generate token exists or not - dataSpreadsheet['token'] = JwtHelper.encode(dataSpreadsheet) # encode a payload object into a token and write it to the dataSpreadsheet object + # encode a payload object into a token and write it to the dataSpreadsheet object + dataSpreadsheet['token'] = JwtHelper.encode(dataSpreadsheet) end dataSpreadsheet diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index 4df9605d9..f307c675c 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -66,7 +66,8 @@ def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_ if JwtHelper.is_enabled && JwtHelper.use_for_request # if the signature is enabled payload['token'] = JwtHelper.encode(payload) # get token and save it to the payload jwtHeader = ServiceConverter.config_manager.jwt_header; # get signature authorization header - req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ payload: })}") # set it to the request with the Bearer prefix + # set it to the request with the Bearer prefix + req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ payload: })}") end req.body = payload.to_json @@ -91,7 +92,8 @@ def generate_revision_id(expected_key) require 'zlib' if expected_key.length > 20 # check if the expected key length is greater than 20 - expected_key = (Zlib.crc32 expected_key).to_s # calculate 32-bit crc value from the expected key and turn it into the string + # calculate 32-bit crc value from the expected key and turn it into the string + expected_key = (Zlib.crc32 expected_key).to_s end key = expected_key.gsub(/[^0-9a-zA-Z.=]/, '_') diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 8f8749861..c6ef61481 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -106,14 +106,25 @@ def process_save(raw_file_data, file_name, user_address) unless cur_ext.eql?(download_ext) key = ServiceConverter.generate_revision_id(download_uri) # get the document key begin - percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data(download_uri, download_ext.delete('.'), cur_ext.delete('.'), key, false, nil) # get the url of the converted file + percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data( + download_uri, + download_ext.delete('.'), + cur_ext.delete('.'), + key, + false, + nil + ) # get the url of the converted file if new_file_uri.nil? || new_file_uri.empty? - new_file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) # get the correct file name if it already exists + new_file_name = DocumentHelper.get_correct_name( + File.basename(file_name, cur_ext) + download_ext, + user_address + ) # get the correct file name if it already exists else download_uri = new_file_uri end rescue StandardError => msg - new_file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) + new_file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, + user_address) end end @@ -123,14 +134,17 @@ def process_save(raw_file_data, file_name, user_address) return saved if data.eql?(nil) begin - storage_path = DocumentHelper.storage_path(new_file_name, user_address) # get the storage directory of the new file + # get the storage directory of the new file + storage_path = DocumentHelper.storage_path(new_file_name, user_address) hist_dir = DocumentHelper.history_dir(storage_path) # get the history directory of the new file - ver_dir = DocumentHelper.version_dir(hist_dir, DocumentHelper.get_file_version(hist_dir)) # get the path to the specified file version + # get the path to the specified file version + ver_dir = DocumentHelper.version_dir(hist_dir, DocumentHelper.get_file_version(hist_dir)) FileUtils.mkdir_p(ver_dir) # create the version directory if doesn't exist - FileUtils.move(DocumentHelper.storage_path(file_name, user_address), File.join(ver_dir, "prev#{cur_ext}")) # move the file from the storage directory to the previous file version directory + # move the file from the storage directory to the previous file version directory + FileUtils.move(DocumentHelper.storage_path(file_name, user_address), File.join(ver_dir, "prev#{cur_ext}")) save_file(data, storage_path) # save the downloaded file to the storage directory @@ -150,7 +164,8 @@ def process_save(raw_file_data, file_name, user_address) file.write(file_data['key']) end - forcesave_path = DocumentHelper.forcesave_path(new_file_name, user_address, false) # get the path to the forcesaved file + # get the path to the forcesaved file + forcesave_path = DocumentHelper.forcesave_path(new_file_name, user_address, false) unless forcesave_path.eql?('') # if this path is empty File.delete(forcesave_path) # remove it end @@ -181,7 +196,14 @@ def process_force_save(file_data, file_name, user_address) unless cur_ext.eql?(download_ext) key = ServiceConverter.generate_revision_id(download_uri) # get the document key begin - percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data(download_uri, download_ext.delete('.'), cur_ext.delete('.'), key, false, nil) # get the url of the converted file + percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data( + download_uri, + download_ext.delete('.'), + cur_ext.delete('.'), + key, + false, + nil + ) # get the url of the converted file if new_file_uri.nil? || new_file_uri.empty? new_file_name = true else @@ -198,20 +220,25 @@ def process_force_save(file_data, file_name, user_address) return saved if data.eql?(nil) begin - is_submit_form = file_data['forcesavetype'].to_i == 3 # check if the forcesave type is equal to 3 (the form was submitted) + # check if the forcesave type is equal to 3 (the form was submitted) + is_submit_form = file_data['forcesavetype'].to_i == 3 if is_submit_form file_name = if new_file_name - DocumentHelper.get_correct_name("#{File.basename(file_name, cur_ext)}-form#{download_ext}", user_address) # get the correct file name if it already exists + DocumentHelper.get_correct_name("#{File.basename(file_name, cur_ext)}-form#{download_ext}", + user_address) # get the correct file name if it already exists else - DocumentHelper.get_correct_name("#{File.basename(file_name, cur_ext)}-form#{cur_ext}", user_address) + DocumentHelper.get_correct_name("#{File.basename(file_name, cur_ext)}-form#{cur_ext}", + user_address) end forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file else - file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) if new_file_name + file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, + user_address) if new_file_name forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, false) if forcesave_path.eql?('') - forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, true) # if the path to the new file doesn't exist, create it + # if the path to the new file doesn't exist, create it + forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, true) end end @@ -219,7 +246,8 @@ def process_force_save(file_data, file_name, user_address) if is_submit_form uid = file_data['actions'][0]['userid'] - DocumentHelper.create_meta(file_name, uid, 'Filling Form', user_address) # create file meta information with the Filling form tag instead of user name + # create file meta information with the Filling form tag instead of user name + DocumentHelper.create_meta(file_name, uid, 'Filling Form', user_address) end saved = 0 @@ -253,7 +281,8 @@ def command_request(method, key, meta = nil) if JwtHelper.is_enabled && JwtHelper.use_for_request # if the signature is enabled payload['token'] = JwtHelper.encode(payload) # get token and save it to the payload jwtHeader = TrackHelper.config_manager.jwt_header; # get signature authorization header - req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ payload: })}") # set it to the request with the Bearer prefix + # set it to the request with the Bearer prefix + req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ payload: })}") end req.body = payload.to_json # convert the payload object into the json format diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 0f1d4e71e..d21897236 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -50,7 +50,8 @@ class Users @@descr_user_2 = [ 'Belongs to Group2', 'Can review only his own changes or changes made by users with no group', - 'Can view comments, edit his own comments and comments left by users with no group. Can remove his own comments only', + 'Can view comments, edit his own comments, and comments left by users with no group. ' \ + 'Can remove his own comments only', 'This file is marked as favorite', 'Can create new files from the editor', 'Can see the information about users from Group2 and users who don’t belong to any group', @@ -126,11 +127,12 @@ def get_user(id) def get_users_for_mentions(id) usersData = [] @@users.each do |user| - usersData.push({ name: user.name, email: user.email }) if !user.id.eql?(id) && !user.name.nil? && !user.email.nil? + usersData.push({ name: user.name, + email: user.email }) if !user.id.eql?(id) && !user.name.nil? && !user.email.nil? end usersData end - + # get a list of users with their id, names and emails for protect def get_users_for_protect(id) users_data = [] From f47f9bf897625f77b6e0e4e581f443c001fc6417 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 14:11:19 +0300 Subject: [PATCH 325/488] ruby: Style/FrozenStringLiteralComment correct --- web/documentserver-example/ruby/Gemfile | 1 + web/documentserver-example/ruby/Rakefile | 1 + .../ruby/app/controllers/application_controller.rb | 1 + .../ruby/app/controllers/home_controller.rb | 1 + .../ruby/app/helpers/application_helper.rb | 1 + web/documentserver-example/ruby/app/helpers/home_helper.rb | 1 + web/documentserver-example/ruby/app/models/document_helper.rb | 1 + web/documentserver-example/ruby/app/models/file_model.rb | 1 + web/documentserver-example/ruby/app/models/file_utility.rb | 1 + web/documentserver-example/ruby/app/models/jwt_helper.rb | 1 + web/documentserver-example/ruby/app/models/service_converter.rb | 1 + web/documentserver-example/ruby/app/models/track_helper.rb | 1 + web/documentserver-example/ruby/app/models/users.rb | 1 + web/documentserver-example/ruby/config.ru | 1 + web/documentserver-example/ruby/config/application.rb | 1 + web/documentserver-example/ruby/config/boot.rb | 1 + 16 files changed, 16 insertions(+) diff --git a/web/documentserver-example/ruby/Gemfile b/web/documentserver-example/ruby/Gemfile index a31eca56b..45e26a0cb 100644 --- a/web/documentserver-example/ruby/Gemfile +++ b/web/documentserver-example/ruby/Gemfile @@ -1,3 +1,4 @@ +# frozen_string_literal: true source 'https://rubygems.org' gem 'byebug', '~> 11.1', groups: %i[development test] diff --git a/web/documentserver-example/ruby/Rakefile b/web/documentserver-example/ruby/Rakefile index 3c3cea86d..bb8920958 100644 --- a/web/documentserver-example/ruby/Rakefile +++ b/web/documentserver-example/ruby/Rakefile @@ -1,3 +1,4 @@ +# frozen_string_literal: true require 'rake/testtask' require_relative 'config/application' diff --git a/web/documentserver-example/ruby/app/controllers/application_controller.rb b/web/documentserver-example/ruby/app/controllers/application_controller.rb index 32ce5cfdb..b6d3299e5 100644 --- a/web/documentserver-example/ruby/app/controllers/application_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/application_controller.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index d331e595d..81e8b0a6f 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/app/helpers/application_helper.rb b/web/documentserver-example/ruby/app/helpers/application_helper.rb index d17fe1b8d..3e7976e0a 100644 --- a/web/documentserver-example/ruby/app/helpers/application_helper.rb +++ b/web/documentserver-example/ruby/app/helpers/application_helper.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/app/helpers/home_helper.rb b/web/documentserver-example/ruby/app/helpers/home_helper.rb index a0e2faf09..421fa0789 100644 --- a/web/documentserver-example/ruby/app/helpers/home_helper.rb +++ b/web/documentserver-example/ruby/app/helpers/home_helper.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index e160abe89..0971ab723 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 55e041796..f29efeb86 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/app/models/file_utility.rb b/web/documentserver-example/ruby/app/models/file_utility.rb index 204dbcac9..5e7965a86 100644 --- a/web/documentserver-example/ruby/app/models/file_utility.rb +++ b/web/documentserver-example/ruby/app/models/file_utility.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/app/models/jwt_helper.rb b/web/documentserver-example/ruby/app/models/jwt_helper.rb index f97ebe801..842c89f29 100644 --- a/web/documentserver-example/ruby/app/models/jwt_helper.rb +++ b/web/documentserver-example/ruby/app/models/jwt_helper.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index f307c675c..89717134c 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index c6ef61481..aee649111 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index d21897236..6d178dcd2 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/config.ru b/web/documentserver-example/ruby/config.ru index e906496b0..edb2b97b1 100644 --- a/web/documentserver-example/ruby/config.ru +++ b/web/documentserver-example/ruby/config.ru @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'config/application' Rails.application.initialize! diff --git a/web/documentserver-example/ruby/config/application.rb b/web/documentserver-example/ruby/config/application.rb index ae55c78c7..6f8a36e1c 100644 --- a/web/documentserver-example/ruby/config/application.rb +++ b/web/documentserver-example/ruby/config/application.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true require_relative 'boot' require 'active_model/railtie' diff --git a/web/documentserver-example/ruby/config/boot.rb b/web/documentserver-example/ruby/config/boot.rb index 5cea2ab21..3ceeeffec 100644 --- a/web/documentserver-example/ruby/config/boot.rb +++ b/web/documentserver-example/ruby/config/boot.rb @@ -1,3 +1,4 @@ +# frozen_string_literal: true ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) require 'bundler/setup' From 5f053de539f417c9b32c25d1d3cddaa32d5ac13d Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 14:12:42 +0300 Subject: [PATCH 326/488] ruby: Style/RedundantParentheses correct --- .../ruby/app/controllers/home_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 81e8b0a6f..86a5a7e2b 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -206,7 +206,7 @@ def track user_address = params[:userAddress] file_name = File.basename(params[:fileName]) - if status == 1 && ((file_data['actions'][0]['type']).zero?) # finished edit + if status == 1 && (file_data['actions'][0]['type']).zero? # finished edit user = file_data['actions'][0]['userid'] # get the user id unless file_data['users'].index(user) json_data = TrackHelper.command_request('forcesave', file_data['key']) # call the forcesave command From a809af8ecab51f9da8457e993195eb54b3fc2ee3 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 14:14:55 +0300 Subject: [PATCH 327/488] ruby: Style/IfUnlessModifier correct --- web/documentserver-example/ruby/app/models/document_helper.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 0971ab723..5a8570a66 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -100,9 +100,7 @@ def forcesave_path(file_name, user_address, create) end directory = File.join(directory, File.basename(file_name)) # get the path to the given file - if !File.file?(directory) && !create - return '' - end + return '' if !File.file?(directory) && !create directory.to_s end From 2477fb21c55661ac677b14927d8cbb8f31a7b14b Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 14:15:41 +0300 Subject: [PATCH 328/488] ruby: Style/RedundantAssignment correct --- .../ruby/app/models/document_helper.rb | 16 ++++++++-------- .../ruby/app/models/track_helper.rb | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 5a8570a66..31da281ac 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -211,21 +211,21 @@ def create_demo(file_ext, sample, user) # get file url def get_file_uri(file_name, for_document_server) - uri = "#{get_server_url(for_document_server)}/" \ + "#{get_server_url(for_document_server)}/" \ "#{DocumentHelper.config_manager.storage_path}/" \ "#{cur_user_host_address(nil)}/" \ "#{ERB::Util.url_encode(file_name)}" - uri + end # get history path url def get_historypath_uri(file_name, version, file, is_serverUrl = true) # for redirection to my link user_host = is_serverUrl ? "&userAddress=#{cur_user_host_address(nil)}" : '' - uri = "#{get_server_url(is_serverUrl)}/downloadhistory/?"\ + "#{get_server_url(is_serverUrl)}/downloadhistory/?"\ "fileName=#{ERB::Util.url_encode(file_name)}&ver=#{version}"\ "&file=#{ERB::Util.url_encode(file)}#{user_host}" - uri + end # get server url @@ -258,7 +258,7 @@ def get_download_url(file_name, is_serverUrl = true) # get internal file extension by its type def get_internal_extension(file_type) - ext = case file_type + case file_type when 'word' # .docx for word type '.docx' when 'cell' # .xlsx for cell type @@ -269,13 +269,13 @@ def get_internal_extension(file_type) '.docx' # the default value is .docx end - ext + end # get image url for templates def get_template_image_url(file_type) path = "#{get_server_url(true)}/assets/" - full_path = case file_type + case file_type when 'word' # for word type "#{path}file_docx.svg" when 'cell' # .xlsx for cell type @@ -286,7 +286,7 @@ def get_template_image_url(file_type) "#{path}file_docx.svg" # the default value is .docx end - full_path + end # get files information diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index aee649111..804d74125 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -293,8 +293,8 @@ def command_request(method, key, meta = nil) raise ex.message end - json_data = JSON.parse(data) # convert the response body into the json format - json_data + JSON.parse(data) # convert the response body into the json format + end # save file from the url From 498268a7a3c93206cfb5ca682e01c649a0ef5c1e Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 14:18:54 +0300 Subject: [PATCH 329/488] ruby: Style/ParenthesesAroundCondition correct --- web/documentserver-example/ruby/app/models/document_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 31da281ac..460efe632 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -230,10 +230,10 @@ def get_historypath_uri(file_name, version, file, is_serverUrl = true) # get server url def get_server_url(for_document_server) - return DocumentHelper.config_manager.example_uri.to_s if ( + return DocumentHelper.config_manager.example_uri.to_s if for_document_server && DocumentHelper.config_manager.example_uri - ) + @@base_url end From 24ff9ce804e4c66e0b3d0de4594ea03ca1d5570c Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 14:21:29 +0300 Subject: [PATCH 330/488] ruby: Style/NegatedIf correct --- web/documentserver-example/ruby/app/models/document_helper.rb | 2 +- .../ruby/app/models/service_converter.rb | 4 ++-- web/documentserver-example/ruby/app/models/track_helper.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 460efe632..e73bf1a2b 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -315,7 +315,7 @@ def get_files_info(file_id) end end - return '"File not found"' if !file_id.nil? + return '"File not found"' unless file_id.nil? result end diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index 89717134c..a598fa90d 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -137,7 +137,7 @@ def get_response_data(json_data) file_result = json_data error_element = file_result['error'] - if !error_element.nil? # if an error occurs + unless error_element.nil? # if an error occurs process_convert_service_responce_error(error_element.to_i) # get an error message end @@ -164,7 +164,7 @@ def get_response_data(json_data) percent_element = file_result['percent'] # get the percentage value - result_percent = percent_element.to_i if !percent_element.nil? + result_percent = percent_element.to_i unless percent_element.nil? result_percent = result_percent >= 100 ? 99 : result_percent diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 804d74125..72fdb5b36 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -267,7 +267,7 @@ def command_request(method, key, meta = nil) key: } - payload.merge!({ meta: }) if !meta.nil? + payload.merge!({ meta: }) unless meta.nil? data = nil begin From 9cbb946c8f26a7860c032930c9c968a7d7b7f026 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 14:24:36 +0300 Subject: [PATCH 331/488] ruby: Style/MultilineTernaryOperator correct --- .../ruby/app/models/file_model.rb | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index f29efeb86..99b92aeb7 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -50,8 +50,12 @@ def file_uri # get file uri for document server def file_uri_user - @config_manager.storage_path.absolute? ? "#{download_url}&dmode=emb" : DocumentHelper.get_file_uri(@file_name, + if @config_manager.storage_path.absolute? + "#{download_url}&dmode=emb" +else + DocumentHelper.get_file_uri(@file_name, false) +end end # get document type from its name (word, cell or slide) @@ -144,8 +148,12 @@ def get_config }, referenceData: { instanceId: DocumentHelper.get_server_url(false), - fileKey: !@user.id.eql?('uid-0') ? { fileName: @file_name, - userAddress: DocumentHelper.cur_user_host_address(nil) }.to_json : nil + fileKey: if !@user.id.eql?('uid-0') + { fileName: @file_name, + userAddress: DocumentHelper.cur_user_host_address(nil) }.to_json +else + nil +end } }, editorConfig: { @@ -248,8 +256,12 @@ def get_history dataObj['url'] = i == cur_ver ? doc_uri : DocumentHelper.get_historypath_uri(file_name, i, "prev#{file_ext}") if is_enable_direct_url == true dataObj['directUrl'] = - i == cur_ver ? download_url(false) : DocumentHelper.get_historypath_uri(file_name, i, "prev#{file_ext}", + if i == cur_ver + download_url(false) +else + DocumentHelper.get_historypath_uri(file_name, i, "prev#{file_ext}", false) +end end dataObj['version'] = i From 0728a71f010a292f914d90957daa84960f1cdf4b Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 14:25:19 +0300 Subject: [PATCH 332/488] ruby: Style/EmptyElse correct --- web/documentserver-example/ruby/app/models/file_model.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 99b92aeb7..f39ece392 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -151,8 +151,6 @@ def get_config fileKey: if !@user.id.eql?('uid-0') { fileName: @file_name, userAddress: DocumentHelper.cur_user_host_address(nil) }.to_json -else - nil end } }, @@ -166,8 +164,6 @@ def get_config mode: 'strict', change: false } - else - nil end, createUrl: !@user.id.eql?('uid-0') ? create_url : nil, templates: @user.templates ? templates : nil, From f4d838710c3e03144dda4ddf69aa175ac1b5aa13 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 14:25:59 +0300 Subject: [PATCH 333/488] ruby: Style/MultilineIfModifier correct --- web/documentserver-example/ruby/app/models/track_helper.rb | 6 ++++-- web/documentserver-example/ruby/app/models/users.rb | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 72fdb5b36..c833ee45c 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -234,8 +234,10 @@ def process_force_save(file_data, file_name, user_address) end forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file else - file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, - user_address) if new_file_name + if new_file_name + file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, + user_address) + end forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, false) if forcesave_path.eql?('') # if the path to the new file doesn't exist, create it diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 6d178dcd2..e66c942f8 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -128,8 +128,10 @@ def get_user(id) def get_users_for_mentions(id) usersData = [] @@users.each do |user| - usersData.push({ name: user.name, - email: user.email }) if !user.id.eql?(id) && !user.name.nil? && !user.email.nil? + if !user.id.eql?(id) && !user.name.nil? && !user.email.nil? + usersData.push({ name: user.name, + email: user.email }) + end end usersData end From 684fa89c1354020f37c8fe40181d23abd7b55b23 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 14:57:15 +0300 Subject: [PATCH 334/488] ruby: Style/EmptyLineAfterMagicComment correct --- web/documentserver-example/ruby/Gemfile | 1 + web/documentserver-example/ruby/Rakefile | 1 + .../ruby/app/controllers/application_controller.rb | 1 + .../ruby/app/controllers/home_controller.rb | 1 + .../ruby/app/helpers/application_helper.rb | 1 + web/documentserver-example/ruby/app/helpers/home_helper.rb | 1 + web/documentserver-example/ruby/app/models/document_helper.rb | 1 + web/documentserver-example/ruby/app/models/file_model.rb | 1 + web/documentserver-example/ruby/app/models/file_utility.rb | 1 + web/documentserver-example/ruby/app/models/jwt_helper.rb | 1 + web/documentserver-example/ruby/app/models/service_converter.rb | 1 + web/documentserver-example/ruby/app/models/track_helper.rb | 1 + web/documentserver-example/ruby/app/models/users.rb | 1 + web/documentserver-example/ruby/config.ru | 1 + web/documentserver-example/ruby/config/application.rb | 1 + web/documentserver-example/ruby/config/boot.rb | 1 + 16 files changed, 16 insertions(+) diff --git a/web/documentserver-example/ruby/Gemfile b/web/documentserver-example/ruby/Gemfile index 45e26a0cb..753e0bdfa 100644 --- a/web/documentserver-example/ruby/Gemfile +++ b/web/documentserver-example/ruby/Gemfile @@ -1,4 +1,5 @@ # frozen_string_literal: true + source 'https://rubygems.org' gem 'byebug', '~> 11.1', groups: %i[development test] diff --git a/web/documentserver-example/ruby/Rakefile b/web/documentserver-example/ruby/Rakefile index bb8920958..fd960c20f 100644 --- a/web/documentserver-example/ruby/Rakefile +++ b/web/documentserver-example/ruby/Rakefile @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'rake/testtask' require_relative 'config/application' diff --git a/web/documentserver-example/ruby/app/controllers/application_controller.rb b/web/documentserver-example/ruby/app/controllers/application_controller.rb index b6d3299e5..7f694b6cf 100644 --- a/web/documentserver-example/ruby/app/controllers/application_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/application_controller.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 86a5a7e2b..56a2a6f75 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/app/helpers/application_helper.rb b/web/documentserver-example/ruby/app/helpers/application_helper.rb index 3e7976e0a..8e77b5bd5 100644 --- a/web/documentserver-example/ruby/app/helpers/application_helper.rb +++ b/web/documentserver-example/ruby/app/helpers/application_helper.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/app/helpers/home_helper.rb b/web/documentserver-example/ruby/app/helpers/home_helper.rb index 421fa0789..de8697270 100644 --- a/web/documentserver-example/ruby/app/helpers/home_helper.rb +++ b/web/documentserver-example/ruby/app/helpers/home_helper.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index e73bf1a2b..78bd7e16c 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index f39ece392..ed2b53faf 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/app/models/file_utility.rb b/web/documentserver-example/ruby/app/models/file_utility.rb index 5e7965a86..b25c3d3b7 100644 --- a/web/documentserver-example/ruby/app/models/file_utility.rb +++ b/web/documentserver-example/ruby/app/models/file_utility.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/app/models/jwt_helper.rb b/web/documentserver-example/ruby/app/models/jwt_helper.rb index 842c89f29..1ca705192 100644 --- a/web/documentserver-example/ruby/app/models/jwt_helper.rb +++ b/web/documentserver-example/ruby/app/models/jwt_helper.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index a598fa90d..3990af67f 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index c833ee45c..4582f25af 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index e66c942f8..9ce9730e7 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + # # (c) Copyright Ascensio System SIA 2023 # diff --git a/web/documentserver-example/ruby/config.ru b/web/documentserver-example/ruby/config.ru index edb2b97b1..ff628ad77 100644 --- a/web/documentserver-example/ruby/config.ru +++ b/web/documentserver-example/ruby/config.ru @@ -1,4 +1,5 @@ # frozen_string_literal: true + require_relative 'config/application' Rails.application.initialize! diff --git a/web/documentserver-example/ruby/config/application.rb b/web/documentserver-example/ruby/config/application.rb index 6f8a36e1c..94076a0f3 100644 --- a/web/documentserver-example/ruby/config/application.rb +++ b/web/documentserver-example/ruby/config/application.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require_relative 'boot' require 'active_model/railtie' diff --git a/web/documentserver-example/ruby/config/boot.rb b/web/documentserver-example/ruby/config/boot.rb index 3ceeeffec..2d46de4ca 100644 --- a/web/documentserver-example/ruby/config/boot.rb +++ b/web/documentserver-example/ruby/config/boot.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) require 'bundler/setup' From f87fc045d331fad3a83af45a40ec2a33a3e40ea7 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 15:00:09 +0300 Subject: [PATCH 335/488] ruby: Lint/UselessAssignment correct --- .../ruby/app/controllers/home_controller.rb | 8 ++++---- .../ruby/app/models/file_model.rb | 2 +- .../ruby/app/models/track_helper.rb | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 56a2a6f75..154d64f14 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -162,7 +162,7 @@ def downloadhistory user_address = params[:userAddress] version = params[:ver] file = params[:file] - isEmbedded = params[:dmode] + params[:dmode] if JwtHelper.is_enabled && JwtHelper.use_for_request jwtHeader = HomeController.config_manager.jwt_header @@ -190,7 +190,7 @@ def downloadhistory response.headers['Content-Disposition'] = "attachment;filename*=UTF-8''#{ERB::Util.url_encode(file)}" send_file file_path, x_sendfile: true - rescue StandardError => ex + rescue StandardError render plain: '{ "error": "File not found"}' end @@ -210,7 +210,7 @@ def track if status == 1 && (file_data['actions'][0]['type']).zero? # finished edit user = file_data['actions'][0]['userid'] # get the user id unless file_data['users'].index(user) - json_data = TrackHelper.command_request('forcesave', file_data['key']) # call the forcesave command + TrackHelper.command_request('forcesave', file_data['key']) # call the forcesave command end end @@ -306,7 +306,7 @@ def download response.headers['Content-Disposition'] = "attachment;filename*=UTF-8''#{ERB::Util.url_encode(file_name)}" send_file file_path, x_sendfile: true - rescue StandardError => ex + rescue StandardError render plain: '{ "error": "File not found"}' end diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index ed2b53faf..164b199e6 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -264,7 +264,7 @@ def get_history if i > 1 # check if the version number is greater than 1 changes = nil - change = nil + nil # get the path to the changes.json file File.open(File.join(DocumentHelper.version_dir(hist_dir, i - 1), 'changes.json'), 'r') do |file| changes = JSON.parse(file.read) # and parse its content diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 4582f25af..c97b12760 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -108,7 +108,7 @@ def process_save(raw_file_data, file_name, user_address) unless cur_ext.eql?(download_ext) key = ServiceConverter.generate_revision_id(download_uri) # get the document key begin - percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data( + _, new_file_uri, _ = ServiceConverter.get_converted_data( download_uri, download_ext.delete('.'), cur_ext.delete('.'), @@ -124,7 +124,7 @@ def process_save(raw_file_data, file_name, user_address) else download_uri = new_file_uri end - rescue StandardError => msg + rescue StandardError new_file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) end @@ -173,7 +173,7 @@ def process_save(raw_file_data, file_name, user_address) end saved = 0 - rescue StandardError => msg + rescue StandardError saved = 1 end @@ -198,7 +198,7 @@ def process_force_save(file_data, file_name, user_address) unless cur_ext.eql?(download_ext) key = ServiceConverter.generate_revision_id(download_uri) # get the document key begin - percent, new_file_uri, new_file_type = ServiceConverter.get_converted_data( + _, new_file_uri, _ = ServiceConverter.get_converted_data( download_uri, download_ext.delete('.'), cur_ext.delete('.'), @@ -211,7 +211,7 @@ def process_force_save(file_data, file_name, user_address) else download_uri = new_file_uri end - rescue StandardError => msg + rescue StandardError new_file_name = true end end @@ -255,7 +255,7 @@ def process_force_save(file_data, file_name, user_address) end saved = 0 - rescue StandardError => msg + rescue StandardError saved = 1 end From c0135c52c5db8c465d88cede93d47b1419283b60 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 15:02:01 +0300 Subject: [PATCH 336/488] ruby: Layout/TrailingWhitespace correct --- .../ruby/app/models/document_helper.rb | 45 ++++++++----------- .../ruby/app/models/file_model.rb | 26 +++++------ .../ruby/app/models/track_helper.rb | 1 - 3 files changed, 32 insertions(+), 40 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 78bd7e16c..6f21b61fe 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -216,7 +216,6 @@ def get_file_uri(file_name, for_document_server) "#{DocumentHelper.config_manager.storage_path}/" \ "#{cur_user_host_address(nil)}/" \ "#{ERB::Util.url_encode(file_name)}" - end # get history path url @@ -226,15 +225,13 @@ def get_historypath_uri(file_name, version, file, is_serverUrl = true) "#{get_server_url(is_serverUrl)}/downloadhistory/?"\ "fileName=#{ERB::Util.url_encode(file_name)}&ver=#{version}"\ "&file=#{ERB::Util.url_encode(file)}#{user_host}" - end # get server url def get_server_url(for_document_server) - return DocumentHelper.config_manager.example_uri.to_s if + return DocumentHelper.config_manager.example_uri.to_s if for_document_server && DocumentHelper.config_manager.example_uri - @@base_url end @@ -260,34 +257,30 @@ def get_download_url(file_name, is_serverUrl = true) # get internal file extension by its type def get_internal_extension(file_type) case file_type - when 'word' # .docx for word type - '.docx' - when 'cell' # .xlsx for cell type - '.xlsx' - when 'slide' # .pptx for slide type - '.pptx' - else - '.docx' # the default value is .docx - end - - + when 'word' # .docx for word type + '.docx' + when 'cell' # .xlsx for cell type + '.xlsx' + when 'slide' # .pptx for slide type + '.pptx' + else + '.docx' # the default value is .docx + end end # get image url for templates def get_template_image_url(file_type) path = "#{get_server_url(true)}/assets/" case file_type - when 'word' # for word type - "#{path}file_docx.svg" - when 'cell' # .xlsx for cell type - "#{path}file_xlsx.svg" - when 'slide' # .pptx for slide type - "#{path}file_pptx.svg" - else - "#{path}file_docx.svg" # the default value is .docx - end - - + when 'word' # for word type + "#{path}file_docx.svg" + when 'cell' # .xlsx for cell type + "#{path}file_xlsx.svg" + when 'slide' # .pptx for slide type + "#{path}file_pptx.svg" + else + "#{path}file_docx.svg" # the default value is .docx + end end # get files information diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 164b199e6..b9ffbc706 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -52,11 +52,11 @@ def file_uri # get file uri for document server def file_uri_user if @config_manager.storage_path.absolute? - "#{download_url}&dmode=emb" -else - DocumentHelper.get_file_uri(@file_name, - false) -end + "#{download_url}&dmode=emb" + else + DocumentHelper.get_file_uri(@file_name, + false) + end end # get document type from its name (word, cell or slide) @@ -150,9 +150,9 @@ def get_config referenceData: { instanceId: DocumentHelper.get_server_url(false), fileKey: if !@user.id.eql?('uid-0') - { fileName: @file_name, - userAddress: DocumentHelper.cur_user_host_address(nil) }.to_json -end + { fileName: @file_name, + userAddress: DocumentHelper.cur_user_host_address(nil) }.to_json + end } }, editorConfig: { @@ -254,11 +254,11 @@ def get_history if is_enable_direct_url == true dataObj['directUrl'] = if i == cur_ver - download_url(false) -else - DocumentHelper.get_historypath_uri(file_name, i, "prev#{file_ext}", - false) -end + download_url(false) + else + DocumentHelper.get_historypath_uri(file_name, i, "prev#{file_ext}", + false) + end end dataObj['version'] = i diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index c97b12760..65885d46a 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -297,7 +297,6 @@ def command_request(method, key, meta = nil) end JSON.parse(data) # convert the response body into the json format - end # save file from the url From ea15f12551a56dfeb342c86812290f040527524c Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Wed, 15 Nov 2023 18:18:56 +0300 Subject: [PATCH 337/488] ruby: Style/TrailingUnderscoreVariable correct --- web/documentserver-example/ruby/app/models/track_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 65885d46a..c0b77908c 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -108,7 +108,7 @@ def process_save(raw_file_data, file_name, user_address) unless cur_ext.eql?(download_ext) key = ServiceConverter.generate_revision_id(download_uri) # get the document key begin - _, new_file_uri, _ = ServiceConverter.get_converted_data( + _, new_file_uri, = ServiceConverter.get_converted_data( download_uri, download_ext.delete('.'), cur_ext.delete('.'), @@ -198,7 +198,7 @@ def process_force_save(file_data, file_name, user_address) unless cur_ext.eql?(download_ext) key = ServiceConverter.generate_revision_id(download_uri) # get the document key begin - _, new_file_uri, _ = ServiceConverter.get_converted_data( + _, new_file_uri, = ServiceConverter.get_converted_data( download_uri, download_ext.delete('.'), cur_ext.delete('.'), From c639ba42877ae1a86cb4666ba9d32f5dc11380ff Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Thu, 16 Nov 2023 10:15:11 +0300 Subject: [PATCH 338/488] ruby: Style/NegatedIf correct --- web/documentserver-example/ruby/app/models/file_model.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index b9ffbc706..533207f85 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -149,7 +149,7 @@ def get_config }, referenceData: { instanceId: DocumentHelper.get_server_url(false), - fileKey: if !@user.id.eql?('uid-0') + fileKey: unless @user.id.eql?('uid-0') { fileName: @file_name, userAddress: DocumentHelper.cur_user_host_address(nil) }.to_json end From c5315de84f035349602ad9a67e5ee3b94e1921a8 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Thu, 16 Nov 2023 10:16:22 +0300 Subject: [PATCH 339/488] ruby: Lint/Void correct --- web/documentserver-example/ruby/app/models/file_model.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 533207f85..9a2c3c28b 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -264,7 +264,6 @@ def get_history if i > 1 # check if the version number is greater than 1 changes = nil - nil # get the path to the changes.json file File.open(File.join(DocumentHelper.version_dir(hist_dir, i - 1), 'changes.json'), 'r') do |file| changes = JSON.parse(file.read) # and parse its content From acdb60dd3b938d2652ab38fa3f07520ce08c392c Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Thu, 16 Nov 2023 11:48:56 +0300 Subject: [PATCH 340/488] ruby: Style/ClassVars correct --- .../ruby/app/models/document_helper.rb | 14 +++++----- .../ruby/app/models/service_converter.rb | 10 +++---- .../ruby/app/models/track_helper.rb | 6 ++-- .../ruby/app/models/users.rb | 28 +++++++++---------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 6f21b61fe..279efe075 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -27,14 +27,14 @@ class << self attr_reader :config_manager, :format_manager end - @@runtime_cache = {} - @@remote_ip = nil - @@base_url = nil + @runtime_cache = {} + @remote_ip = nil + @base_url = nil class << self def init(ip, url) - @@remote_ip = ip - @@base_url = url + @remote_ip = ip + @base_url = url end # define max file size @@ -68,7 +68,7 @@ def convert_exts # get current user host address def cur_user_host_address(user_address) - (user_address.nil? ? @@remote_ip : user_address).gsub(/[^0-9\-.a-zA-Z_=]/, '_') + (user_address.nil? ? @remote_ip : user_address).gsub(/[^0-9\-.a-zA-Z_=]/, '_') end # get the storage path of the given file @@ -233,7 +233,7 @@ def get_server_url(for_document_server) for_document_server && DocumentHelper.config_manager.example_uri - @@base_url + @base_url end # get callback url diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index 3990af67f..832e09648 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -25,8 +25,8 @@ class << self attr_reader :config_manager end - @@convert_timeout = ServiceConverter.config_manager.convertation_timeout - @@document_converter_url = ServiceConverter.config_manager.document_server_converter_uri.to_s + @convert_timeout = ServiceConverter.config_manager.convertation_timeout + @document_converter_url = ServiceConverter.config_manager.document_server_converter_uri.to_s class << self # get the url of the converted file @@ -54,12 +54,12 @@ def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_ data = nil begin - uri = URI.parse(@@document_converter_url) # create the request url + uri = URI.parse(@document_converter_url) # create the request url http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server - DocumentHelper.verify_ssl(@@document_converter_url, http) + DocumentHelper.verify_ssl(@document_converter_url, http) - http.read_timeout = @@convert_timeout + http.read_timeout = @convert_timeout http.open_timeout = 5 req = Net::HTTP::Post.new(uri.request_uri) # create the post request req.add_field('Accept', 'application/json') # set headers diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index c0b77908c..d900867ba 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -29,7 +29,7 @@ class << self attr_reader :config_manager, :proxy_manager end - @@document_command_url = TrackHelper.config_manager.document_server_command_uri.to_s + @document_command_url = TrackHelper.config_manager.document_server_command_uri.to_s class << self # read the request body @@ -274,10 +274,10 @@ def command_request(method, key, meta = nil) data = nil begin - uri = URI.parse(@@document_command_url) # parse the document command url + uri = URI.parse(@document_command_url) # parse the document command url http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server - DocumentHelper.verify_ssl(@@document_command_url, http) + DocumentHelper.verify_ssl(@document_command_url, http) req = Net::HTTP::Post.new(uri.request_uri) # create the post request req.add_field('Content-Type', 'application/json') # set headers diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 9ce9730e7..146dee2c0 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -38,7 +38,7 @@ def initialize(id, name, email, group, reviewGroups, commentGroups, userInfoGrou end class Users - @@descr_user_1 = [ + @descr_user_1 = [ 'File author by default', 'Doesn’t belong to any group', 'Can review all the changes', @@ -49,7 +49,7 @@ class Users 'Has an avatar' ] - @@descr_user_2 = [ + @descr_user_2 = [ 'Belongs to Group2', 'Can review only his own changes or changes made by users with no group', 'Can view comments, edit his own comments, and comments left by users with no group. ' \ @@ -60,7 +60,7 @@ class Users 'Has an avatar' ] - @@descr_user_3 = [ + @descr_user_3 = [ 'Belongs to Group3', 'Can review changes made by Group2 users', 'Can view comments left by Group2 and Group3 users. Can edit comments left by the Group2 users', @@ -72,7 +72,7 @@ class Users 'Can see the information about Group2 users' ] - @@descr_user_0 = [ + @descr_user_0 = [ 'The name is requested when the editor is opened', 'Doesn’t belong to any group', 'Can review all the changes', @@ -87,10 +87,10 @@ class Users 'View file without collaboration' ] - @@users = [ + @users = [ User.new('uid-1', 'John Smith', 'smith@example.com', '', nil, {}, nil, - nil, [], @@descr_user_1, true, true), + nil, [], @descr_user_1, true, true), User.new('uid-2', 'Mark Pottato', 'pottato@example.com', 'group-2', ['group-2', ''], { view: '', @@ -98,7 +98,7 @@ class Users remove: ['group-2'] }, ['group-2', ''], - true, [], @@descr_user_2, false, true), + true, [], @descr_user_2, false, true), User.new('uid-3', 'Hamish Mitchell', nil, 'group-3', ['group-2'], { view: %w[group-3 group-2], @@ -106,29 +106,29 @@ class Users remove: [] }, ['group-2'], - false, %w[copy download print], @@descr_user_3, false, false), + false, %w[copy download print], @descr_user_3, false, false), User.new('uid-0', nil, nil, '', nil, {}, [], - nil, ['protect'], @@descr_user_0, false, false) + nil, ['protect'], @descr_user_0, false, false) ] class << self def get_all_users - @@users + @users end # get a user by id specified def get_user(id) - @@users.each do |user| + @users.each do |user| return user if user.id.eql?(id) end - @@users[0] + @users[0] end # get a list of users with their names and emails for mentions def get_users_for_mentions(id) usersData = [] - @@users.each do |user| + @users.each do |user| if !user.id.eql?(id) && !user.name.nil? && !user.email.nil? usersData.push({ name: user.name, email: user.email }) @@ -140,7 +140,7 @@ def get_users_for_mentions(id) # get a list of users with their id, names and emails for protect def get_users_for_protect(id) users_data = [] - @@users.each do |user| + @users.each do |user| users_data.push({ id: user.id, name: user.name, email: user.email }) if !user.id.eql?(id) && !user.name.nil? end users_data From 4536f83d105527206b06f2a18e2ed4e4f32dc9ba Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Thu, 16 Nov 2023 12:26:27 +0300 Subject: [PATCH 341/488] ruby: Style/OptionalBooleanParameter correct --- .../ruby/app/controllers/home_controller.rb | 2 +- .../ruby/app/models/document_helper.rb | 4 ++-- .../ruby/app/models/file_model.rb | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 154d64f14..3a90bdd67 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -424,7 +424,7 @@ def reference ".#{File.mtime(DocumentHelper.storage_path(fileName, nil))}" ), url: DocumentHelper.get_download_url(fileName), - directUrl: body['directUrl'] ? DocumentHelper.get_download_url(fileName, false) : nil, + directUrl: body['directUrl'] ? DocumentHelper.get_download_url(fileName, is_serverUrl: false) : nil, referenceData: { instanceId: DocumentHelper.get_server_url(false), fileKey: { fileName:, userAddress: DocumentHelper.cur_user_host_address(nil) }.to_json diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 279efe075..b31fec823 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -219,7 +219,7 @@ def get_file_uri(file_name, for_document_server) end # get history path url - def get_historypath_uri(file_name, version, file, is_serverUrl = true) + def get_historypath_uri(file_name, version, file, is_serverUrl: true) # for redirection to my link user_host = is_serverUrl ? "&userAddress=#{cur_user_host_address(nil)}" : '' "#{get_server_url(is_serverUrl)}/downloadhistory/?"\ @@ -249,7 +249,7 @@ def get_create_url(document_type) end # get url to download a file - def get_download_url(file_name, is_serverUrl = true) + def get_download_url(file_name, is_serverUrl: true) user_host = is_serverUrl ? "&userAddress=#{cur_user_host_address(nil)}" : '' "#{get_server_url(is_serverUrl)}/download?fileName=#{ERB::Util.url_encode(file_name)}#{user_host}" end diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 9a2c3c28b..04f316dc0 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -82,8 +82,8 @@ def create_url end # get url to download a file - def download_url(is_serverUrl = true) - DocumentHelper.get_download_url(@file_name, is_serverUrl) + def download_url(is_serverUrl: true) + DocumentHelper.get_download_url(@file_name, is_serverUrl:) end # get current user host address @@ -123,7 +123,7 @@ def get_config document: { title: @file_name, url: download_url, - directUrl: is_enable_direct_url ? download_url(false) : '', + directUrl: is_enable_direct_url ? download_url(is_serverUrl: false) : '', fileType: file_ext.delete('.'), key:, info: { @@ -176,11 +176,11 @@ def get_config }, embedded: { # the parameters for the embedded document type # the absolute URL that will allow the document to be saved onto the user personal computer - saveUrl: download_url(false), + saveUrl: download_url(is_serverUrl: false), # the absolute URL to the document serving as a source file for the document embedded into the web page - embedUrl: download_url(false), + embedUrl: download_url(is_serverUrl: false), # the absolute URL that will allow other users to share this document - shareUrl: download_url(false), + shareUrl: download_url(is_serverUrl: false), toolbarDocked: 'top' # the place for the embedded viewer toolbar (top or bottom) }, customization: { # the parameters for the editor interface @@ -254,7 +254,7 @@ def get_history if is_enable_direct_url == true dataObj['directUrl'] = if i == cur_ver - download_url(false) + download_url(is_serverUrl: false) else DocumentHelper.get_historypath_uri(file_name, i, "prev#{file_ext}", false) From 1cd457c5c6656253bbe68f8937b4689a5e279f59 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Thu, 16 Nov 2023 13:35:06 +0300 Subject: [PATCH 342/488] ruby: Lint/DuplicateMethods correct --- web/documentserver-example/ruby/app/models/file_model.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 04f316dc0..fab5a02f5 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -26,7 +26,7 @@ class FileModel def initialize(attributes = {}) @file_name = attributes[:file_name] @mode = attributes[:mode] - @type = attributes[:type] + @type = attributes[:type] || 'desktop' # the default platform type is desktop @user_ip = attributes[:user_ip] @lang = attributes[:lang] @user = attributes[:user] @@ -35,10 +35,6 @@ def initialize(attributes = {}) @config_manager = ConfigurationManager.new end - def type - @type || 'desktop' # the default platform type is desktop - end - # get file extension from its name def file_ext File.extname(@file_name).downcase From 902ad1341cc24ca1bbfbfeb585f4e2043f7aa731 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Thu, 16 Nov 2023 15:16:47 +0300 Subject: [PATCH 343/488] ruby: Naming/RescuedExceptionsVariableName correct --- .../ruby/app/controllers/home_controller.rb | 16 ++++++++-------- .../ruby/app/models/service_converter.rb | 4 ++-- .../ruby/app/models/track_helper.rb | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 3a90bdd67..7f1e5c09c 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -86,8 +86,8 @@ def upload # write a new file name to the response render plain: "{ \"filename\": \"#{file_name}\", \"documentType\": \"#{document_type}\"}" - rescue StandardError => ex - render plain: "{ \"error\": \"#{ex.message}\"}" # write an error message to the response + rescue StandardError => e + render plain: "{ \"error\": \"#{e.message}\"}" # write an error message to the response end end @@ -152,8 +152,8 @@ def convert end render plain: "{ \"filename\" : \"#{file_name}\"}" - rescue StandardError => ex - render plain: "{ \"error\": \"#{ex.message}\"}" + rescue StandardError => e + render plain: "{ \"error\": \"#{e.message}\"}" end # downloading a history file from public @@ -349,8 +349,8 @@ def saveas render plain: "{\"file\" : \"#{file_name}\"}" nil - rescue StandardError => ex - render plain: "{\"error\":1, \"message\": \"#{ex.message}\"}" + rescue StandardError => e + render plain: "{\"error\":1, \"message\": \"#{e.message}\"}" nil end @@ -498,10 +498,10 @@ def restore error: nil, success: true } - rescue StandardError => error + rescue StandardError => e response.status = :internal_server_error render json: { - error: error.message, + error: e.message, success: false } end diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index 832e09648..15db3f251 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -81,8 +81,8 @@ def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_ data = res.body # and take its body rescue Timeout::Error # try again - rescue StandardError => ex - raise ex.message + rescue StandardError => e + raise e.message end json_data = JSON.parse(data) # parse response body diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index d900867ba..558850dd3 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -292,8 +292,8 @@ def command_request(method, key, meta = nil) req.body = payload.to_json # convert the payload object into the json format res = http.request(req) # get the response data = res.body # and take its body - rescue StandardError => ex - raise ex.message + rescue StandardError => e + raise e.message end JSON.parse(data) # convert the response body into the json format From dafc66d5d842b3338d6d5bca215a0264c30d1a71 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Sun, 19 Nov 2023 02:38:42 +0300 Subject: [PATCH 344/488] ruby: Style/Documentation correct --- .../ruby/app/configuration/configuration.rb | 1 + .../app/configuration/configuration_tests.rb | 16 ++++++++++++++++ .../ruby/app/controllers/home_controller.rb | 1 + .../ruby/app/format/format.rb | 2 ++ .../ruby/app/format/format_tests.rb | 9 +++++++++ .../ruby/app/helpers/application_helper.rb | 1 + .../ruby/app/helpers/home_helper.rb | 1 + .../ruby/app/models/document_helper.rb | 1 + .../ruby/app/models/file_model.rb | 1 + .../ruby/app/models/file_utility.rb | 1 + .../ruby/app/models/jwt_helper.rb | 1 + .../ruby/app/models/service_converter.rb | 1 + .../ruby/app/models/track_helper.rb | 1 + .../ruby/app/models/users.rb | 2 ++ .../ruby/app/proxy/proxy.rb | 1 + .../ruby/app/proxy/proxy_tests.rb | 6 ++++++ .../ruby/config/application.rb | 1 + 17 files changed, 47 insertions(+) diff --git a/web/documentserver-example/ruby/app/configuration/configuration.rb b/web/documentserver-example/ruby/app/configuration/configuration.rb index c2c1846fb..c4efd7fe1 100644 --- a/web/documentserver-example/ruby/app/configuration/configuration.rb +++ b/web/documentserver-example/ruby/app/configuration/configuration.rb @@ -22,6 +22,7 @@ require 'sorbet-runtime' require 'uri' +# ConfigurationManager manages configuration settings for the application. class ConfigurationManager extend T::Sig diff --git a/web/documentserver-example/ruby/app/configuration/configuration_tests.rb b/web/documentserver-example/ruby/app/configuration/configuration_tests.rb index d98e8977b..ccf94cdf6 100644 --- a/web/documentserver-example/ruby/app/configuration/configuration_tests.rb +++ b/web/documentserver-example/ruby/app/configuration/configuration_tests.rb @@ -20,6 +20,7 @@ require 'test/unit' require_relative 'configuration' +# Enviroment module provides a mechanism for capturing and restoring the environment. module Enviroment def initialize(name) @env = ENV.to_hash @@ -31,6 +32,7 @@ def setup end end +# For testing the ConfigurationManager class. class ConfigurationManagerTests < Test::Unit::TestCase def test_corresponds_the_latest_version config_manager = ConfigurationManager.new @@ -38,6 +40,7 @@ def test_corresponds_the_latest_version end end +# For testing the example_uri method of ConfigurationManager. class ConfigurationManagerExampleURITests < Test::Unit::TestCase include Enviroment @@ -55,6 +58,7 @@ def test_assigns_a_value_from_the_environment end end +# For testing the document_server_public_uri method of ConfigurationManager. class ConfigurationManagerDocumentServerPublicURITests < Test::Unit::TestCase include Enviroment @@ -72,6 +76,7 @@ def test_assigns_a_value_from_the_environment end end +# For testing the document_server_private_uri method of ConfigurationManager. class ConfigurationManagerDocumentServerPrivateURITests < Test::Unit::TestCase include Enviroment @@ -89,6 +94,7 @@ def test_assigns_a_value_from_the_environment end end +# For testing the document_server_api_uri method of ConfigurationManager. class ConfigurationManagerDocumentServerAPIURITests < Test::Unit::TestCase include Enviroment @@ -112,6 +118,7 @@ def test_assigns_a_value_from_the_environment end end +# For testing the document_server_preloader_uri method of ConfigurationManager. class ConfigurationManagerDocumentServerPreloaderURITests < Test::Unit::TestCase include Enviroment @@ -135,6 +142,7 @@ def test_assigns_a_value_from_the_environment end end +# For testing the document_server_command_uri method of ConfigurationManager. class ConfigurationManagerDocumentServerCommandURITests < Test::Unit::TestCase include Enviroment @@ -158,6 +166,7 @@ def test_assigns_a_value_from_the_environment end end +# For testing the document_server_converter_uri method of ConfigurationManager. class ConfigurationManagerDocumentServerConverterURITests < Test::Unit::TestCase include Enviroment @@ -181,6 +190,7 @@ def test_assigns_a_value_from_the_environment end end +# For testing the jwt_secret method of ConfigurationManager. class ConfigurationManagerJWTSecretTests < Test::Unit::TestCase include Enviroment @@ -198,6 +208,7 @@ def test_assigns_a_value_from_the_environment end end +# For testing the jwt_header method of ConfigurationManager. class ConfigurationManagerJWTHeaderTests < Test::Unit::TestCase include Enviroment @@ -215,6 +226,7 @@ def test_assigns_a_value_from_the_environment end end +# For testing the jwt_use_for_request method of ConfigurationManager. class ConfigurationManagerJWTUseForRequest < Test::Unit::TestCase include Enviroment @@ -232,6 +244,7 @@ def test_assigns_a_value_from_the_environment end end +# For testing the ssl_verify_peer_mode_enabled method of ConfigurationManager. class ConfigurationManagerSSLTests < Test::Unit::TestCase include Enviroment @@ -249,6 +262,7 @@ def test_assigns_a_value_from_the_environment end end +# For testing the storage_path method of ConfigurationManager. class ConfigurationManagerStoragePathTests < Test::Unit::TestCase include Enviroment @@ -275,6 +289,7 @@ def test_assigns_an_absolute_path_from_the_environment end end +# For testing the maximum_file_size method of ConfigurationManager. class ConfigurationManagerMaximumFileSizeTests < Test::Unit::TestCase include Enviroment @@ -292,6 +307,7 @@ def test_assigns_a_value_from_the_environment end end +# For testing the convertation_timeout method of ConfigurationManager. class ConfigurationManagerConversionTimeoutTests < Test::Unit::TestCase def test_assigns_a_default_value config_manager = ConfigurationManager.new diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 7f1e5c09c..fb1dcbd67 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -21,6 +21,7 @@ require 'mimemagic' require_relative '../configuration/configuration' +# Handling requests controller class HomeController < ApplicationController @config_manager = ConfigurationManager.new diff --git a/web/documentserver-example/ruby/app/format/format.rb b/web/documentserver-example/ruby/app/format/format.rb index 59bb56ea1..03f1a04e4 100644 --- a/web/documentserver-example/ruby/app/format/format.rb +++ b/web/documentserver-example/ruby/app/format/format.rb @@ -20,6 +20,7 @@ require 'pathname' require 'sorbet-runtime' +# Struct representing a document format with properties. class Format < T::Struct extend T::Sig @@ -40,6 +41,7 @@ def extension end end +# FormatManager is responsible for managing document formats and providing various lists of supported extensions. class FormatManager extend T::Sig diff --git a/web/documentserver-example/ruby/app/format/format_tests.rb b/web/documentserver-example/ruby/app/format/format_tests.rb index 62fba2662..8f199c249 100644 --- a/web/documentserver-example/ruby/app/format/format_tests.rb +++ b/web/documentserver-example/ruby/app/format/format_tests.rb @@ -21,6 +21,7 @@ require 'test/unit' require_relative 'format' +# Test case for the Format class. class FormatTests < Test::Unit::TestCase def test_generates_extension content = @@ -39,6 +40,7 @@ def test_generates_extension end end +# Test case for the FormatManager class, checks availability "all" formats. class FormatManagerAllTests < Test::Unit::TestCase def test_loads format_manager = FormatManager.new @@ -46,6 +48,7 @@ def test_loads end end +# Test case for the FormatManager class, checks availability "documents" formats. class FormatManagerDocumentsTests < Test::Unit::TestCase def test_loads format_manager = FormatManager.new @@ -53,6 +56,7 @@ def test_loads end end +# Test case for the FormatManager class, checks availability "presentations" formats. class FormatManagerPresentationsTests < Test::Unit::TestCase def test_loads format_manager = FormatManager.new @@ -60,6 +64,7 @@ def test_loads end end +# Test case for the FormatManager class, checks availability "spreadsheets" formats. class FormatManagerSpreadsheetsTests < Test::Unit::TestCase def test_loads format_manager = FormatManager.new @@ -67,6 +72,7 @@ def test_loads end end +# Test case for the FormatManager class, checks availability "all convertible" formats. class FormatManagerConvertibleTests < Test::Unit::TestCase def test_loads format_manager = FormatManager.new @@ -74,6 +80,7 @@ def test_loads end end +# Test case for the FormatManager class, checks availability "all editable" formats. class FormatManagerEditableTests < Test::Unit::TestCase def test_loads format_manager = FormatManager.new @@ -81,6 +88,7 @@ def test_loads end end +# Test case for the FormatManager class, checks availability "all viewable" formats. class FormatManagerViewableTests < Test::Unit::TestCase def test_loads format_manager = FormatManager.new @@ -88,6 +96,7 @@ def test_loads end end +# Test case for the FormatManager class, checks availability "all filable" formats. class FormatManagerFilableTests < Test::Unit::TestCase def test_loads format_manager = FormatManager.new diff --git a/web/documentserver-example/ruby/app/helpers/application_helper.rb b/web/documentserver-example/ruby/app/helpers/application_helper.rb index 8e77b5bd5..4715a54ec 100644 --- a/web/documentserver-example/ruby/app/helpers/application_helper.rb +++ b/web/documentserver-example/ruby/app/helpers/application_helper.rb @@ -16,5 +16,6 @@ # limitations under the License. # +# Helper for application module ApplicationHelper end diff --git a/web/documentserver-example/ruby/app/helpers/home_helper.rb b/web/documentserver-example/ruby/app/helpers/home_helper.rb index de8697270..71cde17a3 100644 --- a/web/documentserver-example/ruby/app/helpers/home_helper.rb +++ b/web/documentserver-example/ruby/app/helpers/home_helper.rb @@ -16,5 +16,6 @@ # limitations under the License. # +# Helper for home module HomeHelper end diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index b31fec823..e1cc34957 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -19,6 +19,7 @@ require_relative '../configuration/configuration' require_relative '../format/format' +# Class that provides various utility methods related to documents. class DocumentHelper @config_manager = ConfigurationManager.new @format_manager = FormatManager.new diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index fab5a02f5..afd86c1f9 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -18,6 +18,7 @@ require_relative '../configuration/configuration' +# Class for handling file-related operations and information. class FileModel attr_accessor :file_name, :mode, :type, :user_ip, :lang, :user, :action_data, :direct_url attr_reader :config_manager diff --git a/web/documentserver-example/ruby/app/models/file_utility.rb b/web/documentserver-example/ruby/app/models/file_utility.rb index b25c3d3b7..52551f2a9 100644 --- a/web/documentserver-example/ruby/app/models/file_utility.rb +++ b/web/documentserver-example/ruby/app/models/file_utility.rb @@ -18,6 +18,7 @@ require_relative '../format/format' +# Determination file type based on extensions, utilizing `@format_manager` for format management. class FileUtility @format_manager = FormatManager.new diff --git a/web/documentserver-example/ruby/app/models/jwt_helper.rb b/web/documentserver-example/ruby/app/models/jwt_helper.rb index 1ca705192..1a76b1145 100644 --- a/web/documentserver-example/ruby/app/models/jwt_helper.rb +++ b/web/documentserver-example/ruby/app/models/jwt_helper.rb @@ -19,6 +19,7 @@ require 'jwt' require_relative '../configuration/configuration' +# Helper class for JSON Web Token (JWT) operations, including encoding and decoding. class JwtHelper @jwt_secret = ConfigurationManager.new.jwt_secret @token_use_for_request = ConfigurationManager.new.jwt_use_for_request diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index 15db3f251..c5475d6ca 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -18,6 +18,7 @@ require_relative '../configuration/configuration' +# Class responsible for converting documents using a document conversion service. class ServiceConverter @config_manager = ConfigurationManager.new diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 558850dd3..a396ccd2e 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -21,6 +21,7 @@ require_relative '../configuration/configuration' require_relative '../proxy/proxy' +# Helper class for managing document tracking functionalities, such as saving and processing documents. class TrackHelper @config_manager = ConfigurationManager.new @proxy_manager = ProxyManager.new(config_manager: @config_manager) diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 146dee2c0..cb58a04e8 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -16,6 +16,7 @@ # limitations under the License. # +# Represents a user with various attributes class User attr_accessor :id, :name, :email, :group, :reviewGroups, :commentGroups, :userInfoGroups, :favorite, :deniedPermissions, :descriptions, :templates, :avatar @@ -37,6 +38,7 @@ def initialize(id, name, email, group, reviewGroups, commentGroups, userInfoGrou end end +# Manages user-related data and operations. class Users @descr_user_1 = [ 'File author by default', diff --git a/web/documentserver-example/ruby/app/proxy/proxy.rb b/web/documentserver-example/ruby/app/proxy/proxy.rb index fd5a364c1..8fee7df38 100644 --- a/web/documentserver-example/ruby/app/proxy/proxy.rb +++ b/web/documentserver-example/ruby/app/proxy/proxy.rb @@ -21,6 +21,7 @@ require 'uri' require_relative '../configuration/configuration' +# Class manages URI resolution, redirecting public URLs to private ones based on the configuration. class ProxyManager extend T::Sig diff --git a/web/documentserver-example/ruby/app/proxy/proxy_tests.rb b/web/documentserver-example/ruby/app/proxy/proxy_tests.rb index e51d69d8f..2240d09b2 100644 --- a/web/documentserver-example/ruby/app/proxy/proxy_tests.rb +++ b/web/documentserver-example/ruby/app/proxy/proxy_tests.rb @@ -20,7 +20,9 @@ require 'test/unit' require_relative 'proxy' +# Test case for ProxyManager resolving URIs that refer to public and non-public URLs. class ProxyManagerRefersTests < Test::Unit::TestCase + # Mocked configuration manager for testing. class MockedConfigurationManager < ConfigurationManager def document_server_public_uri URI('http://localhost') @@ -31,6 +33,7 @@ def document_server_private_uri end end + # Test case to ensure resolving a URI that refers to the public URI. def test_resolves_a_uri_that_refers_to_the_public_uri config_manager = MockedConfigurationManager.new proxy_manager = ProxyManager.new(config_manager:) @@ -43,13 +46,16 @@ def test_resolves_a_uri_that_refers_to_the_public_uri end end +# Test case for ProxyManager resolving a URL that does not refer to the public URL. class ProxyManagerDoesNotRefersTests < Test::Unit::TestCase + # Mocked configuration manager for testing. class MockedConfigurationManager < ConfigurationManager def document_server_public_uri URI('http://localhost') end end + # Test case to ensure resolving a URL that does not refer to the public URL. def test_resolves_a_url_that_does_not_refers_to_the_public_url config_manager = MockedConfigurationManager.new proxy_manager = ProxyManager.new(config_manager:) diff --git a/web/documentserver-example/ruby/config/application.rb b/web/documentserver-example/ruby/config/application.rb index 94076a0f3..f9c59aa3c 100644 --- a/web/documentserver-example/ruby/config/application.rb +++ b/web/documentserver-example/ruby/config/application.rb @@ -11,6 +11,7 @@ require 'securerandom' +# Configuration for the Rails application. class Application < Rails::Application config.middleware.insert_before 0, Rack::Cors do allow do From 9b0d3e1a2090cc561ef440ed962a03733c848a0a Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Sun, 19 Nov 2023 23:39:10 +0300 Subject: [PATCH 345/488] ruby: Naming/VariableName correct --- .../ruby/app/controllers/home_controller.rb | 70 ++++---- .../ruby/app/models/document_helper.rb | 24 +-- .../ruby/app/models/file_model.rb | 156 +++++++++--------- .../ruby/app/models/service_converter.rb | 4 +- .../ruby/app/models/track_helper.rb | 16 +- .../ruby/app/models/users.rb | 23 ++- 6 files changed, 146 insertions(+), 147 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index fb1dcbd67..4e5ae852e 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -166,9 +166,9 @@ def downloadhistory params[:dmode] if JwtHelper.is_enabled && JwtHelper.use_for_request - jwtHeader = HomeController.config_manager.jwt_header - if request.headers[jwtHeader] - hdr = request.headers[jwtHeader] + jwt_header = HomeController.config_manager.jwt_header + if request.headers[jwt_header] + hdr = request.headers[jwt_header] hdr.slice!(0, 'Bearer '.length) token = JwtHelper.decode(hdr) if !token || token.eql?('') @@ -258,33 +258,33 @@ def remove # getting files information def files file_id = params[:fileId] - filesInfo = DocumentHelper.get_files_info(file_id) # get the information about the file specified by a file id - render json: filesInfo + files_info = DocumentHelper.get_files_info(file_id) # get the information about the file specified by a file id + render json: files_info end # downloading a csv file def csv file_name = 'csv.csv' - csvPath = Rails.root.join('assets', 'document-templates', 'sample', file_name) + csv_path = Rails.root.join('assets', 'document-templates', 'sample', file_name) # add headers to the response to specify the page parameters - response.headers['Content-Length'] = File.size(csvPath).to_s - response.headers['Content-Type'] = MimeMagic.by_path(csvPath).type + response.headers['Content-Length'] = File.size(csv_path).to_s + response.headers['Content-Type'] = MimeMagic.by_path(csv_path).type response.headers['Content-Disposition'] = "attachment;filename*=UTF-8''#{ERB::Util.url_encode(file_name)}" - send_file csvPath, x_sendfile: true + send_file csv_path, x_sendfile: true end # downloading a file def download file_name = File.basename(params[:fileName]) user_address = params[:userAddress] - isEmbedded = params[:dmode] + is_embedded = params[:dmode] - if JwtHelper.is_enabled && isEmbedded.nil? && !user_address.nil? && JwtHelper.use_for_request - jwtHeader = HomeController.config_manager.jwt_header - if request.headers[jwtHeader] - hdr = request.headers[jwtHeader] + if JwtHelper.is_enabled && is_embedded.nil? && !user_address.nil? && JwtHelper.use_for_request + jwt_header = HomeController.config_manager.jwt_header + if request.headers[jwt_header] + hdr = request.headers[jwt_header] hdr.slice!(0, 'Bearer '.length) token = JwtHelper.decode(hdr) end @@ -376,20 +376,20 @@ def rename # ReferenceData def reference body = JSON.parse(request.body.read) - fileName = '' + file_name = '' if body.key?('referenceData') - referenceData = body['referenceData'] - instanceId = referenceData['instanceId'] - if instanceId == DocumentHelper.get_server_url(false) - fileKey = JSON.parse(referenceData['fileKey']) - userAddress = fileKey['userAddress'] - fileName = fileKey['fileName'] if userAddress == DocumentHelper.cur_user_host_address(nil) + reference_data = body['referenceData'] + instance_id = reference_data['instanceId'] + if instance_id == DocumentHelper.get_server_url(false) + file_key = JSON.parse(reference_data['fileKey']) + user_address = file_key['userAddress'] + file_name = file_key['fileName'] if user_address == DocumentHelper.cur_user_host_address(nil) end end link = body['link'] - if fileName.empty? && body.key?('link') + if file_name.empty? && body.key?('link') unless link.include?(DocumentHelper.get_server_url(false)) data = { url: link, @@ -401,37 +401,37 @@ def reference url_obj = URI(link) query_params = CGI.parse(url_obj.query) - fileName = query_params['fileName'].first - unless File.exist?(DocumentHelper.storage_path(fileName, nil)) + file_name = query_params['fileName'].first + unless File.exist?(DocumentHelper.storage_path(file_name, nil)) render plain: '{ "error": "File is not exist"}' return end end - if fileName.empty? && body.key?('path') + if file_name.empty? && body.key?('path') path = File.basename(body['path']) - fileName = path if File.exist?(DocumentHelper.storage_path(path, nil)) + file_name = path if File.exist?(DocumentHelper.storage_path(path, nil)) end - if fileName.empty? + if file_name.empty? render plain: '{ "error": "File not found"}' return end data = { - fileType: File.extname(fileName).downcase.delete('.'), + fileType: File.extname(file_name).downcase.delete('.'), key: ServiceConverter.generate_revision_id( - "#{DocumentHelper.cur_user_host_address(nil)}/#{fileName}" \ - ".#{File.mtime(DocumentHelper.storage_path(fileName, nil))}" + "#{DocumentHelper.cur_user_host_address(nil)}/#{file_name}" \ + ".#{File.mtime(DocumentHelper.storage_path(file_name, nil))}" ), - url: DocumentHelper.get_download_url(fileName), - directUrl: body['directUrl'] ? DocumentHelper.get_download_url(fileName, is_serverUrl: false) : nil, + url: DocumentHelper.get_download_url(file_name), + directUrl: body['directUrl'] ? DocumentHelper.get_download_url(file_name, is_serverUrl: false) : nil, referenceData: { instanceId: DocumentHelper.get_server_url(false), - fileKey: { fileName:, userAddress: DocumentHelper.cur_user_host_address(nil) }.to_json + fileKey: { fileName: file_name, userAddress: DocumentHelper.cur_user_host_address(nil) }.to_json }, - path: fileName, - link: "#{DocumentHelper.get_server_url(false)}/editor?fileName=#{fileName}" + path: file_name, + link: "#{DocumentHelper.get_server_url(false)}/editor?fileName=#{file_name}" } data['token'] = JwtHelper.encode(data) if JwtHelper.is_enabled diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index e1cc34957..fa469917c 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -141,10 +141,10 @@ def get_file_version(hist_dir) # get the correct file name if such a name already exists def get_correct_name(file_name, user_address) - maxName = 50 + max_name = 50 ext = File.extname(file_name) # get file extension # get file name without extension - base_name = File.basename(file_name, ext)[0...maxName] + (file_name.length > maxName ? '[...]' : '') + base_name = File.basename(file_name, ext)[0...max_name] + (file_name.length > max_name ? '[...]' : '') name = base_name + ext.downcase # get full file name index = 1 @@ -220,10 +220,10 @@ def get_file_uri(file_name, for_document_server) end # get history path url - def get_historypath_uri(file_name, version, file, is_serverUrl: true) + def get_historypath_uri(file_name, version, file, is_server_url: true) # for redirection to my link - user_host = is_serverUrl ? "&userAddress=#{cur_user_host_address(nil)}" : '' - "#{get_server_url(is_serverUrl)}/downloadhistory/?"\ + user_host = is_server_url ? "&userAddress=#{cur_user_host_address(nil)}" : '' + "#{get_server_url(is_server_url)}/downloadhistory/?"\ "fileName=#{ERB::Util.url_encode(file_name)}&ver=#{version}"\ "&file=#{ERB::Util.url_encode(file)}#{user_host}" end @@ -250,9 +250,9 @@ def get_create_url(document_type) end # get url to download a file - def get_download_url(file_name, is_serverUrl: true) - user_host = is_serverUrl ? "&userAddress=#{cur_user_host_address(nil)}" : '' - "#{get_server_url(is_serverUrl)}/download?fileName=#{ERB::Util.url_encode(file_name)}#{user_host}" + def get_download_url(file_name, is_server_url: true) + user_host = is_server_url ? "&userAddress=#{cur_user_host_address(nil)}" : '' + "#{get_server_url(is_server_url)}/download?fileName=#{ERB::Util.url_encode(file_name)}#{user_host}" end # get internal file extension by its type @@ -288,9 +288,9 @@ def get_template_image_url(file_type) def get_files_info(file_id) result = [] - get_stored_files(nil).each do |fileName| # run through all the stored files from the folder - directory = storage_path(fileName, nil) - uri = "#{cur_user_host_address(nil)}/#{fileName}" + get_stored_files(nil).each do |file_name| # run through all the stored files from the folder + directory = storage_path(file_name, nil) + uri = "#{cur_user_host_address(nil)}/#{file_name}" # write file parameters to the info object info = { @@ -298,7 +298,7 @@ def get_files_info(file_id) 'id' => ServiceConverter.generate_revision_id("#{uri}.#{File.mtime(directory)}"), 'contentLength' => "#{(File.size(directory) / 1024.0).round(2)} KB", 'pureContentLength' => File.size(directory), - 'title' => fileName, + 'title' => file_name, 'updated' => File.mtime(directory) } diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index afd86c1f9..ea6d7745f 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -79,8 +79,8 @@ def create_url end # get url to download a file - def download_url(is_serverUrl: true) - DocumentHelper.get_download_url(@file_name, is_serverUrl:) + def download_url(is_server_url: true) + DocumentHelper.get_download_url(@file_name, is_server_url:) end # get current user host address @@ -90,17 +90,17 @@ def cur_user_host_address # get config parameters def get_config - editorsmode = @mode || 'edit' # mode: view/edit/review/comment/fillForms/embedded - canEdit = DocumentHelper.edited_exts.include?(file_ext) # check if the document can be edited - if (!canEdit && editorsmode.eql?('edit') || editorsmode.eql?('fillForms')) && + editors_mode = @mode || 'edit' # mode: view/edit/review/comment/fillForms/embedded + can_edit = DocumentHelper.edited_exts.include?(file_ext) # check if the document can be edited + if (!can_edit && editors_mode.eql?('edit') || editors_mode.eql?('fillForms')) && DocumentHelper.fill_forms_exts.include?(file_ext) - editorsmode = 'fillForms' - canEdit = true + editors_mode = 'fillForms' + can_edit = true end - submitForm = editorsmode.eql?('fillForms') && @user.id.eql?('uid-1') && false # the Submit form button state - mode = canEdit && !editorsmode.eql?('view') ? 'edit' : 'view' + submit_form = editors_mode.eql?('fillForms') && @user.id.eql?('uid-1') && false # the Submit form button state + mode = can_edit && !editors_mode.eql?('view') ? 'edit' : 'view' # templates image url in the "From Template" section - templatesImageUrl = DocumentHelper.get_template_image_url(document_type) + templates_image_url = DocumentHelper.get_template_image_url(document_type) templates = [ { image: '', @@ -108,7 +108,7 @@ def get_config url: create_url }, { - image: templatesImageUrl, + image: templates_image_url, title: 'With sample content', url: "#{create_url}&sample=true" } @@ -120,7 +120,7 @@ def get_config document: { title: @file_name, url: download_url, - directUrl: is_enable_direct_url ? download_url(is_serverUrl: false) : '', + directUrl: is_enable_direct_url ? download_url(is_server_url: false) : '', fileType: file_ext.delete('.'), key:, info: { @@ -129,20 +129,20 @@ def get_config favorite: @user.favorite }, permissions: { # the permission for the document to be edited and downloaded or not - comment: !%w[view fillForms embedded blockcontent].include?(editorsmode), - copy: !@user.deniedPermissions.include?('copy'), - download: !@user.deniedPermissions.include?('download'), - edit: canEdit && %w[edit view filter blockcontent].include?(editorsmode), - print: !@user.deniedPermissions.include?('print'), - fillForms: !%w[view comment embedded blockcontent].include?(editorsmode), - modifyFilter: !editorsmode.eql?('filter'), - modifyContentControl: !editorsmode.eql?('blockcontent'), - review: canEdit && (editorsmode.eql?('edit') || editorsmode.eql?('review')), + comment: !%w[view fillForms embedded blockcontent].include?(editors_mode), + copy: !@user.denied_permissions.include?('copy'), + download: !@user.denied_permissions.include?('download'), + edit: can_edit && %w[edit view filter blockcontent].include?(editors_mode), + print: !@user.denied_permissions.include?('print'), + fillForms: !%w[view comment embedded blockcontent].include?(editors_mode), + modifyFilter: !editors_mode.eql?('filter'), + modifyContentControl: !editors_mode.eql?('blockcontent'), + review: can_edit && (editors_mode.eql?('edit') || editors_mode.eql?('review')), chat: !@user.id.eql?('uid-0'), - reviewGroups: @user.reviewGroups, - commentGroups: @user.commentGroups, - userInfoGroups: @user.userInfoGroups, - protect: !@user.deniedPermissions.include?('protect') + reviewGroups: @user.review_groups, + commentGroups: @user.comment_groups, + userInfoGroups: @user.user_info_groups, + protect: !@user.denied_permissions.include?('protect') }, referenceData: { instanceId: DocumentHelper.get_server_url(false), @@ -157,7 +157,7 @@ def get_config mode:, lang: @lang || 'en', callbackUrl: callback_url, # absolute URL to the document storage service - coEditing: if editorsmode.eql?('view') && @user.id.eql?('uid-0') + coEditing: if editors_mode.eql?('view') && @user.id.eql?('uid-0') { mode: 'strict', change: false @@ -173,11 +173,11 @@ def get_config }, embedded: { # the parameters for the embedded document type # the absolute URL that will allow the document to be saved onto the user personal computer - saveUrl: download_url(is_serverUrl: false), + saveUrl: download_url(is_server_url: false), # the absolute URL to the document serving as a source file for the document embedded into the web page - embedUrl: download_url(is_serverUrl: false), + embedUrl: download_url(is_server_url: false), # the absolute URL that will allow other users to share this document - shareUrl: download_url(is_serverUrl: false), + shareUrl: download_url(is_server_url: false), toolbarDocked: 'top' # the place for the embedded viewer toolbar (top or bottom) }, customization: { # the parameters for the editor interface @@ -185,7 +185,7 @@ def get_config comments: true, feedback: true, # the Feedback & Support menu button display forcesave: false, # adding the request for the forced file saving to the callback handler - submitForm:, # the Submit form button state + submitForm: submit_form, # the Submit form button state goback: { url: DocumentHelper.get_server_url(false) } @@ -213,11 +213,11 @@ def get_history if cur_ver.positive? # if file was modified hist = [] - histData = {} + hist_data = {} (1..cur_ver).each do |i| # run through all the file versions obj = {} - dataObj = {} + data_obj = {} ver_dir = DocumentHelper.version_dir(hist_dir, i) # get the path to the given file version # get document key @@ -245,19 +245,19 @@ def get_history end # get the history data from the previous file version and write key and url information about it - dataObj['fileType'] = file_ext[1..file_ext.length] - dataObj['key'] = cur_key - dataObj['url'] = i == cur_ver ? doc_uri : DocumentHelper.get_historypath_uri(file_name, i, "prev#{file_ext}") + data_obj['fileType'] = file_ext[1..file_ext.length] + data_obj['key'] = cur_key + data_obj['url'] = i == cur_ver ? doc_uri : DocumentHelper.get_historypath_uri(file_name, i, "prev#{file_ext}") if is_enable_direct_url == true - dataObj['directUrl'] = + data_obj['directUrl'] = if i == cur_ver - download_url(is_serverUrl: false) + download_url(is_server_url: false) else DocumentHelper.get_historypath_uri(file_name, i, "prev#{file_ext}", false) end end - dataObj['version'] = i + data_obj['version'] = i if i > 1 # check if the version number is greater than 1 changes = nil @@ -274,34 +274,34 @@ def get_history obj['created'] = change ? change['created'] : nil obj['user'] = change ? change['user'] : nil - prev = histData[(i - 2).to_s] # get the history data from the previous file version + prev = hist_data[(i - 2).to_s] # get the history data from the previous file version # write key and url information about previous file version with optional direct url - dataObj['previous'] = if is_enable_direct_url == true - { # write key and url information about previous file version with optional directUrl - fileType: prev['fileType'], - key: prev['key'], - url: prev['url'], - directUrl: prev['directUrl'] - } - else - { - fileType: prev['fileType'], - key: prev['key'], - url: prev['url'] - } - end + data obj['previous'] = if is_enable_direct_url == true + { # write key and url information about previous file version with optional directUrl + fileType: prev['fileType'], + key: prev['key'], + url: prev['url'], + directUrl: prev['directUrl'] + } + else + { + fileType: prev['fileType'], + key: prev['key'], + url: prev['url'] + } + end # write the path to the diff.zip archive with differences in this file version - dataObj['changesUrl'] = DocumentHelper.get_historypath_uri(file_name, i - 1, 'diff.zip') + data_obj['changesUrl'] = DocumentHelper.get_historypath_uri(file_name, i - 1, 'diff.zip') end if JwtHelper.is_enabled # check if a secret key to generate token exists or not # encode a payload object into a token and write it to the data object - dataObj['token'] = JwtHelper.encode(dataObj) + data_obj['token'] = JwtHelper.encode(data_obj) end hist.push(obj) # add object dictionary to the hist list - histData[(i - 1).to_s] = dataObj # write data object information to the history data + hist_data[(i - 1).to_s] = data_obj # write data object information to the history data end return { @@ -309,7 +309,7 @@ def get_history currentVersion: cur_ver, history: hist }, - histData: + histData: hist_data } end @@ -376,28 +376,28 @@ def dataSpreadsheet # file type # server url to the mail merge recipients file # direct url to the mail merge recipients file - dataSpreadsheet = if is_enable_direct_url == true - { - fileType: 'csv', # file type - # server url to the mail merge recipients file - url: "#{DocumentHelper.get_server_url(true)}/csv", - # direct url to the mail merge recipients file - directUrl: "#{DocumentHelper.get_server_url(false)}/csv" - } - else - { - fileType: 'csv', # file type - # server url to the mail merge recipients file - url: "#{DocumentHelper.get_server_url(true)}/csv" - } - end + data_spreadsheet = if is_enable_direct_url == true + { + fileType: 'csv', # file type + # server url to the mail merge recipients file + url: "#{DocumentHelper.get_server_url(true)}/csv", + # direct url to the mail merge recipients file + directUrl: "#{DocumentHelper.get_server_url(false)}/csv" + } + else + { + fileType: 'csv', # file type + # server url to the mail merge recipients file + url: "#{DocumentHelper.get_server_url(true)}/csv" + } + end if JwtHelper.is_enabled # check if a secret key to generate token exists or not # encode a payload object into a token and write it to the dataSpreadsheet object - dataSpreadsheet['token'] = JwtHelper.encode(dataSpreadsheet) + data_spreadsheet['token'] = JwtHelper.encode(data_spreadsheet) end - dataSpreadsheet + data_spreadsheet end # get users data for mentions @@ -415,11 +415,11 @@ def get_users_info name: user_info.name, email: user_info.email, group: user_info.group, - reviewGroups: user_info.reviewGroups, - commentGroups: user_info.commentGroups, - userInfoGroups: user_info.userInfoGroups, + reviewGroups: user_info.review_groups, + commentGroups: user_info.comment_groups, + userInfoGroups: user_info.user_info_groups, favorite: user_info.favorite, - deniedPermissions: user_info.deniedPermissions, + deniedPermissions: user_info.denied_permissions, descriptions: user_info.descriptions, templates: user_info.templates, avatar: user_info.avatar diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index c5475d6ca..e1731c29d 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -68,9 +68,9 @@ def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_ if JwtHelper.is_enabled && JwtHelper.use_for_request # if the signature is enabled payload['token'] = JwtHelper.encode(payload) # get token and save it to the payload - jwtHeader = ServiceConverter.config_manager.jwt_header; # get signature authorization header + jwt_header = ServiceConverter.config_manager.jwt_header; # get signature authorization header # set it to the request with the Bearer prefix - req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ payload: })}") + req.add_field(jwt_header, "Bearer #{JwtHelper.encode({ payload: })}") end req.body = payload.to_json diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index a396ccd2e..120c4f4a0 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -43,16 +43,16 @@ def read_body(request) # check if a secret key to generate token exists or not if JwtHelper.is_enabled && JwtHelper.use_for_request - inHeader = false + in_header = false token = nil - jwtHeader = TrackHelper.config_manager.jwt_header; # get the authorization header from the config + jwt_header = TrackHelper.config_manager.jwt_header; # get the authorization header from the config if file_data['token'] # if the token is in the body token = JwtHelper.decode(file_data['token']) # decode a token into a payload object using a secret key - elsif request.headers[jwtHeader] # if the token is in the header - hdr = request.headers[jwtHeader] + elsif request.headers[jwt_header] # if the token is in the header + hdr = request.headers[jwt_header] hdr.slice!(0, 'Bearer '.length) # get token from it (after Bearer prefix) token = JwtHelper.decode(hdr) # decode a token into a payload object using a secret key - inHeader = true + in_header = true else raise 'Expected JWT' # token missing error message end @@ -61,7 +61,7 @@ def read_body(request) file_data = JSON.parse(token) - file_data = file_data['payload'] if inHeader + file_data = file_data['payload'] if in_header end file_data @@ -285,9 +285,9 @@ def command_request(method, key, meta = nil) if JwtHelper.is_enabled && JwtHelper.use_for_request # if the signature is enabled payload['token'] = JwtHelper.encode(payload) # get token and save it to the payload - jwtHeader = TrackHelper.config_manager.jwt_header; # get signature authorization header + jwt_header = TrackHelper.config_manager.jwt_header; # get signature authorization header # set it to the request with the Bearer prefix - req.add_field(jwtHeader, "Bearer #{JwtHelper.encode({ payload: })}") + req.add_field(jwt_header, "Bearer #{JwtHelper.encode({ payload: })}") end req.body = payload.to_json # convert the payload object into the json format diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index cb58a04e8..2659ee0b5 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -18,22 +18,22 @@ # Represents a user with various attributes class User - attr_accessor :id, :name, :email, :group, :reviewGroups, :commentGroups, :userInfoGroups, :favorite, - :deniedPermissions, :descriptions, :templates, :avatar + attr_accessor :id, :name, :email, :group, :review_groups, :comment_groups, :user_info_groups, :favorite, + :denied_permissions, :descriptions, :templates, :avatar - def initialize(id, name, email, group, reviewGroups, commentGroups, userInfoGroups, favorite, - deniedPermissions, descriptions, templates, avatar) + def initialize(id, name, email, group, review_groups, comment_groups, user_info_groups, favorite, + denied_permissions, descriptions, templates, avatar) @id = id @name = name @email = email @group = group - @reviewGroups = reviewGroups - @commentGroups = commentGroups + @review_groups = review_groups + @comment_groups = comment_groups @favorite = favorite - @deniedPermissions = deniedPermissions + @denied_permissions = denied_permissions @descriptions = descriptions @templates = templates - @userInfoGroups = userInfoGroups + @user_info_groups = user_info_groups @avatar = avatar end end @@ -129,14 +129,13 @@ def get_user(id) # get a list of users with their names and emails for mentions def get_users_for_mentions(id) - usersData = [] + users_data = [] @users.each do |user| if !user.id.eql?(id) && !user.name.nil? && !user.email.nil? - usersData.push({ name: user.name, - email: user.email }) + users_data.push({ name: user.name, email: user.email }) end end - usersData + users_data end # get a list of users with their id, names and emails for protect From f955096fc00dbdb4ac3f27c1bc7dbc906e4eed94 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 00:11:39 +0300 Subject: [PATCH 346/488] ruby: Naming/VariableNumber correct --- .../ruby/app/models/users.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 2659ee0b5..d2e782e72 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -40,7 +40,7 @@ def initialize(id, name, email, group, review_groups, comment_groups, user_info_ # Manages user-related data and operations. class Users - @descr_user_1 = [ + @descr_user_first = [ 'File author by default', 'Doesn’t belong to any group', 'Can review all the changes', @@ -51,7 +51,7 @@ class Users 'Has an avatar' ] - @descr_user_2 = [ + @descr_user_second = [ 'Belongs to Group2', 'Can review only his own changes or changes made by users with no group', 'Can view comments, edit his own comments, and comments left by users with no group. ' \ @@ -62,7 +62,7 @@ class Users 'Has an avatar' ] - @descr_user_3 = [ + @descr_user_third = [ 'Belongs to Group3', 'Can review changes made by Group2 users', 'Can view comments left by Group2 and Group3 users. Can edit comments left by the Group2 users', @@ -74,7 +74,7 @@ class Users 'Can see the information about Group2 users' ] - @descr_user_0 = [ + @descr_user_null = [ 'The name is requested when the editor is opened', 'Doesn’t belong to any group', 'Can review all the changes', @@ -92,7 +92,7 @@ class Users @users = [ User.new('uid-1', 'John Smith', 'smith@example.com', '', nil, {}, nil, - nil, [], @descr_user_1, true, true), + nil, [], @descr_user_first, true, true), User.new('uid-2', 'Mark Pottato', 'pottato@example.com', 'group-2', ['group-2', ''], { view: '', @@ -100,7 +100,7 @@ class Users remove: ['group-2'] }, ['group-2', ''], - true, [], @descr_user_2, false, true), + true, [], @descr_user_second, false, true), User.new('uid-3', 'Hamish Mitchell', nil, 'group-3', ['group-2'], { view: %w[group-3 group-2], @@ -108,10 +108,10 @@ class Users remove: [] }, ['group-2'], - false, %w[copy download print], @descr_user_3, false, false), + false, %w[copy download print], @descr_user_third, false, false), User.new('uid-0', nil, nil, '', nil, {}, [], - nil, ['protect'], @descr_user_0, false, false) + nil, ['protect'], @descr_user_null, false, false) ] class << self From f8d62ab8dbcaf5032679a53a42bdef4794e1d971 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 00:06:41 +0300 Subject: [PATCH 347/488] ruby: Naming/AccessorMethodName correct --- .../ruby/app/models/file_model.rb | 14 +++++++------- .../ruby/app/models/users.rb | 2 +- .../ruby/app/views/home/editor.html.erb | 12 ++++++------ .../ruby/app/views/home/index.html.erb | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index ea6d7745f..0630b41c4 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -89,7 +89,7 @@ def cur_user_host_address end # get config parameters - def get_config + def config editors_mode = @mode || 'edit' # mode: view/edit/review/comment/fillForms/embedded can_edit = DocumentHelper.edited_exts.include?(file_ext) # check if the document can be edited if (!can_edit && editors_mode.eql?('edit') || editors_mode.eql?('fillForms')) && @@ -201,7 +201,7 @@ def get_config end # get document history - def get_history + def history file_name = @file_name file_ext = File.extname(file_name).downcase doc_key = key @@ -317,7 +317,7 @@ def get_history end # get image information - def get_insert_image + def insert_image # image file type # server url to the image # direct url to the image @@ -401,15 +401,15 @@ def dataSpreadsheet end # get users data for mentions - def get_users_mentions + def users_mentions !@user.id.eql?('uid-0') ? Users.get_users_for_mentions(@user.id) : nil end - def get_users_info + def users_info users_info = [] return if @user.id.eql?('uid-0') - Users.get_all_users.each do |user_info| + Users.all_users.each do |user_info| u = { id: user_info.id, name: user_info.name, @@ -431,7 +431,7 @@ def get_users_info end # get users data for protect - def get_users_protect + def users_protect !@user.id.eql?('uid-0') ? Users.get_users_for_protect(@user.id) : nil end diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index d2e782e72..c72d3677b 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -115,7 +115,7 @@ class Users ] class << self - def get_all_users + def all_users @users end diff --git a/web/documentserver-example/ruby/app/views/home/editor.html.erb b/web/documentserver-example/ruby/app/views/home/editor.html.erb index 323c959bc..97c88e289 100755 --- a/web/documentserver-example/ruby/app/views/home/editor.html.erb +++ b/web/documentserver-example/ruby/app/views/home/editor.html.erb @@ -102,7 +102,7 @@ var onRequestInsertImage = function(event) { docEditor.insertImage({ // insert an image into the file "c": event.data.c, - <%= raw @file.get_insert_image %> + <%= raw @file.insert_image %> }) }; @@ -216,7 +216,7 @@ var сonnectEditor = function () { - config = <%= raw @file.get_config.to_json %>; + config = <%= raw @file.config.to_json %>; config.width = "100%"; config.height = "100%"; @@ -234,8 +234,8 @@ }; <% - history = @file.get_history - usersMentions = @file.get_users_mentions %> + history = @file.history + usersMentions = @file.users_mentions %> if (config.editorConfig.user.id) { <% if history %> @@ -262,7 +262,7 @@ switch (c) { case "info": users = []; - var allUsers = <%= raw @file.get_users_info.to_json %>; + var allUsers = <%= raw @file.users_info.to_json %>; for (var i = 0; i < event.data.id.length; i++) { for (var j = 0; j < allUsers.length; j++) { if (allUsers[j].id == event.data.id[i]) { @@ -276,7 +276,7 @@ var users = <%= raw @file.get_users_protect.to_json %>; break; default: - users = <%= raw @file.get_users_mentions.to_json %>; + users = <%= raw @file.users_mentions.to_json %>; } docEditor.setUsers({ "c": c, diff --git a/web/documentserver-example/ruby/app/views/home/index.html.erb b/web/documentserver-example/ruby/app/views/home/index.html.erb index b9018e386..9da594a42 100755 --- a/web/documentserver-example/ruby/app/views/home/index.html.erb +++ b/web/documentserver-example/ruby/app/views/home/index.html.erb @@ -62,7 +62,7 @@ Username @@ -110,7 +110,7 @@ Please do NOT use this integration example on your own server without proper code modifications, it is intended for testing purposes only. In case you enabled this test example, disable it before going for production. You can open the same document using different users in different Web browser sessions, so you can check out multi-user editing functions. - <% for user in Users.get_all_users() do %> + <% for user in Users.all_users() do %>

<%= user.name ? user.name : "Anonymous" %>
    From 94d22003b5a4bc28c867db026f4a683563019f80 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 11:50:10 +0300 Subject: [PATCH 348/488] ruby: Naming/MethodName correct --- web/documentserver-example/ruby/app/models/file_model.rb | 6 +++--- .../ruby/app/views/home/editor.html.erb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 0630b41c4..97b2b6356 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -343,7 +343,7 @@ def insert_image end # get compared file information - def dataDocument + def data_document # file type # server url to the compared file # direct url to the compared file @@ -372,7 +372,7 @@ def dataDocument end # get mail merge recipients information - def dataSpreadsheet + def data_spreadsheet # file type # server url to the mail merge recipients file # direct url to the mail merge recipients file @@ -393,7 +393,7 @@ def dataSpreadsheet end if JwtHelper.is_enabled # check if a secret key to generate token exists or not - # encode a payload object into a token and write it to the dataSpreadsheet object + # encode a payload object into a token and write it to the data_spreadsheet object data_spreadsheet['token'] = JwtHelper.encode(data_spreadsheet) end diff --git a/web/documentserver-example/ruby/app/views/home/editor.html.erb b/web/documentserver-example/ruby/app/views/home/editor.html.erb index 97c88e289..65c002c9d 100755 --- a/web/documentserver-example/ruby/app/views/home/editor.html.erb +++ b/web/documentserver-example/ruby/app/views/home/editor.html.erb @@ -108,14 +108,14 @@ // the user is trying to select document for comparing by clicking the Document from Storage button var onRequestSelectDocument = function(event) { - var data = <%= raw @file.dataDocument.to_json %>; + var data = <%= raw @file.data_document.to_json %>; data.c = event.data.c; docEditor.setRequestedDocument(data); // select a document for comparing }; // the user is trying to select recipients data by clicking the Mail merge button var onRequestSelectSpreadsheet = function (event) { - var data = <%= raw @file.dataSpreadsheet.to_json %>; + var data = <%= raw @file.data_spreadsheet.to_json %>; data.c = event.data.c; docEditor.setRequestedSpreadsheet(data); // insert recipient data for mail merge into the file }; From 8f4de5ce0d8b447e065ab91891d819752981b03b Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 11:53:13 +0300 Subject: [PATCH 349/488] ruby: Naming/PredicateName correct --- .../ruby/app/controllers/home_controller.rb | 6 ++--- .../ruby/app/models/file_model.rb | 24 +++++++++---------- .../ruby/app/models/jwt_helper.rb | 2 +- .../ruby/app/models/service_converter.rb | 2 +- .../ruby/app/models/track_helper.rb | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 4e5ae852e..443d27074 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -165,7 +165,7 @@ def downloadhistory file = params[:file] params[:dmode] - if JwtHelper.is_enabled && JwtHelper.use_for_request + if JwtHelper.enabled? && JwtHelper.use_for_request jwt_header = HomeController.config_manager.jwt_header if request.headers[jwt_header] hdr = request.headers[jwt_header] @@ -281,7 +281,7 @@ def download user_address = params[:userAddress] is_embedded = params[:dmode] - if JwtHelper.is_enabled && is_embedded.nil? && !user_address.nil? && JwtHelper.use_for_request + if JwtHelper.enabled? && is_embedded.nil? && !user_address.nil? && JwtHelper.use_for_request jwt_header = HomeController.config_manager.jwt_header if request.headers[jwt_header] hdr = request.headers[jwt_header] @@ -434,7 +434,7 @@ def reference link: "#{DocumentHelper.get_server_url(false)}/editor?fileName=#{file_name}" } - data['token'] = JwtHelper.encode(data) if JwtHelper.is_enabled + data['token'] = JwtHelper.encode(data) if JwtHelper.enabled? render plain: data.to_json end diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 97b2b6356..938f079e0 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -120,7 +120,7 @@ def config document: { title: @file_name, url: download_url, - directUrl: is_enable_direct_url ? download_url(is_server_url: false) : '', + directUrl: enable_direct_url? ? download_url(is_server_url: false) : '', fileType: file_ext.delete('.'), key:, info: { @@ -193,7 +193,7 @@ def config } } - if JwtHelper.is_enabled # check if a secret key to generate token exists or not + if JwtHelper.enabled? # check if a secret key to generate token exists or not config['token'] = JwtHelper.encode(config) # encode a payload object into a token and write it to the config end @@ -248,7 +248,7 @@ def history data_obj['fileType'] = file_ext[1..file_ext.length] data_obj['key'] = cur_key data_obj['url'] = i == cur_ver ? doc_uri : DocumentHelper.get_historypath_uri(file_name, i, "prev#{file_ext}") - if is_enable_direct_url == true + if enable_direct_url? == true data_obj['directUrl'] = if i == cur_ver download_url(is_server_url: false) @@ -276,7 +276,7 @@ def history prev = hist_data[(i - 2).to_s] # get the history data from the previous file version # write key and url information about previous file version with optional direct url - data obj['previous'] = if is_enable_direct_url == true + data obj['previous'] = if enable_direct_url? == true { # write key and url information about previous file version with optional directUrl fileType: prev['fileType'], key: prev['key'], @@ -295,7 +295,7 @@ def history data_obj['changesUrl'] = DocumentHelper.get_historypath_uri(file_name, i - 1, 'diff.zip') end - if JwtHelper.is_enabled # check if a secret key to generate token exists or not + if JwtHelper.enabled? # check if a secret key to generate token exists or not # encode a payload object into a token and write it to the data object data_obj['token'] = JwtHelper.encode(data_obj) end @@ -321,7 +321,7 @@ def insert_image # image file type # server url to the image # direct url to the image - insert_image = if is_enable_direct_url == true + insert_image = if enable_direct_url? == true { fileType: 'png', # image file type url: "#{DocumentHelper.get_server_url(true)}/assets/logo.png", # server url to the image @@ -334,7 +334,7 @@ def insert_image } end - if JwtHelper.is_enabled # check if a secret key to generate token exists or not + if JwtHelper.enabled? # check if a secret key to generate token exists or not # encode a payload object into a token and write it to the insert_image object insert_image['token'] = JwtHelper.encode(insert_image) end @@ -347,7 +347,7 @@ def data_document # file type # server url to the compared file # direct url to the compared file - compare_file = if is_enable_direct_url == true + compare_file = if enable_direct_url? == true { fileType: 'docx', # file type # server url to the compared file @@ -363,7 +363,7 @@ def data_document } end - if JwtHelper.is_enabled # check if a secret key to generate token exists or not + if JwtHelper.enabled? # check if a secret key to generate token exists or not # encode a payload object into a token and write it to the compare_file object compare_file['token'] = JwtHelper.encode(compare_file) end @@ -376,7 +376,7 @@ def data_spreadsheet # file type # server url to the mail merge recipients file # direct url to the mail merge recipients file - data_spreadsheet = if is_enable_direct_url == true + data_spreadsheet = if enable_direct_url? == true { fileType: 'csv', # file type # server url to the mail merge recipients file @@ -392,7 +392,7 @@ def data_spreadsheet } end - if JwtHelper.is_enabled # check if a secret key to generate token exists or not + if JwtHelper.enabled? # check if a secret key to generate token exists or not # encode a payload object into a token and write it to the data_spreadsheet object data_spreadsheet['token'] = JwtHelper.encode(data_spreadsheet) end @@ -436,7 +436,7 @@ def users_protect end # get direct url existence flag - def is_enable_direct_url + def enable_direct_url? !@direct_url.nil? && @direct_url == 'true' end end diff --git a/web/documentserver-example/ruby/app/models/jwt_helper.rb b/web/documentserver-example/ruby/app/models/jwt_helper.rb index 1a76b1145..48679d790 100644 --- a/web/documentserver-example/ruby/app/models/jwt_helper.rb +++ b/web/documentserver-example/ruby/app/models/jwt_helper.rb @@ -26,7 +26,7 @@ class JwtHelper class << self # check if a secret key to generate token exists or not - def is_enabled + def enabled? @jwt_secret && !@jwt_secret.empty? ? true : false end diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index e1731c29d..39bbff8f3 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -66,7 +66,7 @@ def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_ req.add_field('Accept', 'application/json') # set headers req.add_field('Content-Type', 'application/json') - if JwtHelper.is_enabled && JwtHelper.use_for_request # if the signature is enabled + if JwtHelper.enabled? && JwtHelper.use_for_request # if the signature is enabled payload['token'] = JwtHelper.encode(payload) # get token and save it to the payload jwt_header = ServiceConverter.config_manager.jwt_header; # get signature authorization header # set it to the request with the Bearer prefix diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 120c4f4a0..689183841 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -42,7 +42,7 @@ def read_body(request) file_data = JSON.parse(body) # parse file data # check if a secret key to generate token exists or not - if JwtHelper.is_enabled && JwtHelper.use_for_request + if JwtHelper.enabled? && JwtHelper.use_for_request in_header = false token = nil jwt_header = TrackHelper.config_manager.jwt_header; # get the authorization header from the config @@ -283,7 +283,7 @@ def command_request(method, key, meta = nil) req = Net::HTTP::Post.new(uri.request_uri) # create the post request req.add_field('Content-Type', 'application/json') # set headers - if JwtHelper.is_enabled && JwtHelper.use_for_request # if the signature is enabled + if JwtHelper.enabled? && JwtHelper.use_for_request # if the signature is enabled payload['token'] = JwtHelper.encode(payload) # get token and save it to the payload jwt_header = TrackHelper.config_manager.jwt_header; # get signature authorization header # set it to the request with the Bearer prefix From 8fa40ab439c65a77be7bcfdfd762aeab0ea14b9b Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:10:24 +0300 Subject: [PATCH 350/488] ruby: Style/SymbolArray correct --- web/documentserver-example/ruby/Gemfile | 6 +++--- web/documentserver-example/ruby/config/application.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/documentserver-example/ruby/Gemfile b/web/documentserver-example/ruby/Gemfile index 753e0bdfa..01162d9aa 100644 --- a/web/documentserver-example/ruby/Gemfile +++ b/web/documentserver-example/ruby/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -gem 'byebug', '~> 11.1', groups: %i[development test] +gem 'byebug', '~> 11.1', groups: [:development, :test] gem 'coffee-rails', '~> 5.0' gem 'dalli', '~> 3.2', group: :development gem 'jbuilder', '~> 2.11' @@ -15,12 +15,12 @@ gem 'rubocop', '~> 1.52', group: :development gem 'sass-rails', '~> 6.0' gem 'sdoc', '~> 2.6', group: :doc gem 'sorbet-runtime', '~> 0.5.10871' -gem 'test-unit', '~> 3.6', groups: %i[development test] +gem 'test-unit', '~> 3.6', groups: [:development, :test] gem 'turbolinks', '~> 5.2' gem 'tzinfo-data', '~> 1.2023' gem 'uglifier', '~> 4.2' gem 'uuid', '~> 2.3' -gem 'web-console', '~> 4.2', groups: %i[development test] +gem 'web-console', '~> 4.2', groups: [:development, :test] gem 'webrick', '~> 1.8' # Unfortunately, Sorbet only supports Darwin and Linux-based systems. diff --git a/web/documentserver-example/ruby/config/application.rb b/web/documentserver-example/ruby/config/application.rb index f9c59aa3c..dfe4302f5 100644 --- a/web/documentserver-example/ruby/config/application.rb +++ b/web/documentserver-example/ruby/config/application.rb @@ -16,7 +16,7 @@ class Application < Rails::Application config.middleware.insert_before 0, Rack::Cors do allow do origins '*' - resource '*', headers: :any, methods: %i[get post patch delete put options] + resource '*', headers: :any, methods: [:get, :post, :patch, :delete, :put, :options] end end From 7fe7753c887fef92002478040ef59b1ac1578a1e Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:27:25 +0300 Subject: [PATCH 351/488] ruby: Layout/MultilineMethodArgumentLineBreaks correct --- .../ruby/app/models/file_model.rb | 4 +- .../ruby/app/models/users.rb | 72 +++++++++++++++---- 2 files changed, 61 insertions(+), 15 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 938f079e0..7bb0a353d 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -253,7 +253,9 @@ def history if i == cur_ver download_url(is_server_url: false) else - DocumentHelper.get_historypath_uri(file_name, i, "prev#{file_ext}", + DocumentHelper.get_historypath_uri(file_name, +i, +"prev#{file_ext}", false) end end diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index c72d3677b..a78f2903f 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -18,8 +18,18 @@ # Represents a user with various attributes class User - attr_accessor :id, :name, :email, :group, :review_groups, :comment_groups, :user_info_groups, :favorite, - :denied_permissions, :descriptions, :templates, :avatar + attr_accessor :id, +:name, +:email, +:group, +:review_groups, +:comment_groups, +:user_info_groups, +:favorite, + :denied_permissions, +:descriptions, +:templates, +:avatar def initialize(id, name, email, group, review_groups, comment_groups, user_info_groups, favorite, denied_permissions, descriptions, templates, avatar) @@ -90,28 +100,62 @@ class Users ] @users = [ - User.new('uid-1', 'John Smith', 'smith@example.com', - '', nil, {}, nil, - nil, [], @descr_user_first, true, true), - User.new('uid-2', 'Mark Pottato', 'pottato@example.com', - 'group-2', ['group-2', ''], { + User.new('uid-1', +'John Smith', +'smith@example.com', + '', +nil, +{}, +nil, + nil, +[], +@descr_user_first, +true, +true), + User.new('uid-2', +'Mark Pottato', +'pottato@example.com', + 'group-2', +['group-2', ''], +{ view: '', edit: ['group-2', ''], remove: ['group-2'] }, ['group-2', ''], - true, [], @descr_user_second, false, true), - User.new('uid-3', 'Hamish Mitchell', nil, - 'group-3', ['group-2'], { + true, +[], +@descr_user_second, +false, +true), + User.new('uid-3', +'Hamish Mitchell', +nil, + 'group-3', +['group-2'], +{ view: %w[group-3 group-2], edit: ['group-2'], remove: [] }, ['group-2'], - false, %w[copy download print], @descr_user_third, false, false), - User.new('uid-0', nil, nil, - '', nil, {}, [], - nil, ['protect'], @descr_user_null, false, false) + false, +%w[copy download print], +@descr_user_third, +false, +false), + User.new('uid-0', +nil, +nil, + '', +nil, +{}, +[], + nil, +['protect'], +@descr_user_null, +false, +false) ] class << self From 940b4bfc8052416c0338f738753f7d981a776b60 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:28:12 +0300 Subject: [PATCH 352/488] ruby: Layout/TrailingWhitespace correct --- .../ruby/app/models/file_model.rb | 4 +- .../ruby/app/models/users.rb | 88 +++++++++---------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 7bb0a353d..199ad579c 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -253,8 +253,8 @@ def history if i == cur_ver download_url(is_server_url: false) else - DocumentHelper.get_historypath_uri(file_name, -i, + DocumentHelper.get_historypath_uri(file_name, +i, "prev#{file_ext}", false) end diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index a78f2903f..8e8d21985 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -18,17 +18,17 @@ # Represents a user with various attributes class User - attr_accessor :id, -:name, -:email, -:group, -:review_groups, -:comment_groups, -:user_info_groups, + attr_accessor :id, +:name, +:email, +:group, +:review_groups, +:comment_groups, +:user_info_groups, :favorite, - :denied_permissions, -:descriptions, -:templates, + :denied_permissions, +:descriptions, +:templates, :avatar def initialize(id, name, email, group, review_groups, comment_groups, user_info_groups, favorite, @@ -100,61 +100,61 @@ class Users ] @users = [ - User.new('uid-1', -'John Smith', + User.new('uid-1', +'John Smith', 'smith@example.com', - '', -nil, -{}, + '', nil, - nil, -[], -@descr_user_first, -true, +{}, +nil, + nil, +[], +@descr_user_first, +true, true), - User.new('uid-2', -'Mark Pottato', + User.new('uid-2', +'Mark Pottato', 'pottato@example.com', - 'group-2', -['group-2', ''], + 'group-2', +['group-2', ''], { view: '', edit: ['group-2', ''], remove: ['group-2'] }, ['group-2', ''], - true, -[], -@descr_user_second, -false, + true, +[], +@descr_user_second, +false, true), - User.new('uid-3', -'Hamish Mitchell', + User.new('uid-3', +'Hamish Mitchell', nil, - 'group-3', -['group-2'], + 'group-3', +['group-2'], { view: %w[group-3 group-2], edit: ['group-2'], remove: [] }, ['group-2'], - false, -%w[copy download print], -@descr_user_third, -false, + false, +%w[copy download print], +@descr_user_third, +false, false), - User.new('uid-0', -nil, + User.new('uid-0', +nil, +nil, + '', nil, - '', -nil, -{}, +{}, [], - nil, -['protect'], -@descr_user_null, -false, + nil, +['protect'], +@descr_user_null, +false, false) ] From 40c520e8fd8ac78906694a585f9cd880a29e5605 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:29:02 +0300 Subject: [PATCH 353/488] ruby: Layout/ArgumentAlignment correct --- .../ruby/app/models/file_model.rb | 4 +- .../ruby/app/models/users.rb | 104 +++++++++--------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 199ad579c..b6fb1bb74 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -254,8 +254,8 @@ def history download_url(is_server_url: false) else DocumentHelper.get_historypath_uri(file_name, -i, -"prev#{file_ext}", + i, + "prev#{file_ext}", false) end end diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 8e8d21985..c4db0bbdf 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -19,17 +19,17 @@ # Represents a user with various attributes class User attr_accessor :id, -:name, -:email, -:group, -:review_groups, -:comment_groups, -:user_info_groups, -:favorite, + :name, + :email, + :group, + :review_groups, + :comment_groups, + :user_info_groups, + :favorite, :denied_permissions, -:descriptions, -:templates, -:avatar + :descriptions, + :templates, + :avatar def initialize(id, name, email, group, review_groups, comment_groups, user_info_groups, favorite, denied_permissions, descriptions, templates, avatar) @@ -101,61 +101,61 @@ class Users @users = [ User.new('uid-1', -'John Smith', -'smith@example.com', + 'John Smith', + 'smith@example.com', '', -nil, -{}, -nil, nil, -[], -@descr_user_first, -true, -true), + {}, + nil, + nil, + [], + @descr_user_first, + true, + true), User.new('uid-2', -'Mark Pottato', -'pottato@example.com', + 'Mark Pottato', + 'pottato@example.com', 'group-2', -['group-2', ''], -{ - view: '', - edit: ['group-2', ''], - remove: ['group-2'] - }, + ['group-2', ''], + { + view: '', + edit: ['group-2', ''], + remove: ['group-2'] + }, ['group-2', ''], true, -[], -@descr_user_second, -false, -true), + [], + @descr_user_second, + false, + true), User.new('uid-3', -'Hamish Mitchell', -nil, + 'Hamish Mitchell', + nil, 'group-3', -['group-2'], -{ - view: %w[group-3 group-2], - edit: ['group-2'], - remove: [] - }, ['group-2'], + { + view: %w[group-3 group-2], + edit: ['group-2'], + remove: [] + }, + ['group-2'], + false, + %w[copy download print], + @descr_user_third, false, -%w[copy download print], -@descr_user_third, -false, -false), + false), User.new('uid-0', -nil, -nil, + nil, + nil, '', -nil, -{}, -[], nil, -['protect'], -@descr_user_null, -false, -false) + {}, + [], + nil, + ['protect'], + @descr_user_null, + false, + false) ] class << self From 03a585685e94f98b76dd757a0fb6d03cb7ee514f Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:29:36 +0300 Subject: [PATCH 354/488] ruby: Layout/FirstMethodArgumentLineBreak correct --- .../ruby/app/models/file_model.rb | 6 ++++-- .../ruby/app/models/track_helper.rb | 12 ++++++++---- web/documentserver-example/ruby/app/models/users.rb | 12 ++++++++---- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index b6fb1bb74..80205a1db 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -51,7 +51,8 @@ def file_uri_user if @config_manager.storage_path.absolute? "#{download_url}&dmode=emb" else - DocumentHelper.get_file_uri(@file_name, + DocumentHelper.get_file_uri( +@file_name, false) end end @@ -253,7 +254,8 @@ def history if i == cur_ver download_url(is_server_url: false) else - DocumentHelper.get_historypath_uri(file_name, + DocumentHelper.get_historypath_uri( +file_name, i, "prev#{file_ext}", false) diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 689183841..a8255c49c 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -126,7 +126,8 @@ def process_save(raw_file_data, file_name, user_address) download_uri = new_file_uri end rescue StandardError - new_file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, + new_file_name = DocumentHelper.get_correct_name( +File.basename(file_name, cur_ext) + download_ext, user_address) end end @@ -228,16 +229,19 @@ def process_force_save(file_data, file_name, user_address) if is_submit_form file_name = if new_file_name - DocumentHelper.get_correct_name("#{File.basename(file_name, cur_ext)}-form#{download_ext}", + DocumentHelper.get_correct_name( +"#{File.basename(file_name, cur_ext)}-form#{download_ext}", user_address) # get the correct file name if it already exists else - DocumentHelper.get_correct_name("#{File.basename(file_name, cur_ext)}-form#{cur_ext}", + DocumentHelper.get_correct_name( +"#{File.basename(file_name, cur_ext)}-form#{cur_ext}", user_address) end forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file else if new_file_name - file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, + file_name = DocumentHelper.get_correct_name( +File.basename(file_name, cur_ext) + download_ext, user_address) end forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, false) diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index c4db0bbdf..d64ac2729 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -100,7 +100,8 @@ class Users ] @users = [ - User.new('uid-1', + User.new( +'uid-1', 'John Smith', 'smith@example.com', '', @@ -112,7 +113,8 @@ class Users @descr_user_first, true, true), - User.new('uid-2', + User.new( +'uid-2', 'Mark Pottato', 'pottato@example.com', 'group-2', @@ -128,7 +130,8 @@ class Users @descr_user_second, false, true), - User.new('uid-3', + User.new( +'uid-3', 'Hamish Mitchell', nil, 'group-3', @@ -144,7 +147,8 @@ class Users @descr_user_third, false, false), - User.new('uid-0', + User.new( +'uid-0', nil, nil, '', From f5ccc21f69642e65a5adc3410c9153fed1fcf360 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:31:23 +0300 Subject: [PATCH 355/488] ruby: Style/FetchEnvVar correct --- .../ruby/app/configuration/configuration.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/documentserver-example/ruby/app/configuration/configuration.rb b/web/documentserver-example/ruby/app/configuration/configuration.rb index c4efd7fe1..efae1f14a 100644 --- a/web/documentserver-example/ruby/app/configuration/configuration.rb +++ b/web/documentserver-example/ruby/app/configuration/configuration.rb @@ -36,7 +36,7 @@ def initialize sig { returns(T.nilable(URI::Generic)) } def example_uri - url = ENV['EXAMPLE_URL'] + url = ENV.fetch('EXAMPLE_URL', nil) return nil if url.nil? URI(url) @@ -50,7 +50,7 @@ def document_server_public_uri sig { returns(URI::Generic) } def document_server_private_uri - url = ENV['DOCUMENT_SERVER_PRIVATE_URL'] + url = ENV.fetch('DOCUMENT_SERVER_PRIVATE_URL', nil) return URI(url) if url document_server_public_uri @@ -100,7 +100,7 @@ def jwt_header sig { returns(T::Boolean) } def jwt_use_for_request - env = ENV['JWT_USE_FOR_REQUEST'] + env = ENV.fetch('JWT_USE_FOR_REQUEST', nil) return ActiveModel::Type::Boolean.new.cast(env) if env true @@ -108,7 +108,7 @@ def jwt_use_for_request sig { returns(T::Boolean) } def ssl_verify_peer_mode_enabled - env = ENV['SSL_VERIFY_PEER_MODE_ENABLED'] + env = ENV.fetch('SSL_VERIFY_PEER_MODE_ENABLED', nil) return ActiveModel::Type::Boolean.new.cast(env) if env false @@ -127,7 +127,7 @@ def storage_path sig { returns(Numeric) } def maximum_file_size - env = ENV['MAXIMUM_FILE_SIZE'] + env = ENV.fetch('MAXIMUM_FILE_SIZE', nil) return env.to_i if env 5 * 1024 * 1024 From cba2eac65d8ac962ca8af81a183cb34b7ee97d45 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:32:09 +0300 Subject: [PATCH 356/488] ruby: Lint/NumberConversion correct --- .../ruby/app/configuration/configuration.rb | 2 +- .../ruby/app/controllers/home_controller.rb | 2 +- .../ruby/app/models/service_converter.rb | 6 +++--- web/documentserver-example/ruby/app/models/track_helper.rb | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/documentserver-example/ruby/app/configuration/configuration.rb b/web/documentserver-example/ruby/app/configuration/configuration.rb index efae1f14a..1faa56a31 100644 --- a/web/documentserver-example/ruby/app/configuration/configuration.rb +++ b/web/documentserver-example/ruby/app/configuration/configuration.rb @@ -128,7 +128,7 @@ def storage_path sig { returns(Numeric) } def maximum_file_size env = ENV.fetch('MAXIMUM_FILE_SIZE', nil) - return env.to_i if env + return Integer(env, 10) if env 5 * 1024 * 1024 end diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 443d27074..8b9d270ca 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -203,7 +203,7 @@ def track return end - status = file_data['status'].to_i + status = Integer(file_data['status'], 10) user_address = params[:userAddress] file_name = File.basename(params[:fileName]) diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index 39bbff8f3..a8f49dca9 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -76,7 +76,7 @@ def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_ req.body = payload.to_json res = http.request(req) # get the response - status_code = res.code.to_i + status_code = Integer(res.code, 10) raise "Conversion service returned status: #{status_code}" if status_code != 200 # checking status code data = res.body # and take its body @@ -140,7 +140,7 @@ def get_response_data(json_data) error_element = file_result['error'] unless error_element.nil? # if an error occurs - process_convert_service_responce_error(error_element.to_i) # get an error message + process_convert_service_responce_error(Integer(error_element, 10)) # get an error message end is_end_convert = file_result['endConvert'] # check if the conversion is completed @@ -166,7 +166,7 @@ def get_response_data(json_data) percent_element = file_result['percent'] # get the percentage value - result_percent = percent_element.to_i unless percent_element.nil? + result_percent = Integer(percent_element, 10) unless percent_element.nil? result_percent = result_percent >= 100 ? 99 : result_percent diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index a8255c49c..37742e4b8 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -225,7 +225,7 @@ def process_force_save(file_data, file_name, user_address) begin # check if the forcesave type is equal to 3 (the form was submitted) - is_submit_form = file_data['forcesavetype'].to_i == 3 + is_submit_form = Integer(file_data['forcesavetype'], 10) == 3 if is_submit_form file_name = if new_file_name From 8580ea8a571da515b790f5d138fcb8616e8a53c0 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:32:54 +0300 Subject: [PATCH 357/488] ruby: Style/StringHashKeys correct --- .../ruby/app/configuration/configuration.rb | 80 +++++++++---------- .../ruby/app/models/document_helper.rb | 12 +-- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/web/documentserver-example/ruby/app/configuration/configuration.rb b/web/documentserver-example/ruby/app/configuration/configuration.rb index 1faa56a31..2f191b19b 100644 --- a/web/documentserver-example/ruby/app/configuration/configuration.rb +++ b/web/documentserver-example/ruby/app/configuration/configuration.rb @@ -141,46 +141,46 @@ def convertation_timeout sig { returns(T::Hash[String, String]) } def languages { - 'en' => 'English', - 'hy' => 'Armenian', - 'az' => 'Azerbaijani', - 'eu' => 'Basque', - 'be' => 'Belarusian', - 'bg' => 'Bulgarian', - 'ca' => 'Catalan', - 'zh' => 'Chinese (Simplified)', - 'zh-TW' => 'Chinese (Traditional)', - 'cs' => 'Czech', - 'da' => 'Danish', - 'nl' => 'Dutch', - 'fi' => 'Finnish', - 'fr' => 'French', - 'gl' => 'Galego', - 'de' => 'German', - 'el' => 'Greek', - 'hu' => 'Hungarian', - 'id' => 'Indonesian', - 'it' => 'Italian', - 'ja' => 'Japanese', - 'ko' => 'Korean', - 'lo' => 'Lao', - 'lv' => 'Latvian', - 'ms' => 'Malay (Malaysia)', - 'no' => 'Norwegian', - 'pl' => 'Polish', - 'pt' => 'Portuguese (Brazil)', - 'pt-PT' => 'Portuguese (Portugal)', - 'ro' => 'Romanian', - 'ru' => 'Russian', - 'si' => 'Sinhala (Sri Lanka)', - 'sk' => 'Slovak', - 'sl' => 'Slovenian', - 'es' => 'Spanish', - 'sv' => 'Swedish', - 'tr' => 'Turkish', - 'uk' => 'Ukrainian', - 'vi' => 'Vietnamese', - 'aa-AA' => 'Test Language' + :en => 'English', + :hy => 'Armenian', + :az => 'Azerbaijani', + :eu => 'Basque', + :be => 'Belarusian', + :bg => 'Bulgarian', + :ca => 'Catalan', + :zh => 'Chinese (Simplified)', + :"zh-TW" => 'Chinese (Traditional)', + :cs => 'Czech', + :da => 'Danish', + :nl => 'Dutch', + :fi => 'Finnish', + :fr => 'French', + :gl => 'Galego', + :de => 'German', + :el => 'Greek', + :hu => 'Hungarian', + :id => 'Indonesian', + :it => 'Italian', + :ja => 'Japanese', + :ko => 'Korean', + :lo => 'Lao', + :lv => 'Latvian', + :ms => 'Malay (Malaysia)', + :no => 'Norwegian', + :pl => 'Polish', + :pt => 'Portuguese (Brazil)', + :"pt-PT" => 'Portuguese (Portugal)', + :ro => 'Romanian', + :ru => 'Russian', + :si => 'Sinhala (Sri Lanka)', + :sk => 'Slovak', + :sl => 'Slovenian', + :es => 'Spanish', + :sv => 'Swedish', + :tr => 'Turkish', + :uk => 'Ukrainian', + :vi => 'Vietnamese', + :"aa-AA" => 'Test Language' } end end diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index fa469917c..98fe86061 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -294,12 +294,12 @@ def get_files_info(file_id) # write file parameters to the info object info = { - 'version' => get_file_version(history_dir(directory)), - 'id' => ServiceConverter.generate_revision_id("#{uri}.#{File.mtime(directory)}"), - 'contentLength' => "#{(File.size(directory) / 1024.0).round(2)} KB", - 'pureContentLength' => File.size(directory), - 'title' => file_name, - 'updated' => File.mtime(directory) + :version => get_file_version(history_dir(directory)), + :id => ServiceConverter.generate_revision_id("#{uri}.#{File.mtime(directory)}"), + :contentLength => "#{(File.size(directory) / 1024.0).round(2)} KB", + :pureContentLength => File.size(directory), + :title => file_name, + :updated => File.mtime(directory) } if file_id.nil? # if file id is undefined From 955b35f38238403442b9ca26ee0a3ec9941251e7 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:33:36 +0300 Subject: [PATCH 358/488] ruby: Style/MethodCallWithArgsParentheses correct --- .../app/configuration/configuration_tests.rb | 2 +- .../ruby/app/controllers/home_controller.rb | 74 +++++++++---------- .../ruby/app/models/document_helper.rb | 4 +- .../ruby/app/models/file_model.rb | 4 +- .../ruby/app/models/jwt_helper.rb | 4 +- .../ruby/app/models/service_converter.rb | 12 +-- .../ruby/app/models/track_helper.rb | 10 +-- .../ruby/config/application.rb | 2 +- 8 files changed, 56 insertions(+), 56 deletions(-) diff --git a/web/documentserver-example/ruby/app/configuration/configuration_tests.rb b/web/documentserver-example/ruby/app/configuration/configuration_tests.rb index ccf94cdf6..9dcbb0d5b 100644 --- a/web/documentserver-example/ruby/app/configuration/configuration_tests.rb +++ b/web/documentserver-example/ruby/app/configuration/configuration_tests.rb @@ -28,7 +28,7 @@ def initialize(name) end def setup - ENV.replace @env + ENV.replace(@env) end end diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 8b9d270ca..3eac5f51a 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -51,7 +51,7 @@ def sample DocumentHelper.init(request.remote_ip, request.base_url) user = Users.get_user(params[:userId]) file_name = DocumentHelper.create_demo(params[:fileExt], params[:sample], user) - redirect_to controller: 'home', action: 'editor', fileName: file_name, userId: user.id + redirect_to(controller: 'home', action: 'editor', fileName: file_name, userId: user.id) end # uploading a file @@ -64,12 +64,12 @@ def upload cur_size = http_posted_file.size # check if the file size exceeds the maximum file size - raise 'File size is incorrect' if DocumentHelper.file_size_max < cur_size || cur_size <= 0 + raise('File size is incorrect') if DocumentHelper.file_size_max < cur_size || cur_size <= 0 cur_ext = File.extname(file_name).downcase # check if the file extension is supported by the editor - raise 'File type is not supported' unless DocumentHelper.file_exts.include? cur_ext + raise('File type is not supported') unless DocumentHelper.file_exts.include?(cur_ext) # get the correct file name if such a name already exists file_name = DocumentHelper.get_correct_name(file_name, nil) @@ -86,9 +86,9 @@ def upload DocumentHelper.create_meta(file_name, user.id, user.name, nil) # write a new file name to the response - render plain: "{ \"filename\": \"#{file_name}\", \"documentType\": \"#{document_type}\"}" + render(plain: "{ \"filename\": \"#{file_name}\", \"documentType\": \"#{document_type}\"}") rescue StandardError => e - render plain: "{ \"error\": \"#{e.message}\"}" # write an error message to the response + render(plain: "{ \"error\": \"#{e.message}\"}") # write an error message to the response end end @@ -120,7 +120,7 @@ def convert # if the conversion isn't completed, write file name and step values to the response if percent != 100 - render plain: "{ \"step\" : \"#{percent}\", \"filename\" : \"#{file_name}\"}" + render(plain: "{ \"step\" : \"#{percent}\", \"filename\" : \"#{file_name}\"}") return end @@ -136,7 +136,7 @@ def convert res = http.request(req) data = res.body - raise 'stream is null' if data.nil? + raise('stream is null') if data.nil? # write a file with a new extension, but with the content from the origin file File.open(DocumentHelper.storage_path(correct_name, nil), 'wb') do |file| @@ -152,9 +152,9 @@ def convert DocumentHelper.create_meta(file_name, user.id, user.name, nil) # create meta data of the new file end - render plain: "{ \"filename\" : \"#{file_name}\"}" + render(plain: "{ \"filename\" : \"#{file_name}\"}") rescue StandardError => e - render plain: "{ \"error\": \"#{e.message}\"}" + render(plain: "{ \"error\": \"#{e.message}\"}") end # downloading a history file from public @@ -172,11 +172,11 @@ def downloadhistory hdr.slice!(0, 'Bearer '.length) token = JwtHelper.decode(hdr) if !token || token.eql?('') - render plain: 'JWT validation failed', status: 403 + render(plain: 'JWT validation failed', status: 403) return end else - render plain: 'JWT validation failed', status: 403 + render(plain: 'JWT validation failed', status: 403) return end end @@ -190,16 +190,16 @@ def downloadhistory MimeMagic.by_path(file_path).eql?(nil) ? nil : MimeMagic.by_path(file_path).type response.headers['Content-Disposition'] = "attachment;filename*=UTF-8''#{ERB::Util.url_encode(file)}" - send_file file_path, x_sendfile: true + send_file(file_path, x_sendfile: true) rescue StandardError - render plain: '{ "error": "File not found"}' + render(plain: '{ "error": "File not found"}') end # tracking file changes def track file_data = TrackHelper.read_body(request) # read the request body if file_data.nil? || file_data.empty? - render plain: '{"error":1}' # an error occurs if the file is empty + render(plain: '{"error":1}') # an error occurs if the file is empty return end @@ -217,17 +217,17 @@ def track if [2, 3].include?(status) # MustSave, Corrupted saved = TrackHelper.process_save(file_data, file_name, user_address) # save file - render plain: "{\"error\":#{saved}}" + render(plain: "{\"error\":#{saved}}") return end if [6, 7].include?(status) # MustForceave, CorruptedForcesave saved = TrackHelper.process_force_save(file_data, file_name, user_address) # force save file - render plain: "{\"error\":#{saved}}" + render(plain: "{\"error\":#{saved}}") return end - render plain: '{"error":0}' + render(plain: '{"error":0}') nil end @@ -235,7 +235,7 @@ def track def remove file_name = File.basename(params[:filename]) # get the file name unless file_name # if it doesn't exist - render plain: '{"success":false}' # report that the operation is unsuccessful + render(plain: '{"success":false}') # report that the operation is unsuccessful return end @@ -251,7 +251,7 @@ def remove FileUtils.remove_entry_secure(hist_dir) # delete it end - render plain: '{"success":true}' # report that the operation is successful + render(plain: '{"success":true}') # report that the operation is successful nil end @@ -259,7 +259,7 @@ def remove def files file_id = params[:fileId] files_info = DocumentHelper.get_files_info(file_id) # get the information about the file specified by a file id - render json: files_info + render(json: files_info) end # downloading a csv file @@ -272,7 +272,7 @@ def csv response.headers['Content-Type'] = MimeMagic.by_path(csv_path).type response.headers['Content-Disposition'] = "attachment;filename*=UTF-8''#{ERB::Util.url_encode(file_name)}" - send_file csv_path, x_sendfile: true + send_file(csv_path, x_sendfile: true) end # downloading a file @@ -289,7 +289,7 @@ def download token = JwtHelper.decode(hdr) end if !token || token.eql?('') - render plain: 'JWT validation failed', status: 403 + render(plain: 'JWT validation failed', status: 403) return end end @@ -306,9 +306,9 @@ def download MimeMagic.by_path(file_path).eql?(nil) ? nil : MimeMagic.by_path(file_path).type response.headers['Content-Disposition'] = "attachment;filename*=UTF-8''#{ERB::Util.url_encode(file_name)}" - send_file file_path, x_sendfile: true + send_file(file_path, x_sendfile: true) rescue StandardError - render plain: '{ "error": "File not found"}' + render(plain: '{ "error": "File not found"}') end # Save Copy as... @@ -324,7 +324,7 @@ def saveas DocumentHelper.fill_forms_exts unless all_exts.include?(extension) - render plain: '{"error": "File type is not supported"}' + render(plain: '{"error": "File type is not supported"}') return end @@ -338,7 +338,7 @@ def saveas data = res.body if data.size <= 0 || data.size > HomeController.config_manager.maximum_file_size - render plain: '{"error": "File size is incorrect"}' + render(plain: '{"error": "File size is incorrect"}') return end @@ -348,10 +348,10 @@ def saveas user = Users.get_user(params[:userId]) DocumentHelper.create_meta(file_name, user.id, user.name, nil) # create meta data of the new file - render plain: "{\"file\" : \"#{file_name}\"}" + render(plain: "{\"file\" : \"#{file_name}\"}") nil rescue StandardError => e - render plain: "{\"error\":1, \"message\": \"#{e.message}\"}" + render(plain: "{\"error\":1, \"message\": \"#{e.message}\"}") nil end @@ -370,7 +370,7 @@ def rename } json_data = TrackHelper.command_request('meta', dockey, meta) - render plain: "{ \"result\" : \"#{JSON.dump(json_data)}\"}" + render(plain: "{ \"result\" : \"#{JSON.dump(json_data)}\"}") end # ReferenceData @@ -395,7 +395,7 @@ def reference url: link, directUrl: link } - render plain: data.to_json + render(plain: data.to_json) return end @@ -403,7 +403,7 @@ def reference query_params = CGI.parse(url_obj.query) file_name = query_params['fileName'].first unless File.exist?(DocumentHelper.storage_path(file_name, nil)) - render plain: '{ "error": "File is not exist"}' + render(plain: '{ "error": "File is not exist"}') return end end @@ -414,7 +414,7 @@ def reference end if file_name.empty? - render plain: '{ "error": "File not found"}' + render(plain: '{ "error": "File not found"}') return end @@ -436,7 +436,7 @@ def reference data['token'] = JwtHelper.encode(data) if JwtHelper.enabled? - render plain: data.to_json + render(plain: data.to_json) end def restore @@ -495,15 +495,15 @@ def restore FileUtils.cp(source_file, bumped_file) FileUtils.cp(recovery_file, source_file) - render json: { + render(json: { error: nil, success: true - } + }) rescue StandardError => e response.status = :internal_server_error - render json: { + render(json: { error: e.message, success: false - } + }) end end diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 98fe86061..1a71d137e 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -200,9 +200,9 @@ def create_demo(file_ext, sample, user) # save sample document of a necessary extension to the storage directory src = Rails.root.join('assets', 'document-templates', sample == 'true' ? 'sample' : 'new', demo_name) - dest = storage_path file_name, nil + dest = storage_path(file_name, nil) - FileUtils.cp src, dest + FileUtils.cp(src, dest) # save file meta data to the file diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 80205a1db..5a6485c96 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -280,7 +280,7 @@ def history prev = hist_data[(i - 2).to_s] # get the history data from the previous file version # write key and url information about previous file version with optional direct url - data obj['previous'] = if enable_direct_url? == true + data(obj['previous'] = if enable_direct_url? == true { # write key and url information about previous file version with optional directUrl fileType: prev['fileType'], key: prev['key'], @@ -293,7 +293,7 @@ def history key: prev['key'], url: prev['url'] } - end + end) # write the path to the diff.zip archive with differences in this file version data_obj['changesUrl'] = DocumentHelper.get_historypath_uri(file_name, i - 1, 'diff.zip') diff --git a/web/documentserver-example/ruby/app/models/jwt_helper.rb b/web/documentserver-example/ruby/app/models/jwt_helper.rb index 48679d790..55ab0b32f 100644 --- a/web/documentserver-example/ruby/app/models/jwt_helper.rb +++ b/web/documentserver-example/ruby/app/models/jwt_helper.rb @@ -37,13 +37,13 @@ def use_for_request # encode a payload object into a token using a secret key def encode(payload) - JWT.encode payload, @jwt_secret, 'HS256' # define the hashing algorithm and get token + JWT.encode(payload, @jwt_secret, 'HS256') # define the hashing algorithm and get token end # decode a token into a payload object using a secret key def decode(token) begin - decoded = JWT.decode token, @jwt_secret, true, { algorithm: 'HS256' } + decoded = JWT.decode(token, @jwt_secret, true, { algorithm: 'HS256' }) rescue StandardError return '' end diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index a8f49dca9..e5c77f006 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -77,13 +77,13 @@ def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_ res = http.request(req) # get the response status_code = Integer(res.code, 10) - raise "Conversion service returned status: #{status_code}" if status_code != 200 # checking status code + raise("Conversion service returned status: #{status_code}") if status_code != 200 # checking status code data = res.body # and take its body rescue Timeout::Error # try again rescue StandardError => e - raise e.message + raise(e.message) end json_data = JSON.parse(data) # parse response body @@ -92,11 +92,11 @@ def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_ # generate the document key value def generate_revision_id(expected_key) - require 'zlib' + require('zlib') if expected_key.length > 20 # check if the expected key length is greater than 20 # calculate 32-bit crc value from the expected key and turn it into the string - expected_key = (Zlib.crc32 expected_key).to_s + expected_key = (Zlib.crc32(expected_key)).to_s end key = expected_key.gsub(/[^0-9a-zA-Z.=]/, '_') @@ -131,7 +131,7 @@ def process_convert_service_responce_error(error_code) error_message = "ErrorCode = #{error_code}" # default value for the error message end - raise error_message + raise(error_message) end # get the response url @@ -155,7 +155,7 @@ def get_response_data(json_data) file_type_element = file_result['fileType'] if file_url_element.nil? # and the file url doesn't exist - raise 'Invalid answer format' # get ann error message + raise('Invalid answer format') # get ann error message end response_uri = file_url_element # otherwise, get the file url diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 37742e4b8..9898b0b2c 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -54,10 +54,10 @@ def read_body(request) token = JwtHelper.decode(hdr) # decode a token into a payload object using a secret key in_header = true else - raise 'Expected JWT' # token missing error message + raise('Expected JWT') # token missing error message end - raise 'Invalid JWT signature' if !token || token.eql?('') + raise('Invalid JWT signature') if !token || token.eql?('') file_data = JSON.parse(token) @@ -298,7 +298,7 @@ def command_request(method, key, meta = nil) res = http.request(req) # get the response data = res.body # and take its body rescue StandardError => e - raise e.message + raise(e.message) end JSON.parse(data) # convert the response body into the json format @@ -316,11 +316,11 @@ def download_file(uristr) res = http.request(req) # get the response status_code = res.code - raise "Document editing service returned status: #{status_code}" if status_code != '200' # checking status code + raise("Document editing service returned status: #{status_code}") if status_code != '200' # checking status code data = res.body # and take its body - raise 'stream is null' if data.nil? + raise('stream is null') if data.nil? data end diff --git a/web/documentserver-example/ruby/config/application.rb b/web/documentserver-example/ruby/config/application.rb index dfe4302f5..cccafed30 100644 --- a/web/documentserver-example/ruby/config/application.rb +++ b/web/documentserver-example/ruby/config/application.rb @@ -13,7 +13,7 @@ # Configuration for the Rails application. class Application < Rails::Application - config.middleware.insert_before 0, Rack::Cors do + config.middleware.insert_before(0, Rack::Cors) do allow do origins '*' resource '*', headers: :any, methods: [:get, :post, :patch, :delete, :put, :options] From 5b99e3d17abb513535f42817327a1b72a2e5140d Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:35:14 +0300 Subject: [PATCH 359/488] ruby: Style/HashSyntax correct --- .../ruby/app/configuration/configuration.rb | 80 +++++++++---------- .../ruby/app/models/document_helper.rb | 12 +-- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/web/documentserver-example/ruby/app/configuration/configuration.rb b/web/documentserver-example/ruby/app/configuration/configuration.rb index 2f191b19b..f3dc744e3 100644 --- a/web/documentserver-example/ruby/app/configuration/configuration.rb +++ b/web/documentserver-example/ruby/app/configuration/configuration.rb @@ -141,46 +141,46 @@ def convertation_timeout sig { returns(T::Hash[String, String]) } def languages { - :en => 'English', - :hy => 'Armenian', - :az => 'Azerbaijani', - :eu => 'Basque', - :be => 'Belarusian', - :bg => 'Bulgarian', - :ca => 'Catalan', - :zh => 'Chinese (Simplified)', - :"zh-TW" => 'Chinese (Traditional)', - :cs => 'Czech', - :da => 'Danish', - :nl => 'Dutch', - :fi => 'Finnish', - :fr => 'French', - :gl => 'Galego', - :de => 'German', - :el => 'Greek', - :hu => 'Hungarian', - :id => 'Indonesian', - :it => 'Italian', - :ja => 'Japanese', - :ko => 'Korean', - :lo => 'Lao', - :lv => 'Latvian', - :ms => 'Malay (Malaysia)', - :no => 'Norwegian', - :pl => 'Polish', - :pt => 'Portuguese (Brazil)', - :"pt-PT" => 'Portuguese (Portugal)', - :ro => 'Romanian', - :ru => 'Russian', - :si => 'Sinhala (Sri Lanka)', - :sk => 'Slovak', - :sl => 'Slovenian', - :es => 'Spanish', - :sv => 'Swedish', - :tr => 'Turkish', - :uk => 'Ukrainian', - :vi => 'Vietnamese', - :"aa-AA" => 'Test Language' + en: 'English', + hy: 'Armenian', + az: 'Azerbaijani', + eu: 'Basque', + be: 'Belarusian', + bg: 'Bulgarian', + ca: 'Catalan', + zh: 'Chinese (Simplified)', + "zh-TW": 'Chinese (Traditional)', + cs: 'Czech', + da: 'Danish', + nl: 'Dutch', + fi: 'Finnish', + fr: 'French', + gl: 'Galego', + de: 'German', + el: 'Greek', + hu: 'Hungarian', + id: 'Indonesian', + it: 'Italian', + ja: 'Japanese', + ko: 'Korean', + lo: 'Lao', + lv: 'Latvian', + ms: 'Malay (Malaysia)', + no: 'Norwegian', + pl: 'Polish', + pt: 'Portuguese (Brazil)', + "pt-PT": 'Portuguese (Portugal)', + ro: 'Romanian', + ru: 'Russian', + si: 'Sinhala (Sri Lanka)', + sk: 'Slovak', + sl: 'Slovenian', + es: 'Spanish', + sv: 'Swedish', + tr: 'Turkish', + uk: 'Ukrainian', + vi: 'Vietnamese', + "aa-AA": 'Test Language' } end end diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 1a71d137e..efa6db433 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -294,12 +294,12 @@ def get_files_info(file_id) # write file parameters to the info object info = { - :version => get_file_version(history_dir(directory)), - :id => ServiceConverter.generate_revision_id("#{uri}.#{File.mtime(directory)}"), - :contentLength => "#{(File.size(directory) / 1024.0).round(2)} KB", - :pureContentLength => File.size(directory), - :title => file_name, - :updated => File.mtime(directory) + version: get_file_version(history_dir(directory)), + id: ServiceConverter.generate_revision_id("#{uri}.#{File.mtime(directory)}"), + contentLength: "#{(File.size(directory) / 1024.0).round(2)} KB", + pureContentLength: File.size(directory), + title: file_name, + updated: File.mtime(directory) } if file_id.nil? # if file id is undefined From 7710c6d6e838bdbaf7cd6134d4dfd93b5eee19eb Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:36:03 +0300 Subject: [PATCH 360/488] ruby: Style/QuotedSymbols correct --- .../ruby/app/configuration/configuration.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/documentserver-example/ruby/app/configuration/configuration.rb b/web/documentserver-example/ruby/app/configuration/configuration.rb index f3dc744e3..308345c75 100644 --- a/web/documentserver-example/ruby/app/configuration/configuration.rb +++ b/web/documentserver-example/ruby/app/configuration/configuration.rb @@ -149,7 +149,7 @@ def languages bg: 'Bulgarian', ca: 'Catalan', zh: 'Chinese (Simplified)', - "zh-TW": 'Chinese (Traditional)', + 'zh-TW': 'Chinese (Traditional)', cs: 'Czech', da: 'Danish', nl: 'Dutch', @@ -169,7 +169,7 @@ def languages no: 'Norwegian', pl: 'Polish', pt: 'Portuguese (Brazil)', - "pt-PT": 'Portuguese (Portugal)', + 'pt-PT': 'Portuguese (Portugal)', ro: 'Romanian', ru: 'Russian', si: 'Sinhala (Sri Lanka)', @@ -180,7 +180,7 @@ def languages tr: 'Turkish', uk: 'Ukrainian', vi: 'Vietnamese', - "aa-AA": 'Test Language' + 'aa-AA': 'Test Language' } end end From f2504ab740516ba360fa00d0c44fe868e2443cb2 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:36:45 +0300 Subject: [PATCH 361/488] ruby: Style/FileWrite correct --- .../ruby/app/controllers/home_controller.rb | 12 +++--------- .../ruby/app/models/document_helper.rb | 4 +--- .../ruby/app/models/track_helper.rb | 12 +++--------- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 3eac5f51a..a16c33894 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -76,9 +76,7 @@ def upload document_type = FileUtility.get_file_type(file_name) # write the uploaded file to the storage directory - File.open(DocumentHelper.storage_path(file_name, nil), 'wb') do |file| - file.write(http_posted_file.read) - end + File.binwrite(DocumentHelper.storage_path(file_name, nil), http_posted_file.read) # create file meta information user = Users.get_user(params[:userId]) @@ -139,9 +137,7 @@ def convert raise('stream is null') if data.nil? # write a file with a new extension, but with the content from the origin file - File.open(DocumentHelper.storage_path(correct_name, nil), 'wb') do |file| - file.write(data) - end + File.binwrite(DocumentHelper.storage_path(correct_name, nil), data) old_storage_path = DocumentHelper.storage_path(file_name, nil) File.delete(old_storage_path) if File.exist?(old_storage_path) @@ -342,9 +338,7 @@ def saveas return end - File.open(DocumentHelper.storage_path(file_name, nil), 'wb') do |file| - file.write(data) - end + File.binwrite(DocumentHelper.storage_path(file_name, nil), data) user = Users.get_user(params[:userId]) DocumentHelper.create_meta(file_name, user.id, user.name, nil) # create meta data of the new file diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index efa6db433..977081644 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -188,9 +188,7 @@ def create_meta(file_name, uid, uname, user_address) } # write file meta information to the createdInfo.json file - File.open(File.join(hist_dir, 'createdInfo.json'), 'wb') do |file| - file.write(json.to_json) - end + File.binwrite(File.join(hist_dir, 'createdInfo.json'), json.to_json) end # create demo document diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 9898b0b2c..63444c937 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -158,15 +158,11 @@ def process_save(raw_file_data, file_name, user_address) hist_data = file_data['changeshistory'] hist_data ||= file_data['history'].to_json if hist_data - File.open(File.join(ver_dir, 'changes.json'), 'wb') do |file| # open the file with document changes - file.write(hist_data) # and write history data to this file - end + File.binwrite(File.join(ver_dir, 'changes.json'), hist_data) end # write the key value to the key.txt file - File.open(File.join(ver_dir, 'key.txt'), 'wb') do |file| - file.write(file_data['key']) - end + File.binwrite(File.join(ver_dir, 'key.txt'), file_data['key']) # get the path to the forcesaved file forcesave_path = DocumentHelper.forcesave_path(new_file_name, user_address, false) @@ -326,9 +322,7 @@ def download_file(uristr) end def save_file(data, path) - File.open(path, 'wb') do |file| # open the file from the path specified - file.write(data) # and write the response data to it - end + File.binwrite(path, data) end end end From fd5a2b7b0e3dc6af9f00496008a8c71a4dab9a46 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:37:42 +0300 Subject: [PATCH 362/488] ruby: Style/NegatedIfElseCondition correct --- web/documentserver-example/ruby/app/models/file_model.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 5a6485c96..82b21f7c7 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -164,10 +164,10 @@ def config change: false } end, - createUrl: !@user.id.eql?('uid-0') ? create_url : nil, + createUrl: @user.id.eql?('uid-0') ? nil : create_url, templates: @user.templates ? templates : nil, user: { # the user currently viewing or editing the document - id: !@user.id.eql?('uid-0') ? @user.id : nil, + id: @user.id.eql?('uid-0') ? nil : @user.id, name: @user.name, group: @user.group, image: @user.avatar ? "#{DocumentHelper.get_server_url(true)}/assets/#{@user.id}.png" : nil @@ -406,7 +406,7 @@ def data_spreadsheet # get users data for mentions def users_mentions - !@user.id.eql?('uid-0') ? Users.get_users_for_mentions(@user.id) : nil + @user.id.eql?('uid-0') ? nil : Users.get_users_for_mentions(@user.id) end def users_info @@ -436,7 +436,7 @@ def users_info # get users data for protect def users_protect - !@user.id.eql?('uid-0') ? Users.get_users_for_protect(@user.id) : nil + @user.id.eql?('uid-0') ? nil : Users.get_users_for_protect(@user.id) end # get direct url existence flag From f441ab1650edf8de66255ecd7f39803d59342254 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:38:22 +0300 Subject: [PATCH 363/488] ruby: Style/RedundantParentheses correct --- web/documentserver-example/ruby/app/models/service_converter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index e5c77f006..73efaa272 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -96,7 +96,7 @@ def generate_revision_id(expected_key) if expected_key.length > 20 # check if the expected key length is greater than 20 # calculate 32-bit crc value from the expected key and turn it into the string - expected_key = (Zlib.crc32(expected_key)).to_s + expected_key = Zlib.crc32(expected_key).to_s end key = expected_key.gsub(/[^0-9a-zA-Z.=]/, '_') From 6f5a854cd25fdbcfa51f6a1eb6996906a6c000d7 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:38:50 +0300 Subject: [PATCH 364/488] ruby: Style/WordArray correct --- web/documentserver-example/ruby/app/models/file_model.rb | 6 +++--- web/documentserver-example/ruby/app/models/users.rb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 82b21f7c7..4e83b6bab 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -130,12 +130,12 @@ def config favorite: @user.favorite }, permissions: { # the permission for the document to be edited and downloaded or not - comment: !%w[view fillForms embedded blockcontent].include?(editors_mode), + comment: !['view', 'fillForms', 'embedded', 'blockcontent'].include?(editors_mode), copy: !@user.denied_permissions.include?('copy'), download: !@user.denied_permissions.include?('download'), - edit: can_edit && %w[edit view filter blockcontent].include?(editors_mode), + edit: can_edit && ['edit', 'view', 'filter', 'blockcontent'].include?(editors_mode), print: !@user.denied_permissions.include?('print'), - fillForms: !%w[view comment embedded blockcontent].include?(editors_mode), + fillForms: !['view', 'comment', 'embedded', 'blockcontent'].include?(editors_mode), modifyFilter: !editors_mode.eql?('filter'), modifyContentControl: !editors_mode.eql?('blockcontent'), review: can_edit && (editors_mode.eql?('edit') || editors_mode.eql?('review')), diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index d64ac2729..2457f5465 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -137,13 +137,13 @@ class Users 'group-3', ['group-2'], { - view: %w[group-3 group-2], + view: ['group-3', 'group-2'], edit: ['group-2'], remove: [] }, ['group-2'], false, - %w[copy download print], + ['copy', 'download', 'print'], @descr_user_third, false, false), From 9b6495718954e5e4d84ea62e1474a9cfda8bef4c Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:39:19 +0300 Subject: [PATCH 365/488] ruby: Layout/MultilineMethodParameterLineBreaks correct --- .../ruby/app/models/users.rb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 2457f5465..268b9e308 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -31,8 +31,18 @@ class User :templates, :avatar - def initialize(id, name, email, group, review_groups, comment_groups, user_info_groups, favorite, - denied_permissions, descriptions, templates, avatar) + def initialize(id, +name, +email, +group, +review_groups, +comment_groups, +user_info_groups, +favorite, + denied_permissions, +descriptions, +templates, +avatar) @id = id @name = name @email = email From 9471891a89f62877e2b537c3b9b87d6bec73a117 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:40:05 +0300 Subject: [PATCH 366/488] ruby: Lint/NonAtomicFileOperation correct --- .../ruby/app/controllers/home_controller.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index a16c33894..6e5933a75 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -140,7 +140,7 @@ def convert File.binwrite(DocumentHelper.storage_path(correct_name, nil), data) old_storage_path = DocumentHelper.storage_path(file_name, nil) - File.delete(old_storage_path) if File.exist?(old_storage_path) + FileUtils.rm_f(old_storage_path) file_name = correct_name user = Users.get_user(params[:userId]) @@ -239,13 +239,13 @@ def remove storage_path = DocumentHelper.storage_path(file_name, nil) hist_dir = DocumentHelper.history_dir(storage_path) - if File.exist?(storage_path) # if the file exists - File.delete(storage_path) # delete it from the storage path - end + # if the file exists + FileUtils.rm_f(storage_path) # delete it from the storage path + - if Dir.exist?(hist_dir) # if the history directory of this file exists - FileUtils.remove_entry_secure(hist_dir) # delete it - end + # if the history directory of this file exists + FileUtils.rm_rf(hist_dir) # delete it + render(plain: '{"success":true}') # report that the operation is successful nil From 9796abf846328f9918b78923bda638a05faa5d9d Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:40:48 +0300 Subject: [PATCH 367/488] ruby: Layout/FirstArgumentIndentation correct --- web/documentserver-example/ruby/app/models/file_model.rb | 4 ++-- .../ruby/app/models/track_helper.rb | 8 ++++---- web/documentserver-example/ruby/app/models/users.rb | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 4e83b6bab..760162f4a 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -52,7 +52,7 @@ def file_uri_user "#{download_url}&dmode=emb" else DocumentHelper.get_file_uri( -@file_name, + @file_name, false) end end @@ -255,7 +255,7 @@ def history download_url(is_server_url: false) else DocumentHelper.get_historypath_uri( -file_name, + file_name, i, "prev#{file_ext}", false) diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 63444c937..d2043354d 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -127,7 +127,7 @@ def process_save(raw_file_data, file_name, user_address) end rescue StandardError new_file_name = DocumentHelper.get_correct_name( -File.basename(file_name, cur_ext) + download_ext, + File.basename(file_name, cur_ext) + download_ext, user_address) end end @@ -226,18 +226,18 @@ def process_force_save(file_data, file_name, user_address) if is_submit_form file_name = if new_file_name DocumentHelper.get_correct_name( -"#{File.basename(file_name, cur_ext)}-form#{download_ext}", + "#{File.basename(file_name, cur_ext)}-form#{download_ext}", user_address) # get the correct file name if it already exists else DocumentHelper.get_correct_name( -"#{File.basename(file_name, cur_ext)}-form#{cur_ext}", + "#{File.basename(file_name, cur_ext)}-form#{cur_ext}", user_address) end forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file else if new_file_name file_name = DocumentHelper.get_correct_name( -File.basename(file_name, cur_ext) + download_ext, + File.basename(file_name, cur_ext) + download_ext, user_address) end forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, false) diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 268b9e308..f05ad42e4 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -111,7 +111,7 @@ class Users @users = [ User.new( -'uid-1', + 'uid-1', 'John Smith', 'smith@example.com', '', @@ -124,7 +124,7 @@ class Users true, true), User.new( -'uid-2', + 'uid-2', 'Mark Pottato', 'pottato@example.com', 'group-2', @@ -141,7 +141,7 @@ class Users false, true), User.new( -'uid-3', + 'uid-3', 'Hamish Mitchell', nil, 'group-3', @@ -158,7 +158,7 @@ class Users false, false), User.new( -'uid-0', + 'uid-0', nil, nil, '', From ae738e1be223288ba1bb96f16417112a9178ee4a Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:41:28 +0300 Subject: [PATCH 368/488] ruby: Style/RedundantSelfAssignmentBranch correct --- .../ruby/app/models/service_converter.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index 73efaa272..507dfa68c 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -32,14 +32,14 @@ class << self class << self # get the url of the converted file def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_async, file_pass, lang = nil) - from_ext = from_ext.nil? ? File.extname(document_uri).downcase : from_ext # get the current document extension + from_ext = File.extname(document_uri).downcase if from_ext.nil? # get the current document extension # get the current document name or uuid title = File.basename(URI.parse(document_uri).path) - title = title.nil? ? UUID.generate.to_s : title + title = UUID.generate.to_s if title.nil? # get the document key - document_revision_id = document_revision_id.empty? ? document_uri : document_revision_id + document_revision_id = document_uri if document_revision_id.empty? document_revision_id = generate_revision_id(document_revision_id) payload = { # write all the conversion parameters to the payload @@ -168,7 +168,7 @@ def get_response_data(json_data) result_percent = Integer(percent_element, 10) unless percent_element.nil? - result_percent = result_percent >= 100 ? 99 : result_percent + result_percent = 99 if result_percent >= 100 end From 992dbe18afc0f891141f69479e8990fba786f43a Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:41:52 +0300 Subject: [PATCH 369/488] ruby: Layout/ArgumentAlignment correct --- .../ruby/app/models/file_model.rb | 8 +- .../ruby/app/models/track_helper.rb | 8 +- .../ruby/app/models/users.rb | 104 +++++++++--------- 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 760162f4a..5e262979a 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -53,7 +53,7 @@ def file_uri_user else DocumentHelper.get_file_uri( @file_name, - false) + false) end end @@ -256,9 +256,9 @@ def history else DocumentHelper.get_historypath_uri( file_name, - i, - "prev#{file_ext}", - false) + i, + "prev#{file_ext}", + false) end end data_obj['version'] = i diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index d2043354d..ded766b0a 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -128,7 +128,7 @@ def process_save(raw_file_data, file_name, user_address) rescue StandardError new_file_name = DocumentHelper.get_correct_name( File.basename(file_name, cur_ext) + download_ext, - user_address) + user_address) end end @@ -227,18 +227,18 @@ def process_force_save(file_data, file_name, user_address) file_name = if new_file_name DocumentHelper.get_correct_name( "#{File.basename(file_name, cur_ext)}-form#{download_ext}", - user_address) # get the correct file name if it already exists + user_address) # get the correct file name if it already exists else DocumentHelper.get_correct_name( "#{File.basename(file_name, cur_ext)}-form#{cur_ext}", - user_address) + user_address) end forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file else if new_file_name file_name = DocumentHelper.get_correct_name( File.basename(file_name, cur_ext) + download_ext, - user_address) + user_address) end forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, false) if forcesave_path.eql?('') diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index f05ad42e4..b8f746102 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -112,64 +112,64 @@ class Users @users = [ User.new( 'uid-1', - 'John Smith', - 'smith@example.com', - '', - nil, - {}, - nil, - nil, - [], - @descr_user_first, - true, - true), + 'John Smith', + 'smith@example.com', + '', + nil, + {}, + nil, + nil, + [], + @descr_user_first, + true, + true), User.new( 'uid-2', - 'Mark Pottato', - 'pottato@example.com', - 'group-2', - ['group-2', ''], - { - view: '', - edit: ['group-2', ''], - remove: ['group-2'] - }, - ['group-2', ''], - true, - [], - @descr_user_second, - false, - true), + 'Mark Pottato', + 'pottato@example.com', + 'group-2', + ['group-2', ''], + { + view: '', + edit: ['group-2', ''], + remove: ['group-2'] + }, + ['group-2', ''], + true, + [], + @descr_user_second, + false, + true), User.new( 'uid-3', - 'Hamish Mitchell', - nil, - 'group-3', - ['group-2'], - { - view: ['group-3', 'group-2'], - edit: ['group-2'], - remove: [] - }, - ['group-2'], - false, - ['copy', 'download', 'print'], - @descr_user_third, - false, - false), + 'Hamish Mitchell', + nil, + 'group-3', + ['group-2'], + { + view: ['group-3', 'group-2'], + edit: ['group-2'], + remove: [] + }, + ['group-2'], + false, + ['copy', 'download', 'print'], + @descr_user_third, + false, + false), User.new( 'uid-0', - nil, - nil, - '', - nil, - {}, - [], - nil, - ['protect'], - @descr_user_null, - false, - false) + nil, + nil, + '', + nil, + {}, + [], + nil, + ['protect'], + @descr_user_null, + false, + false) ] class << self From 1f5c23a2d1c625bb8cffe8b92cc6ccf2920f5d09 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:43:31 +0300 Subject: [PATCH 370/488] ruby: Layout/CommentIndentation correct --- .../ruby/app/controllers/home_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 6e5933a75..499572a84 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -239,11 +239,11 @@ def remove storage_path = DocumentHelper.storage_path(file_name, nil) hist_dir = DocumentHelper.history_dir(storage_path) - # if the file exists + # if the file exists FileUtils.rm_f(storage_path) # delete it from the storage path - # if the history directory of this file exists + # if the history directory of this file exists FileUtils.rm_rf(hist_dir) # delete it From 58eec51312f8264646877b3b992fd7026da64be4 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:44:03 +0300 Subject: [PATCH 371/488] ruby: Layout/IndentationConsistency correct --- .../ruby/app/controllers/home_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 499572a84..c6518137c 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -240,11 +240,11 @@ def remove hist_dir = DocumentHelper.history_dir(storage_path) # if the file exists - FileUtils.rm_f(storage_path) # delete it from the storage path + FileUtils.rm_f(storage_path) # delete it from the storage path # if the history directory of this file exists - FileUtils.rm_rf(hist_dir) # delete it + FileUtils.rm_rf(hist_dir) # delete it render(plain: '{"success":true}') # report that the operation is successful From 743176bb5ce22bea5bf839073cd54bb25557d794 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:44:29 +0300 Subject: [PATCH 372/488] ruby: Layout/TrailingWhitespace correct --- .../ruby/app/controllers/home_controller.rb | 4 ++-- .../ruby/app/models/users.rb | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index c6518137c..b4b51d072 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -241,11 +241,11 @@ def remove # if the file exists FileUtils.rm_f(storage_path) # delete it from the storage path - + # if the history directory of this file exists FileUtils.rm_rf(hist_dir) # delete it - + render(plain: '{"success":true}') # report that the operation is successful nil diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index b8f746102..c53883f93 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -31,17 +31,17 @@ class User :templates, :avatar - def initialize(id, -name, -email, -group, -review_groups, -comment_groups, -user_info_groups, + def initialize(id, +name, +email, +group, +review_groups, +comment_groups, +user_info_groups, favorite, - denied_permissions, -descriptions, -templates, + denied_permissions, +descriptions, +templates, avatar) @id = id @name = name From f00f2126620474518309c6d497f88b310f5eacc9 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:44:59 +0300 Subject: [PATCH 373/488] ruby: Lint/SymbolConversion correct --- .../ruby/app/controllers/home_controller.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index b4b51d072..d80464518 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -446,7 +446,7 @@ def restore DocumentHelper.init(request.remote_ip, request.base_url) file_model = FileModel.new( { - 'file_name': source_basename + file_name: source_basename } ) @@ -471,13 +471,13 @@ def restore bumped_changes_file = bumped_version_directory.join('changes.json') bumped_changes = { - 'serverVersion': nil, - 'changes': [ + serverVersion: nil, + changes: [ { - 'created': Time.now.to_formatted_s(:db), - 'user': { - 'id': user.id, - 'name': user.name + created: Time.now.to_formatted_s(:db), + user: { + id: user.id, + name: user.name } } ] From 18aa9487b3bb9d20befa524957c81490de4c05ba Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:45:27 +0300 Subject: [PATCH 374/488] ruby: Layout/FirstMethodArgumentLineBreak correct --- .../ruby/app/controllers/home_controller.rb | 6 ++++-- web/documentserver-example/ruby/app/models/file_model.rb | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index d80464518..eccb0bf9e 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -489,13 +489,15 @@ def restore FileUtils.cp(source_file, bumped_file) FileUtils.cp(recovery_file, source_file) - render(json: { + render( +json: { error: nil, success: true }) rescue StandardError => e response.status = :internal_server_error - render(json: { + render( +json: { error: e.message, success: false }) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 5e262979a..d4a268610 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -280,7 +280,8 @@ def history prev = hist_data[(i - 2).to_s] # get the history data from the previous file version # write key and url information about previous file version with optional direct url - data(obj['previous'] = if enable_direct_url? == true + data( +obj['previous'] = if enable_direct_url? == true { # write key and url information about previous file version with optional directUrl fileType: prev['fileType'], key: prev['key'], From 5f68d09e2f789b45eefc6e0c166e8608bbbc13ca Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:46:25 +0300 Subject: [PATCH 375/488] ruby: Layout/FirstHashElementIndentation correct --- .../ruby/app/controllers/home_controller.rb | 8 ++++---- web/documentserver-example/ruby/app/models/users.rb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index eccb0bf9e..3b08a4cce 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -491,15 +491,15 @@ def restore render( json: { - error: nil, + error: nil, success: true - }) +}) rescue StandardError => e response.status = :internal_server_error render( json: { - error: e.message, + error: e.message, success: false - }) +}) end end diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index c53883f93..463d6f204 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -130,10 +130,10 @@ class Users 'group-2', ['group-2', ''], { - view: '', + view: '', edit: ['group-2', ''], remove: ['group-2'] - }, + }, ['group-2', ''], true, [], @@ -147,10 +147,10 @@ class Users 'group-3', ['group-2'], { - view: ['group-3', 'group-2'], + view: ['group-3', 'group-2'], edit: ['group-2'], remove: [] - }, + }, ['group-2'], false, ['copy', 'download', 'print'], From 7e9356df5ec868483e5086abad4ef5daca8c12ef Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:46:53 +0300 Subject: [PATCH 376/488] ruby: Layout/MultilineMethodCallBraceLayout correct --- .../ruby/app/controllers/home_controller.rb | 6 ++++-- .../ruby/app/models/file_model.rb | 9 ++++++--- .../ruby/app/models/track_helper.rb | 12 ++++++++---- web/documentserver-example/ruby/app/models/users.rb | 12 ++++++++---- 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 3b08a4cce..b6d0ff158 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -493,13 +493,15 @@ def restore json: { error: nil, success: true -}) +} +) rescue StandardError => e response.status = :internal_server_error render( json: { error: e.message, success: false -}) +} +) end end diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index d4a268610..fb4fd5a1b 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -53,7 +53,8 @@ def file_uri_user else DocumentHelper.get_file_uri( @file_name, - false) + false +) end end @@ -258,7 +259,8 @@ def history file_name, i, "prev#{file_ext}", - false) + false +) end end data_obj['version'] = i @@ -294,7 +296,8 @@ def history key: prev['key'], url: prev['url'] } - end) + end +) # write the path to the diff.zip archive with differences in this file version data_obj['changesUrl'] = DocumentHelper.get_historypath_uri(file_name, i - 1, 'diff.zip') diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index ded766b0a..592e4de9d 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -128,7 +128,8 @@ def process_save(raw_file_data, file_name, user_address) rescue StandardError new_file_name = DocumentHelper.get_correct_name( File.basename(file_name, cur_ext) + download_ext, - user_address) + user_address +) end end @@ -227,18 +228,21 @@ def process_force_save(file_data, file_name, user_address) file_name = if new_file_name DocumentHelper.get_correct_name( "#{File.basename(file_name, cur_ext)}-form#{download_ext}", - user_address) # get the correct file name if it already exists + user_address +) # get the correct file name if it already exists else DocumentHelper.get_correct_name( "#{File.basename(file_name, cur_ext)}-form#{cur_ext}", - user_address) + user_address +) end forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file else if new_file_name file_name = DocumentHelper.get_correct_name( File.basename(file_name, cur_ext) + download_ext, - user_address) + user_address +) end forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, false) if forcesave_path.eql?('') diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 463d6f204..9a8ae5cc3 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -122,7 +122,8 @@ class Users [], @descr_user_first, true, - true), + true +), User.new( 'uid-2', 'Mark Pottato', @@ -139,7 +140,8 @@ class Users [], @descr_user_second, false, - true), + true +), User.new( 'uid-3', 'Hamish Mitchell', @@ -156,7 +158,8 @@ class Users ['copy', 'download', 'print'], @descr_user_third, false, - false), + false +), User.new( 'uid-0', nil, @@ -169,7 +172,8 @@ class Users ['protect'], @descr_user_null, false, - false) + false +) ] class << self From af38a4ba61e21602925ceec712986e118d75a87c Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:47:24 +0300 Subject: [PATCH 377/488] ruby: Layout/LineEndStringConcatenationIndentation correct --- .../ruby/app/models/document_helper.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 977081644..53677c90b 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -222,8 +222,8 @@ def get_historypath_uri(file_name, version, file, is_server_url: true) # for redirection to my link user_host = is_server_url ? "&userAddress=#{cur_user_host_address(nil)}" : '' "#{get_server_url(is_server_url)}/downloadhistory/?"\ - "fileName=#{ERB::Util.url_encode(file_name)}&ver=#{version}"\ - "&file=#{ERB::Util.url_encode(file)}#{user_host}" + "fileName=#{ERB::Util.url_encode(file_name)}&ver=#{version}"\ + "&file=#{ERB::Util.url_encode(file)}#{user_host}" end # get server url @@ -238,8 +238,8 @@ def get_server_url(for_document_server) # get callback url def get_callback(file_name) "#{get_server_url(true)}/track?" \ - "fileName=#{ERB::Util.url_encode(file_name)}&" \ - "userAddress=#{cur_user_host_address(nil)}" + "fileName=#{ERB::Util.url_encode(file_name)}&" \ + "userAddress=#{cur_user_host_address(nil)}" end # get url to the created file From 94df21fe21fef692e2abbf67285318d762d4aef9 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:48:18 +0300 Subject: [PATCH 378/488] ruby: Style/ClassMethodsDefinitions correct --- .../ruby/app/models/document_helper.rb | 452 +++++++++-------- .../ruby/app/models/file_utility.rb | 15 +- .../ruby/app/models/jwt_helper.rb | 44 +- .../ruby/app/models/service_converter.rb | 238 +++++---- .../ruby/app/models/track_helper.rb | 454 +++++++++--------- .../ruby/app/models/users.rb | 48 +- 6 files changed, 621 insertions(+), 630 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 53677c90b..765eaafa4 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -32,294 +32,292 @@ class << self @remote_ip = nil @base_url = nil - class << self - def init(ip, url) - @remote_ip = ip - @base_url = url - end + def self.init(ip, url) + @remote_ip = ip + @base_url = url + end - # define max file size - def file_size_max - DocumentHelper.config_manager.maximum_file_size - end + # define max file size + def self.file_size_max + DocumentHelper.config_manager.maximum_file_size + end - # all the supported file extensions - def file_exts - DocumentHelper.format_manager.all_extensions - end + # all the supported file extensions + def self.file_exts + DocumentHelper.format_manager.all_extensions + end - def fill_forms_exts - DocumentHelper.format_manager.fillable_extensions - end + def self.fill_forms_exts + DocumentHelper.format_manager.fillable_extensions + end - # file extensions that can be viewed - def viewed_exts - DocumentHelper.format_manager.viewable_extensions - end + # file extensions that can be viewed + def self.viewed_exts + DocumentHelper.format_manager.viewable_extensions + end - # file extensions that can be edited - def edited_exts - DocumentHelper.format_manager.editable_extensions - end + # file extensions that can be edited + def self.edited_exts + DocumentHelper.format_manager.editable_extensions + end - # file extensions that can be converted - def convert_exts - DocumentHelper.format_manager.convertible_extensions - end + # file extensions that can be converted + def self.convert_exts + DocumentHelper.format_manager.convertible_extensions + end - # get current user host address - def cur_user_host_address(user_address) - (user_address.nil? ? @remote_ip : user_address).gsub(/[^0-9\-.a-zA-Z_=]/, '_') - end + # get current user host address + def self.cur_user_host_address(user_address) + (user_address.nil? ? @remote_ip : user_address).gsub(/[^0-9\-.a-zA-Z_=]/, '_') + end - # get the storage path of the given file - def storage_path(file_name, user_address) - directory = DocumentHelper.config_manager.storage_path.join(cur_user_host_address(user_address)) + # get the storage path of the given file + def self.storage_path(file_name, user_address) + directory = DocumentHelper.config_manager.storage_path.join(cur_user_host_address(user_address)) - # create a new directory if it doesn't exist - FileUtils.mkdir_p(directory) unless File.directory?(directory) + # create a new directory if it doesn't exist + FileUtils.mkdir_p(directory) unless File.directory?(directory) - # put the given file to this directory - File.join(directory, File.basename(file_name)) - end + # put the given file to this directory + File.join(directory, File.basename(file_name)) + end - # get the path to the forcesaved file version - def forcesave_path(file_name, user_address, create) - directory = DocumentHelper.config_manager.storage_path.join(cur_user_host_address(user_address)) + # get the path to the forcesaved file version + def self.forcesave_path(file_name, user_address, create) + directory = DocumentHelper.config_manager.storage_path.join(cur_user_host_address(user_address)) - # the directory with host address doesn't exist - return '' unless File.directory?(directory) + # the directory with host address doesn't exist + return '' unless File.directory?(directory) - # get the path to the history of the given file - directory = File.join(directory, "#{File.basename(file_name)}-hist") - unless File.directory?(directory) - return '' unless create + # get the path to the history of the given file + directory = File.join(directory, "#{File.basename(file_name)}-hist") + unless File.directory?(directory) + return '' unless create - FileUtils.mkdir_p(directory) # create history directory if it doesn't exist + FileUtils.mkdir_p(directory) # create history directory if it doesn't exist - # the history directory doesn't exist and we are not supposed to create it + # the history directory doesn't exist and we are not supposed to create it - end + end - directory = File.join(directory, File.basename(file_name)) # get the path to the given file - return '' if !File.file?(directory) && !create + directory = File.join(directory, File.basename(file_name)) # get the path to the given file + return '' if !File.file?(directory) && !create - directory.to_s - end + directory.to_s + end - # get the path to the file history - def history_dir(storage_path) - directory = "#{storage_path}-hist" + # get the path to the file history + def self.history_dir(storage_path) + directory = "#{storage_path}-hist" - # create history directory if it doesn't exist - FileUtils.mkdir_p(directory) unless File.directory?(directory) + # create history directory if it doesn't exist + FileUtils.mkdir_p(directory) unless File.directory?(directory) - directory - end + directory + end - # get the path to the specified file version - def version_dir(hist_dir, ver) - File.join(hist_dir, ver.to_s) - end + # get the path to the specified file version + def self.version_dir(hist_dir, ver) + File.join(hist_dir, ver.to_s) + end - # get the last file version - def get_file_version(hist_dir) - return 1 unless Dir.exist?(hist_dir) + # get the last file version + def self.get_file_version(hist_dir) + return 1 unless Dir.exist?(hist_dir) - ver = 1 - Dir.foreach(hist_dir) do |e| # run through all the file versions - next if e.eql?('.') - next if e.eql?('..') + ver = 1 + Dir.foreach(hist_dir) do |e| # run through all the file versions + next if e.eql?('.') + next if e.eql?('..') - if File.directory?(File.join(hist_dir, e)) - ver += 1 # and count them - end + if File.directory?(File.join(hist_dir, e)) + ver += 1 # and count them end - - ver end - # get the correct file name if such a name already exists - def get_correct_name(file_name, user_address) - max_name = 50 - ext = File.extname(file_name) # get file extension - # get file name without extension - base_name = File.basename(file_name, ext)[0...max_name] + (file_name.length > max_name ? '[...]' : '') - name = base_name + ext.downcase # get full file name - index = 1 - - # if the file with such a name already exists in this directory - while File.exist?(storage_path(name, user_address)) - name = "#{base_name} (#{index})#{ext.downcase}" # add an index after its base name - index += 1 - end + ver + end - name + # get the correct file name if such a name already exists + def self.get_correct_name(file_name, user_address) + max_name = 50 + ext = File.extname(file_name) # get file extension + # get file name without extension + base_name = File.basename(file_name, ext)[0...max_name] + (file_name.length > max_name ? '[...]' : '') + name = base_name + ext.downcase # get full file name + index = 1 + + # if the file with such a name already exists in this directory + while File.exist?(storage_path(name, user_address)) + name = "#{base_name} (#{index})#{ext.downcase}" # add an index after its base name + index += 1 end - # get all the stored files from the folder - def get_stored_files(user_address) - directory = DocumentHelper.config_manager.storage_path.join(cur_user_host_address(user_address)) + name + end + + # get all the stored files from the folder + def self.get_stored_files(user_address) + directory = DocumentHelper.config_manager.storage_path.join(cur_user_host_address(user_address)) - arr = [] + arr = [] - if Dir.exist?(directory) - Dir.foreach(directory) do |e| # run through all the elements from the folder - next if e.eql?('.') - next if e.eql?('..') - next if File.directory?(File.join(directory, e)) # if the element is a directory, skip it + if Dir.exist?(directory) + Dir.foreach(directory) do |e| # run through all the elements from the folder + next if e.eql?('.') + next if e.eql?('..') + next if File.directory?(File.join(directory, e)) # if the element is a directory, skip it - arr.push(e) # push the file to the array - end + arr.push(e) # push the file to the array end - - arr end - # create file meta information - def create_meta(file_name, uid, uname, user_address) - hist_dir = history_dir(storage_path(file_name, user_address)) # get the path to the file history + arr + end - # write user name, user uid and the creation time to the json object - json = { - created: Time.now.to_formatted_s(:db), - uid:, - uname: - } + # create file meta information + def self.create_meta(file_name, uid, uname, user_address) + hist_dir = history_dir(storage_path(file_name, user_address)) # get the path to the file history - # write file meta information to the createdInfo.json file - File.binwrite(File.join(hist_dir, 'createdInfo.json'), json.to_json) - end + # write user name, user uid and the creation time to the json object + json = { + created: Time.now.to_formatted_s(:db), + uid:, + uname: + } - # create demo document - def create_demo(file_ext, sample, user) - demo_name = (sample == 'true' ? 'sample.' : 'new.') + file_ext - file_name = get_correct_name(demo_name, nil) # get the correct file name if such a name already exists + # write file meta information to the createdInfo.json file + File.binwrite(File.join(hist_dir, 'createdInfo.json'), json.to_json) + end - # save sample document of a necessary extension to the storage directory - src = Rails.root.join('assets', 'document-templates', sample == 'true' ? 'sample' : 'new', demo_name) - dest = storage_path(file_name, nil) + # create demo document + def self.create_demo(file_ext, sample, user) + demo_name = (sample == 'true' ? 'sample.' : 'new.') + file_ext + file_name = get_correct_name(demo_name, nil) # get the correct file name if such a name already exists - FileUtils.cp(src, dest) + # save sample document of a necessary extension to the storage directory + src = Rails.root.join('assets', 'document-templates', sample == 'true' ? 'sample' : 'new', demo_name) + dest = storage_path(file_name, nil) - # save file meta data to the file + FileUtils.cp(src, dest) - create_meta(file_name, user.id, user.name, nil) + # save file meta data to the file - file_name - end + create_meta(file_name, user.id, user.name, nil) - # get file url - def get_file_uri(file_name, for_document_server) - "#{get_server_url(for_document_server)}/" \ - "#{DocumentHelper.config_manager.storage_path}/" \ - "#{cur_user_host_address(nil)}/" \ - "#{ERB::Util.url_encode(file_name)}" - end + file_name + end - # get history path url - def get_historypath_uri(file_name, version, file, is_server_url: true) - # for redirection to my link - user_host = is_server_url ? "&userAddress=#{cur_user_host_address(nil)}" : '' - "#{get_server_url(is_server_url)}/downloadhistory/?"\ - "fileName=#{ERB::Util.url_encode(file_name)}&ver=#{version}"\ - "&file=#{ERB::Util.url_encode(file)}#{user_host}" - end + # get file url + def self.get_file_uri(file_name, for_document_server) + "#{get_server_url(for_document_server)}/" \ + "#{DocumentHelper.config_manager.storage_path}/" \ + "#{cur_user_host_address(nil)}/" \ + "#{ERB::Util.url_encode(file_name)}" + end - # get server url - def get_server_url(for_document_server) - return DocumentHelper.config_manager.example_uri.to_s if - for_document_server && - DocumentHelper.config_manager.example_uri + # get history path url + def self.get_historypath_uri(file_name, version, file, is_server_url: true) + # for redirection to my link + user_host = is_server_url ? "&userAddress=#{cur_user_host_address(nil)}" : '' + "#{get_server_url(is_server_url)}/downloadhistory/?"\ + "fileName=#{ERB::Util.url_encode(file_name)}&ver=#{version}"\ + "&file=#{ERB::Util.url_encode(file)}#{user_host}" + end - @base_url - end + # get server url + def self.get_server_url(for_document_server) + return DocumentHelper.config_manager.example_uri.to_s if + for_document_server && + DocumentHelper.config_manager.example_uri - # get callback url - def get_callback(file_name) - "#{get_server_url(true)}/track?" \ - "fileName=#{ERB::Util.url_encode(file_name)}&" \ - "userAddress=#{cur_user_host_address(nil)}" - end + @base_url + end - # get url to the created file - def get_create_url(document_type) - "#{get_server_url(false)}/sample?fileExt=#{get_internal_extension(document_type).delete('.')}" - end + # get callback url + def self.get_callback(file_name) + "#{get_server_url(true)}/track?" \ + "fileName=#{ERB::Util.url_encode(file_name)}&" \ + "userAddress=#{cur_user_host_address(nil)}" + end - # get url to download a file - def get_download_url(file_name, is_server_url: true) - user_host = is_server_url ? "&userAddress=#{cur_user_host_address(nil)}" : '' - "#{get_server_url(is_server_url)}/download?fileName=#{ERB::Util.url_encode(file_name)}#{user_host}" - end + # get url to the created file + def self.get_create_url(document_type) + "#{get_server_url(false)}/sample?fileExt=#{get_internal_extension(document_type).delete('.')}" + end - # get internal file extension by its type - def get_internal_extension(file_type) - case file_type - when 'word' # .docx for word type - '.docx' - when 'cell' # .xlsx for cell type - '.xlsx' - when 'slide' # .pptx for slide type - '.pptx' - else - '.docx' # the default value is .docx - end + # get url to download a file + def self.get_download_url(file_name, is_server_url: true) + user_host = is_server_url ? "&userAddress=#{cur_user_host_address(nil)}" : '' + "#{get_server_url(is_server_url)}/download?fileName=#{ERB::Util.url_encode(file_name)}#{user_host}" + end + + # get internal file extension by its type + def self.get_internal_extension(file_type) + case file_type + when 'word' # .docx for word type + '.docx' + when 'cell' # .xlsx for cell type + '.xlsx' + when 'slide' # .pptx for slide type + '.pptx' + else + '.docx' # the default value is .docx end + end - # get image url for templates - def get_template_image_url(file_type) - path = "#{get_server_url(true)}/assets/" - case file_type - when 'word' # for word type - "#{path}file_docx.svg" - when 'cell' # .xlsx for cell type - "#{path}file_xlsx.svg" - when 'slide' # .pptx for slide type - "#{path}file_pptx.svg" - else - "#{path}file_docx.svg" # the default value is .docx - end + # get image url for templates + def self.get_template_image_url(file_type) + path = "#{get_server_url(true)}/assets/" + case file_type + when 'word' # for word type + "#{path}file_docx.svg" + when 'cell' # .xlsx for cell type + "#{path}file_xlsx.svg" + when 'slide' # .pptx for slide type + "#{path}file_pptx.svg" + else + "#{path}file_docx.svg" # the default value is .docx end + end + + # get files information + def self.get_files_info(file_id) + result = [] + + get_stored_files(nil).each do |file_name| # run through all the stored files from the folder + directory = storage_path(file_name, nil) + uri = "#{cur_user_host_address(nil)}/#{file_name}" + + # write file parameters to the info object + info = { + version: get_file_version(history_dir(directory)), + id: ServiceConverter.generate_revision_id("#{uri}.#{File.mtime(directory)}"), + contentLength: "#{(File.size(directory) / 1024.0).round(2)} KB", + pureContentLength: File.size(directory), + title: file_name, + updated: File.mtime(directory) + } - # get files information - def get_files_info(file_id) - result = [] - - get_stored_files(nil).each do |file_name| # run through all the stored files from the folder - directory = storage_path(file_name, nil) - uri = "#{cur_user_host_address(nil)}/#{file_name}" - - # write file parameters to the info object - info = { - version: get_file_version(history_dir(directory)), - id: ServiceConverter.generate_revision_id("#{uri}.#{File.mtime(directory)}"), - contentLength: "#{(File.size(directory) / 1024.0).round(2)} KB", - pureContentLength: File.size(directory), - title: file_name, - updated: File.mtime(directory) - } - - if file_id.nil? # if file id is undefined - result.push(info) # push info object to the response array - elsif file_id.eql?(info['id']) # if file id is defined - result.push(info) # response object will be equal to the info object - return result # and it is equal to the document key value - end + if file_id.nil? # if file id is undefined + result.push(info) # push info object to the response array + elsif file_id.eql?(info['id']) # if file id is defined + result.push(info) # response object will be equal to the info object + return result # and it is equal to the document key value end + end - return '"File not found"' unless file_id.nil? + return '"File not found"' unless file_id.nil? - result - end + result + end - # enable ignore certificate - def verify_ssl(file_uri, http) - return unless file_uri.start_with?('https') && DocumentHelper.config_manager.ssl_verify_peer_mode_enabled + # enable ignore certificate + def self.verify_ssl(file_uri, http) + return unless file_uri.start_with?('https') && DocumentHelper.config_manager.ssl_verify_peer_mode_enabled - http.use_ssl = true - # set the flags for the server certificate verification at the beginning of SSL session - http.verify_mode = OpenSSL::SSL::VERIFY_NONE - end + http.use_ssl = true + # set the flags for the server certificate verification at the beginning of SSL session + http.verify_mode = OpenSSL::SSL::VERIFY_NONE end end diff --git a/web/documentserver-example/ruby/app/models/file_utility.rb b/web/documentserver-example/ruby/app/models/file_utility.rb index 52551f2a9..e521aa22f 100644 --- a/web/documentserver-example/ruby/app/models/file_utility.rb +++ b/web/documentserver-example/ruby/app/models/file_utility.rb @@ -25,14 +25,15 @@ class FileUtility class << self attr_reader :format_manager - def get_file_type(file_name) - ext = File.extname(file_name).downcase + end + + def self.get_file_type(file_name) + ext = File.extname(file_name).downcase - return 'word' if FileUtility.format_manager.document_extensinons.include?(ext) - return 'cell' if FileUtility.format_manager.spreadsheet_extensinons.include?(ext) - return 'slide' if FileUtility.format_manager.presentation_extensinons.include?(ext) + return 'word' if FileUtility.format_manager.document_extensinons.include?(ext) + return 'cell' if FileUtility.format_manager.spreadsheet_extensinons.include?(ext) + return 'slide' if FileUtility.format_manager.presentation_extensinons.include?(ext) - 'word' - end + 'word' end end diff --git a/web/documentserver-example/ruby/app/models/jwt_helper.rb b/web/documentserver-example/ruby/app/models/jwt_helper.rb index 55ab0b32f..92c580173 100644 --- a/web/documentserver-example/ruby/app/models/jwt_helper.rb +++ b/web/documentserver-example/ruby/app/models/jwt_helper.rb @@ -24,32 +24,30 @@ class JwtHelper @jwt_secret = ConfigurationManager.new.jwt_secret @token_use_for_request = ConfigurationManager.new.jwt_use_for_request - class << self - # check if a secret key to generate token exists or not - def enabled? - @jwt_secret && !@jwt_secret.empty? ? true : false - end + # check if a secret key to generate token exists or not + def self.enabled? + @jwt_secret && !@jwt_secret.empty? ? true : false + end - # check if a secret key used for request - def use_for_request - @token_use_for_request - end + # check if a secret key used for request + def self.use_for_request + @token_use_for_request + end - # encode a payload object into a token using a secret key - def encode(payload) - JWT.encode(payload, @jwt_secret, 'HS256') # define the hashing algorithm and get token - end + # encode a payload object into a token using a secret key + def self.encode(payload) + JWT.encode(payload, @jwt_secret, 'HS256') # define the hashing algorithm and get token + end - # decode a token into a payload object using a secret key - def decode(token) - begin - decoded = JWT.decode(token, @jwt_secret, true, { algorithm: 'HS256' }) - rescue StandardError - return '' - end - # decoded = Array [ {"data"=>"test"}, # payload - # {"alg"=>"HS256"} # header ] - decoded[0].to_json # get json payload + # decode a token into a payload object using a secret key + def self.decode(token) + begin + decoded = JWT.decode(token, @jwt_secret, true, { algorithm: 'HS256' }) + rescue StandardError + return '' end + # decoded = Array [ {"data"=>"test"}, # payload + # {"alg"=>"HS256"} # header ] + decoded[0].to_json # get json payload end end diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index 507dfa68c..e58bcd3af 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -29,150 +29,148 @@ class << self @convert_timeout = ServiceConverter.config_manager.convertation_timeout @document_converter_url = ServiceConverter.config_manager.document_server_converter_uri.to_s - class << self - # get the url of the converted file - def get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_async, file_pass, lang = nil) - from_ext = File.extname(document_uri).downcase if from_ext.nil? # get the current document extension - - # get the current document name or uuid - title = File.basename(URI.parse(document_uri).path) - title = UUID.generate.to_s if title.nil? - - # get the document key - document_revision_id = document_uri if document_revision_id.empty? - document_revision_id = generate_revision_id(document_revision_id) - - payload = { # write all the conversion parameters to the payload - async: is_async ? true : false, - url: document_uri, - outputtype: to_ext.delete('.'), - filetype: from_ext.delete('.'), - title:, - key: document_revision_id, - password: file_pass, - region: lang - } - - data = nil - begin - uri = URI.parse(@document_converter_url) # create the request url - http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server - - DocumentHelper.verify_ssl(@document_converter_url, http) - - http.read_timeout = @convert_timeout - http.open_timeout = 5 - req = Net::HTTP::Post.new(uri.request_uri) # create the post request - req.add_field('Accept', 'application/json') # set headers - req.add_field('Content-Type', 'application/json') - - if JwtHelper.enabled? && JwtHelper.use_for_request # if the signature is enabled - payload['token'] = JwtHelper.encode(payload) # get token and save it to the payload - jwt_header = ServiceConverter.config_manager.jwt_header; # get signature authorization header - # set it to the request with the Bearer prefix - req.add_field(jwt_header, "Bearer #{JwtHelper.encode({ payload: })}") - end - - req.body = payload.to_json - res = http.request(req) # get the response - - status_code = Integer(res.code, 10) - raise("Conversion service returned status: #{status_code}") if status_code != 200 # checking status code - - data = res.body # and take its body - rescue Timeout::Error - # try again - rescue StandardError => e - raise(e.message) + # get the url of the converted file + def self.get_converted_data(document_uri, from_ext, to_ext, document_revision_id, is_async, file_pass, lang = nil) + from_ext = File.extname(document_uri).downcase if from_ext.nil? # get the current document extension + + # get the current document name or uuid + title = File.basename(URI.parse(document_uri).path) + title = UUID.generate.to_s if title.nil? + + # get the document key + document_revision_id = document_uri if document_revision_id.empty? + document_revision_id = generate_revision_id(document_revision_id) + + payload = { # write all the conversion parameters to the payload + async: is_async ? true : false, + url: document_uri, + outputtype: to_ext.delete('.'), + filetype: from_ext.delete('.'), + title:, + key: document_revision_id, + password: file_pass, + region: lang + } + + data = nil + begin + uri = URI.parse(@document_converter_url) # create the request url + http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server + + DocumentHelper.verify_ssl(@document_converter_url, http) + + http.read_timeout = @convert_timeout + http.open_timeout = 5 + req = Net::HTTP::Post.new(uri.request_uri) # create the post request + req.add_field('Accept', 'application/json') # set headers + req.add_field('Content-Type', 'application/json') + + if JwtHelper.enabled? && JwtHelper.use_for_request # if the signature is enabled + payload['token'] = JwtHelper.encode(payload) # get token and save it to the payload + jwt_header = ServiceConverter.config_manager.jwt_header; # get signature authorization header + # set it to the request with the Bearer prefix + req.add_field(jwt_header, "Bearer #{JwtHelper.encode({ payload: })}") end - json_data = JSON.parse(data) # parse response body - get_response_data(json_data) # get response url + req.body = payload.to_json + res = http.request(req) # get the response + + status_code = Integer(res.code, 10) + raise("Conversion service returned status: #{status_code}") if status_code != 200 # checking status code + + data = res.body # and take its body + rescue Timeout::Error + # try again + rescue StandardError => e + raise(e.message) end - # generate the document key value - def generate_revision_id(expected_key) - require('zlib') + json_data = JSON.parse(data) # parse response body + get_response_data(json_data) # get response url + end - if expected_key.length > 20 # check if the expected key length is greater than 20 - # calculate 32-bit crc value from the expected key and turn it into the string - expected_key = Zlib.crc32(expected_key).to_s - end + # generate the document key value + def self.generate_revision_id(expected_key) + require('zlib') - key = expected_key.gsub(/[^0-9a-zA-Z.=]/, '_') - key[(key.length - [key.length, 20].min)..key.length] # the resulting key is of the length 20 or less + if expected_key.length > 20 # check if the expected key length is greater than 20 + # calculate 32-bit crc value from the expected key and turn it into the string + expected_key = Zlib.crc32(expected_key).to_s end - # create an error message for the error code - def process_convert_service_responce_error(error_code) - error_message = 'unknown error' - - # add an error message to the error message template depending on the error code - case error_code - when -8 - error_message = 'Error occurred in the ConvertService.ashx: Error document VKey' - when -7 - error_message = 'Error occurred in the ConvertService.ashx: Error document request' - when -6 - error_message = 'Error occurred in the ConvertService.ashx: Error database' - when -5 - error_message = 'Error occurred in the ConvertService.ashx: Incorrect password' - when -4 - error_message = 'Error occurred in the ConvertService.ashx: Error download error' - when -3 - error_message = 'Error occurred in the ConvertService.ashx: Error convertation error' - when -2 - error_message = 'Error occurred in the ConvertService.ashx: Error convertation timeout' - when -1 - error_message = 'Error occurred in the ConvertService.ashx: Error convertation unknown' - when 0 - # public const int c_nErrorNo = 0 - else - error_message = "ErrorCode = #{error_code}" # default value for the error message - end + key = expected_key.gsub(/[^0-9a-zA-Z.=]/, '_') + key[(key.length - [key.length, 20].min)..key.length] # the resulting key is of the length 20 or less + end - raise(error_message) + # create an error message for the error code + def self.process_convert_service_responce_error(error_code) + error_message = 'unknown error' + + # add an error message to the error message template depending on the error code + case error_code + when -8 + error_message = 'Error occurred in the ConvertService.ashx: Error document VKey' + when -7 + error_message = 'Error occurred in the ConvertService.ashx: Error document request' + when -6 + error_message = 'Error occurred in the ConvertService.ashx: Error database' + when -5 + error_message = 'Error occurred in the ConvertService.ashx: Incorrect password' + when -4 + error_message = 'Error occurred in the ConvertService.ashx: Error download error' + when -3 + error_message = 'Error occurred in the ConvertService.ashx: Error convertation error' + when -2 + error_message = 'Error occurred in the ConvertService.ashx: Error convertation timeout' + when -1 + error_message = 'Error occurred in the ConvertService.ashx: Error convertation unknown' + when 0 + # public const int c_nErrorNo = 0 + else + error_message = "ErrorCode = #{error_code}" # default value for the error message end - # get the response url - def get_response_data(json_data) - file_result = json_data + raise(error_message) + end - error_element = file_result['error'] - unless error_element.nil? # if an error occurs - process_convert_service_responce_error(Integer(error_element, 10)) # get an error message - end + # get the response url + def self.get_response_data(json_data) + file_result = json_data - is_end_convert = file_result['endConvert'] # check if the conversion is completed + error_element = file_result['error'] + unless error_element.nil? # if an error occurs + process_convert_service_responce_error(Integer(error_element, 10)) # get an error message + end - result_percent = 0 # the conversion percentage - response_uri = '' - response_file_type = '' + is_end_convert = file_result['endConvert'] # check if the conversion is completed - if is_end_convert # if the conversion is completed + result_percent = 0 # the conversion percentage + response_uri = '' + response_file_type = '' - file_url_element = file_result['fileUrl'] - file_type_element = file_result['fileType'] + if is_end_convert # if the conversion is completed - if file_url_element.nil? # and the file url doesn't exist - raise('Invalid answer format') # get ann error message - end + file_url_element = file_result['fileUrl'] + file_type_element = file_result['fileType'] - response_uri = file_url_element # otherwise, get the file url - response_file_type = file_type_element # get the file type - result_percent = 100 + if file_url_element.nil? # and the file url doesn't exist + raise('Invalid answer format') # get ann error message + end - else # if the conversion isn't completed + response_uri = file_url_element # otherwise, get the file url + response_file_type = file_type_element # get the file type + result_percent = 100 - percent_element = file_result['percent'] # get the percentage value + else # if the conversion isn't completed - result_percent = Integer(percent_element, 10) unless percent_element.nil? + percent_element = file_result['percent'] # get the percentage value - result_percent = 99 if result_percent >= 100 + result_percent = Integer(percent_element, 10) unless percent_element.nil? - end + result_percent = 99 if result_percent >= 100 - [result_percent, response_uri, response_file_type] end + + [result_percent, response_uri, response_file_type] end end diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 592e4de9d..2497a4c60 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -32,301 +32,299 @@ class << self @document_command_url = TrackHelper.config_manager.document_server_command_uri.to_s - class << self - # read the request body - def read_body(request) - body = request.body.read - - return '' if body.nil? || body.empty? - - file_data = JSON.parse(body) # parse file data - - # check if a secret key to generate token exists or not - if JwtHelper.enabled? && JwtHelper.use_for_request - in_header = false - token = nil - jwt_header = TrackHelper.config_manager.jwt_header; # get the authorization header from the config - if file_data['token'] # if the token is in the body - token = JwtHelper.decode(file_data['token']) # decode a token into a payload object using a secret key - elsif request.headers[jwt_header] # if the token is in the header - hdr = request.headers[jwt_header] - hdr.slice!(0, 'Bearer '.length) # get token from it (after Bearer prefix) - token = JwtHelper.decode(hdr) # decode a token into a payload object using a secret key - in_header = true - else - raise('Expected JWT') # token missing error message - end + # read the request body + def self.read_body(request) + body = request.body.read + + return '' if body.nil? || body.empty? + + file_data = JSON.parse(body) # parse file data + + # check if a secret key to generate token exists or not + if JwtHelper.enabled? && JwtHelper.use_for_request + in_header = false + token = nil + jwt_header = TrackHelper.config_manager.jwt_header; # get the authorization header from the config + if file_data['token'] # if the token is in the body + token = JwtHelper.decode(file_data['token']) # decode a token into a payload object using a secret key + elsif request.headers[jwt_header] # if the token is in the header + hdr = request.headers[jwt_header] + hdr.slice!(0, 'Bearer '.length) # get token from it (after Bearer prefix) + token = JwtHelper.decode(hdr) # decode a token into a payload object using a secret key + in_header = true + else + raise('Expected JWT') # token missing error message + end - raise('Invalid JWT signature') if !token || token.eql?('') + raise('Invalid JWT signature') if !token || token.eql?('') - file_data = JSON.parse(token) + file_data = JSON.parse(token) - file_data = file_data['payload'] if in_header - end + file_data = file_data['payload'] if in_header + end + + file_data + end + + def self.resolve_process_save_body(body) + copied = body.dup - file_data + url = copied['url'] + if url + uri = URI(url) + resolved_uri = TrackHelper.proxy_manager.resolve_uri(uri) + copied['url'] = resolved_uri.to_s end - def resolve_process_save_body(body) - copied = body.dup + changesurl = copied['changesurl'] + if changesurl + uri = URI(changesurl) + resolved_uri = TrackHelper.proxy_manager.resolve_uri(uri) + copied['changesurl'] = resolved_uri.to_s + end - url = copied['url'] - if url - uri = URI(url) - resolved_uri = TrackHelper.proxy_manager.resolve_uri(uri) - copied['url'] = resolved_uri.to_s - end + home = copied['home'] + copied['home'] = resolve_process_save_body(home) if home - changesurl = copied['changesurl'] - if changesurl - uri = URI(changesurl) - resolved_uri = TrackHelper.proxy_manager.resolve_uri(uri) - copied['changesurl'] = resolved_uri.to_s - end + copied + end - home = copied['home'] - copied['home'] = resolve_process_save_body(home) if home + # file saving process + def self.process_save(raw_file_data, file_name, user_address) + file_data = resolve_process_save_body(raw_file_data) - copied + download_uri = file_data['url'] + if download_uri.eql?(nil) + saved = 1 + return saved end - # file saving process - def process_save(raw_file_data, file_name, user_address) - file_data = resolve_process_save_body(raw_file_data) + new_file_name = file_name + download_ext = ".#{file_data['filetype']}" # get the extension of the downloaded file - download_uri = file_data['url'] - if download_uri.eql?(nil) - saved = 1 - return saved - end + cur_ext = File.extname(file_name).downcase # get current file extension - new_file_name = file_name - download_ext = ".#{file_data['filetype']}" # get the extension of the downloaded file - - cur_ext = File.extname(file_name).downcase # get current file extension - - # convert downloaded file to the file with the current extension if these extensions aren't equal - unless cur_ext.eql?(download_ext) - key = ServiceConverter.generate_revision_id(download_uri) # get the document key - begin - _, new_file_uri, = ServiceConverter.get_converted_data( - download_uri, - download_ext.delete('.'), - cur_ext.delete('.'), - key, - false, - nil - ) # get the url of the converted file - if new_file_uri.nil? || new_file_uri.empty? - new_file_name = DocumentHelper.get_correct_name( - File.basename(file_name, cur_ext) + download_ext, - user_address - ) # get the correct file name if it already exists - else - download_uri = new_file_uri - end - rescue StandardError + # convert downloaded file to the file with the current extension if these extensions aren't equal + unless cur_ext.eql?(download_ext) + key = ServiceConverter.generate_revision_id(download_uri) # get the document key + begin + _, new_file_uri, = ServiceConverter.get_converted_data( + download_uri, + download_ext.delete('.'), + cur_ext.delete('.'), + key, + false, + nil + ) # get the url of the converted file + if new_file_uri.nil? || new_file_uri.empty? new_file_name = DocumentHelper.get_correct_name( File.basename(file_name, cur_ext) + download_ext, user_address -) + ) # get the correct file name if it already exists + else + download_uri = new_file_uri end + rescue StandardError + new_file_name = DocumentHelper.get_correct_name( + File.basename(file_name, cur_ext) + download_ext, + user_address +) end + end - saved = 1 + saved = 1 - data = download_file(download_uri) # download document file - return saved if data.eql?(nil) + data = download_file(download_uri) # download document file + return saved if data.eql?(nil) - begin - # get the storage directory of the new file - storage_path = DocumentHelper.storage_path(new_file_name, user_address) + begin + # get the storage directory of the new file + storage_path = DocumentHelper.storage_path(new_file_name, user_address) - hist_dir = DocumentHelper.history_dir(storage_path) # get the history directory of the new file - # get the path to the specified file version - ver_dir = DocumentHelper.version_dir(hist_dir, DocumentHelper.get_file_version(hist_dir)) + hist_dir = DocumentHelper.history_dir(storage_path) # get the history directory of the new file + # get the path to the specified file version + ver_dir = DocumentHelper.version_dir(hist_dir, DocumentHelper.get_file_version(hist_dir)) - FileUtils.mkdir_p(ver_dir) # create the version directory if doesn't exist + FileUtils.mkdir_p(ver_dir) # create the version directory if doesn't exist - # move the file from the storage directory to the previous file version directory - FileUtils.move(DocumentHelper.storage_path(file_name, user_address), File.join(ver_dir, "prev#{cur_ext}")) + # move the file from the storage directory to the previous file version directory + FileUtils.move(DocumentHelper.storage_path(file_name, user_address), File.join(ver_dir, "prev#{cur_ext}")) - save_file(data, storage_path) # save the downloaded file to the storage directory + save_file(data, storage_path) # save the downloaded file to the storage directory - change_data = download_file(file_data['changesurl']) # download file with document versions differences - save_file(change_data, File.join(ver_dir, 'diff.zip')) # save file with document versions differences + change_data = download_file(file_data['changesurl']) # download file with document versions differences + save_file(change_data, File.join(ver_dir, 'diff.zip')) # save file with document versions differences - hist_data = file_data['changeshistory'] - hist_data ||= file_data['history'].to_json - if hist_data - File.binwrite(File.join(ver_dir, 'changes.json'), hist_data) - end + hist_data = file_data['changeshistory'] + hist_data ||= file_data['history'].to_json + if hist_data + File.binwrite(File.join(ver_dir, 'changes.json'), hist_data) + end - # write the key value to the key.txt file - File.binwrite(File.join(ver_dir, 'key.txt'), file_data['key']) + # write the key value to the key.txt file + File.binwrite(File.join(ver_dir, 'key.txt'), file_data['key']) - # get the path to the forcesaved file - forcesave_path = DocumentHelper.forcesave_path(new_file_name, user_address, false) - unless forcesave_path.eql?('') # if this path is empty - File.delete(forcesave_path) # remove it - end - - saved = 0 - rescue StandardError - saved = 1 + # get the path to the forcesaved file + forcesave_path = DocumentHelper.forcesave_path(new_file_name, user_address, false) + unless forcesave_path.eql?('') # if this path is empty + File.delete(forcesave_path) # remove it end - saved + saved = 0 + rescue StandardError + saved = 1 end - # file force saving process - def process_force_save(file_data, file_name, user_address) - download_uri = file_data['url'] - if download_uri.eql?(nil) - saved = 1 - return saved - end + saved + end + + # file force saving process + def self.process_force_save(file_data, file_name, user_address) + download_uri = file_data['url'] + if download_uri.eql?(nil) + saved = 1 + return saved + end - download_ext = ".#{file_data['filetype']}" # get the extension of the downloaded file - - cur_ext = File.extname(file_name).downcase # get current file extension - - new_file_name = false - - # convert downloaded file to the file with the current extension if these extensions aren't equal - unless cur_ext.eql?(download_ext) - key = ServiceConverter.generate_revision_id(download_uri) # get the document key - begin - _, new_file_uri, = ServiceConverter.get_converted_data( - download_uri, - download_ext.delete('.'), - cur_ext.delete('.'), - key, - false, - nil - ) # get the url of the converted file - if new_file_uri.nil? || new_file_uri.empty? - new_file_name = true - else - download_uri = new_file_uri - end - rescue StandardError + download_ext = ".#{file_data['filetype']}" # get the extension of the downloaded file + + cur_ext = File.extname(file_name).downcase # get current file extension + + new_file_name = false + + # convert downloaded file to the file with the current extension if these extensions aren't equal + unless cur_ext.eql?(download_ext) + key = ServiceConverter.generate_revision_id(download_uri) # get the document key + begin + _, new_file_uri, = ServiceConverter.get_converted_data( + download_uri, + download_ext.delete('.'), + cur_ext.delete('.'), + key, + false, + nil + ) # get the url of the converted file + if new_file_uri.nil? || new_file_uri.empty? new_file_name = true + else + download_uri = new_file_uri end + rescue StandardError + new_file_name = true end + end - saved = 1 + saved = 1 - data = download_file(download_uri) # download document file - return saved if data.eql?(nil) + data = download_file(download_uri) # download document file + return saved if data.eql?(nil) - begin - # check if the forcesave type is equal to 3 (the form was submitted) - is_submit_form = Integer(file_data['forcesavetype'], 10) == 3 - - if is_submit_form - file_name = if new_file_name - DocumentHelper.get_correct_name( - "#{File.basename(file_name, cur_ext)}-form#{download_ext}", - user_address + begin + # check if the forcesave type is equal to 3 (the form was submitted) + is_submit_form = Integer(file_data['forcesavetype'], 10) == 3 + + if is_submit_form + file_name = if new_file_name + DocumentHelper.get_correct_name( + "#{File.basename(file_name, cur_ext)}-form#{download_ext}", + user_address ) # get the correct file name if it already exists - else - DocumentHelper.get_correct_name( - "#{File.basename(file_name, cur_ext)}-form#{cur_ext}", - user_address + else + DocumentHelper.get_correct_name( + "#{File.basename(file_name, cur_ext)}-form#{cur_ext}", + user_address ) - end - forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file - else - if new_file_name - file_name = DocumentHelper.get_correct_name( - File.basename(file_name, cur_ext) + download_ext, - user_address + end + forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file + else + if new_file_name + file_name = DocumentHelper.get_correct_name( + File.basename(file_name, cur_ext) + download_ext, + user_address ) - end - forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, false) - if forcesave_path.eql?('') - # if the path to the new file doesn't exist, create it - forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, true) - end end - - save_file(data, forcesave_path) # save the downloaded file to the storage directory - - if is_submit_form - uid = file_data['actions'][0]['userid'] - # create file meta information with the Filling form tag instead of user name - DocumentHelper.create_meta(file_name, uid, 'Filling Form', user_address) + forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, false) + if forcesave_path.eql?('') + # if the path to the new file doesn't exist, create it + forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, true) end + end - saved = 0 - rescue StandardError - saved = 1 + save_file(data, forcesave_path) # save the downloaded file to the storage directory + + if is_submit_form + uid = file_data['actions'][0]['userid'] + # create file meta information with the Filling form tag instead of user name + DocumentHelper.create_meta(file_name, uid, 'Filling Form', user_address) end - saved + saved = 0 + rescue StandardError + saved = 1 end - # send the command request - def command_request(method, key, meta = nil) - # create a payload object with the method and key - payload = { - c: method, - key: - } + saved + end - payload.merge!({ meta: }) unless meta.nil? + # send the command request + def self.command_request(method, key, meta = nil) + # create a payload object with the method and key + payload = { + c: method, + key: + } - data = nil - begin - uri = URI.parse(@document_command_url) # parse the document command url - http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server + payload.merge!({ meta: }) unless meta.nil? - DocumentHelper.verify_ssl(@document_command_url, http) + data = nil + begin + uri = URI.parse(@document_command_url) # parse the document command url + http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server - req = Net::HTTP::Post.new(uri.request_uri) # create the post request - req.add_field('Content-Type', 'application/json') # set headers + DocumentHelper.verify_ssl(@document_command_url, http) - if JwtHelper.enabled? && JwtHelper.use_for_request # if the signature is enabled - payload['token'] = JwtHelper.encode(payload) # get token and save it to the payload - jwt_header = TrackHelper.config_manager.jwt_header; # get signature authorization header - # set it to the request with the Bearer prefix - req.add_field(jwt_header, "Bearer #{JwtHelper.encode({ payload: })}") - end + req = Net::HTTP::Post.new(uri.request_uri) # create the post request + req.add_field('Content-Type', 'application/json') # set headers - req.body = payload.to_json # convert the payload object into the json format - res = http.request(req) # get the response - data = res.body # and take its body - rescue StandardError => e - raise(e.message) + if JwtHelper.enabled? && JwtHelper.use_for_request # if the signature is enabled + payload['token'] = JwtHelper.encode(payload) # get token and save it to the payload + jwt_header = TrackHelper.config_manager.jwt_header; # get signature authorization header + # set it to the request with the Bearer prefix + req.add_field(jwt_header, "Bearer #{JwtHelper.encode({ payload: })}") end - JSON.parse(data) # convert the response body into the json format + req.body = payload.to_json # convert the payload object into the json format + res = http.request(req) # get the response + data = res.body # and take its body + rescue StandardError => e + raise(e.message) end - # save file from the url - def download_file(uristr) - uri = URI.parse(uristr) # parse the url string - http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server - http.open_timeout = 5 + JSON.parse(data) # convert the response body into the json format + end - DocumentHelper.verify_ssl(uristr, http) + # save file from the url + def self.download_file(uristr) + uri = URI.parse(uristr) # parse the url string + http = Net::HTTP.new(uri.host, uri.port) # create a connection to the http server + http.open_timeout = 5 - req = Net::HTTP::Get.new(uri) - res = http.request(req) # get the response + DocumentHelper.verify_ssl(uristr, http) - status_code = res.code - raise("Document editing service returned status: #{status_code}") if status_code != '200' # checking status code + req = Net::HTTP::Get.new(uri) + res = http.request(req) # get the response - data = res.body # and take its body + status_code = res.code + raise("Document editing service returned status: #{status_code}") if status_code != '200' # checking status code - raise('stream is null') if data.nil? + data = res.body # and take its body - data - end + raise('stream is null') if data.nil? - def save_file(data, path) - File.binwrite(path, data) - end + data + end + + def self.save_file(data, path) + File.binwrite(path, data) end end diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 9a8ae5cc3..20549a773 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -176,37 +176,35 @@ class Users ) ] - class << self - def all_users - @users - end + def self.all_users + @users + end - # get a user by id specified - def get_user(id) - @users.each do |user| - return user if user.id.eql?(id) - end - @users[0] + # get a user by id specified + def self.get_user(id) + @users.each do |user| + return user if user.id.eql?(id) end + @users[0] + end - # get a list of users with their names and emails for mentions - def get_users_for_mentions(id) - users_data = [] - @users.each do |user| - if !user.id.eql?(id) && !user.name.nil? && !user.email.nil? - users_data.push({ name: user.name, email: user.email }) - end + # get a list of users with their names and emails for mentions + def self.get_users_for_mentions(id) + users_data = [] + @users.each do |user| + if !user.id.eql?(id) && !user.name.nil? && !user.email.nil? + users_data.push({ name: user.name, email: user.email }) end - users_data end + users_data + end - # get a list of users with their id, names and emails for protect - def get_users_for_protect(id) - users_data = [] - @users.each do |user| - users_data.push({ id: user.id, name: user.name, email: user.email }) if !user.id.eql?(id) && !user.name.nil? - end - users_data + # get a list of users with their id, names and emails for protect + def self.get_users_for_protect(id) + users_data = [] + @users.each do |user| + users_data.push({ id: user.id, name: user.name, email: user.email }) if !user.id.eql?(id) && !user.name.nil? end + users_data end end From 4577861f8b3537a5ce3e48b92195845fe8d4faa4 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:48:42 +0300 Subject: [PATCH 379/488] ruby: Layout/ClosingParenthesisIndentation correct --- web/documentserver-example/ruby/app/models/file_model.rb | 4 ++-- .../ruby/app/models/track_helper.rb | 8 ++++---- web/documentserver-example/ruby/app/models/users.rb | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index fb4fd5a1b..df823ea63 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -54,7 +54,7 @@ def file_uri_user DocumentHelper.get_file_uri( @file_name, false -) + ) end end @@ -260,7 +260,7 @@ def history i, "prev#{file_ext}", false -) + ) end end data_obj['version'] = i diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 2497a4c60..7f839f4e8 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -128,7 +128,7 @@ def self.process_save(raw_file_data, file_name, user_address) new_file_name = DocumentHelper.get_correct_name( File.basename(file_name, cur_ext) + download_ext, user_address -) + ) end end @@ -228,12 +228,12 @@ def self.process_force_save(file_data, file_name, user_address) DocumentHelper.get_correct_name( "#{File.basename(file_name, cur_ext)}-form#{download_ext}", user_address -) # get the correct file name if it already exists + ) # get the correct file name if it already exists else DocumentHelper.get_correct_name( "#{File.basename(file_name, cur_ext)}-form#{cur_ext}", user_address -) + ) end forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file else @@ -241,7 +241,7 @@ def self.process_force_save(file_data, file_name, user_address) file_name = DocumentHelper.get_correct_name( File.basename(file_name, cur_ext) + download_ext, user_address -) + ) end forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, false) if forcesave_path.eql?('') diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 20549a773..5847d6e04 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -123,7 +123,7 @@ class Users @descr_user_first, true, true -), + ), User.new( 'uid-2', 'Mark Pottato', @@ -141,7 +141,7 @@ class Users @descr_user_second, false, true -), + ), User.new( 'uid-3', 'Hamish Mitchell', @@ -159,7 +159,7 @@ class Users @descr_user_third, false, false -), + ), User.new( 'uid-0', nil, @@ -173,7 +173,7 @@ class Users @descr_user_null, false, false -) + ) ] def self.all_users From 066de3359d5d536e3f4a6ea2dcac069bdcf05b00 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:49:06 +0300 Subject: [PATCH 380/488] ruby: Layout/ExtraSpacing correct --- .../ruby/app/models/service_converter.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index e58bcd3af..43c1d94d5 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -154,10 +154,10 @@ def self.get_response_data(json_data) file_type_element = file_result['fileType'] if file_url_element.nil? # and the file url doesn't exist - raise('Invalid answer format') # get ann error message + raise('Invalid answer format') # get ann error message end - response_uri = file_url_element # otherwise, get the file url + response_uri = file_url_element # otherwise, get the file url response_file_type = file_type_element # get the file type result_percent = 100 From 4ff7b6e543566fa8ee2a7ec518c96f8c620a924f Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:49:36 +0300 Subject: [PATCH 381/488] ruby: Layout/IndentationWidth correct --- .../ruby/app/models/file_model.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index df823ea63..4e3182214 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -284,12 +284,12 @@ def history # write key and url information about previous file version with optional direct url data( obj['previous'] = if enable_direct_url? == true - { # write key and url information about previous file version with optional directUrl - fileType: prev['fileType'], - key: prev['key'], - url: prev['url'], - directUrl: prev['directUrl'] - } + { # write key and url information about previous file version with optional directUrl + fileType: prev['fileType'], + key: prev['key'], + url: prev['url'], + directUrl: prev['directUrl'] + } else { fileType: prev['fileType'], From d613a0206859b128e4e689684378222eec0610fb Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:50:13 +0300 Subject: [PATCH 382/488] ruby: Layout/FirstHashElementLineBreak correct --- web/documentserver-example/ruby/app/models/file_model.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 4e3182214..ec34f18d6 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -149,7 +149,8 @@ def config referenceData: { instanceId: DocumentHelper.get_server_url(false), fileKey: unless @user.id.eql?('uid-0') - { fileName: @file_name, + { +fileName: @file_name, userAddress: DocumentHelper.cur_user_host_address(nil) }.to_json end } From d4b2bf95bc70fb898f2b12bf08e2e7690ad65013 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:50:33 +0300 Subject: [PATCH 383/488] ruby: Layout/LineContinuationSpacing correct --- web/documentserver-example/ruby/app/models/document_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 765eaafa4..12a9a94ed 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -220,8 +220,8 @@ def self.get_file_uri(file_name, for_document_server) def self.get_historypath_uri(file_name, version, file, is_server_url: true) # for redirection to my link user_host = is_server_url ? "&userAddress=#{cur_user_host_address(nil)}" : '' - "#{get_server_url(is_server_url)}/downloadhistory/?"\ - "fileName=#{ERB::Util.url_encode(file_name)}&ver=#{version}"\ + "#{get_server_url(is_server_url)}/downloadhistory/?" \ + "fileName=#{ERB::Util.url_encode(file_name)}&ver=#{version}" \ "&file=#{ERB::Util.url_encode(file)}#{user_host}" end From 10e1848beb1418c5cfd08471e5a81d79989c6090 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:50:59 +0300 Subject: [PATCH 384/488] ruby: Style/AccessorGrouping correct --- .../ruby/app/models/document_helper.rb | 3 ++- .../ruby/app/models/file_model.rb | 9 ++++++- .../ruby/app/models/track_helper.rb | 3 ++- .../ruby/app/models/users.rb | 24 +++++++++---------- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 12a9a94ed..7f7311e64 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -25,7 +25,8 @@ class DocumentHelper @format_manager = FormatManager.new class << self - attr_reader :config_manager, :format_manager + attr_reader :config_manager + attr_reader :format_manager end @runtime_cache = {} diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index ec34f18d6..0400d5dd5 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -20,7 +20,14 @@ # Class for handling file-related operations and information. class FileModel - attr_accessor :file_name, :mode, :type, :user_ip, :lang, :user, :action_data, :direct_url + attr_accessor :file_name + attr_accessor :mode + attr_accessor :type + attr_accessor :user_ip + attr_accessor :lang + attr_accessor :user + attr_accessor :action_data + attr_accessor :direct_url attr_reader :config_manager # set file parameters diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 7f839f4e8..220d79072 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -27,7 +27,8 @@ class TrackHelper @proxy_manager = ProxyManager.new(config_manager: @config_manager) class << self - attr_reader :config_manager, :proxy_manager + attr_reader :config_manager + attr_reader :proxy_manager end @document_command_url = TrackHelper.config_manager.document_server_command_uri.to_s diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 5847d6e04..8a160e8b1 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -18,18 +18,18 @@ # Represents a user with various attributes class User - attr_accessor :id, - :name, - :email, - :group, - :review_groups, - :comment_groups, - :user_info_groups, - :favorite, - :denied_permissions, - :descriptions, - :templates, - :avatar + attr_accessor :id + attr_accessor :name + attr_accessor :email + attr_accessor :group + attr_accessor :review_groups + attr_accessor :comment_groups + attr_accessor :user_info_groups + attr_accessor :favorite + attr_accessor :denied_permissions + attr_accessor :descriptions + attr_accessor :templates + attr_accessor :avatar def initialize(id, name, From 97420e18cf7d326b865e40447fcd710365f0fee3 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:51:34 +0300 Subject: [PATCH 385/488] ruby: Style/AccessModifierDeclarations correct --- web/documentserver-example/ruby/app/format/format.rb | 5 ++--- web/documentserver-example/ruby/app/proxy/proxy.rb | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/web/documentserver-example/ruby/app/format/format.rb b/web/documentserver-example/ruby/app/format/format.rb index 03f1a04e4..378cfb7e8 100644 --- a/web/documentserver-example/ruby/app/format/format.rb +++ b/web/documentserver-example/ruby/app/format/format.rb @@ -146,15 +146,14 @@ def all end end - private sig { returns(Pathname) } - def file + private def file directory.join('onlyoffice-docs-formats.json') end sig { returns(Pathname) } - def directory + private def directory current_directory = Pathname(T.must(__dir__)) directory = current_directory.join('..', '..', 'assets', 'document-formats') directory.cleanpath diff --git a/web/documentserver-example/ruby/app/proxy/proxy.rb b/web/documentserver-example/ruby/app/proxy/proxy.rb index 8fee7df38..1ddb1d1b7 100644 --- a/web/documentserver-example/ruby/app/proxy/proxy.rb +++ b/web/documentserver-example/ruby/app/proxy/proxy.rb @@ -37,10 +37,9 @@ def resolve_uri(uri) redirect_public_url(uri) end - private sig { params(uri: URI::Generic).returns(T::Boolean) } - def refer_public_url(uri) + private def refer_public_url(uri) public_uri = @config_manager.document_server_public_uri uri.scheme == public_uri.scheme && uri.host == public_uri.host && @@ -48,7 +47,7 @@ def refer_public_url(uri) end sig { params(uri: URI::Generic).returns(URI::Generic) } - def redirect_public_url(uri) + private def redirect_public_url(uri) private_uri = @config_manager.document_server_private_uri redirected_uri = uri redirected_uri.scheme = private_uri.scheme From 5148fd26013792f83f17e1f70be55e27a715320c Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:52:02 +0300 Subject: [PATCH 386/488] ruby: Layout/EmptyLines correct --- .../ruby/app/controllers/home_controller.rb | 2 -- web/documentserver-example/ruby/app/format/format.rb | 1 - web/documentserver-example/ruby/app/proxy/proxy.rb | 1 - 3 files changed, 4 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index b6d0ff158..6b8fb3635 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -242,11 +242,9 @@ def remove # if the file exists FileUtils.rm_f(storage_path) # delete it from the storage path - # if the history directory of this file exists FileUtils.rm_rf(hist_dir) # delete it - render(plain: '{"success":true}') # report that the operation is successful nil end diff --git a/web/documentserver-example/ruby/app/format/format.rb b/web/documentserver-example/ruby/app/format/format.rb index 378cfb7e8..cb242ca04 100644 --- a/web/documentserver-example/ruby/app/format/format.rb +++ b/web/documentserver-example/ruby/app/format/format.rb @@ -146,7 +146,6 @@ def all end end - sig { returns(Pathname) } private def file directory.join('onlyoffice-docs-formats.json') diff --git a/web/documentserver-example/ruby/app/proxy/proxy.rb b/web/documentserver-example/ruby/app/proxy/proxy.rb index 1ddb1d1b7..45f3fca62 100644 --- a/web/documentserver-example/ruby/app/proxy/proxy.rb +++ b/web/documentserver-example/ruby/app/proxy/proxy.rb @@ -37,7 +37,6 @@ def resolve_uri(uri) redirect_public_url(uri) end - sig { params(uri: URI::Generic).returns(T::Boolean) } private def refer_public_url(uri) public_uri = @config_manager.document_server_public_uri From e0ed22d1f58e7ccf414c907e473bc8dc3ae86c54 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:52:31 +0300 Subject: [PATCH 387/488] ruby: Layout/FirstArgumentIndentation correct --- .../ruby/app/controllers/home_controller.rb | 16 +++++------ .../ruby/app/models/file_model.rb | 28 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 6b8fb3635..5369ecff9 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -488,18 +488,18 @@ def restore FileUtils.cp(recovery_file, source_file) render( -json: { - error: nil, - success: true -} + json: { + error: nil, + success: true + } ) rescue StandardError => e response.status = :internal_server_error render( -json: { - error: e.message, - success: false -} + json: { + error: e.message, + success: false + } ) end end diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 0400d5dd5..abbe058db 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -291,20 +291,20 @@ def history prev = hist_data[(i - 2).to_s] # get the history data from the previous file version # write key and url information about previous file version with optional direct url data( -obj['previous'] = if enable_direct_url? == true - { # write key and url information about previous file version with optional directUrl - fileType: prev['fileType'], - key: prev['key'], - url: prev['url'], - directUrl: prev['directUrl'] - } - else - { - fileType: prev['fileType'], - key: prev['key'], - url: prev['url'] - } - end + obj['previous'] = if enable_direct_url? == true + { # write key and url information about previous file version with optional directUrl + fileType: prev['fileType'], + key: prev['key'], + url: prev['url'], + directUrl: prev['directUrl'] + } + else + { + fileType: prev['fileType'], + key: prev['key'], + url: prev['url'] + } + end ) # write the path to the diff.zip archive with differences in this file version From 4ea23d16778ed97b96f757fc3738b983b078968e Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:54:00 +0300 Subject: [PATCH 388/488] ruby: Style/Lambda correct --- web/documentserver-example/ruby/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/ruby/Gemfile b/web/documentserver-example/ruby/Gemfile index 01162d9aa..26eb9a681 100644 --- a/web/documentserver-example/ruby/Gemfile +++ b/web/documentserver-example/ruby/Gemfile @@ -29,7 +29,7 @@ gem 'webrick', '~> 1.8' # # https://github.com/sorbet/sorbet/issues/4011 # https://github.com/sorbet/sorbet/issues/4119 -install_if -> { RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /x86_64/ } do +install_if lambda { RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /x86_64/ } do gem 'sorbet', '~> 0.5.10871', group: :development gem 'tapioca', '~> 0.11.6', group: :development end From 10b40423ad5e8cd3ecf49ea1c9cc106abdb6e690 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:54:30 +0300 Subject: [PATCH 389/488] ruby: Layout/CommentIndentation correct --- .../ruby/app/controllers/home_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 5369ecff9..f7fdc4f6d 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -239,10 +239,10 @@ def remove storage_path = DocumentHelper.storage_path(file_name, nil) hist_dir = DocumentHelper.history_dir(storage_path) - # if the file exists + # if the file exists FileUtils.rm_f(storage_path) # delete it from the storage path - # if the history directory of this file exists + # if the history directory of this file exists FileUtils.rm_rf(hist_dir) # delete it render(plain: '{"success":true}') # report that the operation is successful From a69f7f343ac497eb4277cd39dbd30a33e73a3229 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:54:56 +0300 Subject: [PATCH 390/488] ruby: Layout/HashAlignment correct --- .../ruby/app/controllers/home_controller.rb | 4 ++-- web/documentserver-example/ruby/app/models/file_model.rb | 2 +- web/documentserver-example/ruby/app/models/users.rb | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index f7fdc4f6d..45e07a53e 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -490,7 +490,7 @@ def restore render( json: { error: nil, - success: true + success: true } ) rescue StandardError => e @@ -498,7 +498,7 @@ def restore render( json: { error: e.message, - success: false + success: false } ) end diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index abbe058db..32e7d8569 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -158,7 +158,7 @@ def config fileKey: unless @user.id.eql?('uid-0') { fileName: @file_name, - userAddress: DocumentHelper.cur_user_host_address(nil) }.to_json +userAddress: DocumentHelper.cur_user_host_address(nil) }.to_json end } }, diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 8a160e8b1..4878c1137 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -132,8 +132,8 @@ class Users ['group-2', ''], { view: '', - edit: ['group-2', ''], - remove: ['group-2'] + edit: ['group-2', ''], + remove: ['group-2'] }, ['group-2', ''], true, @@ -150,8 +150,8 @@ class Users ['group-2'], { view: ['group-3', 'group-2'], - edit: ['group-2'], - remove: [] + edit: ['group-2'], + remove: [] }, ['group-2'], false, From d744bc2e2397e5bc0e7890384e4300851a5cca4f Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:55:19 +0300 Subject: [PATCH 391/488] ruby: Layout/ClosingParenthesisIndentation correct --- .../ruby/app/controllers/home_controller.rb | 4 ++-- web/documentserver-example/ruby/app/models/file_model.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 45e07a53e..b9d5629e6 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -492,7 +492,7 @@ def restore error: nil, success: true } -) + ) rescue StandardError => e response.status = :internal_server_error render( @@ -500,6 +500,6 @@ def restore error: e.message, success: false } -) + ) end end diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 32e7d8569..c55f7e38d 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -305,7 +305,7 @@ def history url: prev['url'] } end -) + ) # write the path to the diff.zip archive with differences in this file version data_obj['changesUrl'] = DocumentHelper.get_historypath_uri(file_name, i - 1, 'diff.zip') From 716d4dc694434ae0f8adf551f65423e6a8e2c155 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:55:58 +0300 Subject: [PATCH 392/488] ruby: Layout/FirstHashElementIndentation correct --- web/documentserver-example/ruby/app/models/file_model.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index c55f7e38d..895eeff95 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -157,7 +157,7 @@ def config instanceId: DocumentHelper.get_server_url(false), fileKey: unless @user.id.eql?('uid-0') { -fileName: @file_name, + fileName: @file_name, userAddress: DocumentHelper.cur_user_host_address(nil) }.to_json end } From 7197a216f8a95c30df9cea837e645d44229664fa Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:56:29 +0300 Subject: [PATCH 393/488] ruby: Layout/ParameterAlignment correct --- .../ruby/app/models/users.rb | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 4878c1137..116e5d447 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -32,17 +32,17 @@ class User attr_accessor :avatar def initialize(id, -name, -email, -group, -review_groups, -comment_groups, -user_info_groups, -favorite, + name, + email, + group, + review_groups, + comment_groups, + user_info_groups, + favorite, denied_permissions, -descriptions, -templates, -avatar) + descriptions, + templates, + avatar) @id = id @name = name @email = email From 0d3ed49adfc0096d7f20cebcceef5f1886439975 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:57:33 +0300 Subject: [PATCH 394/488] ruby: Layout/MultilineOperationIndentation correct --- web/documentserver-example/ruby/app/proxy/proxy.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/proxy/proxy.rb b/web/documentserver-example/ruby/app/proxy/proxy.rb index 45f3fca62..2e1a7a906 100644 --- a/web/documentserver-example/ruby/app/proxy/proxy.rb +++ b/web/documentserver-example/ruby/app/proxy/proxy.rb @@ -41,8 +41,8 @@ def resolve_uri(uri) private def refer_public_url(uri) public_uri = @config_manager.document_server_public_uri uri.scheme == public_uri.scheme && - uri.host == public_uri.host && - uri.port == public_uri.port + uri.host == public_uri.host && + uri.port == public_uri.port end sig { params(uri: URI::Generic).returns(URI::Generic) } From 63ec4db0b38c5c28a5eca9fed67163d9906cb10a Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 12:58:23 +0300 Subject: [PATCH 395/488] ruby: Lint/AmbiguousOperatorPrecedence correct --- web/documentserver-example/ruby/app/models/file_model.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 895eeff95..f053b21d9 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -101,7 +101,7 @@ def cur_user_host_address def config editors_mode = @mode || 'edit' # mode: view/edit/review/comment/fillForms/embedded can_edit = DocumentHelper.edited_exts.include?(file_ext) # check if the document can be edited - if (!can_edit && editors_mode.eql?('edit') || editors_mode.eql?('fillForms')) && + if ((!can_edit && editors_mode.eql?('edit')) || editors_mode.eql?('fillForms')) && DocumentHelper.fill_forms_exts.include?(file_ext) editors_mode = 'fillForms' can_edit = true From 5fd2878c3d9c9771bfbacf95a64dd7eccb39d729 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 13:00:04 +0300 Subject: [PATCH 396/488] ruby: Layout/FirstHashElementIndentation correct --- web/documentserver-example/ruby/app/models/file_model.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index f053b21d9..b4d432827 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -156,9 +156,10 @@ def config referenceData: { instanceId: DocumentHelper.get_server_url(false), fileKey: unless @user.id.eql?('uid-0') - { + { fileName: @file_name, -userAddress: DocumentHelper.cur_user_host_address(nil) }.to_json + userAddress: DocumentHelper.cur_user_host_address(nil) + }.to_json end } }, From 1e66124a8af848beaf65d704f98c6649633a0978 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 13:01:15 +0300 Subject: [PATCH 397/488] ruby: ElseAlignment correct --- .../ruby/app/models/file_model.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index b4d432827..948185aae 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -299,12 +299,12 @@ def history url: prev['url'], directUrl: prev['directUrl'] } - else - { - fileType: prev['fileType'], - key: prev['key'], - url: prev['url'] - } + else + { + fileType: prev['fileType'], + key: prev['key'], + url: prev['url'] + } end ) From d51dab82c59b10c7b9098939c66b33512456f008 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 13:01:55 +0300 Subject: [PATCH 398/488] ruby: Layout/EndAlignment correct --- web/documentserver-example/ruby/app/models/file_model.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 948185aae..904390f22 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -305,7 +305,7 @@ def history key: prev['key'], url: prev['url'] } - end + end ) # write the path to the diff.zip archive with differences in this file version From 4c9c79ae8e02e077fc991f7b847c6f068abad5f6 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 13:02:20 +0300 Subject: [PATCH 399/488] ruby: Layout/EmptyLinesAroundClassBody correct --- web/documentserver-example/ruby/app/models/file_utility.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/web/documentserver-example/ruby/app/models/file_utility.rb b/web/documentserver-example/ruby/app/models/file_utility.rb index e521aa22f..e9e09e6db 100644 --- a/web/documentserver-example/ruby/app/models/file_utility.rb +++ b/web/documentserver-example/ruby/app/models/file_utility.rb @@ -24,7 +24,6 @@ class FileUtility class << self attr_reader :format_manager - end def self.get_file_type(file_name) From e94d81e228eec611e3817f7fbf73ffa52e52e1ee Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 13:04:00 +0300 Subject: [PATCH 400/488] ruby: Layout/FirstMethodParameterLineBreak correct --- .../ruby/app/models/users.rb | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/users.rb b/web/documentserver-example/ruby/app/models/users.rb index 116e5d447..560153786 100644 --- a/web/documentserver-example/ruby/app/models/users.rb +++ b/web/documentserver-example/ruby/app/models/users.rb @@ -31,18 +31,20 @@ class User attr_accessor :templates attr_accessor :avatar - def initialize(id, - name, - email, - group, - review_groups, - comment_groups, - user_info_groups, - favorite, - denied_permissions, - descriptions, - templates, - avatar) + def initialize( + id, + name, + email, + group, + review_groups, + comment_groups, + user_info_groups, + favorite, + denied_permissions, + descriptions, + templates, + avatar + ) @id = id @name = name @email = email From 0c2a2713576cb8efa5b23bfdbf7a495c899cb97f Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 13:11:01 +0300 Subject: [PATCH 401/488] ruby: added rubocop configuration file --- web/documentserver-example/ruby/.rubocop.yml | 161 +++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 web/documentserver-example/ruby/.rubocop.yml diff --git a/web/documentserver-example/ruby/.rubocop.yml b/web/documentserver-example/ruby/.rubocop.yml new file mode 100644 index 000000000..f2e7b4c9b --- /dev/null +++ b/web/documentserver-example/ruby/.rubocop.yml @@ -0,0 +1,161 @@ +AllCops: + NewCops: enable + +# Bundler + +Bundler/GemVersion: + Enabled: true + EnforcedStyle: required + +# Layout + +Layout/EmptyComment: + Enabled: true + AllowBorderComment: false + AllowMarginComment: true + +Layout/EmptyLineAfterGuardClause: + Enabled: false + +Layout/EndOfLine: + Enabled: true + EnforcedStyle: lf + +Layout/FirstArrayElementLineBreak: + Enabled: true + AllowMultilineFinalElement: false + +Layout/FirstHashElementLineBreak: + Enabled: true + AllowMultilineFinalElement: false + +Layout/FirstMethodArgumentLineBreak: + Enabled: true + AllowMultilineFinalElement: false + +Layout/FirstMethodParameterLineBreak: + Enabled: true + AllowMultilineFinalElement: false + +Layout/LineLength: + Enabled: true + Max: 120 + +Layout/MultilineArrayLineBreaks: + Enabled: true + AllowMultilineFinalElement: false + +Layout/MultilineAssignmentLayout: + Enabled: true + EnforcedStyle: new_line + SupportedTypes: [] + +Layout/MultilineHashKeyLineBreaks: + Enabled: true + AllowMultilineFinalElement: false + +Layout/MultilineMethodArgumentLineBreaks: + Enabled: true + AllowMultilineFinalElement: false + +Layout/MultilineMethodParameterLineBreaks: + Enabled: true + AllowMultilineFinalElement: false + +Layout/SingleLineBlockChain: + Enabled: true + +# Lint + +Lint/NumberConversion: + Enabled: true + +Lint/DuplicateBranch: + Enabled: false + +# Metrics + +Metrics: + Enabled: false + +# Naming + +Naming/InclusiveLanguage: + Enabled: true + +# Style + +Style/AccessModifierDeclarations: + Enabled: true + EnforcedStyle: inline + +Style/AccessorGrouping: + Enabled: true + EnforcedStyle: separated + +Style/ArrayCoercion: + Enabled: true + +Style/ClassAndModuleChildren: + Enabled: true + EnforcedStyle: compact + +Style/ClassMethodsDefinitions: + Enabled: true + +Style/CollectionMethods: + Enabled: true + +Style/DateTime: + Enabled: true + +Style/EndlessMethod: + Enabled: true + EnforcedStyle: disallow + +Style/FrozenStringLiteralComment: + Enabled: true + EnforcedStyle: always + Exclude: + - "Gemfile" + +Style/IfUnlessModifier: + Enabled: false + +Style/Lambda: + Enabled: true + EnforcedStyle: lambda + +Style/MethodCallWithArgsParentheses: + Enabled: true + AllowedMethods: [] + AllowedPatterns: [] + +Style/MethodCalledOnDoEndBlock: + Enabled: true + +Style/MissingElse: + Enabled: true + EnforcedStyle: case + +Style/MultipleComparison: + Enabled: false + +Style/NumberedParameters: + Enabled: true + EnforcedStyle: disallow + +Style/ParenthesesAroundCondition: + Enabled: true + AllowInMultilineConditions: true + +Style/StringHashKeys: + Enabled: true + +Style/SymbolArray: + Enabled: true + EnforcedStyle: brackets + +Style/WordArray: + Enabled: true + EnforcedStyle: brackets From 40d1c0c03b031c07b9066645008a88dc3fce6de4 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Tue, 21 Nov 2023 14:20:35 +0700 Subject: [PATCH 402/488] python: getting storage path to file uri from config manager --- web/documentserver-example/python/manage.py | 1 - web/documentserver-example/python/src/utils/docManager.py | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/web/documentserver-example/python/manage.py b/web/documentserver-example/python/manage.py index 1cdf8f969..af8c700d6 100644 --- a/web/documentserver-example/python/manage.py +++ b/web/documentserver-example/python/manage.py @@ -51,7 +51,6 @@ def configuration(): 'SECRET_KEY': uuid1(), 'STATIC_ROOT': f'{static_root}', 'STATIC_URL': static_url, - 'STORAGE_FOLDER': '/storage/', 'TEMPLATES': [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', diff --git a/web/documentserver-example/python/src/utils/docManager.py b/web/documentserver-example/python/src/utils/docManager.py index 680d111f1..28dd1f68b 100755 --- a/web/documentserver-example/python/src/utils/docManager.py +++ b/web/documentserver-example/python/src/utils/docManager.py @@ -26,7 +26,6 @@ import requests import magic -from django.conf import settings from django.http import FileResponse from src.configuration import ConfigurationManager from src.format import FormatManager @@ -112,7 +111,7 @@ def getServerUrl(forDocumentServer, req): def getFileUri(filename, forDocumentServer, req): host = getServerUrl(forDocumentServer, req) curAdr = req.META['REMOTE_ADDR'] - return f'{host}{settings.STORAGE_FOLDER}{curAdr}/{filename}' + return f'{host}{config_manager.storage_path}{curAdr}/{filename}' # get absolute URL to the document storage service From 9389607aaf66bf8cd34db25084b6920b51af450d Mon Sep 17 00:00:00 2001 From: sshakndr Date: Tue, 21 Nov 2023 15:39:31 +0700 Subject: [PATCH 403/488] python: flake8 configuration file --- .github/workflows/lint-python.yml | 3 +-- web/documentserver-example/python/.flake8 | 4 ++++ web/documentserver-example/python/Makefile | 3 +-- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 web/documentserver-example/python/.flake8 diff --git a/.github/workflows/lint-python.yml b/.github/workflows/lint-python.yml index 756d0e89a..936407a3c 100644 --- a/.github/workflows/lint-python.yml +++ b/.github/workflows/lint-python.yml @@ -31,5 +31,4 @@ jobs: - name: Lint Flake8 run: | - flake8 --count --select=E9,F63,F7,F82 --show-source --statistics - flake8 --count --max-complexity=15 --max-line-length=120 --per-file-ignores="__init__.py:F4" --statistics + flake8 --count --show-source --statistics diff --git a/web/documentserver-example/python/.flake8 b/web/documentserver-example/python/.flake8 new file mode 100644 index 000000000..39193f07e --- /dev/null +++ b/web/documentserver-example/python/.flake8 @@ -0,0 +1,4 @@ +[flake8] +max-complexity = 15 +max-line-length = 120 +per-file-ignores = __init__.py:F4 \ No newline at end of file diff --git a/web/documentserver-example/python/Makefile b/web/documentserver-example/python/Makefile index 03a9c75df..21a227f0c 100644 --- a/web/documentserver-example/python/Makefile +++ b/web/documentserver-example/python/Makefile @@ -47,8 +47,7 @@ compose-prod: # Up containers in a production environment. .PHONY: lint lint: # Lint the source code for style and check for types. - @flake8 - @mypy . + @flake8 --count --show-source --statistics .PHONY: test test: # Recursively run the tests. From 2e69ba0d3fd4af75789d0edf5146379fdd3adc74 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 21 Nov 2023 12:58:17 +0300 Subject: [PATCH 404/488] python: fix lint --- web/documentserver-example/python/src/utils/trackManager.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/python/src/utils/trackManager.py b/web/documentserver-example/python/src/utils/trackManager.py index 6a6e12ddd..e218f73a1 100755 --- a/web/documentserver-example/python/src/utils/trackManager.py +++ b/web/documentserver-example/python/src/utils/trackManager.py @@ -170,10 +170,10 @@ def processForceSave(body, filename, usAddr): data_name = docManager.getCorrectName(fileUtils.getFileNameWithoutExt(filename) + ".txt", usAddr) data_path = docManager.getStoragePath(data_name, usAddr) - forms_data = docManager.downloadFileFromUri(forms_data_url); + forms_data = docManager.downloadFileFromUri(forms_data_url) if data is None: - raise Exception("Document editing service didn't return forms_data"); + raise Exception("Document editing service didn't return forms_data") else: with open(data_path, 'w') as file: file.write(forms_data.text) From 7ecbc6d458d24771a99bad8f2a6d867b0925f0d3 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Thu, 9 Nov 2023 09:55:15 +0300 Subject: [PATCH 405/488] csharp: replace the previous implementation of formats --- .../csharp/Default.aspx.cs | 56 +++---------------- .../csharp/OnlineEditorsExample.csproj | 29 ++++++---- .../csharp/settings.config | 4 -- 3 files changed, 26 insertions(+), 63 deletions(-) diff --git a/web/documentserver-example/csharp/Default.aspx.cs b/web/documentserver-example/csharp/Default.aspx.cs index eabac5f88..3602303c4 100644 --- a/web/documentserver-example/csharp/Default.aspx.cs +++ b/web/documentserver-example/csharp/Default.aspx.cs @@ -30,46 +30,6 @@ namespace OnlineEditorsExample { - internal static class FileType - { - // the spreadsheet extension list - public static readonly List ExtsSpreadsheet = new List - { - ".xls", ".xlsx", ".xlsm", ".xlsb", - ".xlt", ".xltx", ".xltm", - ".ods", ".fods", ".ots", ".csv" - }; - - // the presentation extension list - public static readonly List ExtsPresentation = new List - { - ".pps", ".ppsx", ".ppsm", - ".ppt", ".pptx", ".pptm", - ".pot", ".potx", ".potm", - ".odp", ".fodp", ".otp" - }; - - // the document extension list - public static readonly List ExtsDocument = new List - { - ".doc", ".docx", ".docm", - ".dot", ".dotx", ".dotm", - ".odt", ".fodt", ".ott", ".rtf", ".txt", - ".html", ".htm", ".mht", ".xml", - ".pdf", ".djvu", ".fb2", ".epub", ".xps", ".oxps", ".oform" - }; - - // get an internal file extension - public static string GetInternalExtension(string extension) - { - extension = Path.GetExtension(extension).ToLower(); // get file extension - if (ExtsDocument.Contains(extension)) return ".docx"; // .docx for text document extensions - if (ExtsSpreadsheet.Contains(extension)) return ".xlsx"; // .xlsx for spreadsheet extensions - if (ExtsPresentation.Contains(extension)) return ".pptx"; // .pptx for presentation extensions - return string.Empty; - } - } - public partial class _Default : Page { @@ -115,24 +75,24 @@ private static List FileExts // file extensions that can be viewed private static List ViewedExts { - get { return (WebConfigurationManager.AppSettings["files.docservice.viewed-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); } + get { return FormatManager.ViewableExtensions(); } } - + public static List FillFormsExts { - get { return (WebConfigurationManager.AppSettings["files.docservice.fillform-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); } + get { return FormatManager.FillableExtensions(); } } // file extensions that can be edited public static List EditedExts { - get { return (WebConfigurationManager.AppSettings["files.docservice.edited-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); } + get { return FormatManager.EditableExtensions(); } } // file extensions that can be converted public static List ConvertExts { - get { return (WebConfigurationManager.AppSettings["files.docservice.convert-docs"] ?? "").Split(new char[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); } + get { return FormatManager.ConvertibleExtensions(); } } private static string _fileName; @@ -284,9 +244,9 @@ public static string DocumentType(string fileName) { var ext = Path.GetExtension(fileName).ToLower(); - if (FileType.ExtsDocument.Contains(ext)) return "word"; // word for text document extensions - if (FileType.ExtsSpreadsheet.Contains(ext)) return "cell"; // cell for spreadsheet extensions - if (FileType.ExtsPresentation.Contains(ext)) return "slide"; // slide for presentation extensions + if (FormatManager.DocumentExtensions().Contains(ext)) return "word"; // word for text document extensions + if (FormatManager.SpreadsheetExtensions().Contains(ext)) return "cell"; // cell for spreadsheet extensions + if (FormatManager.PresentationExtensions().Contains(ext)) return "slide"; // slide for presentation extensions return "word"; // the default document type is word } diff --git a/web/documentserver-example/csharp/OnlineEditorsExample.csproj b/web/documentserver-example/csharp/OnlineEditorsExample.csproj index 660be8620..2206a4696 100644 --- a/web/documentserver-example/csharp/OnlineEditorsExample.csproj +++ b/web/documentserver-example/csharp/OnlineEditorsExample.csproj @@ -119,6 +119,7 @@ DocEditor.aspx + @@ -157,17 +158,23 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/web/documentserver-example/csharp/settings.config b/web/documentserver-example/csharp/settings.config index a827d70ff..8715147e8 100644 --- a/web/documentserver-example/csharp/settings.config +++ b/web/documentserver-example/csharp/settings.config @@ -7,10 +7,6 @@ - - - - From c2466ddebe4bd1073a3ffeb47930e50a529bfa94 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 21 Nov 2023 14:20:37 +0300 Subject: [PATCH 406/488] csharp: added format caching --- .../csharp/FormatManager.cs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/web/documentserver-example/csharp/FormatManager.cs b/web/documentserver-example/csharp/FormatManager.cs index 37d2df5c6..f5eba7c28 100644 --- a/web/documentserver-example/csharp/FormatManager.cs +++ b/web/documentserver-example/csharp/FormatManager.cs @@ -50,6 +50,8 @@ public string Extension() public class FormatManager { + private static List cachedFormats; + public static List FillableExtensions() { return Fillable() @@ -159,11 +161,15 @@ public static List AllExtensions() public static List All() { - var path = GetPath(); - var lines = File.ReadLines(path, Encoding.UTF8); - var contents = string.Join(Environment.NewLine, lines); - var formats = JsonConvert.DeserializeObject(contents); - return formats.ToList(); + if (cachedFormats == null) { + var path = GetPath(); + var lines = File.ReadLines(path, Encoding.UTF8); + var contents = string.Join(Environment.NewLine, lines); + var formats = JsonConvert.DeserializeObject(contents); + cachedFormats = formats.ToList(); + } + + return cachedFormats; } private static string GetPath() From 4d49e541290f2ee4d2ddacccc0d8fad4ca29b3be Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 21 Nov 2023 15:19:24 +0300 Subject: [PATCH 407/488] csharp-mvc: added format caching --- .../csharp-mvc/Models/FileUtility.cs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs index b2de3abac..11b214b11 100644 --- a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs +++ b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs @@ -73,6 +73,7 @@ public string Extension() public static class FormatManager { + private static List cachedFormats; public static List FillableExtensions() { return Fillable() @@ -182,11 +183,16 @@ public static List AllExtensions() public static List All() { - var path = GetPath(); - var lines = File.ReadLines(path, Encoding.UTF8); - var contents = string.Join(Environment.NewLine, lines); - var formats = JsonConvert.DeserializeObject(contents); - return formats.ToList(); + if (cachedFormats == null) + { + var path = GetPath(); + var lines = File.ReadLines(path, Encoding.UTF8); + var contents = string.Join(Environment.NewLine, lines); + var formats = JsonConvert.DeserializeObject(contents); + cachedFormats = formats.ToList(); + } + + return cachedFormats; } private static string GetPath() From 38aae731ba65e1ce9313cdd05737e5f758fd2ad6 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Tue, 21 Nov 2023 15:54:33 +0300 Subject: [PATCH 408/488] reorder modules --- .gitmodules | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index 04bd88a9b..10509447e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,6 +10,13 @@ path = web/documentserver-example/nodejs/public/assets/document-formats url = https://github.com/ONLYOFFICE/document-formats branch = master +[submodule "web/documentserver-example/csharp-mvc/assets/document-templates"] + path = web/documentserver-example/csharp-mvc/assets/document-templates + url = https://github.com/ONLYOFFICE/document-templates + branch = main/en +[submodule "web/documentserver-example/csharp-mvc/assets/document-formats"] + path = web/documentserver-example/csharp-mvc/assets/document-formats + url = https://github.com/ONLYOFFICE/document-formats [submodule "web/documentserver-example/php/assets/document-templates"] path = web/documentserver-example/php/assets/document-templates url = https://github.com/ONLYOFFICE/document-templates @@ -50,10 +57,3 @@ path = web/documentserver-example/java-spring/src/main/resources/assets/document-formats url = https://github.com/ONLYOFFICE/document-formats branch = master -[submodule "web/documentserver-example/csharp-mvc/assets/document-templates"] - path = web/documentserver-example/csharp-mvc/assets/document-templates - url = https://github.com/ONLYOFFICE/document-templates - branch = main/en -[submodule "web/documentserver-example/csharp-mvc/assets/document-formats"] - path = web/documentserver-example/csharp-mvc/assets/document-formats - url = https://github.com/ONLYOFFICE/document-formats From 8a2fc218d475f2b89c11ef1a6bda8aaaa0363d60 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Tue, 21 Nov 2023 15:59:08 +0300 Subject: [PATCH 409/488] repo with formats to changelog --- CHANGELOG.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17a48a314..b626a8dbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- using a repo with a list of formats - php: link in referenceData - ruby: link in referenceData - java: link in referenceData @@ -19,11 +20,7 @@ - onRequestSelectSpreadsheet method - key in referenceData - restore from history -- python: using a repo with a list of formats -- ruby: using a repo with a list of formats -- java: using a repo with a list of formats - java: getting history by a separate request -- java-spring: using a repo with a list of formats - java-spring: getting history by a separate request ## 1.7.0 From 293bc9b5b0bcee9529a0422f7a783e9fad4f2753 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Tue, 21 Nov 2023 16:06:03 +0300 Subject: [PATCH 410/488] link in referenceData in changelog --- CHANGELOG.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b626a8dbb..609fbca9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,7 @@ # Change Log +- link in referenceData - using a repo with a list of formats -- php: link in referenceData -- ruby: link in referenceData -- java: link in referenceData -- java-spring: link in referenceData -- csharp-mvc: link in referenceData -- csharp: link in referenceData -- python: link in referenceData - ruby: convert after uploading only tagged formats - python: convert after uploading only tagged formats - php: convert after uploading only tagged formats @@ -15,7 +9,6 @@ - onRequestOpen method - user avatar - trimming long name of uploading file -- nodejs: link in referenceData - onRequestSelectDocument method - onRequestSelectSpreadsheet method - key in referenceData From f32f90282c081985954d4a4a684b7dc25e7a51e1 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Wed, 22 Nov 2023 11:42:05 +0300 Subject: [PATCH 411/488] nodejs: fix status check --- web/documentserver-example/nodejs/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js index 647dfcb6b..05793760f 100755 --- a/web/documentserver-example/nodejs/app.js +++ b/web/documentserver-example/nodejs/app.js @@ -774,7 +774,7 @@ app.post('/track', async (req, res) => { // define a handler for tracking file c const formsdata = await urllib.request(formsdataurl, { method: 'GET' }); const statusFormsdata = formsdata.status; const dataFormsdata = formsdata.data; - if (status === 200) { + if (statusFormsdata === 200) { fileSystem.writeFileSync(formsdataPath, dataFormsdata); // write the forms data } else { emitWarning(`Document editing service returned status: ${statusFormsdata}`); From c06b73404504946465bd6e0bf16b75a458562e53 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Wed, 22 Nov 2023 11:45:02 +0300 Subject: [PATCH 412/488] python: fix forms_data variable --- web/documentserver-example/python/src/utils/trackManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/python/src/utils/trackManager.py b/web/documentserver-example/python/src/utils/trackManager.py index e218f73a1..fdbdfb513 100755 --- a/web/documentserver-example/python/src/utils/trackManager.py +++ b/web/documentserver-example/python/src/utils/trackManager.py @@ -172,7 +172,7 @@ def processForceSave(body, filename, usAddr): forms_data = docManager.downloadFileFromUri(forms_data_url) - if data is None: + if forms_data is None: raise Exception("Document editing service didn't return forms_data") else: with open(data_path, 'w') as file: From 6578d414eaa888770c600913155a2f9c3043df4d Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 7 Nov 2023 08:40:12 +0300 Subject: [PATCH 413/488] php: fix opening history without changes --- web/documentserver-example/php/src/functions.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/php/src/functions.php b/web/documentserver-example/php/src/functions.php index 25912d68c..43e21ad91 100644 --- a/web/documentserver-example/php/src/functions.php +++ b/web/documentserver-example/php/src/functions.php @@ -950,8 +950,11 @@ function getHistory($filename, $filetype, $docKey, $fileuri, $isEnableDirectUrl) "url" => $prev["url"], ]; - // write the path to the diff.zip archive with differences in this file version - $dataObj["changesUrl"] = getHistoryDownloadUrl($filename, $i - 1, "diff.zip"); + $diffPath = implode(DIRECTORY_SEPARATOR, [$histDir, ($i - 1), "diff.zip"]); + if (file_exists($diffPath)) { + // write the path to the diff.zip archive with differences in this file version + $dataObj["changesUrl"] = getHistoryDownloadUrl($filename, $i - 1, "diff.zip"); + } } $jwtManager = new JwtManager(); From ad4b2d136c83a53f3bd3ebe070568e78aa2cebe0 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 7 Nov 2023 09:26:35 +0300 Subject: [PATCH 414/488] java-spring: fix opening history without changes --- .../history/DefaultHistoryManager.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/history/DefaultHistoryManager.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/history/DefaultHistoryManager.java index f640fc8da..2052ae051 100644 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/history/DefaultHistoryManager.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/managers/history/DefaultHistoryManager.java @@ -40,6 +40,7 @@ import java.util.List; import java.util.Map; import java.util.Scanner; +import java.nio.file.Paths; // todo: Rebuild completely @Component @@ -280,8 +281,9 @@ public String getHistoryData(final String fileName, final String version, final dataObj.put("version", i); if (i > 1) { //check if the version number is greater than 1 + Integer verdiff = i - 1; // get the history data from the previous file version - Map prev = (Map) histData.get(Integer.toString(i - 1)); + Map prev = (Map) histData.get(Integer.toString(verdiff)); Map prevInfo = new HashMap(); prevInfo.put("fileType", prev.get("fileType")); prevInfo.put("key", prev.get("key")); // write key and URL information about previous file version @@ -292,10 +294,12 @@ public String getHistoryData(final String fileName, final String version, final // write information about previous file version to the data object dataObj.put("previous", prevInfo); - // write the path to the diff.zip archive with differences in this file version - Integer verdiff = i - 1; - dataObj.put("changesUrl", documentManager - .getHistoryFileUrl(fileName, verdiff, "diff.zip", true)); + + if (diffExists(histDir, verdiff)) { + // write the path to the diff.zip archive with differences in this file version + dataObj.put("changesUrl", documentManager + .getHistoryFileUrl(fileName, verdiff, "diff.zip", true)); + } } if (jwtManager.tokenEnabled()) { @@ -331,4 +335,11 @@ private String readFileToEnd(final File file) { } return output; } + + // diff.zip existence check + private Boolean diffExists(final String histDir, final Integer verdiff) { + String filePath = Paths.get(histDir, String.valueOf(verdiff), "diff.zip").toString(); + File file = new File(filePath); + return file.exists(); + } } From 4de6f4d8288266fa0fb57aa466a45a6bb99fdb15 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Mon, 27 Nov 2023 14:36:18 +0700 Subject: [PATCH 415/488] python: removing irrelevant changes --- web/documentserver-example/python/src/utils/docManager.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/documentserver-example/python/src/utils/docManager.py b/web/documentserver-example/python/src/utils/docManager.py index 28dd1f68b..cbb698fd4 100755 --- a/web/documentserver-example/python/src/utils/docManager.py +++ b/web/documentserver-example/python/src/utils/docManager.py @@ -26,6 +26,7 @@ import requests import magic +from django.conf import settings from django.http import FileResponse from src.configuration import ConfigurationManager from src.format import FormatManager @@ -111,7 +112,7 @@ def getServerUrl(forDocumentServer, req): def getFileUri(filename, forDocumentServer, req): host = getServerUrl(forDocumentServer, req) curAdr = req.META['REMOTE_ADDR'] - return f'{host}{config_manager.storage_path}{curAdr}/{filename}' + return f'{host}{settings.STATIC_URL}{curAdr}/{filename}' # get absolute URL to the document storage service From b19abbcb3690958e1a32d16778bcd09bcc06b3d4 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 27 Nov 2023 10:44:17 +0300 Subject: [PATCH 416/488] csharp-mvc: convert after uploading only tagged formats --- CHANGELOG.md | 1 + web/documentserver-example/csharp-mvc/Models/FileUtility.cs | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 609fbca9b..8249c901c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- csharp-mvc: convert after uploading only tagged formats - link in referenceData - using a repo with a list of formats - ruby: convert after uploading only tagged formats diff --git a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs index 11b214b11..99dbe9da8 100644 --- a/web/documentserver-example/csharp-mvc/Models/FileUtility.cs +++ b/web/documentserver-example/csharp-mvc/Models/FileUtility.cs @@ -126,9 +126,7 @@ public static List ConvertibleExtensions() public static List Convertible() { return All() - .Where(format => (format.Type == FileType.Cell && format.Convert.Contains("xlsx")) - || (format.Type == FileType.Slide && format.Convert.Contains("pptx")) - || (format.Type == FileType.Word && format.Convert.Contains("docx"))) + .Where(format => format.Actions.Contains("auto-convert")) .ToList(); } From 580f8f3e89406b15cab145233d07fdf31067dfd6 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 27 Nov 2023 10:45:29 +0300 Subject: [PATCH 417/488] csharp: convert after uploading only tagged formats --- CHANGELOG.md | 1 + web/documentserver-example/csharp/FormatManager.cs | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8249c901c..cb0cc9bbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- csharp: convert after uploading only tagged formats - csharp-mvc: convert after uploading only tagged formats - link in referenceData - using a repo with a list of formats diff --git a/web/documentserver-example/csharp/FormatManager.cs b/web/documentserver-example/csharp/FormatManager.cs index f5eba7c28..6039f0902 100644 --- a/web/documentserver-example/csharp/FormatManager.cs +++ b/web/documentserver-example/csharp/FormatManager.cs @@ -104,9 +104,7 @@ public static List ConvertibleExtensions() public static List Convertible() { return All() - .Where(format => (format.Type == "cell" && format.Convert.Contains("xlsx")) - || (format.Type == "slide" && format.Convert.Contains("pptx")) - || (format.Type == "word" && format.Convert.Contains("docx"))) + .Where(format => format.Actions.Contains("auto-convert")) .ToList(); } From b903bfc0cb233dabaf63483c5eca693ca98b8a3d Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 7 Nov 2023 11:02:41 +0300 Subject: [PATCH 418/488] java: fix opening history without changes --- .../main/java/controllers/IndexServlet.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java index 970db3044..ef4b4a24e 100755 --- a/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java +++ b/web/documentserver-example/java/src/main/java/controllers/IndexServlet.java @@ -968,9 +968,10 @@ private static void historyData(final HttpServletRequest request, dataObj.put("version", i); if (i > 1) { //check if the version number is greater than 1 + Integer verdiff = i - 1; // get the history data from the previous file version - Map prev = (Map) histData.get(Integer.toString(i - 1)); + Map prev = (Map) histData.get(Integer.toString(verdiff)); Map prevInfo = new HashMap(); prevInfo.put("fileType", prev.get("fileType")); @@ -983,12 +984,16 @@ private static void historyData(final HttpServletRequest request, // write information about previous file version to the data object dataObj.put("previous", prevInfo); - // write the path to the diff.zip archive with differences in this file version - Integer verdiff = i - 1; - String changesUrl = DocumentManager - .getDownloadHistoryUrl(fileName, verdiff, - "diff.zip", true); - dataObj.put("changesUrl", changesUrl); + + String diffPath = Paths.get(histDir, String.valueOf(verdiff), "diff.zip").toString(); + File diffFile = new File(diffPath); + if (diffFile.exists()) { + // write the path to the diff.zip archive with differences in this file version + String changesUrl = DocumentManager + .getDownloadHistoryUrl(fileName, verdiff, + "diff.zip", true); + dataObj.put("changesUrl", changesUrl); + } } if (DocumentManager.tokenEnabled()) { From 0b5b0d9c270545ebf4fe440097d7e6d01b6a1381 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 7 Nov 2023 13:39:37 +0300 Subject: [PATCH 419/488] python: fix opening history without changes --- .../python/src/utils/historyManager.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/python/src/utils/historyManager.py b/web/documentserver-example/python/src/utils/historyManager.py index a4838c198..9fb239e80 100644 --- a/web/documentserver-example/python/src/utils/historyManager.py +++ b/web/documentserver-example/python/src/utils/historyManager.py @@ -214,8 +214,11 @@ def getHistoryObject(storagePath, filename, docKey, docUrl, isEnableDirectUrl, r 'url': prev['url'] } dataObj['previous'] = prevInfo # write information about previous file version to the data object - # write the path to the diff.zip archive with differences in this file version - dataObj['changesUrl'] = getPublicHistUri(filename, i - 1, "diff.zip", req) + + diffPath = os.path.sep.join([histDir, str(i - 1), "diff.zip"]) + if (os.path.exists(diffPath)): + # write the path to the diff.zip archive with differences in this file version + dataObj['changesUrl'] = getPublicHistUri(filename, i - 1, "diff.zip", req) if jwtManager.isEnabled(): dataObj['token'] = jwtManager.encode(dataObj) From 160c0bef3c5521e82f78c44182d3ab8711ad8fb5 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Tue, 7 Nov 2023 22:30:33 +0300 Subject: [PATCH 420/488] ruby: fix opening history without changes --- web/documentserver-example/ruby/app/models/file_model.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 7c1129aef..dd3cd0d2e 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -266,8 +266,11 @@ def get_history :url => prev["url"] } - # write the path to the diff.zip archive with differences in this file version - dataObj["changesUrl"] = DocumentHelper.get_historypath_uri(file_name, i - 1, "diff.zip") + diff_path = [hist_dir, (i - 1).to_s, "diff.zip"].join(File::SEPARATOR) + if File.exist?(diff_path) + # write the path to the diff.zip archive with differences in this file version + dataObj["changesUrl"] = DocumentHelper.get_historypath_uri(file_name, i - 1, "diff.zip") + end end if JwtHelper.is_enabled # check if a secret key to generate token exists or not From 495d97bd3ad4d168f1c4995dc4f8f802ff16aee1 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Mon, 27 Nov 2023 11:35:23 +0300 Subject: [PATCH 421/488] - auto-convert in changelog --- CHANGELOG.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb0cc9bbd..566d777a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,8 @@ # Change Log -- csharp: convert after uploading only tagged formats -- csharp-mvc: convert after uploading only tagged formats -- link in referenceData - using a repo with a list of formats -- ruby: convert after uploading only tagged formats -- python: convert after uploading only tagged formats -- php: convert after uploading only tagged formats +- convert after uploading only tagged formats +- link in referenceData - setUsers for region protection - onRequestOpen method - user avatar From 8fd9113c47e5a3cf0433127a6368fbd97d7cad5c Mon Sep 17 00:00:00 2001 From: sshakndr Date: Mon, 27 Nov 2023 15:36:56 +0700 Subject: [PATCH 422/488] python: mypy in lint workflow --- .github/workflows/lint-python.yml | 4 +++- web/documentserver-example/python/Makefile | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint-python.yml b/.github/workflows/lint-python.yml index 936407a3c..b69c874ca 100644 --- a/.github/workflows/lint-python.yml +++ b/.github/workflows/lint-python.yml @@ -27,8 +27,10 @@ jobs: run: | python -m pip install --upgrade pip pip install flake8 + pip install mypy + pip install django-stubs if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - name: Lint Flake8 run: | - flake8 --count --show-source --statistics + make lint diff --git a/web/documentserver-example/python/Makefile b/web/documentserver-example/python/Makefile index 21a227f0c..a0d9b1326 100644 --- a/web/documentserver-example/python/Makefile +++ b/web/documentserver-example/python/Makefile @@ -48,6 +48,7 @@ compose-prod: # Up containers in a production environment. .PHONY: lint lint: # Lint the source code for style and check for types. @flake8 --count --show-source --statistics + @mypy . .PHONY: test test: # Recursively run the tests. From 969240ad53d62281ac99d05bddf66f54ccc846fb Mon Sep 17 00:00:00 2001 From: sshakndr Date: Mon, 27 Nov 2023 17:30:09 +0700 Subject: [PATCH 423/488] python: intalling dependencies by make in lint workflow --- .github/workflows/lint-python.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/lint-python.yml b/.github/workflows/lint-python.yml index b69c874ca..d4b959c83 100644 --- a/.github/workflows/lint-python.yml +++ b/.github/workflows/lint-python.yml @@ -26,10 +26,8 @@ jobs: - name: Install Dependencies run: | python -m pip install --upgrade pip - pip install flake8 - pip install mypy - pip install django-stubs - if [ -f requirements.txt ]; then pip install -r requirements.txt; fi + make prod + make dev - name: Lint Flake8 run: | From d397db61cd1f5332bb35cd3fe07d5e949dc4766e Mon Sep 17 00:00:00 2001 From: sshakndr Date: Mon, 27 Nov 2023 17:36:21 +0700 Subject: [PATCH 424/488] python: lint workflow python version fix --- .github/workflows/lint-python.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-python.yml b/.github/workflows/lint-python.yml index d4b959c83..b19cf30ce 100644 --- a/.github/workflows/lint-python.yml +++ b/.github/workflows/lint-python.yml @@ -21,7 +21,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.10' + python-version: '3.11' - name: Install Dependencies run: | From 9d5feaaf99d511ac30762b4e0029f3d9f1283c4c Mon Sep 17 00:00:00 2001 From: sshakndr Date: Tue, 28 Nov 2023 13:49:12 +0700 Subject: [PATCH 425/488] python: flake8 and mypy separated --- .github/workflows/lint-python.yml | 5 +++++ web/documentserver-example/python/Makefile | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint-python.yml b/.github/workflows/lint-python.yml index b19cf30ce..13d9458a3 100644 --- a/.github/workflows/lint-python.yml +++ b/.github/workflows/lint-python.yml @@ -32,3 +32,8 @@ jobs: - name: Lint Flake8 run: | make lint + + # TODO: Configure mypy + # - name: Types mypy + # run: | + # make types diff --git a/web/documentserver-example/python/Makefile b/web/documentserver-example/python/Makefile index a0d9b1326..a4cc7a267 100644 --- a/web/documentserver-example/python/Makefile +++ b/web/documentserver-example/python/Makefile @@ -46,8 +46,11 @@ compose-prod: # Up containers in a production environment. up --detach .PHONY: lint -lint: # Lint the source code for style and check for types. +lint: # Lint the source code for style. @flake8 --count --show-source --statistics + +.PHONY: types +types: # Check the source code for types. @mypy . .PHONY: test From dac1cdcdc164cfafa89e9947aef1161ecaedbbb2 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Tue, 28 Nov 2023 10:08:01 +0300 Subject: [PATCH 426/488] format --- web/documentserver-example/php/src/views/DocEditorView.php | 2 +- web/documentserver-example/python/templates/editor.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/php/src/views/DocEditorView.php b/web/documentserver-example/php/src/views/DocEditorView.php index 890212c6f..92b734fe0 100644 --- a/web/documentserver-example/php/src/views/DocEditorView.php +++ b/web/documentserver-example/php/src/views/DocEditorView.php @@ -244,7 +244,7 @@ public function __construct($request, $tempName = "docEditor") // encode the dataSpreadsheet object into the token $dataSpreadsheet["token"] = $jwtManager->jwtEncode($dataSpreadsheet); } - + $historyLayout = ""; if ($user->id != "uid-0") { $historyLayout .= "// add mentions for not anonymous users diff --git a/web/documentserver-example/python/templates/editor.html b/web/documentserver-example/python/templates/editor.html index 9718272d9..5c4f45756 100755 --- a/web/documentserver-example/python/templates/editor.html +++ b/web/documentserver-example/python/templates/editor.html @@ -228,7 +228,7 @@ onRequestHistory() } } - + function onRequestHistory(){ const query = new URLSearchParams(window.location.search) data = { From d6d19812964c0084b96cb3cf80dab4a4b1483116 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Tue, 28 Nov 2023 10:11:09 +0300 Subject: [PATCH 427/488] getting history in changelog --- CHANGELOG.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e229e987e..1b648c405 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,6 @@ # Change Log -- php: getting history via api -- ruby: getting history via api -- python: getting history via api +- getting history via api - using a repo with a list of formats - convert after uploading only tagged formats - link in referenceData @@ -14,8 +12,6 @@ - onRequestSelectSpreadsheet method - key in referenceData - restore from history -- java: getting history by a separate request -- java-spring: getting history by a separate request ## 1.7.0 - nodejs: onRequestSelectDocument method From d40f932863e4f807ff9f5e36fbd8322a1aa04cc5 Mon Sep 17 00:00:00 2001 From: sshakndr Date: Wed, 29 Nov 2023 10:11:43 +0700 Subject: [PATCH 428/488] python: deleted unnecessary lines from workflows --- .github/workflows/lint-python.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/lint-python.yml b/.github/workflows/lint-python.yml index 13d9458a3..4eb8d860a 100644 --- a/.github/workflows/lint-python.yml +++ b/.github/workflows/lint-python.yml @@ -25,8 +25,6 @@ jobs: - name: Install Dependencies run: | - python -m pip install --upgrade pip - make prod make dev - name: Lint Flake8 From 7c1939e8c92fe75ef9ae09cd3b2e4d0022286fd7 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 13:46:02 +0300 Subject: [PATCH 429/488] ruby: updated rubocop configuration file --- web/documentserver-example/ruby/.rubocop.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/documentserver-example/ruby/.rubocop.yml b/web/documentserver-example/ruby/.rubocop.yml index f2e7b4c9b..d640f95a7 100644 --- a/web/documentserver-example/ruby/.rubocop.yml +++ b/web/documentserver-example/ruby/.rubocop.yml @@ -1,3 +1,5 @@ +require: rubocop-rails + AllCops: NewCops: enable From 037c5682f8bd3266d0fac99b5bc8fc72074708f0 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 13:47:28 +0300 Subject: [PATCH 430/488] ruby: Rails/Blank correct --- .../ruby/app/controllers/home_controller.rb | 4 ++-- web/documentserver-example/ruby/app/models/track_helper.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index b9d5629e6..7e9e9c2dc 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -93,7 +93,7 @@ def upload # converting a file def convert file_data = request.body.read - return '' if file_data.nil? || file_data.empty? + return '' if file_data.blank? body = JSON.parse(file_data) @@ -194,7 +194,7 @@ def downloadhistory # tracking file changes def track file_data = TrackHelper.read_body(request) # read the request body - if file_data.nil? || file_data.empty? + if file_data.blank? render(plain: '{"error":1}') # an error occurs if the file is empty return end diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 220d79072..1d4bd38ec 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -37,7 +37,7 @@ class << self def self.read_body(request) body = request.body.read - return '' if body.nil? || body.empty? + return '' if body.blank? file_data = JSON.parse(body) # parse file data @@ -117,7 +117,7 @@ def self.process_save(raw_file_data, file_name, user_address) false, nil ) # get the url of the converted file - if new_file_uri.nil? || new_file_uri.empty? + if new_file_uri.blank? new_file_name = DocumentHelper.get_correct_name( File.basename(file_name, cur_ext) + download_ext, user_address @@ -205,7 +205,7 @@ def self.process_force_save(file_data, file_name, user_address) false, nil ) # get the url of the converted file - if new_file_uri.nil? || new_file_uri.empty? + if new_file_uri.blank? new_file_name = true else download_uri = new_file_uri From efb4616ca6e53b447c5e8fe96fca1bbaca7e4ab4 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 13:49:10 +0300 Subject: [PATCH 431/488] ruby: Rails/HttpStatus correct --- .../ruby/app/controllers/home_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 7e9e9c2dc..10f5a84e6 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -168,11 +168,11 @@ def downloadhistory hdr.slice!(0, 'Bearer '.length) token = JwtHelper.decode(hdr) if !token || token.eql?('') - render(plain: 'JWT validation failed', status: 403) + render(plain: 'JWT validation failed', status: :forbidden) return end else - render(plain: 'JWT validation failed', status: 403) + render(plain: 'JWT validation failed', status: :forbidden) return end end @@ -283,7 +283,7 @@ def download token = JwtHelper.decode(hdr) end if !token || token.eql?('') - render(plain: 'JWT validation failed', status: 403) + render(plain: 'JWT validation failed', status: :forbidden) return end end From 3d0ae07de4c31c2e23eef21708d8a8f5fcbe074b Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 13:49:39 +0300 Subject: [PATCH 432/488] ruby: Rails/TimeZone correct --- .../ruby/app/controllers/home_controller.rb | 2 +- web/documentserver-example/ruby/app/models/document_helper.rb | 2 +- web/documentserver-example/ruby/app/models/file_model.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 10f5a84e6..d9bd5a882 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -472,7 +472,7 @@ def restore serverVersion: nil, changes: [ { - created: Time.now.to_formatted_s(:db), + created: Time.zone.now.to_formatted_s(:db), user: { id: user.id, name: user.name diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 7f7311e64..0ffd082c5 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -182,7 +182,7 @@ def self.create_meta(file_name, uid, uname, user_address) # write user name, user uid and the creation time to the json object json = { - created: Time.now.to_formatted_s(:db), + created: Time.zone.now.to_formatted_s(:db), uid:, uname: } diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 904390f22..eea69a110 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -134,7 +134,7 @@ def config key:, info: { owner: 'Me', - uploaded: Time.now.to_s, + uploaded: Time.zone.now.to_s, favorite: @user.favorite }, permissions: { # the permission for the document to be edited and downloaded or not From b262a34540c3c71c78d18c7501bf96181d090f33 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 13:50:22 +0300 Subject: [PATCH 433/488] ruby: Rails/ToFormattedS correct --- .../ruby/app/controllers/home_controller.rb | 2 +- web/documentserver-example/ruby/app/models/document_helper.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index d9bd5a882..88208f22a 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -472,7 +472,7 @@ def restore serverVersion: nil, changes: [ { - created: Time.zone.now.to_formatted_s(:db), + created: Time.zone.now.to_fs(:db), user: { id: user.id, name: user.name diff --git a/web/documentserver-example/ruby/app/models/document_helper.rb b/web/documentserver-example/ruby/app/models/document_helper.rb index 0ffd082c5..f1bde2136 100755 --- a/web/documentserver-example/ruby/app/models/document_helper.rb +++ b/web/documentserver-example/ruby/app/models/document_helper.rb @@ -182,7 +182,7 @@ def self.create_meta(file_name, uid, uname, user_address) # write user name, user uid and the creation time to the json object json = { - created: Time.zone.now.to_formatted_s(:db), + created: Time.zone.now.to_fs(:db), uid:, uname: } From d894663a4a88af447d4105443090423bb144aeee Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 13:50:44 +0300 Subject: [PATCH 434/488] ruby: Rails/NegateInclude correct --- .../ruby/app/models/file_model.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index eea69a110..a8631b158 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -138,12 +138,12 @@ def config favorite: @user.favorite }, permissions: { # the permission for the document to be edited and downloaded or not - comment: !['view', 'fillForms', 'embedded', 'blockcontent'].include?(editors_mode), - copy: !@user.denied_permissions.include?('copy'), - download: !@user.denied_permissions.include?('download'), + comment: ['view', 'fillForms', 'embedded', 'blockcontent'].exclude?(editors_mode), + copy: @user.denied_permissions.exclude?('copy'), + download: @user.denied_permissions.exclude?('download'), edit: can_edit && ['edit', 'view', 'filter', 'blockcontent'].include?(editors_mode), - print: !@user.denied_permissions.include?('print'), - fillForms: !['view', 'comment', 'embedded', 'blockcontent'].include?(editors_mode), + print: @user.denied_permissions.exclude?('print'), + fillForms: ['view', 'comment', 'embedded', 'blockcontent'].exclude?(editors_mode), modifyFilter: !editors_mode.eql?('filter'), modifyContentControl: !editors_mode.eql?('blockcontent'), review: can_edit && (editors_mode.eql?('edit') || editors_mode.eql?('review')), @@ -151,7 +151,7 @@ def config reviewGroups: @user.review_groups, commentGroups: @user.comment_groups, userInfoGroups: @user.user_info_groups, - protect: !@user.denied_permissions.include?('protect') + protect: @user.denied_permissions.exclude?('protect') }, referenceData: { instanceId: DocumentHelper.get_server_url(false), From e5560b25d78ad336ea433b11630aad8435a23294 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Mon, 20 Nov 2023 13:52:09 +0300 Subject: [PATCH 435/488] ruby: Rails/Present correct --- web/documentserver-example/ruby/app/models/jwt_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/ruby/app/models/jwt_helper.rb b/web/documentserver-example/ruby/app/models/jwt_helper.rb index 92c580173..44293d6a2 100644 --- a/web/documentserver-example/ruby/app/models/jwt_helper.rb +++ b/web/documentserver-example/ruby/app/models/jwt_helper.rb @@ -26,7 +26,7 @@ class JwtHelper # check if a secret key to generate token exists or not def self.enabled? - @jwt_secret && !@jwt_secret.empty? ? true : false + @jwt_secret.present? end # check if a secret key used for request From af1dc6d9b5fe670bd5ac7f32e761a4261469ff66 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Thu, 30 Nov 2023 09:28:05 +0300 Subject: [PATCH 436/488] ruby: add rubocop-rails --- web/documentserver-example/ruby/Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/web/documentserver-example/ruby/Gemfile b/web/documentserver-example/ruby/Gemfile index 26eb9a681..1f2da09b5 100644 --- a/web/documentserver-example/ruby/Gemfile +++ b/web/documentserver-example/ruby/Gemfile @@ -12,6 +12,7 @@ gem 'mimemagic', github: 'mimemagicrb/mimemagic', ref: '01f92d86d15d85cfd0f20dab gem 'rack-cors', '~> 2.0' gem 'rails', '~> 7.0.8' gem 'rubocop', '~> 1.52', group: :development +gem 'rubocop-rails', '~> 2.20', group: :development gem 'sass-rails', '~> 6.0' gem 'sdoc', '~> 2.6', group: :doc gem 'sorbet-runtime', '~> 0.5.10871' From 9cf058078c3654c6d24cddc7dcce1998788114a9 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Thu, 30 Nov 2023 14:05:57 +0300 Subject: [PATCH 437/488] ruby: fix lint problems after merging develop --- .../ruby/app/controllers/home_controller.rb | 46 +++++++------- .../ruby/app/models/file_model.rb | 18 +++++- .../ruby/app/models/track_helper.rb | 62 +++++++------------ 3 files changed, 61 insertions(+), 65 deletions(-) diff --git a/web/documentserver-example/ruby/app/controllers/home_controller.rb b/web/documentserver-example/ruby/app/controllers/home_controller.rb index 94c209e42..23b6cbe9c 100755 --- a/web/documentserver-example/ruby/app/controllers/home_controller.rb +++ b/web/documentserver-example/ruby/app/controllers/home_controller.rb @@ -154,27 +154,25 @@ def convert end def historyobj - begin - data = request.body.read - if data == nil || data.empty? - return "" - end - file_data = JSON.parse(data) - file = FileModel.new( - file_name: File.basename(file_data['file_name']), - mode: file_data['mode'], - type: file_data['type'], - user_ip: file_data['user_ip'], - lang: file_data['lang'], - user: file_data['user'], - action_data: file_data['action_data'], - direct_url: file_data['direct_url'] - ) - history = file.get_history - render json: history - rescue - render json: '{ "error": "File not found"}' + data = request.body.read + if data.blank? + return '' end + file_data = JSON.parse(data) + file = FileModel.new( + file_name: File.basename(file_data['file_name']), + mode: file_data['mode'], + type: file_data['type'], + user_ip: file_data['user_ip'], + lang: file_data['lang'], + user: file_data['user'], + action_data: file_data['action_data'], + direct_url: file_data['direct_url'] + ) + history = file.get_history + render(json: history) + rescue StandardError + render(json: '{ "error": "File not found"}') end # downloading a history file from public @@ -223,7 +221,7 @@ def track return end - status = Integer(file_data['status'], 10) + status = file_data['status'] user_address = params[:userAddress] file_name = File.basename(params[:fileName]) @@ -300,11 +298,11 @@ def assets response.headers['Content-Length'] = File.size(asset_path).to_s response.headers['Content-Type'] = MimeMagic.by_path(asset_path).type - response.headers['Content-Disposition'] = "attachment;filename*=UTF-8\'\'" + ERB::Util.url_encode(file_name) + response.headers['Content-Disposition'] = "attachment;filename*=UTF-8''#{ERB::Util.url_encode(file_name)}" - send_file asset_path, :x_sendfile => true + send_file(asset_path, x_sendfile: true) end - + # downloading a file def download file_name = File.basename(params[:fileName]) diff --git a/web/documentserver-example/ruby/app/models/file_model.rb b/web/documentserver-example/ruby/app/models/file_model.rb index 3dcb4224c..2ec252b62 100755 --- a/web/documentserver-example/ruby/app/models/file_model.rb +++ b/web/documentserver-example/ruby/app/models/file_model.rb @@ -216,7 +216,7 @@ def history file_name = @file_name file_ext = File.extname(file_name).downcase doc_key = key - doc_uri = file_uri + file_uri # get the path to the file history hist_dir = DocumentHelper.history_dir(DocumentHelper.storage_path(@file_name, nil)) @@ -258,7 +258,19 @@ def history # get the history data from the previous file version and write key and url information about it data_obj['fileType'] = file_ext[1..file_ext.length] data_obj['key'] = cur_key - data_obj['url'] = i == cur_ver ? DocumentHelper.get_download_url(file_name, true) : DocumentHelper.get_historypath_uri(file_name, i, "prev#{file_ext}") + data_obj['url'] = + if i == cur_ver + DocumentHelper.get_download_url( + file_name, + true + ) + else + DocumentHelper.get_historypath_uri( + file_name, + i, + "prev#{file_ext}" + ) + end if enable_direct_url? == true data_obj['directUrl'] = if i == cur_ver @@ -308,7 +320,7 @@ def history end ) - diff_path = [hist_dir, (i - 1).to_s, "diff.zip"].join(File::SEPARATOR) + diff_path = [hist_dir, (i - 1).to_s, 'diff.zip'].join(File::SEPARATOR) if File.exist?(diff_path) # write the path to the diff.zip archive with differences in this file version data_obj['changesUrl'] = DocumentHelper.get_historypath_uri(file_name, i - 1, 'diff.zip') diff --git a/web/documentserver-example/ruby/app/models/track_helper.rb b/web/documentserver-example/ruby/app/models/track_helper.rb index 1bbb59d3f..b55c44683 100755 --- a/web/documentserver-example/ruby/app/models/track_helper.rb +++ b/web/documentserver-example/ruby/app/models/track_helper.rb @@ -236,44 +236,13 @@ def self.process_force_save(file_data, file_name, user_address) user_address ) end - forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file - else - if new_file_name - file_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + download_ext, user_address) - end - forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, false) - if forcesave_path.eql?("") - forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, true) # if the path to the new file doesn't exist, create it - end - end - - save_file(data, forcesave_path) # save the downloaded file to the storage directory - - if is_submit_form - uid = file_data['actions'][0]['userid'] - DocumentHelper.create_meta(file_name, uid, "Filling Form", user_address) # create file meta information with the Filling form tag instead of user name - - forms_data_url = file_data["formsdataurl"].to_s - - if forms_data_url && !forms_data_url.eql?("") - forms_name = DocumentHelper.get_correct_name(File.basename(file_name, cur_ext) + ".txt", user_address) - forms_path = DocumentHelper.storage_path(forms_name, user_address) - forms = download_file(forms_data_url) - if forms.eql?(nil) - return saved - end - save_file(forms, forms_path) - else - raise 'Document editing service did not return formsDataUrl' - end - end - - saved = 0 - rescue StandardError => msg - saved = 1 - end - - saved + forcesave_path = DocumentHelper.storage_path(file_name, user_address) # get the path to the new file + else + if new_file_name + file_name = DocumentHelper.get_correct_name( + File.basename(file_name, cur_ext) + download_ext, + user_address + ) end forcesave_path = DocumentHelper.forcesave_path(file_name, user_address, false) if forcesave_path.eql?('') @@ -288,6 +257,23 @@ def self.process_force_save(file_data, file_name, user_address) uid = file_data['actions'][0]['userid'] # create file meta information with the Filling form tag instead of user name DocumentHelper.create_meta(file_name, uid, 'Filling Form', user_address) + + forms_data_url = file_data['formsdataurl'].to_s + + unless forms_data_url && !forms_data_url.eql?('') + raise('Document editing service did not return formsDataUrl') + end + forms_name = DocumentHelper.get_correct_name( + "#{File.basename(file_name, cur_ext)}.txt", + user_address + ) + forms_path = DocumentHelper.storage_path(forms_name, user_address) + forms = download_file(forms_data_url) + if forms.eql?(nil) + return saved + end + save_file(forms, forms_path) + end saved = 0 From 83b1dc07e1d4ae9f2e53a2d072ef8be083b936f2 Mon Sep 17 00:00:00 2001 From: ZEROM22 Date: Thu, 30 Nov 2023 18:19:38 +0300 Subject: [PATCH 438/488] =?UTF-8?q?node:=20fixed=20overflow=20when=20hashi?= =?UTF-8?q?ng=20=D1=81yrillic=20characters?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/documentserver-example/nodejs/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/documentserver-example/nodejs/app.js b/web/documentserver-example/nodejs/app.js index 05793760f..38810d33e 100755 --- a/web/documentserver-example/nodejs/app.js +++ b/web/documentserver-example/nodejs/app.js @@ -55,7 +55,7 @@ String.prototype.hashCode = function hashCode() { const len = this.length; let ret = 0; for (let i = 0; i < len; i++) { - ret = Math.trunc(31 * ret + this.charCodeAt(i)); + ret = Math.imul(ret, 31) + this.charCodeAt(i); } return ret; }; From 449ad0759ba452c2a1acd396c038406803fd5e3a Mon Sep 17 00:00:00 2001 From: Taygunova Rina Date: Fri, 1 Dec 2023 10:50:26 +0300 Subject: [PATCH 439/488] java-spring: add version index.html --- .../onlyoffice/integration/controllers/IndexController.java | 4 ++++ .../java-spring/src/main/resources/templates/index.html | 1 + 2 files changed, 5 insertions(+) diff --git a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/IndexController.java b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/IndexController.java index 1088ead79..e519e1091 100755 --- a/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/IndexController.java +++ b/web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/IndexController.java @@ -76,6 +76,9 @@ public class IndexController { @Value("${files.docservice.languages}") private String langs; + @Value("${server.version}") + private String serverVersion; + @GetMapping("${url.index}") public String index(@RequestParam(value = "directUrl", required = false) final Boolean directUrl, final Model model) { @@ -124,6 +127,7 @@ public String index(@RequestParam(value = "directUrl", required = false) final B model.addAttribute("users", users); model.addAttribute("languages", languages); model.addAttribute("directUrl", directUrl); + model.addAttribute("serverVersion", serverVersion); return "index.html"; } diff --git a/web/documentserver-example/java-spring/src/main/resources/templates/index.html b/web/documentserver-example/java-spring/src/main/resources/templates/index.html index 5c519273b..d2d333c93 100755 --- a/web/documentserver-example/java-spring/src/main/resources/templates/index.html +++ b/web/documentserver-example/java-spring/src/main/resources/templates/index.html @@ -3,6 +3,7 @@ +