dikaioai
diff --git a/‎.changeset/spotty-students-judge.md‎
Lines changed: 5 additions & 0 deletions b/‎.changeset/spotty-students-judge.md‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎package-lock.json‎
Lines changed: 22 additions & 14 deletions b/‎package-lock.json‎
Lines changed: 22 additions & 14 deletions
diff --git a/‎packages/backend/src/constants.ts‎
Lines changed: 1 addition & 0 deletions b/‎packages/backend/src/constants.ts‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎packages/backend/src/tokens/__tests__/request.test.ts‎
Lines changed: 1 addition & 0 deletions b/‎packages/backend/src/tokens/__tests__/request.test.ts‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎packages/backend/src/tokens/request.ts‎
Lines changed: 12 additions & 4 deletions b/‎packages/backend/src/tokens/request.ts‎
Lines changed: 12 additions & 4 deletions
diff --git a/‎packages/fastify/src/__tests__/__snapshots__/constants.test.ts.snap‎
Lines changed: 1 addition & 0 deletions b/‎packages/fastify/src/__tests__/__snapshots__/constants.test.ts.snap‎
Lines changed: 1 addition & 0 deletions
@@ -0,0 +1,5 @@
+---
+"@clerk/backend": patch
+---
+
+Fix Chrome caching 307 redirects when a handshake is triggered.
@@ -55,6 +55,7 @@ const Headers = {
   ContentType: 'content-type',
   SecFetchDest: 'sec-fetch-dest',
   Location: 'location',
+  CacheControl: 'cache-control',
 } as const;
 
 const ContentTypes = {
 
@@ -62,6 +62,7 @@ function assertHandshake(
     signInUrl?: string;
   },
 ) {
+  assert.true(!!requestState.headers.get('cache-control'));
   assert.propContains(requestState, {
     proxyUrl: '',
     status: AuthStatus.Handshake,
 
@@ -96,7 +96,7 @@ export async function authenticateRequest(
       url.searchParams.append(constants.QueryParameters.DevBrowser, authenticateContext.devBrowserToken);
     }
 
-    return new Headers({ location: url.href });
+    return new Headers({ [constants.Headers.Location]: url.href });
   }
 
   async function resolveHandshake() {
@@ -120,7 +120,8 @@ export async function authenticateRequest(
       const newUrl = new URL(authenticateContext.clerkUrl);
       newUrl.searchParams.delete(constants.QueryParameters.Handshake);
       newUrl.searchParams.delete(constants.QueryParameters.HandshakeHelp);
-      headers.append('Location', newUrl.toString());
+      headers.append(constants.Headers.Location, newUrl.toString());
+      headers.set(constants.Headers.CacheControl, 'no-store');
     }
 
     if (sessionToken === '') {
@@ -174,6 +175,13 @@ ${error.getFullMessage()}`,
       // Right now the only usage of passing in different headers is for multi-domain sync, which redirects somewhere else.
       // In the future if we want to decorate the handshake redirect with additional headers per call we need to tweak this logic.
       const handshakeHeaders = headers ?? buildRedirectToHandshake();
+
+      // Chrome aggressively caches inactive tabs. If we don't set the header here,
+      // all 307 redirects will be cached and the handshake will end up in an infinite loop.
+      if (handshakeHeaders.get(constants.Headers.Location)) {
+        handshakeHeaders.set(constants.Headers.CacheControl, 'no-store');
+      }
+
       // Introduce the mechanism to protect for infinite handshake redirect loops
       // using a cookie and returning true if it's infinite redirect loop or false if we can
       // proceed with triggering handshake.
@@ -294,7 +302,7 @@ ${error.getFullMessage()}`,
         authenticateContext.clerkUrl.toString(),
       );
 
-      const headers = new Headers({ location: redirectURL.toString() });
+      const headers = new Headers({ [constants.Headers.Location]: redirectURL.toString() });
       return handleMaybeHandshakeStatus(authenticateContext, AuthErrorReason.SatelliteCookieNeedsSyncing, '', headers);
     }
 
@@ -314,7 +322,7 @@ ${error.getFullMessage()}`,
       }
       redirectBackToSatelliteUrl.searchParams.append(constants.QueryParameters.ClerkSynced, 'true');
 
-      const headers = new Headers({ location: redirectBackToSatelliteUrl.toString() });
+      const headers = new Headers({ [constants.Headers.Location]: redirectBackToSatelliteUrl.toString() });
       return handleMaybeHandshakeStatus(authenticateContext, AuthErrorReason.PrimaryRespondsToSyncing, '', headers);
     }
     /**
 
@@ -19,6 +19,7 @@ exports[`constants from environment variables 1`] = `
     "AuthStatus": "x-clerk-auth-status",
     "AuthToken": "x-clerk-auth-token",
     "Authorization": "authorization",
+    "CacheControl": "cache-control",
     "ClerkRedirectTo": "x-clerk-redirect-to",
     "ClerkRequestData": "x-clerk-request-data",
     "ClerkUrl": "x-clerk-clerk-url",
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@clerk/backend": patch
 +---
++
 +Fix Chrome caching 307 redirects when a handshake is triggered.