Skip to content

Commit 6d90e72

Browse files
sevelinCasevelinCa
committed
updates
1 parent e99cd05 commit 6d90e72

File tree

3 files changed

+79
-79
lines changed

3 files changed

+79
-79
lines changed

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

+68-68
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,77 @@
1-
import { Request, Response, NextFunction } from 'express';
2-
import { Session } from 'express-session';
3-
import { generate2FACode, verify2FACode } from '../services/2fa.service';
1+
// import { Request, Response, NextFunction } from 'express';
2+
// import { Session } from 'express-session';
3+
// import { generate2FACode, verify2FACode } from '../services/2fa.service';
44

5-
interface ExtendedSession extends Session {
6-
email?: string;
7-
password?: string;
8-
twoFactorCode?: string | null;
9-
twoFactorExpiry?: Date | null;
10-
twoFAError?: string;
11-
}
5+
// interface ExtendedSession extends Session {
6+
// email?: string;
7+
// password?: string;
8+
// twoFactorCode?: string | null;
9+
// twoFactorExpiry?: Date | null;
10+
// twoFAError?: string;
11+
// }
1212

13-
interface ExtendedRequest extends Request {
14-
session: ExtendedSession;
15-
}
13+
// interface ExtendedRequest extends Request {
14+
// session: ExtendedSession;
15+
// }
1616

17-
export const twoFAController = async (
18-
req: ExtendedRequest,
19-
res: Response,
20-
next: NextFunction
21-
) => {
22-
const { email, password } = req.body;
23-
const twoFactorData = await generate2FACode(req.body);
24-
const extSession = req.session;
17+
// export const twoFAController = async (
18+
// req: ExtendedRequest,
19+
// res: Response,
20+
// next: NextFunction
21+
// ) => {
22+
// const { email, password } = req.body;
23+
// const twoFactorData = await generate2FACode(req.body);
24+
// const extSession = req.session;
2525

26-
if (twoFactorData) {
27-
extSession.twoFactorCode = twoFactorData.twoFactorCode;
28-
if (typeof twoFactorData.twoFactorExpiry === 'number') {
29-
extSession.twoFactorExpiry = new Date(twoFactorData.twoFactorExpiry);
30-
}
31-
extSession.email = email;
32-
extSession.password = password;
33-
return res.status(200).json({ message: '2FA code sent. Please verify the code.' });
34-
} else {
35-
next();
36-
}
37-
};
26+
// if (twoFactorData) {
27+
// extSession.twoFactorCode = twoFactorData.twoFactorCode;
28+
// if (typeof twoFactorData.twoFactorExpiry === 'number') {
29+
// extSession.twoFactorExpiry = new Date(twoFactorData.twoFactorExpiry);
30+
// }
31+
// extSession.email = email;
32+
// extSession.password = password;
33+
// return res.status(200).json({ message: '2FA code sent. Please verify the code.' });
34+
// } else {
35+
// next();
36+
// }
37+
// };
3838

39-
export const verifyCode = async (
40-
req: ExtendedRequest,
41-
res: Response,
42-
next: NextFunction
43-
) => {
44-
const extendedSession = req.session;
45-
const { code } = req.body;
39+
// export const verifyCode = async (
40+
// req: ExtendedRequest,
41+
// res: Response,
42+
// next: NextFunction
43+
// ) => {
44+
// const extendedSession = req.session;
45+
// const { code } = req.body;
4646

47-
const sessionCode = extendedSession.twoFactorCode;
48-
const sessionExpiry = extendedSession.twoFactorExpiry;
47+
// const sessionCode = extendedSession.twoFactorCode;
48+
// const sessionExpiry = extendedSession.twoFactorExpiry;
4949

50-
if (sessionCode && sessionExpiry) {
51-
const sessionExpiryDate = new Date(sessionExpiry);
50+
// if (sessionCode && sessionExpiry) {
51+
// const sessionExpiryDate = new Date(sessionExpiry);
5252

53-
if (verify2FACode(code, sessionCode, sessionExpiryDate.getTime())) {
54-
extendedSession.twoFactorCode = null;
55-
extendedSession.twoFactorExpiry = null;
56-
} else {
57-
extendedSession.twoFAError = 'Invalid or expired 2FA code.';
58-
}
59-
} else {
60-
extendedSession.twoFAError = '2FA code or expiring time is missing.';
61-
}
53+
// if (verify2FACode(code, sessionCode, sessionExpiryDate.getTime())) {
54+
// extendedSession.twoFactorCode = null;
55+
// extendedSession.twoFactorExpiry = null;
56+
// } else {
57+
// extendedSession.twoFAError = 'Invalid or expired 2FA code.';
58+
// }
59+
// } else {
60+
// extendedSession.twoFAError = '2FA code or expiring time is missing.';
61+
// }
6262

63-
try {
64-
await new Promise<void>((resolve, reject) => {
65-
req.session.save((err) => {
66-
if (err) {
67-
reject(err);
68-
} else {
69-
resolve();
70-
}
71-
});
72-
});
73-
next();
74-
} catch (err) {
75-
return res.status(500).json({ message: 'Error saving session' });
76-
}
77-
};
63+
// try {
64+
// await new Promise<void>((resolve, reject) => {
65+
// req.session.save((err) => {
66+
// if (err) {
67+
// reject(err);
68+
// } else {
69+
// resolve();
70+
// }
71+
// });
72+
// });
73+
// next();
74+
// } catch (err) {
75+
// return res.status(500).json({ message: 'Error saving session' });
76+
// }
77+
// };

Diff for: ‎src/routes/2fa.route.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { Router } from "express";
2-
import { enable2FA } from "../controllers/2fa.controller";
3-
import { VerifyAccessToken } from "../middleware/verfiyToken";
4-
import { verifyCode } from "./../middleware/2fa.middleware";
5-
import { login } from "../controllers/user.controller";
1+
// import { Router } from "express";
2+
// import { enable2FA } from "../controllers/2fa.controller";
3+
// import { VerifyAccessToken } from "../middleware/verfiyToken";
4+
// import { verifyCode } from "./../middleware/2fa.middleware";
5+
// import { login } from "../controllers/user.controller";
66

7-
const router = Router();
7+
// const router = Router();
88

9-
router.post("/enable-2fa", VerifyAccessToken, enable2FA);
10-
router.post("/verify-code", verifyCode, login);
9+
// router.post("/enable-2fa", VerifyAccessToken, enable2FA);
10+
// router.post("/verify-code", verifyCode, login);
1111

12-
export default router;
12+
// export default router;

Diff for: ‎src/routes/user.route.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { twoFAController } from "./../middleware/2fa.middleware";
1+
22

33
import express,{Request,Response} from "express";
44
import {
@@ -30,7 +30,7 @@ route.post("/register", register);
3030
route.patch("/updateuser/:id", editUser);
3131
route.patch("/updatepassword/:id", updatePassword);
3232
route.delete("/deleteuser/:id", VerifyAccessToken, deleteUser);
33-
route.post("/login", twoFAController, login);
33+
route.post("/login", login);
3434
route.post("/addreview/:id", addReview);
3535
route.post("/addfeedback/:id", addFeedback);
3636

0 commit comments

Comments
 (0)