fix(login): Updated to support expired tokens

hastearcade · Oct 1, 2021 · 56f03a4 · 56f03a4
1 parent 54d7bbc
commit 56f03a4
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/web/package.json b/packages/web/package.json
@@ -48,6 +48,7 @@
     "axios": "^0.21.1",
     "jsonwebtoken": "^8.5.1",
     "jwks-rsa": "^2.0.4",
+    "jwt-decode": "^3.1.2",
     "secure-ls": "^1.2.6"
   },
   "devDependencies": {

diff --git a/packages/web/src/api/hasteClient.ts b/packages/web/src/api/hasteClient.ts
@@ -3,6 +3,7 @@ import { isBrowser } from '../util/environmentCheck';
 import createAuth0Client, { Auth0Client } from '@auth0/auth0-spa-js';
 import { HasteClientConfiguration } from '../config/hasteClientConfiguration';
 import SecureLS from 'secure-ls';
+import jwtDecode, { JwtPayload } from 'jwt-decode';
 
 export type HasteAuthentication = {
   token: string;
@@ -68,10 +69,23 @@ export class HasteClient {
       const cachedToken = this.ls.get('haste:config');
 
       if (cachedToken) {
-        return {
-          token: cachedToken,
-          isAuthenticated: true,
-        } as HasteAuthentication;
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+        const decoded = jwtDecode<JwtPayload>(cachedToken);
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+        const expiration = decoded.exp;
+
+        if (expiration && new Date(expiration * 1000) > new Date()) {
+          return {
+            token: cachedToken,
+            isAuthenticated: true,
+          } as HasteAuthentication;
+        } else {
+          this.ls.remove('haste:config');
+          return {
+            token: '',
+            isAuthenticated: false,
+          } as HasteAuthentication;
+        }
       } else if (idToken) {
         this.ls.set('haste:config', idToken);
         return {