Skip to content

Commit 85034e0

Browse files
feat(local): ⚡ only process signIn callback url when redirect true (#979)
* feat(local): ⚡ only process signIn callback url when redirect true * style: 🎨 remove empty merge lines and spaces
1 parent 52d4b9a commit 85034e0

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

src/runtime/composables/local/useAuth.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,18 @@ const signIn: SignInFunc<Credentials, any> = async (credentials, signInOptions,
6262
await nextTick(getSession)
6363
}
6464

65-
let { callbackUrl } = signInOptions ?? {}
66-
if (typeof callbackUrl === 'undefined') {
67-
const redirectQueryParam = useRoute()?.query?.redirect
68-
if (redirectQueryParam) {
69-
callbackUrl = redirectQueryParam.toString()
70-
}
71-
else {
72-
callbackUrl = await determineCallbackUrl(runtimeConfig.public.auth, () => getRequestURLWN(nuxt))
73-
}
74-
}
7565
if (redirect) {
66+
let { callbackUrl } = signInOptions ?? {}
67+
if (typeof callbackUrl === 'undefined') {
68+
const redirectQueryParam = useRoute()?.query?.redirect
69+
if (redirectQueryParam) {
70+
callbackUrl = redirectQueryParam.toString()
71+
}
72+
else {
73+
callbackUrl = await determineCallbackUrl(runtimeConfig.public.auth, () => getRequestURLWN(nuxt))
74+
}
75+
}
76+
7677
return navigateTo(callbackUrl, { external })
7778
}
7879
}

0 commit comments

Comments
 (0)