MrDiderot/Michess
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update db models

Browse Source
This commit is contained in:
Nathaniel Tampus
2023-04-01 23:15:54 +08:00
parent 97b750fec4
commit af25b4ff20
4 changed files with 74 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/controllers/auth.controller.ts
View File

@@ -107,7 +107,7 @@ export const registerUser = async (req: Request, res: Response) => {
return;
}
const duplicateUsers = await UserModel.find({ name, email });
const duplicateUsers = await UserModel.findByNameEmail({ name, email });
if (duplicateUsers && duplicateUsers.length) {
const dupl = duplicateUsers[0].name === name ? "Username" : "Email";
res.status(409).json({ message: `${dupl} is already in use.` });
@@ -165,7 +165,10 @@ export const loginUser = async (req: Request, res: Response) => {
const nameOrEmail = xss(req.body.name);
const password = req.body.password;
const users = await UserModel.find({ name: nameOrEmail, email: nameOrEmail });
const users = await UserModel.findByNameEmail(
{ name: nameOrEmail, email: nameOrEmail },
true
);
if (!users || !users.length) {
res.status(404).json({ message: "Invalid username/email." });
return;
@@ -238,7 +241,7 @@ export const updateUser = async (req: Request, res: Response) => {
const email = xss(req.body.email || req.session.user.email);
const duplicateUsers = await UserModel.find({ name, email });
const duplicateUsers = await UserModel.findByNameEmail({ name, email });
if (
duplicateUsers &&
duplicateUsers.length &&