nodejs: getting name in wopi (Fix Bug 70092)

ONLYOFFICE · Sep 18, 2024 · 4c8fb6b · 4c8fb6b
1 parent b9b4aef
commit 4c8fb6b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/web/documentserver-example/nodejs/helpers/documentService.js b/web/documentserver-example/nodejs/helpers/documentService.js
@@ -61,7 +61,8 @@ documentService.getConvertedUri = function getConvertedUri(
   filePass = null,
   lang = null,
 ) {
-  const fromExt = fromExtension || fileUtility.getFileExtension(documentUri); // get the current document extension
+  // get the current document extension
+  const fromExt = fromExtension || fileUtility.getFileExtension(documentUri, false, true);
 
   // get the current document name or uuid
   const title = fileUtility.getFileNameFromUrl(documentUri) || guidManager.newGuid();

diff --git a/web/documentserver-example/nodejs/helpers/fileUtility.js b/web/documentserver-example/nodejs/helpers/fileUtility.js
@@ -50,20 +50,21 @@ fileUtility.getFileName = function getFileName(path, withoutExtension) {
   return fileName;
 };
 
-// get file extension from the given url
-fileUtility.getFileExtension = function getFileExtension(url, withoutDot) {
-  if (!url) return null;
+// get file extension from the given path
+fileUtility.getFileExtension = function getFileExtension(path, withoutDot, isUrl) {
+  if (!path) return null;
 
-  const fileName = fileUtility.getFileNameFromUrl(url); // get file name from the given url
+  // get file name from the given path
+  const fileName = isUrl ? fileUtility.getFileNameFromUrl(path) : fileUtility.getFileName(path);
 
   const parts = fileName.toLowerCase().split('.');
 
   return withoutDot ? parts.pop() : `.${parts.pop()}`; // get the extension from the file name with or without dot
 };
 
-// get file type from the given url
-fileUtility.getFileType = function getFileType(url) {
-  const ext = fileUtility.getFileExtension(url, true); // get the file extension from the given url
+// get file type from the given path
+fileUtility.getFileType = function getFileType(path) {
+  const ext = fileUtility.getFileExtension(path, true); // get the file extension from the given path
 
   for (let i = 0; i < supportedFormats.length; i++) {
     if (supportedFormats[i].name === ext && supportedFormats[i].type !== '') return supportedFormats[i].type;