fix: make jwt parsing less strict

packages/ui/docs-bundle/src/pages/api/fern-docs/auth/callback.ts

@@ -62,8 +62,6 @@ export default async function GET(req: NextRequest): Promise<NextResponse> {
         });
 
         const fernUser: FernUser = {
-            type: "user",
-            partner: "workos",
             name:
                 user.firstName != null && user.lastName != null
                     ? `${user.firstName} ${user.lastName}`

packages/ui/docs-bundle/src/pages/api/fern-docs/oauth/ory/callback.ts

@@ -53,8 +53,6 @@ export default async function GET(req: NextRequest): Promise<NextResponse> {
         const { access_token, refresh_token } = await oauthClient.getToken(code);
         const token = OryAccessTokenSchema.parse(await oauthClient.decode(access_token));
         const fernUser: FernUser = {
-            type: "user",
-            partner: "ory",
             name: token.ext?.name,
             email: token.ext?.email,
         };

packages/ui/docs-bundle/src/server/DocsLoader.ts

@@ -3,7 +3,7 @@ import * as FernNavigation from "@fern-api/fdr-sdk/navigation";
 import type { AuthEdgeConfig, FernUser } from "@fern-ui/fern-docs-auth";
 import { getAuthEdgeConfig } from "@fern-ui/fern-docs-edge-config";
 import { verifyFernJWTConfig } from "./auth/FernJWT";
-import { AuthProps } from "./authProps";
+import { AuthProps, withAuthProps } from "./authProps";
 import { loadWithUrl } from "./loadWithUrl";
 import { pruneWithBasicTokenPublic } from "./withBasicTokenPublic";
 
@@ -39,10 +39,7 @@ export class DocsLoader {
         return this;
     }
 
-    private async loadAuth(): Promise<{
-        authConfig: AuthEdgeConfig | undefined;
-        user: FernUser | undefined;
-    }> {
+    private async loadAuth(): Promise<AuthProps | undefined> {
         if (!this.auth) {
             this.auth = await getAuthEdgeConfig(this.xFernHost);
 
@@ -55,10 +52,10 @@ export class DocsLoader {
                 console.error(e);
             }
         }
-        return {
-            authConfig: this.auth,
-            user: this.user,
-        };
+        if (!this.auth) {
+            return undefined;
+        }
+        return withAuthProps(this.auth, this.fernToken);
     }
 
     #loadForDocsUrlResponse: DocsV2Read.LoadDocsForUrlResponse | undefined;
@@ -75,9 +72,7 @@ export class DocsLoader {
 
     private async loadDocs(): Promise<DocsV2Read.LoadDocsForUrlResponse | undefined> {
         if (!this.#loadForDocsUrlResponse) {
-            const { user } = await this.loadAuth();
-            const authProps: AuthProps | undefined =
-                user && this.fernToken ? { user, token: this.fernToken } : undefined;
+            const authProps = await this.loadAuth();
 
             const response = await loadWithUrl(this.xFernHost, authProps);
 

packages/ui/docs-bundle/src/server/LoadDocsPerformanceTracker.ts

@@ -3,6 +3,7 @@ import { DocsPage } from "@fern-ui/ui";
 import { track } from "@vercel/analytics/server";
 import { GetServerSidePropsResult } from "next/types";
 import { ComponentProps } from "react";
+import { AuthPartner } from "./authProps";
 import type { LoadWithUrlResponse } from "./loadWithUrl";
 
 export class LoadDocsPerformanceTracker {
@@ -13,15 +14,15 @@ export class LoadDocsPerformanceTracker {
     }: {
         host: string;
         slug: string[];
-        auth: "workos" | "ory" | "custom" | undefined;
+        auth: AuthPartner | undefined;
     }): LoadDocsPerformanceTracker {
         return new LoadDocsPerformanceTracker(host, slug, auth);
     }
 
     private constructor(
         private host: string,
         private slug: string[],
-        private auth: "workos" | "ory" | "custom" | undefined,
+        private auth: AuthPartner | undefined,
     ) {}
 
     private loadDocsDurationMs: number | undefined;

packages/ui/docs-bundle/src/server/auth/FernJWT.ts

@@ -17,7 +17,8 @@ export async function verifyFernJWT(token: string, secret?: string, issuer?: str
     const verified = await jwtVerify(token, getJwtTokenSecret(secret), {
         issuer: issuer ?? "https://buildwithfern.com",
     });
-    return FernUserSchema.parse(verified.payload.fern);
+    // if the token is undefined, FernUser will be an empty object
+    return FernUserSchema.optional().parse(verified.payload.fern) ?? {};
 }
 
 export async function verifyFernJWTConfig(token: string, authConfig: AuthEdgeConfig | undefined): Promise<FernUser> {

packages/ui/docs-bundle/src/server/authProps.ts

@@ -1,30 +1,42 @@
-import type { FernUser } from "@fern-ui/fern-docs-auth";
+import type { AuthEdgeConfig, FernUser } from "@fern-ui/fern-docs-auth";
 import { getAuthEdgeConfig } from "@fern-ui/fern-docs-edge-config";
 import { verifyFernJWTConfig } from "./auth/FernJWT";
 
+export type AuthPartner = "workos" | "ory" | "webflow" | "custom";
+
 export interface AuthProps {
     token: string;
     user: FernUser;
+    partner: AuthPartner;
 }
 
 /**
  * In Venus, workos tokens are prefixed with "workos_" to differentiate them from "fern_" tokens.
  */
-function withPrefix(token: string, partner: FernUser["partner"]): string {
+function withPrefix(token: string, partner: AuthPartner): string {
     return `${partner}_${token}`;
 }
 
-export async function withAuthProps(xFernHost: string, fernToken: string | null | undefined): Promise<AuthProps> {
+export async function withAuthProps(
+    xFernHostOrAuthConfig: string | AuthEdgeConfig,
+    fernToken: string | null | undefined,
+): Promise<AuthProps> {
     if (fernToken == null) {
         throw new Error("Missing fern_token cookie");
     }
-    const config = await getAuthEdgeConfig(xFernHost);
+    const config =
+        typeof xFernHostOrAuthConfig === "string"
+            ? await getAuthEdgeConfig(xFernHostOrAuthConfig)
+            : xFernHostOrAuthConfig;
+    const partner =
+        config?.type === "oauth2" ? config.partner : config?.type === "basic_token_verification" ? "custom" : "workos";
     const user: FernUser = await verifyFernJWTConfig(fernToken, config);
-    const token = withPrefix(fernToken, user.partner);
+    const token = withPrefix(fernToken, partner);
 
     const authProps: AuthProps = {
         token,
         user,
+        partner,
     };
 
     return authProps;

packages/ui/docs-bundle/src/server/getDocsPageProps.ts

@@ -23,7 +23,7 @@ export async function getDocsPageProps(
         return { notFound: true };
     }
 
-    const performance = LoadDocsPerformanceTracker.init({ host: xFernHost, slug, auth: auth?.user.partner });
+    const performance = LoadDocsPerformanceTracker.init({ host: xFernHost, slug, auth: auth?.partner });
 
     /**
      * Load the docs for the given URL.

packages/ui/fern-docs-auth/src/types.ts

@@ -1,8 +1,6 @@
 import { z } from "zod";
 
 export const FernUserSchema = z.object({
-    type: z.literal("user"),
-    partner: z.union([z.literal("workos"), z.literal("ory"), z.literal("custom")]),
     name: z.string().optional(),
     email: z.string().optional(),
 });