stevebaros · August 30, 2020 07:45 · May 19, 2020 · May 23, 2018 · May 23, 2018
diff --git a/axios-response-interceptor.js b/axios-response-interceptor.js
@@ -12,10 +12,10 @@ function addSubscriber(callback) {
 axios.interceptors.response.use(function (response) {
   return response
 }, function (error) {
-  const { config, response: { status } } = error
+  const { config, response } = error
   const originalRequest = config
 
-  if (status === 401) {
+  if (response && response.status === 401) {
     if (!isAlreadyFetchingAccessToken) {
       isAlreadyFetchingAccessToken = true
       store.dispatch(fetchAccessToken()).then((access_token) => {

diff --git a/gistfile1.txt → axios-response-interceptor.js b/gistfile1.txt → axios-response-interceptor.js
@@ -1,4 +1,3 @@
-```javascript
 let isAlreadyFetchingAccessToken = false
 let subscribers = []
 
@@ -34,6 +33,4 @@ axios.interceptors.response.use(function (response) {
     return retryOriginalRequest
   }
   return Promise.reject(error)
-})
-
-```
+})
diff --git a/gistfile1.txt b/gistfile1.txt
@@ -0,0 +1,39 @@
+```javascript
+let isAlreadyFetchingAccessToken = false
+let subscribers = []
+
+function onAccessTokenFetched(access_token) {
+  subscribers = subscribers.filter(callback => callback(access_token))
+}
+
+function addSubscriber(callback) {
+  subscribers.push(callback)
+}
+
+axios.interceptors.response.use(function (response) {
+  return response
+}, function (error) {
+  const { config, response: { status } } = error
+  const originalRequest = config
+
+  if (status === 401) {
+    if (!isAlreadyFetchingAccessToken) {
+      isAlreadyFetchingAccessToken = true
+      store.dispatch(fetchAccessToken()).then((access_token) => {
+        isAlreadyFetchingAccessToken = false
+        onAccessTokenFetched(access_token)
+      })
+    }
+
+    const retryOriginalRequest = new Promise((resolve) => {
+      addSubscriber(access_token => {
+        originalRequest.headers.Authorization = 'Bearer ' + access_token
+        resolve(axios(originalRequest))
+      })
+    })
+    return retryOriginalRequest
+  }
+  return Promise.reject(error)
+})
+
+```