Skip to content

Commit 51ea6cd

Browse files
committed
fix login extended req
1 parent ef2ce98 commit 51ea6cd

File tree

1 file changed

+23
-35
lines changed

1 file changed

+23
-35
lines changed

Diff for: src/controllers/user.controller.ts

+23-35
Original file line numberDiff line numberDiff line change
@@ -37,47 +37,35 @@ interface ExtendedRequest extends ExpressRequest {
3737
};
3838
}
3939

40-
export const login = async (req: ExtendedRequest, res: Response) => {
41-
if (req.session.twoFAError) {
42-
res.status(401).json({ message: req.session.twoFAError });
43-
} else {
44-
try {
45-
const email = req.session.email || req.body.email;
46-
const password = req.session.password || req.body.password;
47-
48-
const { existUser, vendorId } = await loginFunc({ email, password });
49-
if (!existUser) {
50-
return res.status(404).json({ message: "User not found" });
51-
}
40+
export const login = async (req: Request, res: Response) => {
41+
try {
42+
const email = req.body.email;
43+
const password = req.body.password;
5244

53-
const isPasswordValid = await bcrypt.compare(
54-
password,
55-
existUser.password
56-
);
57-
if (!isPasswordValid) {
58-
return res
59-
.status(401)
60-
.json({ message: "Invalid credentials. Try again" });
61-
}
45+
const { existUser, vendorId } = await loginFunc({ email, password });
46+
if (!existUser) {
47+
return res.status(404).json({ message: "User not found" });
48+
}
6249

63-
const token = await generateToken(existUser);
64-
res.cookie("token", token, { httpOnly: true });
50+
const isPasswordValid = await bcrypt.compare(password, existUser.password);
51+
if (!isPasswordValid) {
52+
return res.status(401).json({ message: "Invalid credentials. Try again" });
53+
}
6554

66-
req.session.email = null;
67-
req.session.password = null;
55+
const token = await generateToken(existUser);
56+
res.cookie("token", token, { httpOnly: true });
6857

69-
return res.status(200).json({
70-
message: "Login successful",
71-
token,
72-
user: existUser,vendorId
73-
});
74-
} catch (error) {
75-
console.error(error);
76-
return res.status(500).json({ message: "Unable to log in" });
77-
}
58+
return res.status(200).json({
59+
message: "Login successful",
60+
token,
61+
user: existUser,
62+
vendorId
63+
});
64+
} catch (error) {
65+
console.error(error);
66+
return res.status(500).json({ message: "Unable to log in" });
7867
}
7968
};
80-
8169
export const register = async (req: Request, res: Response) => {
8270
const { name, email, password } = req.body;
8371
if (!name || !email || !password) {

0 commit comments

Comments
 (0)