fix: allow overriding the query parameter (#1847)

fern-api · Nov 23, 2024 · 669b075 · 669b075
1 parent 197a05c
commit 669b075
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/packages/ui/docs-bundle/src/server/auth/getAuthState.ts b/packages/ui/docs-bundle/src/server/auth/getAuthState.ts
@@ -170,10 +170,20 @@ function getAuthorizationUrl(authConfig: AuthEdgeConfig, host: string, pathname?
     const state = urlJoin(removeTrailingSlash(withDefaultProtocol(host)), pathname ?? "");
 
     if (authConfig.type === "basic_token_verification") {
-        const redirectUri = urlJoin(removeTrailingSlash(withDefaultProtocol(host)), "/api/fern-docs/auth/jwt/callback");
         const destination = new URL(authConfig.redirect);
-        destination.searchParams.set("redirect_uri", redirectUri);
-        destination.searchParams.set(getReturnToQueryParam(authConfig), state);
+
+        // note: `redirect` is allowed to override the default redirect uri, and the `return_to` param
+        if (!destination.searchParams.has("redirect_uri")) {
+            const redirectUri = urlJoin(
+                removeTrailingSlash(withDefaultProtocol(host)),
+                "/api/fern-docs/auth/jwt/callback",
+            );
+
+            destination.searchParams.set("redirect_uri", redirectUri);
+        }
+        if (!destination.searchParams.has(getReturnToQueryParam(authConfig))) {
+            destination.searchParams.set(getReturnToQueryParam(authConfig), state);
+        }
         return destination.toString();
     } else if (authConfig.type === "sso" && authConfig.partner === "workos") {
         const redirectUri = urlJoin(removeTrailingSlash(withDefaultProtocol(host)), "/api/fern-docs/auth/sso/callback");