From 0ecc5d8c0e353676e9f5bdbc724bb33572d3b572 Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Fri, 27 Aug 2021 11:10:42 +0200
Subject: :construction: api

---
 api/src/routes/auth/login.ts | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'api/src/routes/auth/login.ts')

diff --git a/api/src/routes/auth/login.ts b/api/src/routes/auth/login.ts
index 579a097e..c0acad4e 100644
--- a/api/src/routes/auth/login.ts
+++ b/api/src/routes/auth/login.ts
@@ -21,9 +21,6 @@ router.post(
 	async (req: Request, res: Response) => {
 		const { login, password, captcha_key, undelete } = req.body;
 		const email = adjustEmail(login);
-		const query: any[] = [{ phone: login }];
-		if (email) query.push({ email });
-
 		console.log(req.body, email);
 
 		const config = Config.get();
@@ -41,11 +38,10 @@ router.post(
 			// TODO: check captcha
 		}
 
-		const user = await User.findOneOrFail(
-			{ $or: query },
-			{ "data.hash": true, id: true, disabled: true, deleted: true, "settings.locale": true, "settings.theme": true }
-		).catch((e) => {
-			console.log(e, query);
+		const user = await User.findOneOrFail({
+			where: [{ phone: login }, { email: login }],
+			select: ["data", "id", "disabled", "deleted", "settings"]
+		}).catch((e) => {
 			throw FieldErrors({ login: { message: req.t("auth:login.INVALID_LOGIN"), code: "INVALID_LOGIN" } });
 		});
 
-- 
cgit 1.5.1