diff --git a/src/runtime/composables/local/useAuth.ts b/src/runtime/composables/local/useAuth.ts index 8815551e..9419758e 100644 --- a/src/runtime/composables/local/useAuth.ts +++ b/src/runtime/composables/local/useAuth.ts @@ -62,17 +62,18 @@ const signIn: SignInFunc = async (credentials, signInOptions, await nextTick(getSession) } - let { callbackUrl } = signInOptions ?? {} - if (typeof callbackUrl === 'undefined') { - const redirectQueryParam = useRoute()?.query?.redirect - if (redirectQueryParam) { - callbackUrl = redirectQueryParam.toString() - } - else { - callbackUrl = await determineCallbackUrl(runtimeConfig.public.auth, () => getRequestURLWN(nuxt)) - } - } if (redirect) { + let { callbackUrl } = signInOptions ?? {} + if (typeof callbackUrl === 'undefined') { + const redirectQueryParam = useRoute()?.query?.redirect + if (redirectQueryParam) { + callbackUrl = redirectQueryParam.toString() + } + else { + callbackUrl = await determineCallbackUrl(runtimeConfig.public.auth, () => getRequestURLWN(nuxt)) + } + } + return navigateTo(callbackUrl, { external }) } }