chore: Fix logic of detecting cookie strings in storage (#82)

* Refactor logic

* Refactor logic

* Refactor logic

Author: nkshah2

lib/build/antiCsrf.js

@@ -49,20 +49,32 @@ export default class AntiCSRF {
 
         if (fromStorage != null) {
             let value = "; " + fromStorage;
-            let parts = value.split("; " + ANTI_CSRF_NAME + "=");
-            let last = parts.pop();
-
-            if (last !== undefined) {
-                let temp = last.split(";").shift();
-                if (temp !== undefined) {
-                    // This means that the storage had a cookie string instead of a simple key value (legacy sessions)
-                    // We update storage to set just the value and return it
-                    await AntiCSRF.setItem(associatedAccessTokenUpdate, temp);
-                    return temp;
-                }
 
-                // This means that the storage had a cookie string but it was malformed somehow
-                return null;
+            if (value.includes("; " + ANTI_CSRF_NAME + "=")) {
+                // This means that the storage had a cookie string instead of a simple key value (legacy sessions)
+                let parts = value.split("; " + ANTI_CSRF_NAME + "=");
+                let last = parts.pop();
+
+                if (last !== undefined) {
+                    let splitForExpiry = fromStorage.split(";");
+                    let expiry = Date.parse(splitForExpiry[1].split("=")[1]);
+                    let currentTime = Date.now();
+
+                    if (expiry < currentTime) {
+                        await AntiCSRF.removeToken();
+                        return null;
+                    }
+
+                    let temp = last.split(";").shift();
+                    if (temp !== undefined) {
+                        // We update storage to set just the value and return it
+                        await AntiCSRF.setItem(associatedAccessTokenUpdate, temp);
+                        return temp;
+                    }
+
+                    // This means that the storage had a cookie string but it was malformed somehow
+                    return null;
+                }
             }
         }
 

lib/build/frontToken.js

@@ -18,20 +18,32 @@ export default class FrontToken {
 
         if (frontTokenFromStorage !== null) {
             let value = "; " + frontTokenFromStorage;
-            let parts = value.split("; " + FRONT_TOKEN_NAME + "=");
-
-            let last = parts.pop();
-            if (last !== undefined) {
-                let temp = last.split(";").shift();
-                if (temp !== undefined) {
-                    // This means that the storage had a cookie string instead of a simple key value (legacy sessions)
-                    // We update storage to set just the value and return it
-                    await FrontToken.setFrontToken(temp);
-                    return temp;
-                }
 
-                // This means that the storage had a cookie string but it was malformed somehow
-                return null;
+            if (value.includes("; " + FRONT_TOKEN_NAME + "=")) {
+                // This means that the storage had a cookie string instead of a simple key value (legacy sessions)
+                let parts = value.split("; " + FRONT_TOKEN_NAME + "=");
+
+                let last = parts.pop();
+                if (last !== undefined) {
+                    let splitForExpiry = frontTokenFromStorage.split(";");
+                    let expiry = Date.parse(splitForExpiry[1].split("=")[1]);
+                    let currentTime = Date.now();
+
+                    if (expiry < currentTime) {
+                        await FrontToken.removeToken();
+                        return null;
+                    }
+
+                    let temp = last.split(";").shift();
+                    if (temp !== undefined) {
+                        // We update storage to set just the value and return it
+                        await FrontToken.setFrontToken(temp);
+                        return temp;
+                    }
+
+                    // This means that the storage had a cookie string but it was malformed somehow
+                    return null;
+                }
             }
 
             return frontTokenFromStorage;