1- import { createClerkRequest } from '@clerk/backend/internal' ;
1+ import type { ClerkRequest } from '@clerk/backend/internal' ;
22import { apiUrlFromPublishableKey } from '@clerk/shared/apiUrlFromPublishableKey' ;
33import { getEnvVariable } from '@clerk/shared/getEnvVariable' ;
44import { isDevelopmentFromSecretKey } from '@clerk/shared/keys' ;
@@ -9,10 +9,8 @@ import { errorThrower } from '../utils';
99import { getPublicEnvVariables } from '../utils/env' ;
1010import { commonEnvs } from './constants' ;
1111import type { LoaderOptions } from './types' ;
12- import { patchRequest } from './utils' ;
1312
14- export const loadOptions = ( request : Request , overrides : LoaderOptions = { } ) => {
15- const clerkRequest = createClerkRequest ( patchRequest ( request ) ) ;
13+ export const loadOptions = ( request : ClerkRequest , overrides : LoaderOptions = { } ) => {
1614 const commonEnv = commonEnvs ( ) ;
1715 const secretKey = overrides . secretKey || commonEnv . SECRET_KEY ;
1816 const machineSecretKey = overrides . machineSecretKey || commonEnv . MACHINE_SECRET_KEY ;
@@ -21,15 +19,15 @@ export const loadOptions = (request: Request, overrides: LoaderOptions = {}) =>
2119 const apiUrl = getEnvVariable ( 'CLERK_API_URL' ) || apiUrlFromPublishableKey ( publishableKey ) ;
2220 const domain = handleValueOrFn ( overrides . domain , new URL ( request . url ) ) || commonEnv . DOMAIN ;
2321 const isSatellite = handleValueOrFn ( overrides . isSatellite , new URL ( request . url ) ) || commonEnv . IS_SATELLITE ;
24- const relativeOrAbsoluteProxyUrl = handleValueOrFn ( overrides ?. proxyUrl , clerkRequest . clerkUrl , commonEnv . PROXY_URL ) ;
22+ const relativeOrAbsoluteProxyUrl = handleValueOrFn ( overrides ?. proxyUrl , request . clerkUrl , commonEnv . PROXY_URL ) ;
2523 const signInUrl = overrides . signInUrl || commonEnv . SIGN_IN_URL ;
2624 const signUpUrl = overrides . signUpUrl || commonEnv . SIGN_UP_URL ;
2725 const afterSignInUrl = overrides . afterSignInUrl || getPublicEnvVariables ( ) . afterSignInUrl ;
2826 const afterSignUpUrl = overrides . afterSignUpUrl || getPublicEnvVariables ( ) . afterSignUpUrl ;
2927
3028 let proxyUrl ;
3129 if ( ! ! relativeOrAbsoluteProxyUrl && isProxyUrlRelative ( relativeOrAbsoluteProxyUrl ) ) {
32- proxyUrl = new URL ( relativeOrAbsoluteProxyUrl , clerkRequest . clerkUrl ) . toString ( ) ;
30+ proxyUrl = new URL ( relativeOrAbsoluteProxyUrl , request . clerkUrl ) . toString ( ) ;
3331 } else {
3432 proxyUrl = relativeOrAbsoluteProxyUrl ;
3533 }
0 commit comments