1 files changed, 9 insertions, 4 deletions
diff --git a/api/src/routes/users/@me/disable.ts b/api/src/routes/users/@me/disable.ts
index 2d3a9850..7b8a130c 100644
--- a/api/src/routes/users/@me/disable.ts
+++ b/api/src/routes/users/@me/disable.ts
@@ -1,15 +1,20 @@
-import { UserModel } from "@fosscord/util";
+import { User } from "@fosscord/util";
import { Router, Response, Request } from "express";
import bcrypt from "bcrypt";
const router = Router();
router.post("/", async (req: Request, res: Response) => {
- const user = await UserModel.findOne({ id: req.user_id }).exec(); //User object
+ const user = await User.findOneOrFail({ id: req.user_id }); //User object
+ let correctpass = true;
+
+ if (user.data.hash) {
+ // guest accounts can delete accounts without password
+ correctpass = await bcrypt.compare(req.body.password, user.data.hash); //Not sure if user typed right password :/
+ }
- let correctpass = await bcrypt.compare(req.body.password, user!.user_data.hash); //Not sure if user typed right password :/
if (correctpass) {
- await UserModel.updateOne({ id: req.user_id }, { disabled: true }).exec();
+ await User.update({ id: req.user_id }, { disabled: true });
res.sendStatus(204);
} else {
|
