Sprint 32 (#520)

* Resolves #430
DiscipleTools · Dec 7, 2020 · 1aa537c · 1aa537c
1 parent 3a4b473
commit 1aa537c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/store/reducers/user.reducer.js b/store/reducers/user.reducer.js
@@ -45,7 +45,7 @@ export default function userReducer(state = initialState, action) {
       };
     case actions.USER_LOGIN_SUCCESS: {
       let state = { ...newState };
-      if (newState.userData.username !== action.user.user_nicename) {
+      if (newState.userData.username !== action.user.username) {
         state = {
           ...state,
           pinCode: {
@@ -59,7 +59,7 @@ export default function userReducer(state = initialState, action) {
         userData: {
           domain: action.domain,
           token: action.user.token,
-          username: action.user.user_nicename,
+          username: action.user.username,
           password: action.user.password,
           displayName: action.user.user_display_name,
           email: action.user.user_email,

diff --git a/store/sagas/user.sagas.js b/store/sagas/user.sagas.js
@@ -31,7 +31,11 @@ export function* login({ domain, username, password }) {
     const jsonData = response.data;
 
     if (response.status === 200) {
-      yield put({ type: actions.USER_LOGIN_SUCCESS, domain, user: { ...jsonData, password } });
+      yield put({
+        type: actions.USER_LOGIN_SUCCESS,
+        domain,
+        user: { ...jsonData, username, password },
+      });
       yield put({ type: actions.USER_GET_PUSH_TOKEN, domain, token: jsonData.token });
     } else {
       yield put({