UniqAI/hexabot
1
0
Fork 0
mirror of https://github.com/hexastack/hexabot synced 2024-11-24 13:05:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #117 from devamitranjan/FIX#114

Browse Source 
feat(frontend): added fix for the base url
This commit is contained in:
Mohamed Marrouchi 2024-10-02 07:13:54 +01:00 committed by GitHub
commit 28313e1cf7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -28,12 +28,17 @@ export const getFromQuery = ({
export const buildURL = (baseUrl: string, relativePath: string): string => { export const buildURL = (baseUrl: string, relativePath: string): string => {
try { try {
const url = new URL(relativePath, baseUrl); return new URL(relativePath).toString();
} catch {
return url.toString(); try {
return new URL(
relativePath.replace(/^\//, ""),
baseUrl.endsWith("/") ? baseUrl : `${baseUrl}/`,
).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 => {