Fix request options and use better filename

client/coral-admin/src/actions/assets.js

@@ -8,7 +8,7 @@ import {
   UPDATE_ASSETS
 } from '../constants/assets';
 
-import coralApi from '../../../coral-framework/helpers/response';
+import coralApi from '../../../coral-framework/helpers/request';
 
 /**
  * Action disptacher related to assets

client/coral-admin/src/actions/auth.js

@@ -1,6 +1,6 @@
 import bowser from 'bowser';
 import * as actions from '../constants/auth';
-import coralApi from 'coral-framework/helpers/response';
+import coralApi from 'coral-framework/helpers/request';
 import * as Storage from 'coral-framework/helpers/storage';
 import {handleAuthToken} from 'coral-framework/actions/auth';
 

client/coral-admin/src/actions/community.js

@@ -14,7 +14,7 @@ import {
   HIDE_SUSPENDUSER_DIALOG
 } from '../constants/community';
 
-import coralApi from '../../../coral-framework/helpers/response';
+import coralApi from '../../../coral-framework/helpers/request';
 
 export const fetchAccounts = (query = {}) => (dispatch) => {
 

client/coral-admin/src/actions/install.js

@@ -1,4 +1,4 @@
-import coralApi from 'coral-framework/helpers/response';
+import coralApi from 'coral-framework/helpers/request';
 import * as actions from '../constants/install';
 import validate from 'coral-framework/helpers/validate';
 import errorMsj from 'coral-framework/helpers/error';

client/coral-admin/src/actions/settings.js

@@ -1,4 +1,4 @@
-import coralApi from '../../../coral-framework/helpers/response';
+import coralApi from '../../../coral-framework/helpers/request';
 
 export const SETTINGS_LOADING = 'SETTINGS_LOADING';
 export const SETTINGS_RECEIVED = 'SETTINGS_RECEIVED';

client/coral-admin/src/actions/users.js

@@ -1,4 +1,4 @@
-import coralApi from '../../../coral-framework/helpers/response';
+import coralApi from '../../../coral-framework/helpers/request';
 import * as userTypes from '../constants/users';
 
 /**

client/coral-framework/actions/asset.js

@@ -1,5 +1,5 @@
 import * as actions from '../constants/asset';
-import coralApi from '../helpers/response';
+import coralApi from '../helpers/request';
 import {addNotification} from '../actions/notification';
 
 import I18n from 'coral-framework/modules/i18n/i18n';

client/coral-framework/actions/auth.js

@@ -3,7 +3,7 @@ import {pym} from 'coral-framework';
 import bowser from 'bowser';
 import * as actions from '../constants/auth';
 import * as Storage from '../helpers/storage';
-import coralApi, {base} from '../helpers/response';
+import coralApi, {base} from '../helpers/request';
 
 const lang = new I18n(translations);
 import translations from './../translations';

client/coral-framework/actions/user.js

@@ -1,5 +1,5 @@
 import {addNotification} from '../actions/notification';
-import coralApi from '../helpers/response';
+import coralApi from '../helpers/request';
 import * as actions from '../constants/auth';
 
 import I18n from 'coral-framework/modules/i18n/i18n';

client/coral-framework/helpers/request.js

@@ -1,4 +1,6 @@
 import bowser from 'bowser';
+import * as Storage from './storage';
+import merge from 'lodash/merge';
 
 const buildOptions = (inputOptions = {}) => {
   const defaultOptions = {
@@ -10,18 +12,13 @@ const buildOptions = (inputOptions = {}) => {
     credentials: 'same-origin'
   };
 
-  let options = {
-    ...defaultOptions,
-    ...inputOptions
-  };
+  let options = merge({}, defaultOptions, inputOptions);
 
   if (!bowser.safari && !bowser.ios) {
-    let authorization = localStorage.getItem('token');
+    let authorization = Storage.getItem('token');
 
     if (authorization) {
-      options.headers = {
-        Authorization: `Bearer ${authorization}`
-      };
+      options.headers.Authorization = `Bearer ${authorization}`;
     }
   }