SImplify api calls by using an axios API object

src/main.js

@@ -3,6 +3,9 @@ import './plugins/bootstrap-vue'
 import App from './App.vue'
 import store from './store'
 import router from './router'
+import { apiStore } from './shared/apiService'
+
+apiStore.store = store;
 
 Vue.config.productionTip = false
 

src/shared/apiService.js

@@ -0,0 +1,40 @@
+import axios from 'axios';
+import { apiBase } from '../store/modules/config';
+
+
+export const apiStore = {store: null}
+
+export const api = axios.create({
+  baseURL: apiBase,
+  timeout: 1000,
+  withCredentials: true,
+}
+)
+
+api.interceptors.request.use((config) => {
+  const custconfig = config;
+  // Merge custconfig dicts
+  custconfig.headers = {...config.headers, ...apiStore.store.getters['user/apiAuth']};
+  // Do something before request is sent
+  // console.log(custconfig)
+  return custconfig;
+}, (error) => Promise.reject(error)
+);
+
+api.interceptors.response.use((response) => {
+    return response;
+  }
+  ,(err) => {
+      // console.log(err.response.status);
+      console.log(err);
+      if (err.response && err.response.status === 401) {
+        console.log("Dispatching refresh_token...")
+        apiStore.store.dispatch('user/refresh_token')
+        // maybe redirect to /login if needed !
+      }
+      return new Promise((resolve, reject) => {
+        reject(err);
+      });
+      // // return Promise.reject(err);
+  }
+  );

src/store/modules/ftbot.js

@@ -1,6 +1,4 @@
-import axios from 'axios';
+import { api } from '../../shared/apiService';
-
-import { apiBase } from './config';
 
 export default {
   namespaced: true,
@@ -16,9 +14,6 @@ export default {
     balance: {}
   },
   getters: {
-    apiAuth(state, getters, rootState, rootGetters) {
-      return rootGetters['user/apiAuth']
-    },
     openTrades(state) {
       return state.openTrades;
       // return state.trades.filter((item) => item.is_open);
@@ -55,114 +50,78 @@ export default {
     },
   },
   actions: {
-    getTrades({ commit, getters }) {
+    getTrades({ commit }) {
-      return axios.get(`${apiBase}/trades`, {
+      console.log("fetching trades")
-        ...getters.apiAuth
+      return api.get('/trades')
-      })
         .then((result) => commit('updateTrades', result.data))
         .catch(console.error);
   },
-    getOpentrades({ commit, getters }) {
+    getOpentrades({ commit }) {
-      return axios.get(`${apiBase}/status`, {
+      return api.get(`/status`)
-        ...getters.apiAuth
-      })
         .then((result) => commit('updateOpenTrades', result.data))
         .catch(console.error);
   },
-    getPerformance({ commit, getters }) {
+    getPerformance({ commit }) {
-      return axios.get(`${apiBase}/performance`, {
+      return api.get(`/performance`)
-        ...getters.apiAuth
-      })
         .then((result) => commit('updatePerformance', result.data))
         .catch(console.error);
     },
-    getWhitelist({ commit, getters }) {
+    getWhitelist({ commit }) {
-      return axios.get(`${apiBase}/whitelist`, {
+      return api.get(`/whitelist`)
-        ...getters.apiAuth
-      })
         .then((result) => commit('updateWhitelist', result.data))
         .catch(console.error);
     },
-    getBlacklist({ commit, getters }) {
+    getBlacklist({ commit }) {
-      return axios.get(`${apiBase}/blacklist`, {
+      return api.get(`/blacklist`)
-        ...getters.apiAuth
-      })
         .then((result) => commit('updateBlacklist', result.data))
         .catch(console.error);
   },
-    getProfit({ commit, getters }) {
+    getProfit({ commit }) {
-      return axios.get(`${apiBase}/profit`, {
+      return api.get(`/profit`)
-        ...getters.apiAuth
-      })
         .then((result) => commit('updateProfit', result.data))
         .catch(console.error);
     },
-    getBalance({ commit, getters }) {
+    getBalance({ commit }) {
-      return axios.get(`${apiBase}/balance`, {
+      return api.get(`/balance`)
-        ...getters.apiAuth
-      })
         .then((result) => commit('updateBalance', result.data))
         .catch(console.error);
     },
-    getState({ commit, getters, dispatch }) {
+    getState({ commit }) {
-      return axios.get(`${apiBase}/show_config`, {
+      return api.get(`/show_config`)
-        ...getters.apiAuth
-      })
         .then((result) => commit('updateState', result.data))
-        .catch((error) => {
+        .catch(console.error);
-          console.error(error);
-          if (error.response.status !== 401) {
-            return new Promise((resolve, reject) => {
-              reject(error);
-            });
-          }
-          console.log("Dispatching refresh_token...")
-          dispatch('user/refresh_token', null, { root: true })
-          return null;
-        });
   },
     // Post methods
     // TODO: Migrate calls to API to a seperate module unrelated to vuex?
-    startBot({ getters }) {
+    startBot() {
-      return axios.post(`${apiBase}/start`, {}, {
+      return api.post(`/start`, {})
-        ...getters.apiAuth
-      })
-        // .then((result) => )
         .catch(console.error);
   },
-    stopBot({ getters }) {
+    stopBot() {
-      return axios.post(`${apiBase}/stop`, {}, {
+      return api.post(`/stop`, {})
-        ...getters.apiAuth
-      })
-        // .then((result) => )
         .catch(console.error);
+
     },
-    stopBuy({ getters }) {
+    stopBuy() {
-      return axios.post(`${apiBase}/stopbuy`, {}, {
+      return api.post(`/stopbuy`, {})
-        ...getters.apiAuth
-      })
-        // .then((result) => )
         .catch(console.error);
+
     },
-    reloadConfig({ getters }) {
+    reloadConfig() {
-      return axios.post(`${apiBase}/reload_conf`, {}, {
+      return api.post(`/reload_conf`, {})
-        ...getters.apiAuth
-      })
-        // .then((result) => )
         .catch(console.error);
+
     },
-    forcesell({ getters, dispatch }, tradeid) {
+    forcesell({ dispatch }, tradeid) {
       console.log(tradeid);
       if (tradeid) {
         const payload = { tradeid };
         console.log(payload);
-        return axios.post(`${apiBase}/forcesell`, payload, {
+        return api.post(`/forcesell`, payload).then(() => {
-          ...getters.apiAuth
+          dispatch('alerts/addAlert', { message: `Sell order for ${tradeid} created` }, { root: true })
-        }).then(() => {
-          dispatch('alerts/addAlert', { message: `Sell order for ${tradeid} created`}, { root: true }, )
         }).catch((error) => {
           console.error(error.response)
-          dispatch('alerts/addAlert', { message: `Failed to create sell order for ${tradeid}`, severity: 'danger'}, { root: true }, )
+          dispatch('alerts/addAlert', { message: `Failed to create sell order for ${tradeid}`, severity: 'danger' }, { root: true })
 
         })
       }
@@ -173,13 +132,11 @@ export default {
         reject(error);
       });
     },
-    forcebuy({getters, dispatch}, payload) {
+    forcebuy({ dispatch }, payload) {
       console.log(payload);
       if (payload && payload.pair) {
 
-        return axios.post(`${apiBase}/forcebuy`, payload, {
+        return api.post(`/forcebuy`, payload).then(() => {
-          ...getters.apiAuth
-        }).then(() => {
           dispatch('alerts/addAlert', { message: `Buy order for ${payload.pair} created.` }, { root: true })
         }).catch((error) => {
           console.error(error.response)

src/store/modules/user.js

@@ -19,9 +19,7 @@ export default {
       let result = {}
       if (state.accessToken) {
         result = {
-          headers: {
             Authorization: `Bearer ${state.accessToken}`,
-          }
         };
       }
       else {
@@ -84,7 +82,6 @@ export default {
 
       })
         .then((result) => {
-          console.log(result.data)
           if (result.data.access_token) {
             commit('setAccessTokens', result.data.access_token);
           }