Await GoogleAuth to finish initialization (#382)

* Await GoogleAuth to finish initialization * fixed logout * ignore if unmounted
anthonyjgrove · Oct 19, 2020 · a8f39eb · a8f39eb
1 parent 6f59a2e
commit a8f39eb
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/src/use-google-login.js b/src/use-google-login.js
@@ -110,13 +110,25 @@ const useGoogleLogin = ({
               onFailure(err)
             }
           )
-        } else if (isSignedIn && GoogleAuth.isSignedIn.get()) {
-          setLoaded(true)
-          onAutoLoadFinished(true)
-          handleSigninSuccess(GoogleAuth.currentUser.get())
-        } else if (!unmounted) {
-          setLoaded(true)
-          onAutoLoadFinished(false)
+        } else {
+          GoogleAuth.then(
+            () => {
+              if (unmounted) {
+                return
+              }
+              if (isSignedIn && GoogleAuth.isSignedIn.get()) {
+                setLoaded(true)
+                onAutoLoadFinished(true)
+                handleSigninSuccess(GoogleAuth.currentUser.get())
+              } else {
+                setLoaded(true)
+                onAutoLoadFinished(false)
+              }
+            },
+            err => {
+              onFailure(err)
+            }
+          )
         }
       })
     })

diff --git a/src/use-google-logout.js b/src/use-google-logout.js
@@ -23,7 +23,12 @@ const useGoogleLogout = ({
     if (window.gapi) {
       const auth2 = window.gapi.auth2.getAuthInstance()
       if (auth2 != null) {
-        auth2.signOut().then(auth2.disconnect().then(onLogoutSuccess))
+        auth2.then(
+          () => {
+            auth2.signOut().then(auth2.disconnect().then(onLogoutSuccess))
+          },
+          err => onFailure(err)
+        )
       }
     }
   }