Skip to content

Commit 86d32f9

Browse files
committed
Add sessiom request types
1 parent 8f4e01e commit 86d32f9

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

Diff for: src/middleware/2fa.middleware.ts

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Request, Response, NextFunction } from "express";
22
import { Session } from "express-session";
3-
import { generate2FACode } from "../services/2fa.service";
4-
import { verify2FACode } from "../services/2fa.service";
3+
import { generate2FACode, verify2FACode } from "../services/2fa.service";
54

5+
// Extend the Session interface
66
interface ExtendedSession extends Session {
77
email?: string;
88
password?: string;
@@ -11,14 +11,19 @@ interface ExtendedSession extends Session {
1111
twoFAError?: string;
1212
}
1313

14+
// Extend the Request interface
15+
interface ExtendedRequest extends Request {
16+
session: ExtendedSession;
17+
}
18+
1419
export const twoFAController = async (
15-
req: Request,
20+
req: ExtendedRequest,
1621
res: Response,
1722
next: NextFunction
1823
) => {
1924
const { email, password } = req.body;
2025
const twoFactorData = await generate2FACode(req.body);
21-
const extSession = req.session as ExtendedSession;
26+
const extSession = req.session;
2227

2328
if (twoFactorData) {
2429
extSession.twoFactorCode = twoFactorData.twoFactorCode;
@@ -34,11 +39,11 @@ export const twoFAController = async (
3439
};
3540

3641
export const verifyCode = async (
37-
req: Request,
42+
req: ExtendedRequest,
3843
res: Response,
3944
next: NextFunction
4045
) => {
41-
const extendedSession = req.session as ExtendedSession;
46+
const extendedSession = req.session;
4247
const { code } = req.body;
4348

4449
const sessionCode = extendedSession.twoFactorCode;

0 commit comments

Comments
 (0)