@@ -27,12 +27,10 @@ import type { APIContext } from 'astro';
2727
2828import { authAsyncStorage } from '#async-local-storage' ;
2929
30- import { canUseKeyless } from '../utils/feature-flags' ;
3130import { buildClerkHotloadScript } from './build-clerk-hotload-script' ;
3231import { clerkClient } from './clerk-client' ;
3332import { createCurrentUser } from './current-user' ;
3433import { getClientSafeEnv , getSafeEnv , initCloudflareEnv } from './get-safe-env' ;
35- import { resolveKeysWithKeylessFallback } from './keyless/utils' ;
3634import { serverRedirectWithAuth } from './server-redirect-with-auth' ;
3735import type {
3836 AstroMiddleware ,
@@ -87,42 +85,9 @@ export const clerkMiddleware: ClerkMiddleware = (...args: unknown[]): any => {
8785 const patchedRequest = patchRequest ( context . request ) ;
8886 const clerkRequest = createClerkRequest ( patchedRequest ) ;
8987
90- // Resolve keyless URLs per-request in development
91- let keylessClaimUrl : string | undefined ;
92- let keylessApiKeysUrl : string | undefined ;
93- let keylessOptions = options ;
94-
95- if ( canUseKeyless ) {
96- try {
97- const env = getSafeEnv ( context ) ;
98- const configuredPublishableKey = options ?. publishableKey || env . pk ;
99- const configuredSecretKey = options ?. secretKey || env . sk ;
100-
101- const keylessResult = await resolveKeysWithKeylessFallback (
102- configuredPublishableKey ,
103- configuredSecretKey ,
104- context ,
105- ) ;
106-
107- keylessClaimUrl = keylessResult . claimUrl ;
108- keylessApiKeysUrl = keylessResult . apiKeysUrl ;
109-
110- // Override keys with keyless values if returned
111- if ( keylessResult . publishableKey || keylessResult . secretKey ) {
112- keylessOptions = {
113- ...options ,
114- ...( keylessResult . publishableKey && { publishableKey : keylessResult . publishableKey } ) ,
115- ...( keylessResult . secretKey && { secretKey : keylessResult . secretKey } ) ,
116- } ;
117- }
118- } catch {
119- // Silently fail - continue without keyless
120- }
121- }
122-
12388 const requestState = await clerkClient ( context ) . authenticateRequest (
12489 clerkRequest ,
125- createAuthenticateRequestOptions ( clerkRequest , keylessOptions , context ) ,
90+ createAuthenticateRequestOptions ( clerkRequest , options , context ) ,
12691 ) ;
12792
12893 const locationHeader = requestState . headers . get ( constants . Headers . Location ) ;
@@ -145,16 +110,6 @@ export const clerkMiddleware: ClerkMiddleware = (...args: unknown[]): any => {
145110
146111 decorateAstroLocal ( clerkRequest , authObjectFn , context , requestState ) ;
147112
148- // Store keyless data for injection into client
149- if ( keylessClaimUrl || keylessApiKeysUrl ) {
150- context . locals . keylessClaimUrl = keylessClaimUrl ;
151- context . locals . keylessApiKeysUrl = keylessApiKeysUrl ;
152- // Also store the resolved publishable key so client can use it
153- if ( keylessOptions ?. publishableKey ) {
154- context . locals . keylessPublishableKey = keylessOptions . publishableKey ;
155- }
156- }
157-
158113 /**
159114 * ALS is crucial for guaranteeing SSR in UI frameworks like React.
160115 * This currently powers the `useAuth()` React hook and any other hook or Component that depends on it.
0 commit comments