auth_headers_fix

Author: Djnt

client/src/actions/auth.js

@@ -67,17 +67,18 @@ export function login(data, router) {
       .then((res) => {
         if (res && res.status == 200) {
           const { data } = res;
-
+          
+          saveAuthToken(data);
+          
           dispatch({
             type: LOGIN_SUCCESS,
             payload: {
               token: data.access_token
             }
           });
 
-          saveAuthToken(data);
           new Toaster(dispatch).success('Login successfully');
-          dispatch(push('/registers'));
+          browserHistory.push('/registers');
         }
       })
       .catch(err => { 

client/src/actions/features.js

@@ -4,14 +4,14 @@ import cookie               from 'react-cookie'
 const API_URL = `${window.location.origin}/api/v1/features`
 
 let headers = {}
-headers['Authorization'] = `Bearer ${cookie.load('token')}`
 
 export function show() {
   return function(dispatch, getState) {
     return new Promise((resolve, reject) => {
       let currentWorkspace = cookie.load('current_workspace')
       let { id } = currentWorkspace
 
+      headers['Authorization'] = `Bearer ${cookie.load('token')}`
       headers['workspace-id'] = id
 
       axios.get(`${API_URL}/${id}`, { headers })

client/src/actions/holidays.js

@@ -4,11 +4,12 @@ import cookie               from 'react-cookie';
 const API_URL = `${window.location.origin}/api/v1/holidays`;
 
 const headers = {};
-headers['Authorization'] = `Bearer ${cookie.load('token')}`;
+
 
 export function index() {
   return function(dispatch, getState) {
     return new Promise((resolve, reject) => {
+      headers['Authorization'] = `Bearer ${cookie.load('token')}`;
       axios.get(API_URL)
         .then(res => {
           dispatch({ type: 'FETCH_HOLIDAY_ITEMS', payload: res.data });
@@ -25,6 +26,7 @@ export function index() {
 export function create(item) {
   return function(dispatch, getState) {
     return new Promise((resolve, reject) => {
+      headers['Authorization'] = `Bearer ${cookie.load('token')}`;
       axios.post(API_URL, item, { headers })
         .then(res => {
           item.id = res.data
@@ -42,6 +44,7 @@ export function create(item) {
 export function update(item, id) {
   return function(dispatch, getState) {
     return new Promise((resolve, reject) => {
+      headers['Authorization'] = `Bearer ${cookie.load('token')}`;
       axios.patch(`${API_URL}/${id}`, item, { headers: headers })
         .then(res => {
           resolve(res);
@@ -57,6 +60,7 @@ export function update(item, id) {
 export function destroy(id) {
   return function(dispatch, getState) {
     return new Promise((resolve, reject) => {
+      headers['Authorization'] = `Bearer ${cookie.load('token')}`;
       axios.delete(`${API_URL}/${id}`, { headers: headers })
         .then(res => {
           dispatch({ type: 'DESTROY_HOLIDAY_ITEM', payload: id });
@@ -73,6 +77,7 @@ export function destroy(id) {
 export function show(id) {
   return function(dispatch, getState) {
     return new Promise((resolve, reject) => {
+      headers['Authorization'] = `Bearer ${cookie.load('token')}`;
       axios.get(`${API_URL}/${id}`, { headers: headers })
         .then(res => {
           dispatch({ type: 'FETCH_HOLIDAY_ITEM', payload: res.data });

client/src/actions/inventory.js

@@ -4,7 +4,6 @@ import cookie               from 'react-cookie'
 const API_URL = `${window.location.origin}/api/v1/inventory_items`
 
 let headers = {}
-headers['Authorization'] = `Bearer ${cookie.load('token')}`
 
 if (cookie.load('current_workspace')) {
   headers['workspace-id'] = cookie.load('current_workspace').id
@@ -13,6 +12,7 @@ if (cookie.load('current_workspace')) {
 export function index() {
   return function(dispatch, getState) {
     return new Promise((resolve, reject) => {
+      headers['Authorization'] = `Bearer ${cookie.load('token')}`
       headers['workspace-id'] = cookie.load('current_workspace').id
       axios.get(API_URL, { headers })
         .then(res => {