Change login handling to automatically redirect a user if their session will need renewal.

resources/assets/scripts/models/user.js

@@ -9,17 +9,19 @@ export default class User {
      */
     static fromToken(token) {
         if (!isString(token)) {
-            token = localStorage.getItem('token');
+            token = this.getToken();
         }
 
         if (!isString(token) || token.length < 1) {
             return null;
         }
 
-        const data = jwtDecode(token);
-        if (data.user) {
-            return new User(data.user);
-        }
+        try {
+            const data = jwtDecode(token);
+            if (data.user) {
+                return new User(data.user);
+            }
+        } catch (ex) {}
 
         return null;
     }
@@ -29,8 +31,7 @@ export default class User {
      *
      * @returns {string | null}
      */
-    static getToken()
-    {
+    static getToken() {
         return localStorage.getItem('token');
     }
 
@@ -60,4 +61,11 @@ export default class User {
         this.last_name = last_name;
         this.language = language;
     }
+
+    /**
+     * Returns the JWT belonging to the current user.
+     */
+    getJWT() {
+        return jwtDecode(User.getToken());
+    }
 }