1 files changed, 12 insertions, 5 deletions
diff --git a/api/src/routes/users/@me/delete.ts b/api/src/routes/users/@me/delete.ts
index f863237d..6bfe0b93 100644
--- a/api/src/routes/users/@me/delete.ts
+++ b/api/src/routes/users/@me/delete.ts
@@ -1,16 +1,23 @@
import { Router, Request, Response } from "express";
-import { GuildModel, MemberModel, UserModel } from "@fosscord/util";
+import { Guild, Member, User } from "@fosscord/util";
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 :/
+ }
+
+ // TODO: decrement guild member count
- let correctpass = await bcrypt.compare(req.body.password, user!.user_data.hash); //Not sure if user typed right password :/
if (correctpass) {
await Promise.all([
- UserModel.deleteOne({ id: req.user_id }).exec(), //Yeetus user deletus
- MemberModel.deleteMany({ id: req.user_id }).exec()
+ User.delete({ id: req.user_id }), //Yeetus user deletus
+ Member.delete({ id: req.user_id })
]);
res.sendStatus(204);
|
