Cleaned up email verification reducer logic

This commit is contained in:
Alexander Wong
2017-09-03 14:42:44 -06:00
parent a5df76d7e9
commit 4cadf5df3a
7 changed files with 35 additions and 99 deletions

View File

@@ -3,17 +3,12 @@ import {
isSendingAuthRequest,
setAuthRequestError,
setAuthRequestSuccess,
setEmailVerificationError,
setEmailVerificationSuccess,
clearAuthRequestError,
clearEmailVerificationError,
clearAuthRequestSuccess,
clearEmailVerificationSuccess,
setSelfUserToken,
setFormEmail,
setFormPassword,
setFormPasswordConfirmation,
setFormEmailVerification,
setFormOldPassword
} from "../actions/auth/reducer.actions";
import {
@@ -45,7 +40,7 @@ function* verifyEmailCall(postBody) {
try {
return yield effects.call(verifyEmail, emailKey);
} catch (exception) {
yield effects.put(setEmailVerificationError(exception));
yield effects.put(setAuthRequestError(exception));
return false;
} finally {
yield effects.put(isSendingAuthRequest(false));
@@ -133,13 +128,12 @@ export function* registerUserFlow(request) {
}
export function* verifyEmailFlow(request) {
yield effects.put(clearEmailVerificationSuccess());
yield effects.put(clearEmailVerificationError());
yield effects.put(clearAuthRequestSuccess());
yield effects.put(clearAuthRequestError());
const wasSuccessful = yield effects.call(verifyEmailCall, request.data);
if (wasSuccessful) {
yield effects.put(setEmailVerificationSuccess(wasSuccessful));
yield effects.put(clearEmailVerificationError());
yield effects.put(setFormEmailVerification(""));
yield effects.put(setAuthRequestSuccess(wasSuccessful));
yield effects.put(clearAuthRequestError());
}
}