fix: urljoin on basepath (#1207)

fern-api · Jul 26, 2024 · 003c538 · 003c538
1 parent 013b849
commit 003c538
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/packages/ui/app/src/api-playground/PlaygroundContext.tsx b/packages/ui/app/src/api-playground/PlaygroundContext.tsx
@@ -18,7 +18,8 @@ const fetcher = async (url: string) => {
 
 export const PlaygroundContextProvider: FC = () => {
     const basePath = useBasePath();
-    const key = urljoin(basePath ?? "", "/api/fern-docs/resolve-api");
+    // note: if the first argument of urjoin is "", it will strip the leading slash. `|| "/"` ensures "" -> "/"
+    const key = urljoin(basePath || "/", "/api/fern-docs/resolve-api");
 
     const { data } = useSWR<Record<string, ResolvedRootPackage> | null>(key, fetcher, {
         revalidateOnFocus: false,

diff --git a/packages/ui/app/src/services/useApiKeyInjectionConfig.ts b/packages/ui/app/src/services/useApiKeyInjectionConfig.ts
@@ -9,7 +9,8 @@ const DEFAULT = { enabled: false as const };
 
 export function useApiKeyInjectionConfig(): APIKeyInjectionConfig {
     const basePath = useBasePath();
-    const key = urljoin(basePath ?? "", API_KEY_INJECTION_ROUTE);
+    // note: if the first argument of urjoin is "", it will strip the leading slash. `|| "/"` ensures "" -> "/"
+    const key = urljoin(basePath || "/", API_KEY_INJECTION_ROUTE);
 
     const { data } = useSWR<APIKeyInjectionConfig>(
         key,

diff --git a/packages/ui/app/src/services/useSearchService.ts b/packages/ui/app/src/services/useSearchService.ts
@@ -34,7 +34,8 @@ export function useSearchConfig(): [SearchConfig, refresh: () => void] {
         return [{ isAvailable: false }, noop];
     }
 
-    const key = urljoin(basePath ?? "", "/api/fern-docs/search");
+    // note: if the first argument of urjoin is "", it will strip the leading slash. `|| "/"` ensures "" -> "/"
+    const key = urljoin(basePath || "/", "/api/fern-docs/search");
 
     const { data } = useSWR<SearchConfig>(key, (url: string) => fetch(url).then((res) => res.json()), {
         refreshInterval: 1000 * 60 * 60 * 2, // 2 hours

diff --git a/packages/ui/docs-bundle/src/utils/getDocsPageProps.ts b/packages/ui/docs-bundle/src/utils/getDocsPageProps.ts
@@ -374,7 +374,8 @@ async function convertDocsToDocsPageProps({
         theme: docs.baseUrl.domain.includes("cohere") ? "cohere" : "default",
     };
 
-    props.fallback[urljoin(docs.baseUrl.basePath ?? "", "/api/fern-docs/search")] = await getSearchConfig(
+    // note: if the first argument of urjoin is "", it will strip the leading slash. `|| "/"` ensures "" -> "/"
+    props.fallback[urljoin(docs.baseUrl.basePath || "/", "/api/fern-docs/search")] = await getSearchConfig(
         xFernHost,
         docs.definition.search,
     );
@@ -392,7 +393,8 @@ async function convertDocsToDocsPageProps({
     }
 
     const apiKeyInjectionConfig = await getAPIKeyInjectionConfigNode(xFernHost, cookies);
-    props.fallback[urljoin(docs.baseUrl.basePath ?? "", "/api/fern-docs/auth/api-key-injection")] =
+    // note: if the first argument of urjoin is "", it will strip the leading slash. `|| "/"` ensures "" -> "/"
+    props.fallback[urljoin(docs.baseUrl.basePath || "/", "/api/fern-docs/auth/api-key-injection")] =
         apiKeyInjectionConfig;
 
     return {