Fix SocialLogin.tsx

aelassas · Dec 30, 2024 · bbe20ed · bbe20ed
1 parent 76674b0
commit bbe20ed
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/frontend/src/components/SocialLogin.tsx b/frontend/src/components/SocialLogin.tsx
@@ -10,6 +10,7 @@ import { IResolveParams } from '@/types'
 import { strings as commonStrings } from '@/lang/common'
 import env from '@/config/env.config'
 import * as UserService from '@/services/UserService'
+import { useUserContext, UserContextType } from '@/context/UserContext'
 
 import FacebookIcon from '@/assets/img/facebook-icon.png'
 import AppleIcon from '@/assets/img/apple-icon.png'
@@ -41,6 +42,8 @@ const SocialLogin = ({
   onBlackListed }: SocialLoginProps) => {
   const navigate = useNavigate()
 
+  const { setUser, setUserLoaded } = useUserContext() as UserContextType
+
   const loginSuccess = async (socialSignInType: bookcarsTypes.SocialSignInType, accessToken: string, email: string, fullName: string, avatar?: string) => {
     const data: bookcarsTypes.SignInPayload = {
       socialSignInType,
@@ -58,10 +61,16 @@ const SocialLogin = ({
         if (onBlackListed) {
           onBlackListed()
         }
-      } else if (redirectToHomepage) {
-        navigate('/')
       } else {
-        navigate(0)
+        const user = await UserService.getUser(res.data._id)
+        setUser(user)
+        setUserLoaded(true)
+
+        if (redirectToHomepage) {
+          navigate('/')
+        } else {
+          navigate(0)
+        }
       }
     } else if (onSignInError) {
       onSignInError()