describe('helpers', () => {
// given
- const url = 'https://example.com/c=zzzzz/t=v2/a/b/LIMS/1.html';
+ const url = 'https://example.com/c=zzzzz-4zz18-0123456789abcde/t=v2/a/b/LIMS/1.html';
+ const urlWithPdh = 'https://example.com/c=012345678901234567890123456789aa+0/t=v2/a/b/LIMS/1.html';
describe('sanitizeToken', () => {
it('should sanitize token from the url', () => {
const result = sanitizeToken(url);
// then
- expect(result).toBe('https://example.com/c=zzzzz/LIMS/1.html?api_token=v2/a/b');
+ expect(result).toBe('https://example.com/c=zzzzz-4zz18-0123456789abcde/LIMS/1.html?api_token=v2/a/b');
});
});
const result = getClipboardUrl(url);
// then
- expect(result).toBe('http://localhost?redirectTo=https://example.com/c=zzzzz/LIMS/1.html');
+ expect(result).toBe('http://localhost?redirectTo=https://example.com/c=zzzzz-4zz18-0123456789abcde/LIMS/1.html');
});
});
// then
expect(getInlineFileUrl(url, webDavDownloadUrl, webDavUrlA))
- .toBe('https://zzzzz.collections.example.com/t=v2/a/b/LIMS/1.html');
+ .toBe('https://zzzzz-4zz18-0123456789abcde.collections.example.com/t=v2/a/b/LIMS/1.html');
expect(getInlineFileUrl(url, webDavDownloadUrl, webDavUrlB))
- .toBe('https://zzzzz--collections.example.com/t=v2/a/b/LIMS/1.html');
+ .toBe('https://zzzzz-4zz18-0123456789abcde--collections.example.com/t=v2/a/b/LIMS/1.html');
+ expect(getInlineFileUrl(urlWithPdh, webDavDownloadUrl, webDavUrlA))
+ .toBe('https://012345678901234567890123456789aa-0.collections.example.com/t=v2/a/b/LIMS/1.html');
+ expect(getInlineFileUrl(urlWithPdh, webDavDownloadUrl, webDavUrlB))
+ .toBe('https://012345678901234567890123456789aa-0--collections.example.com/t=v2/a/b/LIMS/1.html');
});
it('should keep the url the same when no inline url available', () => {
const result = getInlineFileUrl(url, webDavDownloadUrl, webDavUrl);
// then
- expect(result).toBe('https://example.com/c=zzzzz/t=v2/a/b/LIMS/1.html');
+ expect(result).toBe('https://example.com/c=zzzzz-4zz18-0123456789abcde/t=v2/a/b/LIMS/1.html');
});
it('should replace the url when available', () => {
const result = getInlineFileUrl(url, webDavDownloadUrl, webDavUrl);
// then
- expect(result).toBe('https://download.example.com/c=zzzzz/t=v2/a/b/LIMS/1.html');
+ expect(result).toBe('https://download.example.com/c=zzzzz-4zz18-0123456789abcde/t=v2/a/b/LIMS/1.html');
});
});
});
\ No newline at end of file
//
// SPDX-License-Identifier: AGPL-3.0
+import { extractUuidKind, ResourceKind } from "~/models/resource";
+
export const sanitizeToken = (href: string, tokenAsQueryParam = true): string => {
const [prefix, suffix] = href.split('/t=');
const [token1, token2, token3, ...rest] = suffix.split('/');
};
export const getInlineFileUrl = (url: string, keepWebSvcUrl: string, keepWebInlineSvcUrl: string): string => {
- const collUuidMatch = url.match(/\/c=([a-z0-9-]+)\//);
- if (collUuidMatch === null) { return ''; }
- const collUuid = collUuidMatch[1];
+ const collMatch = url.match(/\/c=([a-z0-9-+]+)\//);
+ if (collMatch === null) { return ''; }
+ if (extractUuidKind(collMatch[1]) !== ResourceKind.COLLECTION) { return ''; }
+ const collId = collMatch[1].replace('+', '-');
let inlineUrl = keepWebInlineSvcUrl !== ""
? url.replace(keepWebSvcUrl, keepWebInlineSvcUrl)
: url;
// 'https://*--collections.example.com' should get the uuid on their hostnames
// See: https://doc.arvados.org/v2.1/api/keep-web-urls.html
if (inlineUrl.indexOf('*.') > -1) {
- inlineUrl = inlineUrl.replace('*.', `${collUuid}.`);
+ inlineUrl = inlineUrl.replace('*.', `${collId}.`);
uuidOnHostname = true;
} else if (inlineUrl.indexOf('*--') > -1) {
- inlineUrl = inlineUrl.replace('*--', `${collUuid}--`);
+ inlineUrl = inlineUrl.replace('*--', `${collId}--`);
uuidOnHostname = true;
}
if (uuidOnHostname) {
- inlineUrl = inlineUrl.replace(`/c=${collUuid}`, '');
+ inlineUrl = inlineUrl.replace(`/c=${collMatch[1]}`, '');
}
return inlineUrl;
};
\ No newline at end of file