now returning user after verifying token

MattPlayGamez · Oct 2, 2024 · d2a40a1 · d2a40a1
1 parent b4fa052
commit d2a40a1
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 13 deletions.
diff --git a/file.js b/file.js
@@ -177,7 +177,7 @@ class Authenticator {
     async verifyToken(token) {
         if (jwt.verify(token, this.JWT_SECRET_KEY, this.JWT_OPTIONS)) {
             let jwt_token = jwt.decode(token);
-            return (this.getInfoFromUser(jwt_token._id).jwt_version == jwt_token.version);
+            return (this.getInfoFromUser(jwt_token._id).version == jwt_token.version) ? this.getInfoFromUser(jwt_token._id) : false;
         }
     }
     async verify2FA(userId, twofactorcode) {

diff --git a/file.test.js b/file.test.js
@@ -101,7 +101,7 @@ describe('Authenticator Class Tests', () => {
     test('Verify JWT Token', async () => {
         const loginResult = await authenticator.login(mockUser.email, mockUser.password);
         const tokenVerification = await authenticator.verifyToken(loginResult.jwt_token);
-        expect(tokenVerification).toBe(true);
+        expect(tokenVerification).toBeDefined()
     });
 
     test('Verify 2FA code', async () => {

diff --git a/memory.js b/memory.js
@@ -123,7 +123,7 @@ class Authenticator {
     async verifyToken(token) {
         if (jwt.verify(token, this.JWT_SECRET_KEY, this.JWT_OPTIONS)) {
             let jwt_token = jwt.decode(token);
-            return (this.getInfoFromUser(jwt_token._id).jwt_version == jwt_token.version);
+            return (this.getInfoFromUser(jwt_token._id).version == jwt_token.version) ? this.getInfoFromUser(jwt_token._id) : false;
         }
     }
     async verify2FA(userId, twofactorcode) {

diff --git a/memory.test.js b/memory.test.js
@@ -100,7 +100,7 @@ describe('Authenticator Class Tests', () => {
     test('Verify JWT Token', async () => {
         const loginResult = await authenticator.login(mockUser.email, mockUser.password);
         const tokenVerification = await authenticator.verifyToken(loginResult.jwt_token);
-        expect(tokenVerification).toBe(true);
+        expect(tokenVerification).toBeDefined()
     });
 
     test('Verify 2FA code', async () => {

diff --git a/mongodb.js b/mongodb.js
@@ -147,13 +147,7 @@ class Authenticator {
         try {
             if (jwt.verify(token, this.JWT_SECRET_KEY, this.JWT_OPTIONS)) {
                 let jwt_token = jwt.decode(token);
-                let user = await this.getInfoFromUser(jwt_token.id)
-
-                if (user.jwt_version == jwt_token.version) {
-                    return true
-                } else {
-                    return false
-                }
+                return (this.getInfoFromUser(jwt_token._id).version == jwt_token.version) ? this.getInfoFromUser(jwt_token._id) : false;
             }
         } catch (error) {
             console.log(error)

diff --git a/mongodb.test.js b/mongodb.test.js
@@ -108,7 +108,7 @@ describe('Authenticator Class Tests', () => {
   test('Verify JWT Token', async () => {
     const loginResult = await authenticator.login(mockUser.email, mockUser.password);
     const tokenVerification = await authenticator.verifyToken(loginResult.jwt_token);
-    expect(tokenVerification).toBe(true);
+    expect(tokenVerification).toBeDefined()
   });
 
   test('Verify 2FA code', async () => {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "seamless-auth",
-  "version": "3.7.4",
+  "version": "3.7.5",
   "description": "A full fledged authentication system...",
   "type": "commonjs",
   "main": "memory.js",