From 2249507858ec135cee7568a41b2f5378b6a9eec5 Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Tue, 6 Mar 2018 11:48:46 -0300 Subject: [PATCH] [FIX] Download links was duplicating Sub Paths --- packages/rocketchat-file-upload/server/lib/requests.js | 2 +- .../rocketchat-message-attachments/client/messageAttachment.js | 2 +- packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/rocketchat-file-upload/server/lib/requests.js b/packages/rocketchat-file-upload/server/lib/requests.js index 7a47c0496e8..7962e095351 100644 --- a/packages/rocketchat-file-upload/server/lib/requests.js +++ b/packages/rocketchat-file-upload/server/lib/requests.js @@ -1,6 +1,6 @@ /* globals FileUpload, WebApp */ -WebApp.connectHandlers.use(`${ __meteor_runtime_config__.ROOT_URL_PATH_PREFIX }/file-upload/`, function(req, res, next) { +WebApp.connectHandlers.use('/file-upload/', function(req, res, next) { const match = /^\/([^\/]+)\/(.*)/.exec(req.url); diff --git a/packages/rocketchat-message-attachments/client/messageAttachment.js b/packages/rocketchat-message-attachments/client/messageAttachment.js index 8da6606bca3..d0df4d8f3b5 100644 --- a/packages/rocketchat-message-attachments/client/messageAttachment.js +++ b/packages/rocketchat-message-attachments/client/messageAttachment.js @@ -22,7 +22,7 @@ const fixCordova = function(url) { } else if (navigator.userAgent.indexOf('Electron') > -1) { return __meteor_runtime_config__.ROOT_URL_PATH_PREFIX + url; } else { - return Meteor.absoluteUrl().replace(/\/$/, '') + __meteor_runtime_config__.ROOT_URL_PATH_PREFIX + url; + return Meteor.absoluteUrl().replace(/\/$/, '') + url; } }; /*globals renderMessageBody*/ diff --git a/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js b/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js index e93b82b6af1..75aededa69b 100644 --- a/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js +++ b/packages/rocketchat-ui-flextab/client/tabs/uploadedFilesList.js @@ -23,7 +23,7 @@ const fixCordova = (url) => { } else if (navigator.userAgent.indexOf('Electron') > -1) { return __meteor_runtime_config__.ROOT_URL_PATH_PREFIX + url; } else { - return Meteor.absoluteUrl().replace(/\/$/, '') + __meteor_runtime_config__.ROOT_URL_PATH_PREFIX + url; + return Meteor.absoluteUrl().replace(/\/$/, '') + url; } };