feat(auth): use new firebase login methods- prescottprue#467 - @kadikraman

Author: prescottprue

src/actions/auth.js

@@ -448,13 +448,23 @@ export const login = (dispatch, firebase, credentials) => {
       if (!userData) return Promise.resolve(null)
 
       // For email auth return uid (createUser is used for creating a profile)
-      if (method === 'signInWithEmailAndPassword') {
+      if (
+        [
+          'signInWithEmailAndPassword',
+          'signInAndRetrieveDataWithEmailAndPassword'
+        ].includes(method)
+      ) {
         return { user: userData }
       }
       // TODO: Only call createUserProfile once, and just pass different settings
 
       // For token auth, the user key doesn't exist. Instead, return the JWT.
-      if (method === 'signInWithCustomToken') {
+      if (
+        [
+          'signInWithCustomToken',
+          'signInAndRetrieveDataWithCustomToken'
+        ].includes(method)
+      ) {
         if (!firebase._.config.updateProfileOnLogin) {
           return { user: userData }
         }

src/utils/auth.js

@@ -97,6 +97,12 @@ export const getLoginMethodAndParams = (firebase, creds) => {
     return { method: 'signInWithRedirect', params: [authProvider] }
   }
   if (token) {
+    const tokenAuth = firebase.auth().signInAndRetrieveDataWithCustomToken
+
+    if (tokenAuth) {
+      return { method: 'signInAndRetrieveDataWithCustomToken', params: [token] }
+    }
+
     return { method: 'signInWithCustomToken', params: [token] }
   }
   if (phoneNumber) {
@@ -110,6 +116,17 @@ export const getLoginMethodAndParams = (firebase, creds) => {
       params: [phoneNumber, applicationVerifier]
     }
   }
+
+  const emailPasswordAuth = firebase.auth()
+    .signInAndRetrieveDataWithEmailAndPassword
+
+  if (emailPasswordAuth) {
+    return {
+      method: 'signInAndRetrieveDataWithEmailAndPassword',
+      params: [email, password]
+    }
+  }
+
   return { method: 'signInWithEmailAndPassword', params: [email, password] }
 }
 

test/utils.js

@@ -129,7 +129,7 @@ export const fakeFirebase = {
               email: '[email protected]',
               providerData: [{}]
             }),
-    signInWithCustomToken: () => {
+    signInAndRetrieveDataWithCustomToken: () => {
       return Promise.resolve({
         toJSON: () => ({
           stsTokenManager: {