From 82f76ba07b60262ff64a0bc17641f06a5c9d9cad Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Sun, 1 Jan 2023 14:20:41 +1100
Subject: Revert "Don't let users undisable their accounts"

This reverts commit 52840f4f9806d1caa6fa21733e961275dd3d7547.
---
 src/api/routes/auth/login.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/api/routes/auth/login.ts b/src/api/routes/auth/login.ts
index b9cefe1a..bbfb5425 100644
--- a/src/api/routes/auth/login.ts
+++ b/src/api/routes/auth/login.ts
@@ -66,6 +66,9 @@ router.post(
 		});
 
 		if (undelete) {
+			// undelete refers to un'disable' here
+			if (user.disabled)
+				await User.update({ id: user.id }, { disabled: false });
 			if (user.deleted)
 				await User.update({ id: user.id }, { deleted: false });
 		} else {
@@ -74,14 +77,13 @@ router.post(
 					message: "This account is scheduled for deletion.",
 					code: 20011,
 				});
+			if (user.disabled)
+				return res.status(400).json({
+					message: req.t("auth:login.ACCOUNT_DISABLED"),
+					code: 20013,
+				});
 		}
 
-		if (user.disabled)
-			return res.status(400).json({
-				message: req.t("auth:login.ACCOUNT_DISABLED"),
-				code: 20013,
-			});
-
 		// the salt is saved in the password refer to bcrypt docs
 		const same_password = await bcrypt.compare(
 			password,
-- 
cgit 1.4.1