finished testing route auth/refreshJWT

__tests__/auth/__snapshots__/refreshjwt.test.js.snap

+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`refresh JWT > given authtoken is valid > should respond with a proper body 1`] = `
+{
+  "accessToken": Any<String>,
+  "message": "Access token refreshed",
+}
+`;
+
+exports[`refresh JWT > given refresh token is invalid > should respond with a proper body 1`] = `
+{
+  "message": "Refresh token is invalid",
+}
+`;
+
+exports[`refresh JWT > given refresh token is malformed > should respond with a proper body 1`] = `
+{
+  "message": "jwt malformed",
+}
+`;
+
+exports[`refresh JWT > given refresh token is missing > should respond with a proper body 1`] = `
+{
+  "message": "Refresh token is missing. Consider to re-login",
+}
+`;

__tests__/auth/login.test.js

@@ -13,8 +13,6 @@ let response;
 //  OBJECTS
 // ############################
 const mockedVals = vi.hoisted(() => {
-  // const password = await bcrypt.hash('StrongPass1!', Number(process.env.BCRYPT_STRENGTH));
-
   return {
     foundUser: {
       _id: '66a29da2942b3eb',

logs/__tests__/users/refreshjwt.test.js → __tests__/auth/refreshjwt.test.js

@@ -2,108 +2,124 @@
 import { vi, beforeAll, beforeEach, describe, expect, expectTypeOf, test, it, afterEach } from 'vitest';
 import supertest from "supertest";
 import app from "../../app.js";
-// ignore expiration of the (self-signed) certificate
-process.env.NODE_TLS_REJECT_UNAUTHORIZED = 0;
-// set timeout
-const BEFORE_ALL_TIMEOUT = 30000; // 30 sec
+import jwt from 'jsonwebtoken';
+
 // set route
-const ROUTE = '/users/refreshjwt';
+const ROUTE = '/auth';
 // prepare response of each test
 let response;
 
 // ############################
 //  OBJECTS
 // ############################
-const authStoreModel = {
-  avatar: "",
-  collectionId: "_pb_users_auth_",
-  collectionName: "users",
-  created: "2024-05-06 07:45:18.836Z",
-  email: "johndoe@local.local",
-  emailVisibility: false,
-  id: "jr9mt8yvuri3sbd",
-  name: "John Doe",
-  updated: "2024-07-02 13:23:52.155Z",
-  username: "johndoe",
-  verified: true
-};
-const userLoginVerifiedResponse = {
-  "record": authStoreModel,
-  "token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjb2xsZWN0aW9uSWQiOiJfcGJfdXNlcnNfYXV0aF8iLCJleHAiOjE3MjA2NDk3NTQsImlkIjoianI5bXQ4eXZ1cmkzc2JkIiwidHlwZSI6ImF1dGhSZWNvcmQifQ.yFP1vlM_N2Fvpa_56INlaefSXnpwrm9ASCJuxPwf1Vk"
+const mockedVals = vi.hoisted(() => {
+  return {
+    foundUser: {
+      _id: '66a29da2942b3eb',
+      username: 'snoopy',
+      name: 'My User',
+      email: 'user@mail.local',
+      verified: true,
+      role: 0,
+      createdAt: '2024-07 - 25T18: 46: 58.982Z',
+      updatedAt: '2024-07 - 25T18: 46: 58.982Z',
+      __v: 0,
+      password: 'StrongPass1!',
+      // password,
+      id: '66a29da2942b3ebcaf047f07'
+    }
   };
+});
 
 // ############################
 //  MOCKS
 // ############################
-// import PocketBase Service
-import * as pbService from '../../utils/pocketbase/handlePocketBase.js';
-// mock pbService
-vi.mock('../../utils/pocketbase/handlePocketBase.js', async (importOriginal) => {
+// import Database Service
+import * as dbService from '../../utils/handleDB.js';
+// mock dbService
+vi.mock('../../utils/handleDB.js', async (importOriginal) => {
   return {
     ...await importOriginal(),
-    pbVerifyAccessToken: vi.fn().mockImplementation((req, res, next) => {
-      next();
-    }),
-    pbRefreshJWT: vi.fn().mockImplementation(() => {
-      return userLoginVerifiedResponse;
-    })
+    dbConnection: vi.fn(() => 'mocked'),
+    findOneRecord: vi.fn(() => mockedVals.foundUser),
+    findByIdAndUpdate: vi.fn(() => { return { ...mockedVals.foundUser, refreshToken: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjY2MOCKED' }; })
   };
 });
+// verifyRefreshToken;
 
 // ############################
 //  TESTS
 // ############################
 
 describe('refresh JWT', () => {
+
+
   describe('given authtoken is valid', () => {
     beforeAll(async () => {
+      const refreshToken = jwt.sign({ id: mockedVals.foundUser.id }, process.env.JWT_REFRESH_KEY);
+      // console.log('refreshToken', refreshToken);
       response = await supertest(app)
         .get(ROUTE)
-        .set('Authorization', 'Bearer 123valid');
-    }, BEFORE_ALL_TIMEOUT);
+        .set('Cookie', `refreshToken=${refreshToken}`);
+    });
     it('should return a proper status code', () => {
       expect(response.status).toBe(200);
     });
-    it('should respond with a proper record and token', () => {
-      expect(response.body).toEqual(userLoginVerifiedResponse);
+    it('should respond with a proper body', () => {
+      expect(response.body).toMatchSnapshot({
+        accessToken: expect.any(String),
+      });
     });
   });
 
   // ############################
-  describe('given authtoken is invalid', () => {
+  describe('given refresh token is malformed', () => {
     beforeAll(async () => {
-      pbService.pbVerifyAccessToken.mockImplementation((req, res, next) => {
-        res.status(403).json({ message: 'You are not logged in.' });
+      // const refreshToken = jwt.sign({ id: mockedVals.foundUser.id }, process.env.JWT_REFRESH_KEY);
+      // console.log('refreshToken', refreshToken);
+      response = await supertest(app)
+        .get(ROUTE)
+        .set('Cookie', 'refreshToken=invalid');
     });
+    it('should return a proper status code', () => {
+      expect(response.status).toBe(400);
+    });
+    it('should respond with a proper body', () => {
+      expect(response.body).toMatchSnapshot();
+    });
+  });
+
+  // ############################
 
+  describe('given refresh token is invalid', () => {
+    beforeAll(async () => {
+      // const refreshToken = jwt.sign({ id: mockedVals.foundUser.id }, process.env.JWT_REFRESH_KEY);
+      // console.log('refreshToken', refreshToken);
       response = await supertest(app)
         .get(ROUTE)
-        .set('Authorization', 'Bearer 123invalid');
-    }, BEFORE_ALL_TIMEOUT);
+        .set('Cookie', 'refreshToken=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6IjY2YTNkYTViYTEwNjUzMmNhZTEyYTYwOSIsImlhdCI6MTcyMjA5ODM3OX0.7Pq8F2zSDwuEzlCQX3vMZAw9D43N6dSViCyVPZ_s_Zs');
+    });
     it('should return a proper status code', () => {
       expect(response.status).toBe(403);
     });
-    it('should respond with a proper record and token', () => {
-      expect(response.body.message).toEqual('You are not logged in.');
+    it('should respond with a proper body', () => {
+      expect(response.body).toMatchSnapshot();
     });
   });
 
   // ############################
 
-  describe('given authtoken is missing', () => {
+  describe('given refresh token is missing', () => {
     beforeAll(async () => {
-      pbService.pbVerifyAccessToken.mockImplementation((req, res, next) => {
-        res.status(403).json({ message: 'You are not logged in.' });
-      });
 
       response = await supertest(app)
         .get(ROUTE);
-    }, BEFORE_ALL_TIMEOUT);
+    });
     it('should return a proper status code', () => {
-      expect(response.status).toBe(403);
+      expect(response.status).toBe(401);
     });
-    it('should respond with a proper record and token', () => {
-      expect(response.body.message).toEqual('You are not logged in.');
+    it('should respond with a proper body', () => {
+      expect(response.body).toMatchSnapshot();
     });
   });
 });
\ No newline at end of file

controllers/Auth.js

@@ -104,8 +104,9 @@ export const login = async (req, res, next) => {
  * return new accessToken and refreshToken
  */
 export const renewAccessToken = async (req, res, next) => {
+  try {
+    // get token from cookie
     const refreshToken = req.cookies.refreshToken;
-
     if (!refreshToken) return res.status(401).json({ message: 'Refresh token is missing. Consider to re-login' });
     // verify token
     const user = await verifyRefreshToken(refreshToken);
@@ -115,6 +116,9 @@ export const renewAccessToken = async (req, res, next) => {
     // create & return 
     const accessToken = createAccessToken({ id: user._id, role: user.role });
     return res.json({ message: 'Access token refreshed', accessToken });
+  } catch (error) {
+    next(error);
+  }
 };
 
 

utils/handleErrors.js

@@ -19,6 +19,7 @@ const generateErrorStatusCode = (error) => {
   switch (error.name) {
     // VALIDATION ERROR
     case "ValidationError":
+    case "JsonWebTokenError":
     // ZOD VALIDATION ERROR
     case "zodError": {
       return 400;

utils/handleTokens.js

@@ -93,12 +93,16 @@ export const createRefreshToken = async (payload) => {
  * @return  {any}         user from DB if exists, false if not
  */
 export const verifyRefreshToken = async (refreshToken) => {
+  try {
     // check if in DB
-  const foundUser = await User.findOne({ refreshToken });
+    const foundUser = await findOneRecord(User, { refreshToken });
     if (!foundUser) return false;
     // check if valid
     const user = jwt.verify(refreshToken, process.env.JWT_REFRESH_KEY);
     return (user && user.id === foundUser.id ? foundUser : false);
+  } catch (error) {
+    throw error;
+  }
 };
 
 /**