Bug fix: Fixed Firebase promises so that errors/exceptions can be caught

packages/auth/src/authClients/firebase.ts

@@ -27,33 +27,58 @@ export const firebase = (client: Firebase): AuthClient => {
   const getProvider = (providerId: oAuthProvider) => {
     return new client.auth.OAuthProvider(providerId)
   }
+  // Firebase auth functions return a goog.Promise which as of 2021-05-12 does
+  // not appear to work with try {await} catch blocks as exceptions are not caught.
+  // This client returns a new standard Promise so that the exceptions can be
+  // caught and no changes are required in common auth code located in AuthProvider.tsx
+  const repackagePromise = (
+    fireBasePromise: Promise<any | string>
+  ): Promise<any | string> => {
+    return new Promise((resolve, reject) => {
+      fireBasePromise
+        .then((result) => resolve(result))
+        .catch((error) => reject(error))
+    })
+  }
 
   return {
     type: 'firebase',
     client,
-    restoreAuthState: () => client.auth().getRedirectResult(),
-    login: async (withAuth: oAuthProvider | PasswordCreds = 'google.com') => {
+    restoreAuthState: () => repackagePromise(client.auth().getRedirectResult()),
+    login: (withAuth: oAuthProvider | PasswordCreds = 'google.com') => {
       if (isPasswordCreds(withAuth)) {
-        return client
-          .auth()
-          .signInWithEmailAndPassword(withAuth.email, withAuth.password)
+        return repackagePromise(
+          client
+            .auth()
+            .signInWithEmailAndPassword(withAuth.email, withAuth.password)
+        )
       }
 
       const provider = getProvider(withAuth)
       return client.auth().signInWithPopup(provider)
     },
-    logout: () => client.auth().signOut(),
-    signup: async (withAuth: oAuthProvider | PasswordCreds = 'google.com') => {
+    logout: () => repackagePromise(client.auth().signOut()),
+    signup: (withAuth: oAuthProvider | PasswordCreds = 'google.com') => {
       if (isPasswordCreds(withAuth)) {
-        return client
-          .auth()
-          .createUserWithEmailAndPassword(withAuth.email, withAuth.password)
+        return repackagePromise(
+          client
+            .auth()
+            .createUserWithEmailAndPassword(withAuth.email, withAuth.password)
+        )
       }
 
       const provider = getProvider(withAuth)
-      return client.auth().signInWithPopup(provider)
+      return repackagePromise(client.auth().signInWithPopup(provider))
+    },
+    getToken: () => {
+      const currentUser = client.auth().currentUser
+      if (currentUser) {
+        return repackagePromise(currentUser.getIdToken())
+      }
+      return new Promise(() => {
+        return null
+      })
     },
-    getToken: async () => client.auth().currentUser?.getIdToken() ?? null,
     getUserMetadata: async () => client.auth().currentUser,
   }
 }