From 5dc6eafeccd567557fd13baef8dc81fc2d3402fc Mon Sep 17 00:00:00 2001 From: Leonardo Ostjen Couto Date: Mon, 9 Aug 2021 08:30:36 -0300 Subject: [PATCH] [FIX] Broken download link on uploaded files (#22848) * switched from rtrim to replace * removed subdirectory start * added regex to string.replace * added regex to string.replace * proper user of scape regex * removed logging statement --- app/utils/lib/getURL.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/utils/lib/getURL.js b/app/utils/lib/getURL.js index 9e93b614abd..662db6fcf7e 100644 --- a/app/utils/lib/getURL.js +++ b/app/utils/lib/getURL.js @@ -1,4 +1,5 @@ import s from 'underscore.string'; +import { escapeRegExp } from '@rocket.chat/string-helpers'; import { isURL } from './isURL'; import { settings } from '../../settings'; @@ -54,7 +55,7 @@ export const _getURL = (path, { cdn, full, cloud, cloud_route, cloud_params, _cd } if (full) { - return s.rtrim(siteUrl, pathPrefix) + url; + return siteUrl.replace(new RegExp(`${ escapeRegExp(pathPrefix) }$`), '') + url; } return url;