Added axios package

3 files changed, 42 insertions, 15 deletions

diff --git a/src/site/plugins/axios.js b/src/site/plugins/axios.js
new file mode 100644
index 0000000..5a169b2
--- /dev/null
+++ b/src/site/plugins/axios.js
@@ -0,0 +1,29 @@
+/*
+import Vue from 'vue';
+import axios from 'axios';
+import VueAxios from 'vue-axios';
+
+Vue.use(VueAxios, axios);
+Vue.axios.defaults.headers.common.Accept = 'application/vnd.lolisafe.json';
+*/
+
+export default function({ $axios, redirect }) {
+	$axios.onRequest(config => {
+		console.log(`Making request to > /${config.url}`);
+	});
+	$axios.setHeader('accept', 'application/vnd.lolisafe.json');
+
+	$axios.onError(error => {
+		// console.log('=====');
+		console.log(error);
+		// console.log('=====');
+		/*
+		$toast.open({
+			duration: 2500,
+			message: 'testing',
+			position: 'is-bottom',
+			type: error ? 'is-danger' : 'is-success'
+		});
+		*/
+	});
+}
diff --git a/src/site/plugins/vue-axios.js b/src/site/plugins/vue-axios.js
deleted file mode 100644
index 41f026f..0000000
--- a/src/site/plugins/vue-axios.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import Vue from 'vue';
-import axios from 'axios';
-import VueAxios from 'vue-axios';
-
-Vue.use(VueAxios, axios);
-Vue.axios.defaults.headers.common.Accept = 'application/vnd.lolisafe.json';
diff --git a/src/site/store/index.js b/src/site/store/index.js
index 6a05622..13e49c3 100644
--- a/src/site/store/index.js
+++ b/src/site/store/index.js
@@ -1,5 +1,7 @@
+/*
 import Vue from 'vue';
 import axios from 'axios';
+*/
 
 const cookieparser = process.server ? require('cookieparser') : null;
 
@@ -27,7 +29,6 @@ export const mutations = {
 			state.token = null;
 			return;
 		}
-		setAuthorizationHeader(payload);
 		state.token = payload;
 	},
 	config(state, payload) {
@@ -36,7 +37,7 @@ export const mutations = {
 };
 
 export const actions = {
-	async nuxtServerInit({ commit }, { req }) {
+	async nuxtServerInit({ commit }, { app, req }) {
 		commit('config', {
 			version: process.env.npm_package_version,
 			URL: process.env.DOMAIN,
@@ -56,9 +57,11 @@ export const actions = {
 				commit('loggedIn', true);
 				commit('token', token);
 
-				const res = await axios.get(`${this.config.baseURL}/verify`);
-				if (!res || !res.data.user);
-				commit('user', res.data.user);
+				app.$axios.setToken(token, 'Bearer');
+
+				const data = await this.$axios.$get(`verify`);
+				if (!data || !data.user);
+				commit('user', data.user);
 			} catch (error) {
 				// TODO: Deactivate this on production
 				console.error(error);
@@ -69,9 +72,10 @@ export const actions = {
 			commit('user', null);
 			commit('loggedIn', false);
 		}
+	},
+	login({ commit }, { app, token, user }) {
+		commit('token', token);
+		commit('user', user);
+		commit('loggedIn', true);
 	}
 };
-
-const setAuthorizationHeader = payload => {
-	Vue.axios.defaults.headers.common.Authorization = payload ? `Bearer ${payload}` : '';
-};