1- import { ClerkRequest } 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' ;
@@ -10,24 +10,24 @@ import { getPublicEnvVariables } from '../utils/env';
1010import { commonEnvs } from './constants' ;
1111import type { LoaderOptions } from './types' ;
1212
13- export const loadOptions = ( clerkRequest : ClerkRequest , overrides : LoaderOptions = { } ) => {
13+ export const loadOptions = ( request : ClerkRequest , overrides : LoaderOptions = { } ) => {
1414 const commonEnv = commonEnvs ( ) ;
1515 const secretKey = overrides . secretKey || commonEnv . SECRET_KEY ;
1616 const machineSecretKey = overrides . machineSecretKey || commonEnv . MACHINE_SECRET_KEY ;
1717 const publishableKey = overrides . publishableKey || commonEnv . PUBLISHABLE_KEY ;
1818 const jwtKey = overrides . jwtKey || commonEnv . CLERK_JWT_KEY ;
1919 const apiUrl = getEnvVariable ( 'CLERK_API_URL' ) || apiUrlFromPublishableKey ( publishableKey ) ;
20- const domain = handleValueOrFn ( overrides . domain , new URL ( clerkRequest . url ) ) || commonEnv . DOMAIN ;
21- const isSatellite = handleValueOrFn ( overrides . isSatellite , new URL ( clerkRequest . url ) ) || commonEnv . IS_SATELLITE ;
22- const relativeOrAbsoluteProxyUrl = handleValueOrFn ( overrides ?. proxyUrl , clerkRequest . clerkUrl , commonEnv . PROXY_URL ) ;
20+ const domain = handleValueOrFn ( overrides . domain , new URL ( request . url ) ) || commonEnv . DOMAIN ;
21+ const isSatellite = handleValueOrFn ( overrides . isSatellite , new URL ( request . url ) ) || commonEnv . IS_SATELLITE ;
22+ const relativeOrAbsoluteProxyUrl = handleValueOrFn ( overrides ?. proxyUrl , request . clerkUrl , commonEnv . PROXY_URL ) ;
2323 const signInUrl = overrides . signInUrl || commonEnv . SIGN_IN_URL ;
2424 const signUpUrl = overrides . signUpUrl || commonEnv . SIGN_UP_URL ;
2525 const afterSignInUrl = overrides . afterSignInUrl || getPublicEnvVariables ( ) . afterSignInUrl ;
2626 const afterSignUpUrl = overrides . afterSignUpUrl || getPublicEnvVariables ( ) . afterSignUpUrl ;
2727
2828 let proxyUrl ;
2929 if ( ! ! relativeOrAbsoluteProxyUrl && isProxyUrlRelative ( relativeOrAbsoluteProxyUrl ) ) {
30- proxyUrl = new URL ( relativeOrAbsoluteProxyUrl , clerkRequest . clerkUrl ) . toString ( ) ;
30+ proxyUrl = new URL ( relativeOrAbsoluteProxyUrl , request . clerkUrl ) . toString ( ) ;
3131 } else {
3232 proxyUrl = relativeOrAbsoluteProxyUrl ;
3333 }
0 commit comments