13494: Merge branch 'master' into 13494-collection-version-browser

[arvados.git] / src / views-components / context-menu / actions / helpers.ts

diff --git a/src/views-components/context-menu/actions/helpers.ts b/src/views-components/context-menu/actions/helpers.ts
index 3836860626a8363554ae1df135975a7a07c204ba..0ad2dc3c56c2c2ecd25a2f397467f377e2928bef 100644 (file)
--- a/src/views-components/context-menu/actions/helpers.ts
+++ b/src/views-components/context-menu/actions/helpers.ts
@@ -2,16 +2,18 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-export const sanitizeToken = (href: string, tokenAsQueryParam: boolean = true): string => {
+export const sanitizeToken = (href: string, tokenAsQueryParam = true): string => {
     const [prefix, suffix] = href.split('/t=');
-    const [token, ...rest] = suffix.split('/');
+    const [token1, token2, token3, ...rest] = suffix.split('/');
+    const token = `${token1}/${token2}/${token3}`;
+    const sep = href.indexOf("?") > -1 ? "&" : "?";
 
-    return `${[prefix, ...rest].join('/')}${tokenAsQueryParam ? `?api_token=${token}` : ''}`;
+    return `${[prefix, ...rest].join('/')}${tokenAsQueryParam ? `${sep}api_token=${token}` : ''}`;
 };
 
-export const getClipboardUrl = (href: string): string => {
+export const getClipboardUrl = (href: string, shouldSanitizeToken = true): string => {
     const { origin } = window.location;
-    const url = sanitizeToken(href, false);
+    const url = shouldSanitizeToken ? sanitizeToken(href, false) : href;
 
-    return `${origin}?redirectTo=${url}`;
-};
\ No newline at end of file
+    return shouldSanitizeToken ? `${origin}?redirectTo=${url}` : `${origin}${url}`;
+};