refactor: improve async handling (#117)

memfreeme · Oct 30, 2024 · c022c4e · c022c4e
1 parent 3eebe97
commit c022c4e
Showing 1 changed file with 18 additions and 25 deletions.
diff --git a/frontend/hooks/use-one-tap.ts b/frontend/hooks/use-one-tap.ts
@@ -7,40 +7,33 @@ import { GOOGLE_CLIENT_ID } from '@/lib/client_env';
 const useOneTapSignin = (options, user: User) => {
     const [isLoading, setIsLoading] = useState(false);
 
-    const oneTap = () => {
-        if (isLoading) {
-            return;
-        }
-        const { google } = window;
-        if (google) {
-            setIsLoading(true);
-            google.accounts.id.initialize({
-                // log_level: 'debug',
-                client_id: GOOGLE_CLIENT_ID!,
-                callback: async (response: CredentialResponse) => {
-                    setIsLoading(true);
-
-                    void signIn('googleonetap', {
+    const oneTap = async () => {
+        if (isLoading || !window.google) return;
+
+        setIsLoading(true);
+        window.google.accounts.id.initialize({
+            client_id: GOOGLE_CLIENT_ID!,
+            callback: async (response: CredentialResponse) => {
+                try {
+                    await signIn('googleonetap', {
                         credential: response.credential,
                         redirect: true,
                         ...options,
                     });
+                } finally {
                     setIsLoading(false);
-                },
-            });
+                }
+            },
+        });
 
-            google.accounts.id.prompt();
-        }
+        window.google.accounts.id.prompt();
     };
 
     useEffect(() => {
-        if (user) {
-            return;
-        }
-        const timeout = setTimeout(() => oneTap(), 1000);
-        return () => {
-            clearTimeout(timeout);
-        };
+        if (user) return;
+
+        const timeout = setTimeout(oneTap, 1000);
+        return () => clearTimeout(timeout);
     }, [user]);
 
     return { isLoading };