fix(condo): DOMA-11031 add new logic for removing unnecessary requests

open-condo-software · Jan 31, 2025 · 8f301d5 · 8f301d5
1 parent 58275fa
commit 8f301d5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/apps/condo/domains/miniapp/components/GlobalApps/GlobalAppsContainer.tsx b/apps/condo/domains/miniapp/components/GlobalApps/GlobalAppsContainer.tsx
@@ -120,11 +120,11 @@ export const GlobalAppsContainer: React.FC = () => {
     }, [organizationId])
 
     useEffect(() => {
-        if (!isGlobalAppsFetched.current && !loading && !isNull(user)) {
+        if (!isGlobalAppsFetched.current && !loading && !isNull(user) && !isLoading) {
             refetch()
             isGlobalAppsFetched.current = true
         }
-    }, [user, loading])
+    }, [user, loading, isLoading])
 
     // Global miniapps allowed only for authenticated employees
     if (!user || !organizationId) {

diff --git a/packages/next/auth.tsx b/packages/next/auth.tsx
@@ -263,11 +263,17 @@ const _withAuthLegacy: WithAuthLegacyType = ({ ssr = false, ...opts } = {}) => P
 const AuthProvider: React.FC = ({ children }) => {
     const apolloClient = useApolloClient()
 
-    const { data, loading: userLoading, refetch } = useQuery(USER_QUERY, {
-        notifyOnNetworkStatusChange: true,
-    })
+    const [isAuthLoading, setAuthLoading] = useState<boolean>(false)
+
+    const { data, loading: userLoading, refetch } = useQuery(USER_QUERY)
+
+    const user = useMemo(() => {
+        if (!userLoading) {
+            setAuthLoading(false)
+            return get(data, 'authenticatedUser') || null
+        }
+    }, [data, userLoading])
 
-    const user = useMemo(() => get(data, 'authenticatedUser') || null, [data])
 
     const refetchAuth = useCallback(async () => {
         await refetch()
@@ -282,15 +288,17 @@ const AuthProvider: React.FC = ({ children }) => {
             if (item) {
                 await apolloClient.clearStore()
             }
+            setAuthLoading(false)
         },
         onError: (error) => {
             console.error(error)
+            setAuthLoading(false)
         },
     })
 
     const [signOutMutation, { loading: signOutLoading }] = useMutation(SIGNOUT_MUTATION, {
-        refetchQueries: [USER_QUERY],
         onCompleted: async () => {
+            await refetch()
             removeCookieEmployeeId()
             await apolloClient.cache.reset()
             apolloClient.cache.writeQuery({
@@ -299,16 +307,24 @@ const AuthProvider: React.FC = ({ children }) => {
                     authenticatedUser: null,
                 },
             })
+            setAuthLoading(false)
         },
         onError: (error) => {
             console.error(error)
+            setAuthLoading(false)
         },
     })
 
+    useEffect(() => {
+        if (userLoading || signOutLoading || signInLoading) {
+            setAuthLoading(true)
+        }
+    }, [userLoading, signOutLoading, signInLoading])
+
     return (
         <AuthContext.Provider
             value={{
-                isLoading: userLoading || signOutLoading || signInLoading,
+                isLoading: userLoading || signOutLoading || signInLoading || isAuthLoading,
                 isAuthenticated: !!user,
                 user,
                 refetch: refetchAuth,