From 2d5eec9dfeb6ac229e0eedc00e132b0a2b01c67b Mon Sep 17 00:00:00 2001
From: Daniel-I-Am <djdecloet@gmail.com>
Date: Thu, 2 Sep 2021 12:52:37 +0200
Subject: [PATCH] Refactor login page to work on all parts

---
 resources/js/bootstrap.js    |  8 ++++++++
 resources/js/views/Login.vue | 10 +++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js
index 4e01a36..f97a3da 100644
--- a/resources/js/bootstrap.js
+++ b/resources/js/bootstrap.js
@@ -11,6 +11,14 @@ window.axios = require('axios');
 
 window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
 
+const tokenData = JSON.parse(window.localStorage.getItem('authentication-token'));
+
+if (!!tokenData) {
+    if (new Date(tokenData.valid_until) > new Date()) {
+        axios.defaults.headers.common.Authorization = tokenData.token;
+    }
+}
+
 /**
  * Echo exposes an expressive API for subscribing to channels and listening
  * for events that are broadcast by Laravel. Echo and event broadcasting
diff --git a/resources/js/views/Login.vue b/resources/js/views/Login.vue
index 61ffba7..1f469f9 100644
--- a/resources/js/views/Login.vue
+++ b/resources/js/views/Login.vue
@@ -48,14 +48,10 @@ export default {
                 });
         },
         getCurrentToken() {
-            if (!!axios.defaults.headers.common.Authorization) {
-                return axios.defaults.headers.common.Authorization;
-            }
+            const tokenData = JSON.parse(window.localStorage.getItem('authentication-token'));
 
-            if (window.localStorage.getItem('authentication-token')) {
-                const tokenData = JSON.parse(window.localStorage.getItem('authentication-token'));
-
-                if (moment(tokenData.valid_until) > moment()) {
+            if (!!tokenData) {
+                if (new Date(tokenData.valid_until) > new Date()) {
                     this.tokenId = tokenData.id;
                     axios.defaults.headers.common.Authorization = tokenData.token;
                     return tokenData.token;