@@ -37,7 +37,8 @@ import { clerkClient } from './clerkClient';
3737import { DOMAIN , PROXY_URL , PUBLISHABLE_KEY , SECRET_KEY , SIGN_IN_URL , SIGN_UP_URL } from './constants' ;
3838import { type ContentSecurityPolicyOptions , createContentSecurityPolicyHeaders } from './content-security-policy' ;
3939import { errorThrower } from './errorThrower' ;
40- import { clerkMiddlewareRequestDataStorage , clerkMiddlewareRequestDataStore } from './middleware-storage' ;
40+ import type { ClerkMiddlewareRequestDataStore } from './middleware-storage' ;
41+ import { clerkMiddlewareRequestDataStorage } from './middleware-storage' ;
4142import {
4243 isNextjsNotFoundError ,
4344 isNextjsRedirectError ,
@@ -145,63 +146,64 @@ export const clerkMiddleware = ((...args: unknown[]): NextMiddleware | NextMiddl
145146 const [ request , event ] = parseRequestAndEvent ( args ) ;
146147 const [ handler , params ] = parseHandlerAndOptions ( args ) ;
147148
148- const middleware = clerkMiddlewareRequestDataStorage . run ( clerkMiddlewareRequestDataStore , ( ) => {
149- const baseNextMiddleware : NextMiddleware = withLogger ( 'clerkMiddleware' , logger => async ( request , event ) => {
150- // Handles the case where `options` is a callback function to dynamically access `NextRequest`
151- const resolvedParams = typeof params === 'function' ? await params ( request ) : params ;
149+ const baseNextMiddleware : NextMiddleware = withLogger ( 'clerkMiddleware' , logger => async ( request , event ) => {
150+ // Handles the case where `options` is a callback function to dynamically access `NextRequest`
151+ const resolvedParams = typeof params === 'function' ? await params ( request ) : params ;
152152
153- const publishableKey = assertKey ( resolvedParams . publishableKey || PUBLISHABLE_KEY , ( ) =>
154- errorThrower . throwMissingPublishableKeyError ( ) ,
155- ) ;
153+ const publishableKey = assertKey ( resolvedParams . publishableKey || PUBLISHABLE_KEY , ( ) =>
154+ errorThrower . throwMissingPublishableKeyError ( ) ,
155+ ) ;
156156
157- const secretKey = assertKey ( resolvedParams . secretKey || SECRET_KEY , ( ) =>
158- errorThrower . throwMissingSecretKeyError ( ) ,
159- ) ;
157+ const secretKey = assertKey ( resolvedParams . secretKey || SECRET_KEY , ( ) =>
158+ errorThrower . throwMissingSecretKeyError ( ) ,
159+ ) ;
160160
161- // Handle Frontend API proxy requests early, before authentication
162- const requestUrl = new URL ( request . nextUrl . href ) ;
163- let frontendApiProxyConfig = resolvedParams . frontendApiProxy ;
164-
165- // Auto-detect when no explicit proxy or domain is configured
166- const hasExplicitProxyOrDomain = resolvedParams . proxyUrl || PROXY_URL || resolvedParams . domain || DOMAIN ;
167- if (
168- ! frontendApiProxyConfig &&
169- ! hasExplicitProxyOrDomain &&
170- ! isAutoProxyDisabledFromEnvironment ( ) &&
171- isProductionFromPublishableKey ( publishableKey )
172- ) {
173- if ( shouldAutoProxy ( requestUrl . hostname ) ) {
174- frontendApiProxyConfig = { enabled : true } ;
175- }
161+ // Handle Frontend API proxy requests early, before authentication
162+ const requestUrl = new URL ( request . nextUrl . href ) ;
163+ let frontendApiProxyConfig = resolvedParams . frontendApiProxy ;
164+
165+ // Auto-detect when no explicit proxy or domain is configured
166+ const hasExplicitProxyOrDomain = resolvedParams . proxyUrl || PROXY_URL || resolvedParams . domain || DOMAIN ;
167+ if (
168+ ! frontendApiProxyConfig &&
169+ ! hasExplicitProxyOrDomain &&
170+ ! isAutoProxyDisabledFromEnvironment ( ) &&
171+ isProductionFromPublishableKey ( publishableKey )
172+ ) {
173+ if ( shouldAutoProxy ( requestUrl . hostname ) ) {
174+ frontendApiProxyConfig = { enabled : true } ;
176175 }
177- if ( frontendApiProxyConfig ) {
178- const { enabled , path : proxyPath = DEFAULT_PROXY_PATH } = frontendApiProxyConfig ;
179-
180- // Resolve enabled - either boolean or function
181- const isEnabled = typeof enabled === 'function' ? enabled ( requestUrl ) : enabled ;
182-
183- if ( isEnabled && matchProxyPath ( request , { proxyPath } ) ) {
184- return clerkFrontendApiProxy ( request , {
185- proxyPath ,
186- publishableKey ,
187- secretKey ,
188- } ) ;
189- }
176+ }
177+ if ( frontendApiProxyConfig ) {
178+ const { enabled , path : proxyPath = DEFAULT_PROXY_PATH } = frontendApiProxyConfig ;
179+
180+ // Resolve enabled - either boolean or function
181+ const isEnabled = typeof enabled === 'function' ? enabled ( requestUrl ) : enabled ;
182+
183+ if ( isEnabled && matchProxyPath ( request , { proxyPath } ) ) {
184+ return clerkFrontendApiProxy ( request , {
185+ proxyPath ,
186+ publishableKey ,
187+ secretKey ,
188+ } ) ;
190189 }
190+ }
191+
192+ const signInUrl = resolvedParams . signInUrl || SIGN_IN_URL ;
193+ const signUpUrl = resolvedParams . signUpUrl || SIGN_UP_URL ;
191194
192- const signInUrl = resolvedParams . signInUrl || SIGN_IN_URL ;
193- const signUpUrl = resolvedParams . signUpUrl || SIGN_UP_URL ;
195+ const options = {
196+ publishableKey,
197+ secretKey,
198+ signInUrl,
199+ signUpUrl,
200+ ...resolvedParams ,
201+ } ;
194202
195- const options = {
196- publishableKey,
197- secretKey,
198- signInUrl,
199- signUpUrl,
200- ...resolvedParams ,
201- } ;
203+ // Propagates the request data to be accessed on the server application runtime from helpers such as `clerkClient`
204+ const requestDataStore : ClerkMiddlewareRequestDataStore = new Map ( [ [ 'requestData' , options ] ] ) ;
202205
203- // Propagates the request data to be accessed on the server application runtime from helpers such as `clerkClient`
204- clerkMiddlewareRequestDataStore . set ( 'requestData' , options ) ;
206+ return clerkMiddlewareRequestDataStorage . run ( requestDataStore , async ( ) => {
205207 const resolvedClerkClient = await clerkClient ( ) ;
206208
207209 if ( options . debug ) {
@@ -239,19 +241,17 @@ export const clerkMiddleware = ((...args: unknown[]): NextMiddleware | NextMiddl
239241 logger,
240242 } ) ;
241243 } ) ;
242-
243- // If we have a request and event, we're being called as a middleware directly
244- // eg, export default clerkMiddleware;
245- if ( request && event ) {
246- return baseNextMiddleware ( request , event ) ;
247- }
248-
249- // Otherwise, return a middleware that can be called with a request and event
250- // eg, export default clerkMiddleware(auth => { ... });
251- return baseNextMiddleware ;
252244 } ) ;
253245
254- return middleware ;
246+ // If we have a request and event, we're being called as a middleware directly
247+ // eg, export default clerkMiddleware;
248+ if ( request && event ) {
249+ return baseNextMiddleware ( request , event ) ;
250+ }
251+
252+ // Otherwise, return a middleware that can be called with a request and event
253+ // eg, export default clerkMiddleware(auth => { ... });
254+ return baseNextMiddleware ;
255255} ) as ClerkMiddleware ;
256256
257257const parseRequestAndEvent = ( args : unknown [ ] ) => {
@@ -338,9 +338,7 @@ async function runHandlerWithRequestState({
338338
339339 let handlerResult : Response = NextResponse . next ( ) ;
340340 try {
341- const userHandlerResult = await clerkMiddlewareRequestDataStorage . run ( clerkMiddlewareRequestDataStore , async ( ) =>
342- handler ?.( authHandler , request , event ) ,
343- ) ;
341+ const userHandlerResult = await handler ?.( authHandler , request , event ) ;
344342 handlerResult = userHandlerResult || handlerResult ;
345343 } catch ( e : any ) {
346344 handlerResult = handleControlFlowErrors ( e , clerkRequest , request , requestState ) ;
0 commit comments