diff options
| -rw-r--r-- | src/api/routes/auth/login.ts | 14 |
1 files 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, |