4 files changed, 13 insertions, 6 deletions
diff --git a/src/site/layouts/default.vue b/src/site/layouts/default.vue
index 41c3ebd..7a5d4cc 100644
--- a/src/site/layouts/default.vue
+++ b/src/site/layouts/default.vue
@@ -41,12 +41,14 @@ export default {
 		processCatch(error, logout) {
 			if (error.response && error.response.data && error.response.data.message) {
 				this.showToast(error.response.data.message, true, 5000);
+				/*
 				if (error.response.status === 429) return;
 				if (error.response.status === 502) return;
 				if (error.response.data.message === 'Token expired') {
 					this.$logOut();
 					setTimeout(() => this.$router.push('/'), 3000);
 				}
+				*/
 			} else {
 				console.error(error);
 				this.showToast('Something went wrong, please check the console :(', true, 5000);
diff --git a/src/site/pages/dashboard/account.vue b/src/site/pages/dashboard/account.vue
index 3ff6c70..b0b90a3 100644
--- a/src/site/pages/dashboard/account.vue
+++ b/src/site/pages/dashboard/account.vue
@@ -67,7 +67,8 @@
 							message="This API key lets you use the service from other apps"
 							horizontal>
 							<b-input v-model="user.apiKey"
-								expanded />
+								expanded
+								disabled />
 						</b-field>
 
 						<div class="mb2 mt2 text-center">
@@ -130,7 +131,8 @@ export default {
 		},
 		promptNewAPIKey() {
 			this.$dialog.confirm({
-				message: 'Are you sure you want to regenerate your API key?',
+				type: 'is-danger',
+				message: 'Are you sure you want to regenerate your API key? If you had a previous API key generated it will stop working. Make sure to write it down as this is the only time its gonna be displayed to you.',
 				onConfirm: () => this.requestNewAPIKey()
 			});
 		},
@@ -139,6 +141,7 @@ export default {
 				const response = await this.axios.post(`${this.config.baseURL}/user/apikey/change`);
 				this.user.apiKey = response.data.apiKey;
 				this.$toast.open(response.data.message);
+				this.$forceUpdate();
 			} catch (error) {
 				this.$onPromiseError(error);
 			}
diff --git a/src/site/pages/login.vue b/src/site/pages/login.vue
index fe7d64a..5af3371 100644
--- a/src/site/pages/login.vue
+++ b/src/site/pages/login.vue
@@ -116,6 +116,7 @@ export default {
 					this.getUserData();
 				}
 				*/
+				document.cookie = `token=${encodeURIComponent(res.data.token)}`;
 				this.redirect();
 			}).catch(err => {
 				this.isLoading = false;
diff --git a/src/site/store/index.js b/src/site/store/index.js
index 3c43f53..2f83f63 100644
--- a/src/site/store/index.js
+++ b/src/site/store/index.js
@@ -53,12 +53,13 @@ export const actions = {
 		if (req.headers.cookie) {
 			try {
 				token = cookieparser.parse(req.headers.cookie).token;
+				console.log(token);
 				commit('loggedIn', true);
 				commit('token', token);
-
-				const res = await axios.get(`${process.env.DOMAIN}${process.env.ROUTE_PREFIX}/verify`);
-				if (!res || !res.data.user);
-				commit('user', res.data.user);
+				const res = await axios.get(`${process.env.DOMAIN}${process.env.ROUTE_PREFIX}/verify`, {
+					headers: { authorization: `Bearer ${token}` }
+				});
+				if (res && res.data.user) commit('user', res.data.user);
 			} catch (error) {
 				// TODO: Deactivate this on production
 				console.error(error);