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(() => {