UniqAI/hexabot
1
0
Fork 0
mirror of https://github.com/hexastack/hexabot synced 2025-05-06 05:44:37 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

feat(fix): added fix for the relative url too

Browse Source
This commit is contained in:
Amit Ranjan 2024-10-01 20:05:07 +05:30
parent 008257db64
commit 3a7b0ab4fb
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/src/utils/helpers/URL.ts
View File

@ -1,13 +1,14 @@
export const buildURL = (baseUrl: string, relativePath: string): string => { export const buildURL = (baseUrl: string, relativePath: string): string => {
try { try {
const normalizedBaseUrl = baseUrl.endsWith('/') ? baseUrl : `${baseUrl}/`; return new URL(relativePath).toString();
const normalizedRelativePath = relativePath.startsWith('/') } catch {
? relativePath.slice(1) try {
: relativePath; return new URL(
const url = new URL(normalizedRelativePath, normalizedBaseUrl); relativePath.replace(/^\//, ''),
baseUrl.endsWith('/') ? baseUrl : `${baseUrl}/`,
return url.toString(); ).toString();
} catch { } catch {
throw new Error(`Invalid base URL: ${baseUrl}`); throw new Error(`Invalid base URL: ${baseUrl}`);
} }
}
}; };

15
frontend/src/utils/URL.ts
View File

@ -28,16 +28,17 @@ export const getFromQuery = ({
export const buildURL = (baseUrl: string, relativePath: string): string => { export const buildURL = (baseUrl: string, relativePath: string): string => {
try { try {
const normalizedBaseUrl = baseUrl.endsWith("/") ? baseUrl : `${baseUrl}/`; return new URL(relativePath).toString();
const normalizedRelativePath = relativePath.startsWith("/") } catch {
? relativePath.slice(1) try {
: relativePath; return new URL(
const url = new URL(normalizedRelativePath, normalizedBaseUrl); relativePath.replace(/^\//, ""),
baseUrl.endsWith("/") ? baseUrl : `${baseUrl}/`,
return url.toString(); ).toString();
} catch { } catch {
throw new Error(`Invalid base URL: ${baseUrl}`); throw new Error(`Invalid base URL: ${baseUrl}`);
} }
}
}; };
export const isAbsoluteUrl = (value: string = ""): boolean => { export const isAbsoluteUrl = (value: string = ""): boolean => {