fix(backend,nextjs): Replace DevBrowser constant usage for query para…

…ms (#3355) * fix(backend,nextjs): Replace DevBrowser constant usage for query params Instead of using Cookies.DevBrowser we should use QueryParameters.DevBrowser when adding dev browser token to the url for consistency even though both constants have the same value * fix(backend): Replace Handshake constant usage for query params Instead of using Cookies.Handshake we should use QueryParameters.Handshake
clerk · May 10, 2024 · 558430d · 558430d
1 parent 7b213d5
commit 558430d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/.changeset/lemon-plums-cheat.md b/.changeset/lemon-plums-cheat.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/packages/backend/src/createRedirect.ts b/packages/backend/src/createRedirect.ts
@@ -20,7 +20,7 @@ const buildUrl = (
   }
   // For cross-origin redirects, we need to pass the dev browser token for URL session syncing
   if (_devBrowserToken && baseUrl.hostname !== res.hostname) {
-    res.searchParams.set(constants.Cookies.DevBrowser, _devBrowserToken);
+    res.searchParams.set(constants.QueryParameters.DevBrowser, _devBrowserToken);
   }
   return res.toString();
 };

diff --git a/packages/backend/src/tokens/authenticateContext.ts b/packages/backend/src/tokens/authenticateContext.ts
@@ -48,10 +48,10 @@ class AuthenticateContext {
 
   private initHandshakeValues() {
     this.devBrowserToken =
-      this.clerkRequest.clerkUrl.searchParams.get(constants.Cookies.DevBrowser) ||
+      this.clerkRequest.clerkUrl.searchParams.get(constants.QueryParameters.DevBrowser) ||
       this.clerkRequest.cookies.get(constants.Cookies.DevBrowser);
     this.handshakeToken =
-      this.clerkRequest.clerkUrl.searchParams.get(constants.Cookies.Handshake) ||
+      this.clerkRequest.clerkUrl.searchParams.get(constants.QueryParameters.Handshake) ||
       this.clerkRequest.cookies.get(constants.Cookies.Handshake);
   }
 

diff --git a/packages/backend/src/tokens/request.ts b/packages/backend/src/tokens/request.ts
@@ -248,7 +248,10 @@ ${error.getFullMessage()}`,
     /**
      * Otherwise, check for "known unknown" auth states that we can resolve with a handshake.
      */
-    if (instanceType === 'development' && authenticateContext.clerkUrl.searchParams.has(constants.Cookies.DevBrowser)) {
+    if (
+      instanceType === 'development' &&
+      authenticateContext.clerkUrl.searchParams.has(constants.QueryParameters.DevBrowser)
+    ) {
       return handleMaybeHandshakeStatus(authenticateContext, AuthErrorReason.DevBrowserSync, '');
     }
 
@@ -284,7 +287,7 @@ ${error.getFullMessage()}`,
 
       if (authenticateContext.devBrowserToken) {
         redirectBackToSatelliteUrl.searchParams.append(
-          constants.Cookies.DevBrowser,
+          constants.QueryParameters.DevBrowser,
           authenticateContext.devBrowserToken,
         );
       }

diff --git a/packages/nextjs/src/app-router/server/auth.ts b/packages/nextjs/src/app-router/server/auth.ts
@@ -25,7 +25,7 @@ export const auth = (): Auth => {
   const redirectToSignIn: RedirectFun<never> = (opts = {}) => {
     const clerkRequest = createClerkRequest(request);
     const devBrowserToken =
-      clerkRequest.clerkUrl.searchParams.get(constants.Cookies.DevBrowser) ||
+      clerkRequest.clerkUrl.searchParams.get(constants.QueryParameters.DevBrowser) ||
       clerkRequest.cookies.get(constants.Cookies.DevBrowser);
 
     return createRedirect({