Clear client session on 401

freeCodeCamp · Nov 20, 2017 · b1cbc57 · b1cbc57
1 parent 7262004
commit b1cbc57
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/client/store/middleware/api.js b/client/store/middleware/api.js
@@ -3,6 +3,8 @@ import fetch from 'isomorphic-fetch'
 import {normalize} from 'normalizr'
 import {SubmissionError} from 'redux-form'
 
+import {clearUser} from '../../modules/users/authReducer'
+
 let _socket
 
 const API_ROOT = process.env.NODE_ENV === 'production' ?
@@ -35,7 +37,7 @@ export function callApi(endpoint, method = 'GET', body, schema, responseSchema)
   })
     .then(response =>
       response.json().then(json => {
-        if (!response.ok) return Promise.reject(json)
+        if (!response.ok) return Promise.reject({ ...json, status: response.status })
         if (responseSchema) return normalize(json, responseSchema)
         if (schema) return normalize(json, schema)
         return json
@@ -93,6 +95,7 @@ export default socket => {
         response
       })),
       error => {
+        if (error.status === 401) store.dispatch(clearUser())
         next(actionWith({
           type: failureType,
           error

diff --git a/client/store/middleware/api.spec.js b/client/store/middleware/api.spec.js
@@ -55,7 +55,7 @@ describe('api middleware', function() {
       expect(fetchMock).to.calledWith('root/foo')
 
       return result.catch(err => {
-        expect(err).to.eql({error: 'error'})
+        expect(err).to.include({error: 'error'})
         expect(responseMock.json).to.have.been.calledOnce
       })
     })