Add default actions to auth sagas

AuxStudio · May 2, 2018 · 5bf5e9c · 5bf5e9c
1 parent 6c4e5c0
commit 5bf5e9c
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 31 deletions.
diff --git a/sagas/auth/getAuth.js b/sagas/auth/getAuth.js
@@ -12,10 +12,18 @@ export default function* getAuth(action) {
           ...action.meta.nextAction,
           payload: response,
         });
+      } else {
+        yield put({
+          type: 'SIGN_IN_USER',
+          payload: response,
+        });
       }
     } else {
       yield put({
         type: 'signInAnonymously',
+        meta: {
+          nextAction: action.meta && action.meta.nextAction,
+        },
       });
     }
   } catch (error) {

diff --git a/sagas/auth/getCredentialAndSignIn.js b/sagas/auth/getCredentialAndSignIn.js
@@ -9,28 +9,31 @@ export default function* getCredentialAndSignIn(action) {
       auth[service],
       action.payload.email,
       action.payload.password,
-    ); // NOTE: only getCredentialFromEmail is expecting these: args[1], args[2]
+    ); // NOTE: only getCredentialFromEmail is expecting email and password
 
-    if (getCredentialResponse) {
-      try {
-        yield call(
-          auth.signInWithCredential,
-          getCredentialResponse, // the credential
-        );
+    try {
+      const signInWithCredentialResponse = yield call(
+        auth.signInWithCredential,
+        getCredentialResponse, // the credential
+      );
 
-        if (action.nextAction) {
-          yield put({
-            ...action.nextAction,
-            payload: getCredentialResponse,
-          });
-        }
-      } catch (error) {
+      if (action.nextAction) {
         yield put({
-          type: 'SET_SYSTEM_MESSAGE',
-          payload: utils.createError(error),
-          error: true,
+          ...action.nextAction,
+          payload: getCredentialResponse,
+        });
+      } else {
+        yield put({
+          type: 'SIGN_IN_USER',
+          payload: signInWithCredentialResponse,
         });
       }
+    } catch (error) {
+      yield put({
+        type: 'SET_SYSTEM_MESSAGE',
+        payload: utils.createError(error),
+        error: true,
+      });
     }
   } catch (error) {
     yield put({

diff --git a/sagas/auth/getCredentialFromEmail.js b/sagas/auth/getCredentialFromEmail.js
@@ -15,6 +15,11 @@ export default function* getCredentialFromEmail(action) {
         ...action.meta.nextAction,
         payload: response,
       });
+    } else {
+      yield put({
+        type: 'SIGN_IN_USER',
+        payload: response,
+      });
     }
   } catch (error) {
     yield put({

diff --git a/sagas/auth/getCredentialFromFacebook.js b/sagas/auth/getCredentialFromFacebook.js
@@ -11,6 +11,11 @@ export default function* getCredentialFromFacebook(action) {
         ...action.meta.nextAction,
         payload: response,
       });
+    } else {
+      yield put({
+        type: 'SIGN_IN_USER',
+        payload: response,
+      });
     }
   } catch (error) {
     yield put({

diff --git a/sagas/auth/getCredentialFromGoogle.js b/sagas/auth/getCredentialFromGoogle.js
@@ -11,6 +11,11 @@ export default function* getCredentialFromGoogle(action) {
         ...action.meta.nextAction,
         payload: response,
       });
+    } else {
+      yield put({
+        type: 'SIGN_IN_USER',
+        payload: response,
+      });
     }
   } catch (error) {
     yield put({

diff --git a/sagas/auth/sendPasswordResetEmail.js b/sagas/auth/sendPasswordResetEmail.js
@@ -11,6 +11,14 @@ export default function* sendPasswordResetEmail(action) {
         ...action.meta.nextAction,
         payload: response,
       });
+    } else {
+      yield put({
+        type: 'SET_SYSTEM_MESSAGE',
+        payload: {
+          message: 'Email sent successfully',
+        },
+        error: true,
+      });
     }
   } catch (error) {
     yield put({

diff --git a/sagas/auth/signInAnonymously.js b/sagas/auth/signInAnonymously.js
@@ -5,11 +5,17 @@ import utils from '../../utils';
 export default function* signInAnonymously(action) {
   try {
     const response = yield call(auth.signInAnonymously);
+    const { user } = response; // omits additionalUserInfo
 
     if (action.meta && action.meta.nextAction) {
       yield put({
         ...action.meta.nextAction,
-        payload: response,
+        payload: user,
+      });
+    } else {
+      yield put({
+        type: 'SIGN_IN_USER',
+        payload: user,
       });
     }
   } catch (error) {

diff --git a/sagas/auth/signInWithCredential.js b/sagas/auth/signInWithCredential.js
@@ -11,22 +11,17 @@ export default function* signInWithCredential(action) {
         ...action.meta.nextAction,
         payload: response,
       });
-    }
-  } catch (error) {
-    if (error.message.code === 'auth/account-exists-with-different-credential') {
-      yield put({
-        type: 'SET_SYSTEM_MESSAGE',
-        payload: utils.createError(
-          "Hello! You've already signed in with someone else. Please try another option.",
-        ),
-        error: true,
-      });
     } else {
       yield put({
-        type: 'SET_SYSTEM_MESSAGE',
-        payload: utils.createError(error),
-        error: true,
+        type: 'SIGN_IN_USER',
+        payload: response,
       });
     }
+  } catch (error) {
+    yield put({
+      type: 'SET_SYSTEM_MESSAGE',
+      payload: utils.createError(error),
+      error: true,
+    });
   }
 }
diff --git a/sagas/auth/signOut.js b/sagas/auth/signOut.js
@@ -11,6 +11,10 @@ export default function* signOut(action) {
         ...action.meta.nextAction,
         payload: response,
       });
+    } else {
+      yield put({
+        type: 'SIGN_OUT_USER',
+      });
     }
   } catch (error) {
     yield put({