Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

fix(libs): strip trailing slash before appending /api in resolveApiBaseUrl

Tin6edf7cfaf117
diff --git a/packages/libs/src/api-url.test.ts b/packages/libs/src/api-url.test.ts
index 6ee781870..4aa661049 100644
--- a/packages/libs/src/api-url.test.ts
+++ b/packages/libs/src/api-url.test.ts
@@ -14,4 +14,13 @@ describe("resolveApiBaseUrl", () => {
"http://localhost:1337/api",
);
});
+
+ it("strips trailing slashes before appending /api", () => {
+ expect(resolveApiBaseUrl("http://localhost:1337/")).toBe(
+ "http://localhost:1337/api",
+ );
+ expect(resolveApiBaseUrl("http://localhost:1337/api/")).toBe(
+ "http://localhost:1337/api",
+ );
+ });
});
diff --git a/packages/libs/src/api-url.ts b/packages/libs/src/api-url.ts
index 5fff1f754..b06426b4b 100644
--- a/packages/libs/src/api-url.ts
+++ b/packages/libs/src/api-url.ts
@@ -3,6 +3,7 @@
* If the value already ends with `/api`, it is returned as-is; otherwise `/api` is appended.
*/
export function resolveApiBaseUrl(viteApiUrl: string | undefined): string {
- const baseUrl = viteApiUrl || "http://localhost:1337";
+ const raw = viteApiUrl || "http://localhost:1337";
+ const baseUrl = raw.replace(/\/+$/, "");
return baseUrl.endsWith("/api") ? baseUrl : `${baseUrl}/api`;
}