From a32d9e830521abe2f70380a87a68d619d6e22160 Mon Sep 17 00:00:00 2001 From: David Mehren Date: Fri, 4 Mar 2022 17:57:55 +0100 Subject: [PATCH] fix(api/private/auth): wait for error Previously, the `logout` method immediately returned and did not wait for the possible error callback. This wraps the call to `session.destroy` into a promise, so the error can be properly handled. Signed-off-by: David Mehren --- src/api/private/auth/auth.controller.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/api/private/auth/auth.controller.ts b/src/api/private/auth/auth.controller.ts index e6f564517..84352b6cb 100644 --- a/src/api/private/auth/auth.controller.ts +++ b/src/api/private/auth/auth.controller.ts @@ -85,12 +85,16 @@ export class AuthController { @UseGuards(SessionGuard) @Delete('logout') @OpenApi(204, 400, 401) - logout(@Req() request: Request & { session: Session }): void { - request.session.destroy((err) => { - if (err) { - this.logger.error('Encountered an error while logging out: ${err}'); - throw new BadRequestException('Unable to log out'); - } + logout(@Req() request: Request & { session: Session }): Promise { + return new Promise((resolve, reject) => { + request.session.destroy((err) => { + if (err) { + this.logger.error('Encountered an error while logging out: ${err}'); + reject(new BadRequestException('Unable to log out')); + } else { + resolve(); + } + }); }); } }