fix: add url to state for redirection from SSR (#1321)

fern-api · Aug 20, 2024 · d1af0d2 · d1af0d2
1 parent c0c1f11
commit d1af0d2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/ui/app/src/api-playground/PlaygroundAuthorizationForm.tsx b/packages/ui/app/src/api-playground/PlaygroundAuthorizationForm.tsx
@@ -349,7 +349,12 @@ export function PlaygroundAuthorizationFormCard({
                                         text="Logout"
                                         intent="none"
                                         onClick={() => {
-                                            fetch(urlJoin(window.location.origin, "/api/fern-docs/auth/logout"))
+                                            const url = new URL(
+                                                urlJoin(window.location.origin, "/api/fern-docs/auth/logout"),
+                                            );
+                                            const state = new URL(window.location.href);
+                                            url.searchParams.set("state", state.toString());
+                                            fetch(url)
                                                 .then(() => {
                                                     window.location.reload();
                                                 })

diff --git a/packages/ui/docs-bundle/src/pages/api/fern-docs/auth/logout.ts b/packages/ui/docs-bundle/src/pages/api/fern-docs/auth/logout.ts
@@ -9,7 +9,10 @@ export default async function GET(req: NextRequest): Promise<NextResponse> {
     const domain = getXFernHostEdge(req);
     const config = await getAuthEdgeConfig(domain);
 
-    const res = NextResponse.redirect(req.nextUrl.origin);
+    const state = req.nextUrl.searchParams.get("state");
+    const redirectLocation = state ?? req.nextUrl.origin;
+
+    const res = NextResponse.redirect(redirectLocation);
     if (config != null && config.type === "oauth2" && config.partner === "ory") {
         res.cookies.delete("fern_token");
         res.cookies.delete("access_token");