null token is considered expired

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.2
+
+Bugfix:
+
+  - Empty or invalid token is considered expired
+
 ## 1.0.1
 
 Enhancements:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nwx/jwt",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/neekware/nwx-jwt.git"

pkgs/jwt/src/jwt.service.ts

@@ -40,18 +40,26 @@ export class JwtService {
    * @returns a payload object or null if decode fails
    */
   getPayload(token: string): any {
-    const parts = token.split('.');
-    if (parts.length !== 3) {
-      this.log.error('JWT must have 3 parts');
-    } else {
-      try {
-        const decoded = Base64.decode(parts[1]);
-        const payload = JSON.parse(decoded);
-        return payload;
-      } catch (e) {
-        this.log.error('Cannot decode the token');
+    let parts = [];
+
+    try {
+      parts = token.split('.');
+      if (parts.length !== 3) {
+        throw Error('JWT must have 3 parts');
       }
+    } catch (e) {
+      this.log.error(e.message);
+      return null;
+    }
+
+    try {
+      const decoded = Base64.decode(parts[1]);
+      const payload = JSON.parse(decoded);
+      return payload;
+    } catch (e) {
+      this.log.error('Cannot decode the token');
     }
+
     return null;
   }
 
@@ -71,7 +79,7 @@ export class JwtService {
       const expired = now > expiry + offset;
       return expired;
     }
-    return false;
+    return true;
   }
 
   /**

pkgs/jwt/tst/jwt.service.spec.ts

@@ -84,6 +84,26 @@ describe('JwtService', () => {
     })
   );
 
+  it(
+    'should verify expiry on a null token',
+    inject([JwtService], (service: JwtService) => {
+      const token = null;
+      const payload = service.getPayload(token);
+      const isExpired = service.isExpired(payload);
+      expect(isExpired).toBe(true);
+    })
+  );
+
+  it(
+    'should verify expiry on a token with missing parts',
+    inject([JwtService], (service: JwtService) => {
+      const token = 'part1.part2';
+      const payload = service.getPayload(token);
+      const isExpired = service.isExpired(payload);
+      expect(isExpired).toBe(true);
+    })
+  );
+
   it(
     'should verify refresh time on a valid token',
     inject([JwtService], (service: JwtService) => {