Skip to content

Commit 7d0698c

Browse files
authored
fix: cleanup SvelteKitAuth export (#9663)
1 parent c7c38ba commit 7d0698c

File tree

1 file changed

+10
-17
lines changed
  • packages/frameworks-sveltekit/src/lib

1 file changed

+10
-17
lines changed

packages/frameworks-sveltekit/src/lib/index.ts

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,11 @@ type DynamicSvelteKitAuthConfig = (
262262
event: RequestEvent
263263
) => PromiseLike<SvelteKitAuthConfig>
264264

265-
function AuthHandle(
265+
/**
266+
* The main entry point to `@auth/sveltekit`
267+
* @see https://sveltekit.authjs.dev
268+
*/
269+
export function SvelteKitAuth(
266270
svelteKitAuthOptions: SvelteKitAuthConfig | DynamicSvelteKitAuthConfig
267271
): Handle {
268272
return async function ({ event, resolve }) {
@@ -271,6 +275,11 @@ function AuthHandle(
271275
? svelteKitAuthOptions
272276
: await svelteKitAuthOptions(event)
273277
const { prefix = `${base}/auth` } = authOptions
278+
279+
authOptions.secret ??= env.AUTH_SECRET
280+
authOptions.redirectProxyUrl ??= env.AUTH_REDIRECT_PROXY_URL
281+
authOptions.trustHost ??= !!(env.AUTH_TRUST_HOST ?? env.VERCEL ?? dev)
282+
274283
const { url, request } = event
275284

276285
event.locals.getSession ??= () => getSession(request, authOptions)
@@ -287,22 +296,6 @@ function AuthHandle(
287296
}
288297
}
289298

290-
/**
291-
* The main entry point to `@auth/sveltekit`
292-
* @see https://sveltekit.authjs.dev
293-
*/
294-
export function SvelteKitAuth(
295-
options: SvelteKitAuthConfig | DynamicSvelteKitAuthConfig
296-
): Handle {
297-
if (typeof options === "object") {
298-
options.secret ??= env.AUTH_SECRET
299-
options.redirectProxyUrl ??= env.AUTH_REDIRECT_PROXY_URL
300-
options.trustHost ??= !!(env.AUTH_TRUST_HOST ?? env.VERCEL ?? dev)
301-
options.prefix ??= `${base}/auth`
302-
}
303-
return AuthHandle(options)
304-
}
305-
306299
declare global {
307300
// eslint-disable-next-line @typescript-eslint/no-namespace
308301
namespace App {

0 commit comments

Comments
 (0)