Merge pull request #485 from 18F/cached-data-on-master

Cherry-pick "clear state on logout"

src/reducers/authentication.js

@@ -49,15 +49,6 @@ const authentication = function (state = defaultState, action) {
       error: action.error
     }
 
-  case AuthConstants.LOGOUT:
-    return {
-      ...state,
-      authenticated: false,
-      twofactor: false,
-      token: null,
-      qrcode: null
-    }
-
   default:
     return state
   }

src/reducers/authentication.test.js

@@ -26,21 +26,6 @@ describe('Authentication Reducer', function () {
     expect(authentication(defaultState, action)).toEqual(expectedState)
   })
 
-  it('should handle logout', function () {
-    const expectedState = {
-      authenticated: false,
-      token: null,
-      twofactor: false,
-      qrcode: null
-    }
-
-    const action = {
-      type: AuthConstants.LOGOUT
-    }
-
-    expect(authentication(defaultState, action)).toEqual(expectedState)
-  })
-
   it('should handle login error', function () {
     const expectedState = {
       authenticated: false,

src/reducers/index.js

@@ -2,11 +2,22 @@ import { combineReducers } from 'redux'
 import authentication from './authentication'
 import section from './section'
 import application from './application'
+import AuthConstants from '../actions/AuthConstants'
 
-const rootReducer = combineReducers({
+const appReducer = combineReducers({
   authentication: authentication,
   section: section,
   application: application
 })
 
+const rootReducer = (state, action) => {
+  // clear data on logout
+  // https://netbasal.com/how-to-secure-your-users-data-after-logout-in-redux-30468c6848e8
+  if (action.type === AuthConstants.LOGOUT) {
+    state = undefined
+  }
+
+  return appReducer(state, action)
+}
+
 export default rootReducer

src/reducers/index.test.js

@@ -0,0 +1,58 @@
+import rootReducer from './index'
+import AuthConstants from '../actions/AuthConstants'
+
+describe('Root Reducer', function () {
+  const defaultState = {
+    application: {
+      AddressBooks: { },
+      Citizenship: { },
+      Completed: { },
+      Errors: { },
+      Financial: { },
+      Foreign: { },
+      History: { },
+      Identification: { },
+      Legal: { },
+      Military: { },
+      Psychological: { },
+      Relationships: { },
+      Settings: { },
+      Submission: { },
+      Substance: { },
+      TBD: { }
+    },
+    authentication: {
+      authenticated: false,
+      token: null
+    },
+    section: {
+      section: 'identification',
+      subsection: ''
+    }
+  }
+
+  it('should populate the state', function () {
+    const startState = {}
+    const action = { type: 'unknown' }
+    expect(rootReducer(startState, action)).toEqual(defaultState)
+  })
+
+  it('should handle logout', function () {
+    const startState = {
+      application: {
+        AddressBooks: { foo: 'bar' }
+      },
+      authentication: {
+        authenticated: true,
+        token: 'dummytoken'
+      },
+      section: {
+        section: 'identification',
+        subsection: ''
+      }
+    }
+
+    const action = { type: AuthConstants.LOGOUT }
+    expect(rootReducer(startState, action)).toEqual(defaultState)
+  })
+})