From 28e812737de818b3c6a049693e9cfb232905f1a9 Mon Sep 17 00:00:00 2001 From: HF Date: Mon, 20 Jun 2022 23:27:27 +0200 Subject: [PATCH] update logout route on delete-account --- src/routes/api/auth/delete_account.js | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/routes/api/auth/delete_account.js b/src/routes/api/auth/delete_account.js index cbe7dcb..9b3fc1e 100644 --- a/src/routes/api/auth/delete_account.js +++ b/src/routes/api/auth/delete_account.js @@ -1,11 +1,7 @@ /* * request password change - * @flow */ - -import type { Request, Response } from 'express'; - import { RegUser } from '../../../data/sql'; import { validatePassword } from '../../../utils/validation'; import { compareToHash } from '../../../utils/hash'; @@ -19,7 +15,7 @@ function validate(password, gettext) { return errors; } -export default async (req: Request, res: Response) => { +export default async (req, res) => { const { password } = req.body; const { t, gettext } = req.ttag; const errors = await validate(password, gettext); @@ -50,10 +46,21 @@ export default async (req: Request, res: Response) => { return; } - req.logout(); - RegUser.destroy({ where: { id } }); - res.json({ - success: true, + req.logout((err) => { + if (err) { + res.status(500); + res.json({ + errors: [t`Server error when logging out.`], + }); + return; + } + + RegUser.destroy({ where: { id } }); + + res.status(200); + res.json({ + success: true, + }); }); };