fix: inconsistent deserialization of authprops

fern-api · Oct 9, 2024 · 7cb4b48 · 7cb4b48
1 parent 67a8acc
commit 7cb4b48
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 20 deletions.
diff --git a/packages/ui/docs-bundle/src/server/DocsLoader.ts b/packages/ui/docs-bundle/src/server/DocsLoader.ts
@@ -12,7 +12,7 @@ interface DocsLoaderFlags {
 }
 
 export class DocsLoader {
-    static for(xFernHost: string, fernToken: string | undefined): DocsLoader {
+    static for(xFernHost: string, fernToken?: string): DocsLoader {
         return new DocsLoader(xFernHost, fernToken);
     }
 
@@ -30,25 +30,29 @@ export class DocsLoader {
         return this;
     }
 
-    private auth: AuthEdgeConfig | undefined;
-    public withAuth(auth: AuthEdgeConfig | undefined): DocsLoader {
-        this.auth = auth;
+    private authConfig: AuthEdgeConfig | undefined;
+    private authProps: AuthProps | undefined;
+    public withAuth(authConfig: AuthEdgeConfig | undefined, authProps?: AuthProps): DocsLoader {
+        this.authConfig = authConfig;
+        if (authProps) {
+            this.authProps = authProps;
+        }
         return this;
     }
 
     private async loadAuth(): Promise<[AuthProps | undefined, AuthEdgeConfig | undefined]> {
-        if (!this.auth) {
-            this.auth = await getAuthEdgeConfig(this.xFernHost);
+        if (!this.authConfig) {
+            this.authConfig = await getAuthEdgeConfig(this.xFernHost);
         }
-        if (!this.auth) {
-            return [undefined, undefined];
+        if (!this.authConfig || !this.fernToken || (this.authProps && this.authConfig)) {
+            return [this.authProps, this.authConfig];
         }
         try {
-            return [await withAuthProps(this.auth, this.fernToken), this.auth];
+            return [await withAuthProps(this.authConfig, this.fernToken), this.authConfig];
         } catch (e) {
             // eslint-disable-next-line no-console
             console.error(e);
-            return [undefined, this.auth];
+            return [undefined, this.authConfig];
         }
     }
 

diff --git a/packages/ui/docs-bundle/src/server/getDynamicDocsPageProps.ts b/packages/ui/docs-bundle/src/server/getDynamicDocsPageProps.ts
@@ -3,7 +3,7 @@ import { type DocsPage } from "@fern-ui/ui";
 import type { NextApiRequestCookies } from "next/dist/server/api-utils";
 import type { GetServerSidePropsResult } from "next/types";
 import type { ComponentProps } from "react";
-import { withAuthProps } from "./authProps";
+import { AuthProps, withAuthProps } from "./authProps";
 import { getDocsPageProps } from "./getDocsPageProps";
 
 type GetServerSideDocsPagePropsResult = GetServerSidePropsResult<ComponentProps<typeof DocsPage>>;
@@ -13,18 +13,20 @@ export async function getDynamicDocsPageProps(
     slug: string[],
     cookies: NextApiRequestCookies,
 ): Promise<GetServerSideDocsPagePropsResult> {
-    if (cookies[COOKIE_FERN_TOKEN] == null) {
-        /**
-         * this only happens when ?error=true is passed in the URL
-         * Note: custom auth (via edge config) is supported via middleware, so we don't need to handle it here
-         */
-        return getDocsPageProps(xFernHost, slug);
+    let authProps: AuthProps | undefined;
+
+    try {
+        if (cookies[COOKIE_FERN_TOKEN]) {
+            authProps = await withAuthProps(xFernHost, cookies[COOKIE_FERN_TOKEN]);
+        }
+    } catch (e) {
+        // eslint-disable-next-line no-console
+        console.error("Failed to get auth props", e);
     }
 
     /**
      * Authenticated user is guaranteed to have a valid token because the middleware
      * would have redirected them to the login page
      */
-    const authProps = await withAuthProps(xFernHost, cookies[COOKIE_FERN_TOKEN]);
     return getDocsPageProps(xFernHost, slug, authProps);
 }
diff --git a/packages/ui/docs-bundle/src/server/withInitialProps.ts b/packages/ui/docs-bundle/src/server/withInitialProps.ts
@@ -61,9 +61,9 @@ export async function withInitialProps({
     const featureFlags = await getFeatureFlags(xFernHost);
 
     const authConfig = await getAuthEdgeConfig(xFernHost);
-    const loader = DocsLoader.for(xFernHost, auth?.token)
+    const loader = DocsLoader.for(xFernHost)
         .withFeatureFlags(featureFlags)
-        .withAuth(authConfig)
+        .withAuth(authConfig, auth)
         .withLoadDocsForUrlResponse(docs);
 
     const root = await loader.root();