Browse Source

fix(web): fix redirection issues after login

pull/88/head
isra el 9 months ago
parent
commit
9e15483752
  1. 5
      web/app/(app)/(auth)/(components)/login-form.tsx
  2. 4
      web/app/(app)/(auth)/(components)/login-with-google.tsx

5
web/app/(app)/(auth)/(components)/login-form.tsx

@ -39,7 +39,8 @@ export default function LoginForm() {
const onSubmit = async (data: LoginFormValues) => { const onSubmit = async (data: LoginFormValues) => {
try { try {
const result = await signIn('email-password-login', { const result = await signIn('email-password-login', {
redirect: false,
redirect: true,
callbackUrl: Routes.dashboard,
email: data.email, email: data.email,
password: data.password, password: data.password,
}) })
@ -49,8 +50,6 @@ export default function LoginForm() {
type: 'manual', type: 'manual',
message: 'Invalid email or password', message: 'Invalid email or password',
}) })
} else {
router.push(Routes.dashboard)
} }
} catch (error) { } catch (error) {
console.error('login error:', error) console.error('login error:', error)

4
web/app/(app)/(auth)/(components)/login-with-google.tsx

@ -20,10 +20,10 @@ export default function LoginWithGoogle() {
variant: 'default', variant: 'default',
}) })
await signIn('google-id-token-login', { await signIn('google-id-token-login', {
redirect: false,
redirect: true,
callbackUrl: redirect ? decodeURIComponent(redirect) : Routes.dashboard,
idToken: credentialResponse.credential, idToken: credentialResponse.credential,
}) })
router.push(redirect ? decodeURIComponent(redirect) : Routes.dashboard)
} }
const onGoogleLoginError = () => { const onGoogleLoginError = () => {

Loading…
Cancel
Save