ADD_HTTP_HEADERS action

Author: yujin-wu

dash/dash-renderer/src/actions/api.js

@@ -1,5 +1,5 @@
 import {mergeDeepRight, once} from 'ramda';
-import {getCSRFHeader, handleAsyncError, setConfigNoRefresh} from '../actions';
+import {getCSRFHeader, handleAsyncError, addHttpHeaders} from '../actions';
 import {urlBase} from './utils';
 import {MAX_AUTH_RETRIES} from './constants';
 import {JWT_EXPIRED_MESSAGE, STATUS} from '../constants/constants';
@@ -33,7 +33,7 @@ const request = {GET, POST};
 export default function apiThunk(endpoint, method, store, id, body) {
     return async (dispatch, getState) => {
         let {config, hooks} = getState();
-        let configChanged = false;
+        let newHeaders = null;
 
         const url = `${urlBase(config)}${endpoint}`;
 
@@ -76,14 +76,15 @@ export default function apiThunk(endpoint, method, store, id, body) {
                                 )
                             );
                             if (newJwt) {
+                                newHeaders = {
+                                    Authorization: `Bearer ${newJwt}`
+                                };
+
                                 config = mergeDeepRight(config, {
                                     fetch: {
-                                        headers: {
-                                            Authorization: `Bearer ${newJwt}`
-                                        }
+                                        headers: newHeaders
                                     }
                                 });
-                                configChanged = true;
 
                                 continue;
                             }
@@ -95,8 +96,8 @@ export default function apiThunk(endpoint, method, store, id, body) {
 
             const contentType = res.headers.get('content-type');
 
-            if (configChanged) {
-                dispatch(setConfigNoRefresh(config));
+            if (newHeaders) {
+                dispatch(addHttpHeaders(newHeaders));
             }
             setConnectionStatus(true);
             if (contentType && contentType.indexOf('application/json') !== -1) {

dash/dash-renderer/src/actions/constants.js

@@ -6,7 +6,7 @@ const actionList = {
     SET_LAYOUT: 1,
     SET_APP_LIFECYCLE: 1,
     SET_CONFIG: 1,
-    SET_CONFIG_NO_REFRESH: 2,
+    ADD_HTTP_HEADERS: 2,
     ON_ERROR: 1,
     SET_HOOKS: 1
 };

dash/dash-renderer/src/actions/index.js

@@ -11,9 +11,7 @@ import {getPath} from './paths';
 export const onError = createAction(getAction('ON_ERROR'));
 export const setAppLifecycle = createAction(getAction('SET_APP_LIFECYCLE'));
 export const setConfig = createAction(getAction('SET_CONFIG'));
-export const setConfigNoRefresh = createAction(
-    getAction('SET_CONFIG_NO_REFRESH')
-);
+export const addHttpHeaders = createAction(getAction('ADD_HTTP_HEADERS'));
 export const setGraphs = createAction(getAction('SET_GRAPHS'));
 export const setHooks = createAction(getAction('SET_HOOKS'));
 export const setLayout = createAction(getAction('SET_LAYOUT'));

dash/dash-renderer/src/reducers/config.js

@@ -1,10 +1,15 @@
 import {getAction} from '../actions/constants';
+import {mergeDeepRight} from 'ramda';
 
 export default function config(state = null, action) {
     if (action.type === getAction('SET_CONFIG')) {
         return action.payload;
-    } else if (action.type === getAction('SET_CONFIG_NO_REFRESH')) {
-        return action.payload;
+    } else if (action.type === getAction('ADD_HTTP_HEADERS')) {
+        return mergeDeepRight(state, {
+            fetch: {
+                headers: action.payload
+            }
+        });
     }
     return state;
 }