Merge branch 'main' into fix/970-authjs-better-redirect-handling

sidebase · Jan 16, 2025 · a85f79e · a85f79e
2 parents e990d39 + 85034e0
commit a85f79e
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/src/runtime/composables/local/useAuth.ts b/src/runtime/composables/local/useAuth.ts
@@ -62,17 +62,18 @@ const signIn: SignInFunc<Credentials, any> = 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 })
   }
 }