Rename signin code to cvxAuthCode

get-convex · Dec 20, 2024 · 3c35da8 · 3c35da8
1 parent e6cbdc6
commit 3c35da8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/src/nextjs/server/request.ts b/src/nextjs/server/request.ts
@@ -26,7 +26,7 @@ export async function handleAuthenticationInRequest(
   const refreshTokens = await getRefreshedTokens(verbose);
 
   // Handle code exchange for OAuth and magic links via server-side redirect
-  const code = requestUrl.searchParams.get("code");
+  const code = requestUrl.searchParams.get("cvxAuthCode");
   if (
     code &&
     request.method === "GET" &&
@@ -35,7 +35,7 @@ export async function handleAuthenticationInRequest(
     logVerbose(`Handling code exchange for OAuth or magic link`, verbose);
     const verifier = (await getRequestCookies()).verifier ?? undefined;
     const redirectUrl = new URL(requestUrl);
-    redirectUrl.searchParams.delete("code");
+    redirectUrl.searchParams.delete("cvxAuthCode");
     try {
       const result = await fetchAction(
         "auth:signIn" as unknown as SignInAction,

diff --git a/src/react/client.tsx b/src/react/client.tsx
@@ -166,12 +166,14 @@ export function AuthProvider({
 
   const verifyCodeAndSetToken = useCallback(
     async (
-      args: { code: string; verifier?: string } | { refreshToken: string },
+      args:
+        | { cvxAuthCode: string; verifier?: string }
+        | { refreshToken: string },
     ) => {
       const { tokens } = await client.unauthenticatedCall(
         "auth:signIn" as unknown as SignInAction,
-        "code" in args
-          ? { params: { code: args.code }, verifier: args.verifier }
+        "cvxAuthCode" in args
+          ? { params: { code: args.cvxAuthCode }, verifier: args.verifier }
           : args,
       );
       logVerbose(`retrieved tokens, is null: ${tokens === null}`);
@@ -322,15 +324,15 @@ export function AuthProvider({
       }
       const code =
         typeof window?.location !== "undefined"
-          ? new URLSearchParams(window.location.search).get("code")
+          ? new URLSearchParams(window.location.search).get("cvxAuthCode")
           : null;
       // code from URL is only consumed initially,
       // ref avoids racing in Strict mode
       if (signingInWithCodeFromURL.current || code) {
         if (code && !signingInWithCodeFromURL.current) {
           signingInWithCodeFromURL.current = true;
           const url = new URL(window.location.href);
-          url.searchParams.delete("code");
+          url.searchParams.delete("cvxAuthCode");
           void (async () => {
             await replaceURL(url.pathname + url.search + url.hash);
             await signIn(undefined, { code });

diff --git a/src/server/implementation/index.ts b/src/server/implementation/index.ts
@@ -341,7 +341,7 @@ export function convexAuth(config_: ConvexAuthConfig) {
                 headers: {
                   Location: setURLSearchParam(
                     destinationUrl,
-                    "code",
+                    "cvxAuthCode",
                     verificationCode,
                   ),
                   "Cache-Control": "must-revalidate",

diff --git a/test-nextjs/package-lock.json b/test-nextjs/package-lock.json