ruby: fix - search for filename by path

Author: rivexe

web/documentserver-example/ruby/app/controllers/home_controller.rb

@@ -366,55 +366,49 @@ def rename
 
     #ReferenceData
     def reference
-      begin
-        body = JSON.parse(request.body.read)
-        referenceData = body["referenceData"]
+      body = JSON.parse(request.body.read)
+      fileName = ""
+      
 
-        if referenceData != nil
-          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
+      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
 
-        if (!defined?(fileName) && defined?(userAddress))
-          begin
-            path = File.basename(body["path"])
-            if File.exists?(DocumentHelper.storage_path(path, nil))
-              fileName = path
-            end
-          rescue => ex
-            render plain: '{ "error": "' + ex.message + '"}'
-          end
+      if fileName.empty? and body.key?("path")
+        path = File.basename(body["path"])
+        if File.exist?(DocumentHelper.storage_path(path, nil))
+          fileName = path
         end
+      end
 
-        if !defined?(fileName)
-          render plain: '{ "error": "File not found"}'
-          return
-        end
+      if fileName.empty?
+        render plain: '{ "error": "File not found"}'
+        return
+      end
 
-        data = {
-          :fileType => DocumentHelper.get_internal_extension(fileName),
-          :url => DocumentHelper.get_download_url(fileName),
-          :directUrl => body["directUrl"] ? DocumentHelper.get_download_url(fileName) : DocumentHelper.get_download_url(fileName,false),
-          :referenceData => {
-            :instanceId => DocumentHelper.get_server_url(false),
-            :fileKey => fileKey.to_json
-          },
-          :path => fileName
-        }
-
-        if JwtHelper.is_enabled
-          data["token"] = JwtHelper.encode(data)
-        end
+      data = {
+        :fileType => DocumentHelper.get_internal_extension(fileName),
+        :url => DocumentHelper.get_download_url(fileName),
+        :directUrl => body["directUrl"] ? DocumentHelper.get_download_url(fileName) : DocumentHelper.get_download_url(fileName,false),
+        :referenceData => {
+          :instanceId => DocumentHelper.get_server_url(false),
+          :fileKey => {:fileName => fileName,:userAddress => DocumentHelper.cur_user_host_address(nil)}.to_json
+        },
+        :path => fileName
+      }
 
-        render plain: data.to_json
-      rescue => ex
-        render plain: '{ "error": "' + ex.message + '"}'
+      if JwtHelper.is_enabled
+        data["token"] = JwtHelper.encode(data)
       end
+
+      render plain: data.to_json
     end
 end

web/documentserver-example/ruby/app/models/file_model.rb

@@ -105,11 +105,6 @@ def get_config
       }
     ]
 
-    fileKey = {
-      :fileName => @file_name,
-      :userAddress => DocumentHelper.cur_user_host_address(nil) 
-    }
-
     config = {
       :type => type(),
       :documentType => document_type,
@@ -141,7 +136,7 @@ def get_config
         },
         :referenceData => {
           :instanceId => DocumentHelper.get_server_url(false),
-          :fileKey => !@user.id.eql?("uid-0") ? fileKey.to_json : nil
+          :fileKey => !@user.id.eql?("uid-0") ? {:fileName => @file_name,:userAddress => DocumentHelper.cur_user_host_address(nil)}.to_json : nil
         }
       },
       :editorConfig => {