Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Don't let users undisable their accounts"

Browse Source 
This reverts commit cd84412c92c447826ebb2668295d46956618d962.
This commit is contained in:
Madeline 2023-01-01 14:20:41 +11:00
parent cd84412c92
commit 1bee8dc48f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/api/routes/auth/login.ts
View File

@ -66,6 +66,9 @@ router.post(
}); });
if (undelete) { if (undelete) {
// undelete refers to un'disable' here
if (user.disabled)
await User.update({ id: user.id }, { disabled: false });
if (user.deleted) if (user.deleted)
await User.update({ id: user.id }, { deleted: false }); await User.update({ id: user.id }, { deleted: false });
} else { } else {
@ -74,14 +77,13 @@ router.post(
message: "This account is scheduled for deletion.", message: "This account is scheduled for deletion.",
code: 20011, 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 // the salt is saved in the password refer to bcrypt docs
const same_password = await bcrypt.compare( const same_password = await bcrypt.compare(
password, password,