fix(user): correct user login and user set role names

EditVR · Jun 6, 2018 · 8a7f982 · 8a7f982
1 parent 549b721
commit 8a7f982
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/src/actions/user.js b/src/actions/user.js
@@ -46,7 +46,7 @@ export function* userLogIn({ username, password }) {
  */
 export function* userLogOut() {
   yield put({
-    type: USER_LOG_OUT
+    type: `${USER_LOG_OUT}_SUCCESS`
   });
 }
 
@@ -57,7 +57,7 @@ export function* userLogOut() {
  */
 export function* userSetRole(role) {
   yield put({
-    type: USER_SET_ROLE,
+    type: `${USER_SET_ROLE}_SUCCESS`,
     payload: {
       role
     }

diff --git a/src/actions/user.test.js b/src/actions/user.test.js
@@ -59,7 +59,7 @@ describe('actions->user', () => {
     testSaga(userLogOut)
       .next()
       .put({
-        type: USER_LOG_OUT
+        type: `${USER_LOG_OUT}_SUCCESS`
       })
       .next()
       .isDone();
@@ -69,7 +69,7 @@ describe('actions->user', () => {
     testSaga(userSetRole, USER_ROLE_EDITOR)
       .next()
       .put({
-        type: USER_SET_ROLE,
+        type: `${USER_SET_ROLE}_SUCCESS`,
         payload: {
           role: USER_ROLE_EDITOR
         }

diff --git a/src/components/App/App.js b/src/components/App/App.js
@@ -22,13 +22,13 @@ const App = () => (
           redirectTo="/dashboard"
           component={Login}
         />
+        <PrivateRoute exact path="/logout" redirectTo="/" component={Logout} />
         <PrivateRoute
           exact
           path="/dashboard"
           redirectTo="/login"
           component={Dashboard}
         />
-        <PrivateRoute exact path="/logout" redirectTo="/" component={Logout} />
       </Switch>
     </Router>
   </Fragment>

diff --git a/src/pages/Logout/Logout.container.js b/src/pages/Logout/Logout.container.js
@@ -10,6 +10,6 @@ const mapDispatchToProps = dispatch => ({
   dispatch
 });
 
-const mapState = () => ({});
+const mapState = ({ user }) => ({ user });
 
 export default connect(mapState, mapDispatchToProps)(Logout);
diff --git a/src/reducers/__snapshots__/user.test.js.snap b/src/reducers/__snapshots__/user.test.js.snap
@@ -51,7 +51,7 @@ Object {
 }
 `;
 
-exports[`reducers->user Should handle USER_LOG_OUT 1`] = `
+exports[`reducers->user Should handle USER_LOG_OUT_SUCCESS 1`] = `
 Object {
   "authentication": Object {
     "accessToken": null,
@@ -68,7 +68,7 @@ Object {
 }
 `;
 
-exports[`reducers->user Should handle USER_SET_ROLE 1`] = `
+exports[`reducers->user Should handle USER_SET_ROLE_SUCCESS 1`] = `
 Object {
   "authentication": Object {
     "accessToken": null,

diff --git a/src/reducers/user.js b/src/reducers/user.js
@@ -91,14 +91,14 @@ export default function user(state = defaultState, action) {
     /**
      * Reducer that handles user logout actions.
      */
-    case USER_LOG_OUT: {
-      return { ...defaultState };
+    case `${USER_LOG_OUT}_SUCCESS`: {
+      return defaultState;
     }
 
     /**
      * Reducer that handles setting a user's role.
      */
-    case USER_SET_ROLE: {
+    case `${USER_SET_ROLE}_SUCCESS`: {
       const { role } = action.payload;
       return { ...state, authentication: { ...state.authentication, role } };
     }

diff --git a/src/reducers/user.test.js b/src/reducers/user.test.js
@@ -61,18 +61,18 @@ describe('reducers->user', () => {
     ).toMatchSnapshot();
   });
 
-  it(`Should handle ${USER_LOG_OUT}`, () => {
+  it(`Should handle ${USER_LOG_OUT}_SUCCESS`, () => {
     expect(
       reducer(undefined, {
-        type: USER_LOG_OUT
+        type: `${USER_LOG_OUT}_SUCCESS`
       })
     ).toMatchSnapshot();
   });
 
-  it(`Should handle ${USER_SET_ROLE}`, () => {
+  it(`Should handle ${USER_SET_ROLE}_SUCCESS`, () => {
     expect(
       reducer(undefined, {
-        type: USER_SET_ROLE,
+        type: `${USER_SET_ROLE}_SUCCESS`,
         payload: {
           role: USER_ROLE_EDITOR
         }