UniqAI/hexabot
1
0
Fork 0
mirror of https://github.com/hexastack/hexabot synced 2024-11-28 06:52:20 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'Hexastack:main' into fix-issue-45

Browse Source
This commit is contained in:
Pranav Bhat 2024-10-02 17:17:35 +05:30 committed by GitHub
commit e85e6dcec4
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

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

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

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

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