From 043698e5358c85f2461e4c33bd179cce7c26cffb Mon Sep 17 00:00:00 2001 From: Rushi Gandhi Date: Thu, 17 Oct 2024 17:01:36 +0530 Subject: [PATCH 1/7] add endpoint to refresh auth token --- Server/controllers/authController.js | 63 ++++++++++++++++++++++++++++ Server/routes/authRoute.js | 2 + Server/utils/messages.js | 1 + 3 files changed, 66 insertions(+) diff --git a/Server/controllers/authController.js b/Server/controllers/authController.js index 4ce5a0e2b..a9272e7c0 100644 --- a/Server/controllers/authController.js +++ b/Server/controllers/authController.js @@ -173,6 +173,68 @@ const loginUser = async (req, res, next) => { } }; +/** + * Generates new auth token if the refresh token is valid + * @function + * @param {Express.Request} req - The Express request object. + * @property {Object} req.headers - The parameter of the request. + * @param {Express.Response} res - The Express response object. + * @param {function} next - The next middleware function. + * @returns {Object} The response object with a success status, a message indicating new auth token is generated. + * @throws {Error} If there is an error during the process such as any of the token is not received + */ +const refreshAuthToken = (req, res, next) => { + try { + // check for refreshToken + const refreshToken = req.headers["x-refresh-token"]; + + if (!refreshToken) { + // No refresh token provided + const error = new Error(errorMessages.NO_REFRESH_TOKEN); + error.status = 401; + error.service = SERVICE_NAME; + error.method = "handleExpiredJwtToken"; + return next(error); + } + + // Verify refresh token + const { refreshTokenSecret } = req.settingsService.getSettings(); + jwt.verify(refreshToken, refreshTokenSecret, (refreshErr, refreshDecoded) => { + if (refreshErr) { + // Invalid or expired refresh token, trigger logout + const errorMessage = + refreshErr.name === "TokenExpiredError" + ? errorMessages.EXPIRED_REFRESH_TOKEN + : errorMessages.INVALID_REFRESH_TOKEN; + const error = new Error(errorMessage); + error.status = 401; + error.service = SERVICE_NAME; + return next(error); + } + }); + + // Refresh token is valid and unexpired, generate new access token + const oldAuthToken = getTokenFromHeaders(req.headers); + const { jwtSecret } = req.settingsService.getSettings(); + + const payloadData = jwt.verify(oldAuthToken, jwtSecret, { ignoreExpiration: true }); + // delete old token related data + delete payloadData.iat; + delete payloadData.exp; + + const newAuthToken = issueToken(payloadData, tokenType.ACCESS_TOKEN, req.settingsService.getSettings()); + + return res.status(200).json({ + success: true, + msg: successMessages.AUTH_TOKEN_REFRESHED, + data: { user: payloadData, token: newAuthToken, refreshToken: refreshToken }, + }); + } catch (error) { + next(handleError(error, SERVICE_NAME, "refreshAuthToken")); + } +}; + + /** * Edits a user's information. If the user wants to change their password, the current password is checked before updating to the new password. * @async @@ -455,6 +517,7 @@ export { issueToken, registerUser, loginUser, + refreshAuthToken, editUser, checkSuperadminExists, requestRecovery, diff --git a/Server/routes/authRoute.js b/Server/routes/authRoute.js index 11e371654..e19f855db 100644 --- a/Server/routes/authRoute.js +++ b/Server/routes/authRoute.js @@ -11,6 +11,7 @@ const upload = multer(); import { registerUser, loginUser, + refreshAuthToken, editUser, requestRecovery, validateRecovery, @@ -23,6 +24,7 @@ import { //Auth routes router.post("/register", upload.single("profileImage"), registerUser); router.post("/login", loginUser); +router.post("/refresh", refreshAuthToken); router.put("/user/:userId", upload.single("profileImage"), verifyJWT, editUser); router.get("/users/superadmin", checkSuperadminExists); router.get("/users", verifyJWT, isAllowed(["admin", "superadmin"]), getAllUsers); diff --git a/Server/utils/messages.js b/Server/utils/messages.js index f7255af1f..159ed5b30 100644 --- a/Server/utils/messages.js +++ b/Server/utils/messages.js @@ -75,6 +75,7 @@ const successMessages = { AUTH_RESET_PASSWORD: "Password reset successfully", AUTH_ADMIN_CHECK: "Admin check completed successfully", AUTH_DELETE_USER: "User deleted successfully", + AUTH_TOKEN_REFRESHED: "Auth token is refreshed", // Check Controller CHECK_CREATE: "Check created successfully", From 9f861f977947a1a18662e2875bfe356b005fa1fb Mon Sep 17 00:00:00 2001 From: Rushi Gandhi Date: Thu, 17 Oct 2024 17:13:25 +0530 Subject: [PATCH 2/7] move token generation part into callback --- Server/controllers/authController.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Server/controllers/authController.js b/Server/controllers/authController.js index a9272e7c0..a1a1988f1 100644 --- a/Server/controllers/authController.js +++ b/Server/controllers/authController.js @@ -211,23 +211,23 @@ const refreshAuthToken = (req, res, next) => { error.service = SERVICE_NAME; return next(error); } - }); - // Refresh token is valid and unexpired, generate new access token - const oldAuthToken = getTokenFromHeaders(req.headers); - const { jwtSecret } = req.settingsService.getSettings(); + // Refresh token is valid and unexpired, generate new access token + const oldAuthToken = getTokenFromHeaders(req.headers); + const { jwtSecret } = req.settingsService.getSettings(); - const payloadData = jwt.verify(oldAuthToken, jwtSecret, { ignoreExpiration: true }); - // delete old token related data - delete payloadData.iat; - delete payloadData.exp; + const payloadData = jwt.verify(oldAuthToken, jwtSecret, { ignoreExpiration: true }); + // delete old token related data + delete payloadData.iat; + delete payloadData.exp; - const newAuthToken = issueToken(payloadData, tokenType.ACCESS_TOKEN, req.settingsService.getSettings()); + const newAuthToken = issueToken(payloadData, tokenType.ACCESS_TOKEN, req.settingsService.getSettings()); - return res.status(200).json({ - success: true, - msg: successMessages.AUTH_TOKEN_REFRESHED, - data: { user: payloadData, token: newAuthToken, refreshToken: refreshToken }, + return res.status(200).json({ + success: true, + msg: successMessages.AUTH_TOKEN_REFRESHED, + data: { user: payloadData, token: newAuthToken, refreshToken: refreshToken }, + }); }); } catch (error) { next(handleError(error, SERVICE_NAME, "refreshAuthToken")); From 861adc0b96723fb12cf3d50b8d71196a1dcf6ce0 Mon Sep 17 00:00:00 2001 From: Rushi Gandhi Date: Fri, 18 Oct 2024 09:47:38 +0530 Subject: [PATCH 3/7] fix error.method name in refreshAuthToken --- Server/controllers/authController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/controllers/authController.js b/Server/controllers/authController.js index a1a1988f1..c668bb69f 100644 --- a/Server/controllers/authController.js +++ b/Server/controllers/authController.js @@ -193,7 +193,7 @@ const refreshAuthToken = (req, res, next) => { const error = new Error(errorMessages.NO_REFRESH_TOKEN); error.status = 401; error.service = SERVICE_NAME; - error.method = "handleExpiredJwtToken"; + error.method = "refreshAuthToken"; return next(error); } From 19e47ff975dab4f953e636a5074d35f328000045 Mon Sep 17 00:00:00 2001 From: Rushi Gandhi Date: Fri, 18 Oct 2024 10:21:57 +0530 Subject: [PATCH 4/7] documented the new endpoint in the openapi.json --- Server/openapi.json | 69 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/Server/openapi.json b/Server/openapi.json index 6d079e685..6dc9ef360 100644 --- a/Server/openapi.json +++ b/Server/openapi.json @@ -229,6 +229,75 @@ } } }, + "/auth/refresh": { + "post": { + "tags": ["auth"], + "description": "Generates a new auth token if the refresh token is valid.", + "requestBody": { + "content": { + "application/json": { + "schema": { + "type": "object", + "properties": {} + } + } + }, + "required": false + }, + "parameters": [ + { + "name": "x-refresh-token", + "in": "header", + "description": "Refresh token required to generate a new auth token.", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "authorization", + "in": "header", + "description": "Old access token, used to extract payload).", + "required": true, + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "New access token generated.", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SuccessResponse" + } + } + } + }, + "401": { + "description": "Unauthorized or invalid refresh token.", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "500": { + "description": "Internal Server Error", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + } + } + } + }, "/auth/user/{userId}": { "put": { "tags": ["auth"], From 7c24136e6a06f49b921611c3a66ba8771ac2605e Mon Sep 17 00:00:00 2001 From: Rushi Gandhi Date: Fri, 18 Oct 2024 14:55:41 +0530 Subject: [PATCH 5/7] Add testcases for new endpoint --- Server/controllers/authController.js | 11 ++- .../tests/controllers/authController.test.js | 85 ++++++++++++++++++- 2 files changed, 89 insertions(+), 7 deletions(-) diff --git a/Server/controllers/authController.js b/Server/controllers/authController.js index c668bb69f..a55111f5c 100644 --- a/Server/controllers/authController.js +++ b/Server/controllers/authController.js @@ -175,7 +175,7 @@ const loginUser = async (req, res, next) => { /** * Generates new auth token if the refresh token is valid - * @function + * @async * @param {Express.Request} req - The Express request object. * @property {Object} req.headers - The parameter of the request. * @param {Express.Response} res - The Express response object. @@ -183,7 +183,7 @@ const loginUser = async (req, res, next) => { * @returns {Object} The response object with a success status, a message indicating new auth token is generated. * @throws {Error} If there is an error during the process such as any of the token is not received */ -const refreshAuthToken = (req, res, next) => { +const refreshAuthToken = async (req, res, next) => { try { // check for refreshToken const refreshToken = req.headers["x-refresh-token"]; @@ -198,8 +198,8 @@ const refreshAuthToken = (req, res, next) => { } // Verify refresh token - const { refreshTokenSecret } = req.settingsService.getSettings(); - jwt.verify(refreshToken, refreshTokenSecret, (refreshErr, refreshDecoded) => { + const { refreshTokenSecret } = await req.settingsService.getSettings(); + jwt.verify(refreshToken, refreshTokenSecret, async (refreshErr, refreshDecoded) => { if (refreshErr) { // Invalid or expired refresh token, trigger logout const errorMessage = @@ -214,7 +214,7 @@ const refreshAuthToken = (req, res, next) => { // Refresh token is valid and unexpired, generate new access token const oldAuthToken = getTokenFromHeaders(req.headers); - const { jwtSecret } = req.settingsService.getSettings(); + const { jwtSecret } = await req.settingsService.getSettings(); const payloadData = jwt.verify(oldAuthToken, jwtSecret, { ignoreExpiration: true }); // delete old token related data @@ -234,7 +234,6 @@ const refreshAuthToken = (req, res, next) => { } }; - /** * Edits a user's information. If the user wants to change their password, the current password is checked before updating to the new password. * @async diff --git a/Server/tests/controllers/authController.test.js b/Server/tests/controllers/authController.test.js index 40c4939dd..b7616b310 100644 --- a/Server/tests/controllers/authController.test.js +++ b/Server/tests/controllers/authController.test.js @@ -2,6 +2,7 @@ import { issueToken, registerUser, loginUser, + refreshAuthToken, editUser, checkSuperadminExists, requestRecovery, @@ -13,7 +14,7 @@ import { import jwt from "jsonwebtoken"; import { errorMessages, successMessages } from "../../utils/messages.js"; import sinon from "sinon"; -import { tokenType } from "../../utils/utils.js"; +import { getTokenFromHeaders, tokenType } from "../../utils/utils.js"; import logger from "../../utils/logger.js"; describe("Auth Controller - issueToken", () => { @@ -303,6 +304,88 @@ describe("Auth Controller - loginUser", () => { }); }); +describe('Auth Controller - refreshAuthToken', () => { + let req, res, next, issueTokenStub; + + beforeEach(() => { + req = { + headers: { + 'x-refresh-token': 'valid_refresh_token', + authorization: 'Bearer old_auth_token', + }, + settingsService: { + getSettings: sinon.stub().resolves({ + jwtSecret: 'my_secret', + refreshTokenSecret: 'my_refresh_secret', + }), + }, + }; + res = { + status: sinon.stub().returnsThis(), + json: sinon.stub(), + }; + next = sinon.stub(); + sinon.stub(jwt, 'verify'); + + issueTokenStub = sinon.stub().returns("new_auth_token"); + sinon.replace({ issueToken }, "issueToken", issueTokenStub); + }); + + afterEach(() => { + sinon.restore(); + }); + + it('should reject if no refresh token is provided', async () => { + delete req.headers['x-refresh-token']; + await refreshAuthToken(req, res, next); + + expect(next.firstCall.args[0]).to.be.an("error"); + expect(next.firstCall.args[0].message).to.equal(errorMessages.NO_REFRESH_TOKEN); + expect(next.firstCall.args[0].status).to.equal(401); + }); + + it('should reject if the refresh token is invalid', async () => { + jwt.verify.yields(new Error('invalid token')); + await refreshAuthToken(req, res, next); + + expect(next.firstCall.args[0]).to.be.an("error"); + expect(next.firstCall.args[0].message).to.equal(errorMessages.INVALID_REFRESH_TOKEN); + expect(next.firstCall.args[0].status).to.equal(401); + }); + + it('should reject if settingsService.getSettings fails', async () => { + req.settingsService.getSettings.rejects(new Error('settingsService.getSettings error')); + await refreshAuthToken(req, res, next); + + expect(next.firstCall.args[0]).to.be.an("error"); + expect(next.firstCall.args[0].message).to.equal('settingsService.getSettings error'); + }); + + it('should generate a new auth token if the refresh token is valid', async () => { + const oldAuthToken = 'valid_old_auth_token'; + const newAuthToken = 'new_generated_token'; + const decodedPayload = { userId: '123', email: 'test@test.com' }; + + sinon.stub(getTokenFromHeaders).returns(oldAuthToken); + jwt.verify.callsFake((token, secret, callback) => { + if (token === 'valid_refresh_token') { + callback(null, {}); + } else { + callback(new Error('Invalid token')); + } + }); + + await refreshAuthToken(req, res, next); + + expect(res.status).to.have.been.calledWith(200); + expect(res.json).to.have.been.calledWith({ + success: true, + msg: successMessages.AUTH_TOKEN_REFRESHED, + data: { user: decodedPayload, token: newAuthToken, refreshToken: 'valid_refresh_token' }, + }); + }); +}); + describe("Auth Controller - editUser", async () => { let req, res, next, stub, user; beforeEach(() => { From 7f95b061ed0a36684673afddf18c5edcb53d402f Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Sat, 19 Oct 2024 17:18:35 +0800 Subject: [PATCH 6/7] Refactor refreshAuthToken, add tests for coverage --- Server/controllers/authController.js | 90 +++++----- .../tests/controllers/authController.test.js | 154 ++++++++++-------- 2 files changed, 126 insertions(+), 118 deletions(-) diff --git a/Server/controllers/authController.js b/Server/controllers/authController.js index a55111f5c..fa59b4d05 100644 --- a/Server/controllers/authController.js +++ b/Server/controllers/authController.js @@ -184,54 +184,52 @@ const loginUser = async (req, res, next) => { * @throws {Error} If there is an error during the process such as any of the token is not received */ const refreshAuthToken = async (req, res, next) => { - try { - // check for refreshToken - const refreshToken = req.headers["x-refresh-token"]; + try { + // check for refreshToken + const refreshToken = req.headers["x-refresh-token"]; - if (!refreshToken) { - // No refresh token provided - const error = new Error(errorMessages.NO_REFRESH_TOKEN); - error.status = 401; - error.service = SERVICE_NAME; - error.method = "refreshAuthToken"; - return next(error); - } + if (!refreshToken) { + // No refresh token provided + const error = new Error(errorMessages.NO_REFRESH_TOKEN); + error.status = 401; + error.service = SERVICE_NAME; + error.method = "refreshAuthToken"; + return next(error); + } - // Verify refresh token - const { refreshTokenSecret } = await req.settingsService.getSettings(); - jwt.verify(refreshToken, refreshTokenSecret, async (refreshErr, refreshDecoded) => { - if (refreshErr) { - // Invalid or expired refresh token, trigger logout - const errorMessage = - refreshErr.name === "TokenExpiredError" - ? errorMessages.EXPIRED_REFRESH_TOKEN - : errorMessages.INVALID_REFRESH_TOKEN; - const error = new Error(errorMessage); - error.status = 401; - error.service = SERVICE_NAME; - return next(error); - } + // Verify refresh token + const appSettings = await req.settingsService.getSettings(); + const { refreshTokenSecret } = appSettings; + jwt.verify(refreshToken, refreshTokenSecret, async (refreshErr, refreshDecoded) => { + if (refreshErr) { + // Invalid or expired refresh token, trigger logout + const errorMessage = + refreshErr.name === "TokenExpiredError" + ? errorMessages.EXPIRED_REFRESH_TOKEN + : errorMessages.INVALID_REFRESH_TOKEN; + const error = new Error(errorMessage); + error.status = 401; + error.service = SERVICE_NAME; + return next(error); + } + }); + // Refresh token is valid and unexpired, generate new access token + const oldAuthToken = getTokenFromHeaders(req.headers); + const { jwtSecret } = await req.settingsService.getSettings(); + const payloadData = jwt.verify(oldAuthToken, jwtSecret, { ignoreExpiration: true }); + // delete old token related data + delete payloadData.iat; + delete payloadData.exp; + const newAuthToken = issueToken(payloadData, tokenType.ACCESS_TOKEN, appSettings); - // Refresh token is valid and unexpired, generate new access token - const oldAuthToken = getTokenFromHeaders(req.headers); - const { jwtSecret } = await req.settingsService.getSettings(); - - const payloadData = jwt.verify(oldAuthToken, jwtSecret, { ignoreExpiration: true }); - // delete old token related data - delete payloadData.iat; - delete payloadData.exp; - - const newAuthToken = issueToken(payloadData, tokenType.ACCESS_TOKEN, req.settingsService.getSettings()); - - return res.status(200).json({ - success: true, - msg: successMessages.AUTH_TOKEN_REFRESHED, - data: { user: payloadData, token: newAuthToken, refreshToken: refreshToken }, - }); - }); - } catch (error) { - next(handleError(error, SERVICE_NAME, "refreshAuthToken")); - } + return res.status(200).json({ + success: true, + msg: successMessages.AUTH_TOKEN_REFRESHED, + data: { user: payloadData, token: newAuthToken, refreshToken: refreshToken }, + }); + } catch (error) { + next(handleError(error, SERVICE_NAME, "refreshAuthToken")); + } }; /** @@ -516,7 +514,7 @@ export { issueToken, registerUser, loginUser, - refreshAuthToken, + refreshAuthToken, editUser, checkSuperadminExists, requestRecovery, diff --git a/Server/tests/controllers/authController.test.js b/Server/tests/controllers/authController.test.js index b7616b310..d9329e54e 100644 --- a/Server/tests/controllers/authController.test.js +++ b/Server/tests/controllers/authController.test.js @@ -2,7 +2,7 @@ import { issueToken, registerUser, loginUser, - refreshAuthToken, + refreshAuthToken, editUser, checkSuperadminExists, requestRecovery, @@ -16,6 +16,7 @@ import { errorMessages, successMessages } from "../../utils/messages.js"; import sinon from "sinon"; import { getTokenFromHeaders, tokenType } from "../../utils/utils.js"; import logger from "../../utils/logger.js"; +import e from "cors"; describe("Auth Controller - issueToken", () => { let stub; @@ -304,86 +305,95 @@ describe("Auth Controller - loginUser", () => { }); }); -describe('Auth Controller - refreshAuthToken', () => { - let req, res, next, issueTokenStub; +describe("Auth Controller - refreshAuthToken", () => { + let req, res, next, issueTokenStub; - beforeEach(() => { - req = { - headers: { - 'x-refresh-token': 'valid_refresh_token', - authorization: 'Bearer old_auth_token', - }, - settingsService: { - getSettings: sinon.stub().resolves({ - jwtSecret: 'my_secret', - refreshTokenSecret: 'my_refresh_secret', - }), - }, - }; - res = { - status: sinon.stub().returnsThis(), - json: sinon.stub(), - }; - next = sinon.stub(); - sinon.stub(jwt, 'verify'); - - issueTokenStub = sinon.stub().returns("new_auth_token"); - sinon.replace({ issueToken }, "issueToken", issueTokenStub); - }); + beforeEach(() => { + req = { + headers: { + "x-refresh-token": "valid_refresh_token", + authorization: "Bearer old_auth_token", + }, + settingsService: { + getSettings: sinon.stub().resolves({ + jwtSecret: "my_secret", + refreshTokenSecret: "my_refresh_secret", + }), + }, + }; + res = { + status: sinon.stub().returnsThis(), + json: sinon.stub(), + }; + next = sinon.stub(); + sinon.stub(jwt, "verify"); - afterEach(() => { - sinon.restore(); - }); + issueTokenStub = sinon.stub().returns("new_auth_token"); + sinon.replace({ issueToken }, "issueToken", issueTokenStub); + }); - it('should reject if no refresh token is provided', async () => { - delete req.headers['x-refresh-token']; - await refreshAuthToken(req, res, next); + afterEach(() => { + sinon.restore(); + }); - expect(next.firstCall.args[0]).to.be.an("error"); - expect(next.firstCall.args[0].message).to.equal(errorMessages.NO_REFRESH_TOKEN); - expect(next.firstCall.args[0].status).to.equal(401); - }); + it("should reject if no refresh token is provided", async () => { + delete req.headers["x-refresh-token"]; + await refreshAuthToken(req, res, next); - it('should reject if the refresh token is invalid', async () => { - jwt.verify.yields(new Error('invalid token')); - await refreshAuthToken(req, res, next); + expect(next.firstCall.args[0]).to.be.an("error"); + expect(next.firstCall.args[0].message).to.equal(errorMessages.NO_REFRESH_TOKEN); + expect(next.firstCall.args[0].status).to.equal(401); + }); - expect(next.firstCall.args[0]).to.be.an("error"); - expect(next.firstCall.args[0].message).to.equal(errorMessages.INVALID_REFRESH_TOKEN); - expect(next.firstCall.args[0].status).to.equal(401); - }); + it("should reject if the refresh token is invalid", async () => { + jwt.verify.yields(new Error("invalid token")); + await refreshAuthToken(req, res, next); - it('should reject if settingsService.getSettings fails', async () => { - req.settingsService.getSettings.rejects(new Error('settingsService.getSettings error')); - await refreshAuthToken(req, res, next); + expect(next.firstCall.args[0]).to.be.an("error"); + expect(next.firstCall.args[0].message).to.equal(errorMessages.INVALID_REFRESH_TOKEN); + expect(next.firstCall.args[0].status).to.equal(401); + }); - expect(next.firstCall.args[0]).to.be.an("error"); - expect(next.firstCall.args[0].message).to.equal('settingsService.getSettings error'); - }); + it("should reject if the refresh token is expired", async () => { + const error = new Error("Token expired"); + error.name = "TokenExpiredError"; + jwt.verify.yields(error); + await refreshAuthToken(req, res, next); + expect(next.firstCall.args[0]).to.be.an("error"); + expect(next.firstCall.args[0].message).to.equal(errorMessages.EXPIRED_REFRESH_TOKEN); + expect(next.firstCall.args[0].status).to.equal(401); + }); - it('should generate a new auth token if the refresh token is valid', async () => { - const oldAuthToken = 'valid_old_auth_token'; - const newAuthToken = 'new_generated_token'; - const decodedPayload = { userId: '123', email: 'test@test.com' }; - - sinon.stub(getTokenFromHeaders).returns(oldAuthToken); - jwt.verify.callsFake((token, secret, callback) => { - if (token === 'valid_refresh_token') { - callback(null, {}); - } else { - callback(new Error('Invalid token')); - } - }); - - await refreshAuthToken(req, res, next); - - expect(res.status).to.have.been.calledWith(200); - expect(res.json).to.have.been.calledWith({ - success: true, - msg: successMessages.AUTH_TOKEN_REFRESHED, - data: { user: decodedPayload, token: newAuthToken, refreshToken: 'valid_refresh_token' }, - }); - }); + it("should reject if settingsService.getSettings fails", async () => { + req.settingsService.getSettings.rejects( + new Error("settingsService.getSettings error") + ); + await refreshAuthToken(req, res, next); + + expect(next.firstCall.args[0]).to.be.an("error"); + expect(next.firstCall.args[0].message).to.equal("settingsService.getSettings error"); + }); + + it("should generate a new auth token if the refresh token is valid", async () => { + const decodedPayload = { expiresIn: "60" }; + jwt.verify.callsFake(() => { + return decodedPayload; + }); + await refreshAuthToken(req, res, next); + + expect(res.status.calledWith(200)).to.be.true; + expect( + res.json.calledWith({ + success: true, + msg: successMessages.AUTH_TOKEN_REFRESHED, + data: { + user: decodedPayload, + token: sinon.match.string, + refreshToken: "valid_refresh_token", + }, + }) + ).to.be.true; + }); }); describe("Auth Controller - editUser", async () => { From 225938d4543990c4645132cafa15bff36ff2e459 Mon Sep 17 00:00:00 2001 From: Rushi Gandhi Date: Tue, 22 Oct 2024 10:36:15 +0530 Subject: [PATCH 7/7] fix AppSettings.js import path --- Server/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/index.js b/Server/index.js index 68a6c354a..179f7e9f4 100644 --- a/Server/index.js +++ b/Server/index.js @@ -36,7 +36,7 @@ import mjml2html from "mjml"; // Settings Service and dependencies import SettingsService from "./service/settingsService.js"; -import AppSettings from "../db/models/AppSettings.js"; +import AppSettings from "./db/models/AppSettings.js"; import db from "./db/mongo/MongoDB.js"; const SERVICE_NAME = "Server";