Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
"@types/cors": "^2.8.13",
"@types/debug": "^4.1.7",
"@types/express": "^4.17.17",
"@types/express-session": "^1.17.6",
"@types/express-session": "^1.17.7",
"@types/jest": "^29.5.0",
"@types/jsonwebtoken": "^9.0.1",
"@types/lodash": "^4.14.191",
"@types/multer": "^1.4.7",
"@types/node": "^18.15.3",
"@types/node": "^18.15.5",
"@types/passport": "^1.0.12",
"@types/passport-google-oauth20": "^2.0.11",
"@types/passport-local": "^1.0.35",
Expand All @@ -51,8 +51,8 @@
"supertest": "^6.3.3",
"ts-jest": "^29.0.5",
"ts-node": "^10.9.1",
"typedoc": "^0.23.26",
"typescript": "~4.9.5"
"typedoc": "^0.23.28",
"typescript": "~5.0.2"
},
"dependencies": {
"@google-cloud/pubsub": "^3.4.1",
Expand Down
10 changes: 5 additions & 5 deletions src/tests/utils/generators.utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
generateOTP,
generateCookie,
generateJsonWebToken,
JwtPayload,
} from '../../../src/utils/generators.utils';

// Mock process.env.JWT_KEY with a string value
Expand All @@ -22,12 +23,11 @@ describe('Generators Utilities Tests Suite', () => {

describe('generateJsonWebToken', () => {
it('should generate a JWT token', () => {
const payload = {username: 'user1'};
const payload = {id: 1, username: 'user1'};
const token = generateJsonWebToken(payload);
const decoded = jwt.verify(
token,
<string>process.env.JWT_KEY
) as jwt.JwtPayload;
const decoded = jwt.verify(token, process.env.JWT_KEY!) as JwtPayload<
typeof payload
>;
expect(decoded.payload).toEqual(payload);
});
});
Expand Down
5 changes: 4 additions & 1 deletion src/utils/generators.utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@ import {ICustomExpressRequest} from '../middlewares/currentUser.middleware';
import {Response} from 'express';
import jwt from 'jsonwebtoken';

export interface JwtPayload<T> {
[key: string]: T;
}
/**
* Generate a json web token
* @param payload
* @returns
*/
const generateJsonWebToken = (payload: object): string => {
const generateJsonWebToken = <T>(payload: JwtPayload<T>): string => {
const jwtKey = process.env.JWT_KEY;

if (!jwtKey) {
Expand Down