feat: added signin persistence

api/db/models/user.py

@@ -1,12 +1,12 @@
-from peewee import CharField,TextField, DateTimeField
+from peewee import CharField,TextField, DateTimeField, BooleanField
 from . import BaseModel
 from datetime import datetime
 class User(BaseModel):
     id = CharField(primary_key=True)
     name = TextField(column_name='name')
     email = CharField(column_name='email')
     picture = TextField(column_name='profile_pic')
-    new_user = TextField(column_name='new_user')
+    new_user = BooleanField(column_name='new_user')
     provider = CharField(column_name='provider')
     created_at = DateTimeField(default=datetime.utcnow, column_name='created_at')
     updated_at = DateTimeField(default=datetime.utcnow, column_name='updated_at')

client/src/apis/hooks/auth/useAuthState.ts

@@ -1,31 +1,32 @@
-import { User } from "firebase/auth";
+import { isAxiosError } from "axios";
 import { useEffect, useState } from "react";
 import Firebase from "../../../integrations/firebase";
-
-const loadUser = () =>
-  new Promise<User | null>((resolve, reject) =>
-    Firebase.auth.onAuthStateChanged((user) =>
-      user ? resolve(user) : reject()
-    )
-  );
+import { useAuthStore } from "../../../store/auth";
+import { getSigninMetaData } from "../../http/endpoints/auth";
 
 export const useAuthState = () => {
   const [isLoading, setIsLoading] = useState(false);
+  const { setLogin, setPendingStatus } = useAuthStore();
 
   useEffect(() => {
     setIsLoading(true);
-    const unsubscribe = Firebase.auth.onAuthStateChanged(
-      async (user) => {
-        setIsLoading(false);
-        console.log(user);
-      },
-      (error) => {
-        console.log(error);
-      },
-      () => {
-        console.log("compeleted...");
+    const unsubscribe = Firebase.auth.onAuthStateChanged(async (user) => {
+      setPendingStatus(true);
+      try {
+        if (user) {
+          const signInRes = await getSigninMetaData();
+          if (signInRes.status === 200) console.log("Logged in!!");
+          if (signInRes.status === 201) console.log("Signed up!!");
+          setLogin(signInRes.data.data);
+        }
+      } catch (error) {
+        if (isAxiosError(error)) {
+          await Firebase.auth.signOut();
+        }
+      } finally {
+        setPendingStatus(false);
       }
-    );
+    });
     return () => {
       unsubscribe();
     };

client/src/apis/hooks/auth/useGoogleLogin.ts

@@ -1,9 +1,6 @@
 import { useQueryClient } from "@tanstack/react-query";
-import { isAxiosError } from "axios";
 import { GoogleAuthProvider, signInWithPopup } from "firebase/auth";
 import Firebase from "../../../integrations/firebase";
-import { api } from "../../http";
-import { SIGNIN } from "../../http/endpoints/auth";
 
 export const GOOGLE_LOGIN = "GOOGLE_LOGIN_Q_KEY" as const;
 
@@ -16,13 +13,8 @@ export const useAuth = () => {
         queryFn: async () => {
           try {
             await signInWithPopup(Firebase.auth, new GoogleAuthProvider());
-            const signInRes = await api.get(SIGNIN);
-            if (signInRes.status === 200) console.log("Logged in!!");
-            if (signInRes.status === 201) console.log("Signed up!!");
           } catch (error) {
-            if (isAxiosError(error)) {
-              await Firebase.auth.signOut();
-            }
+            await Firebase.auth.signOut();
           }
         },
       }),

client/src/apis/http/endpoints/auth.ts

@@ -1 +1,7 @@
-export const SIGNIN = "/auth/signin";
+import { api, IResponse } from "..";
+import { IUser } from "../../../store/auth/types";
+
+const SIGNIN = "/auth/signin";
+
+export const getSigninMetaData = async () =>
+  await api.get<IResponse<IUser>>(SIGNIN);

client/src/apis/http/index.ts

@@ -2,6 +2,12 @@ import axios from "axios";
 import { getIdToken } from "firebase/auth";
 import Firebase from "../../integrations/firebase";
 
+export interface IResponse<TData> {
+  requestId: string;
+  status: number;
+  data: TData;
+  success: boolean;
+}
 export const api = axios.create({
   baseURL: `${import.meta.env.PUBLIC_API_URI}/api/v1`,
   headers: {

client/src/store/auth/index.ts

@@ -1,14 +1,14 @@
-import { User } from "firebase/auth";
 import { create } from "zustand";
+import { IUser } from "./types";
 
 interface State {
   isAuthenticated: boolean;
-  user: User | null;
+  user: IUser | null;
   isPending: boolean;
 }
 
 interface Action {
-  setLogin: (payload: User) => void;
+  setLogin: (payload: IUser) => void;
   setPendingStatus: (pendingStatus: boolean) => void;
 }
 
@@ -18,8 +18,8 @@ const useRootState = create<State & Action>((set) => ({
   user: null,
   setPendingStatus: (pendingStatus) =>
     set(() => ({ isPending: pendingStatus })),
-  setLogin: (user: User) => set(() => ({ isAuthenticated: true, user })),
+  setLogin: (user: IUser) => set(() => ({ isAuthenticated: true, user })),
   setLogout: () => set(() => ({ isAuthenticated: false, user: null })),
 }));
 
-export const useAuth = () => useRootState((state) => state);
+export const useAuthStore = () => useRootState((state) => state);

client/src/store/auth/types.ts

@@ -0,0 +1,10 @@
+export interface IUser {
+  created_at: Date;
+  email: string;
+  id: string;
+  name: string;
+  new_user: boolean;
+  picture: string;
+  provider: string;
+  updated_at: Date;
+}