From 1d54fb085b43aaa9584a9998a2381fd49bec0040 Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Fri, 18 Dec 2020 19:19:47 +0100 Subject: [PATCH] Shoothed out variable nameing scheme ref #6 --- src/authchecker.ts | 2 +- src/models/actions/HandleLogout.ts | 4 ++-- src/models/actions/RefreshAuth.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/authchecker.ts b/src/authchecker.ts index 5243598..b17a803 100644 --- a/src/authchecker.ts +++ b/src/authchecker.ts @@ -43,7 +43,7 @@ const authchecker = async (action: Action, permissions: string[] | string) => { const refresh = async (action: Action) => { let refresh_token = undefined; try { - cookie.parse(action.request.headers["cookie"])["lfk_backend__refresh_token"]; + refresh_token = cookie.parse(action.request.headers["cookie"])["lfk_backend__refresh_token"]; } catch { throw new IllegalJWTError(); diff --git a/src/models/actions/HandleLogout.ts b/src/models/actions/HandleLogout.ts index 37c30c4..165c78e 100644 --- a/src/models/actions/HandleLogout.ts +++ b/src/models/actions/HandleLogout.ts @@ -23,11 +23,11 @@ export class HandleLogout { throw new IllegalJWTError() } logout.timestamp = Math.floor(Date.now() / 1000) - let found_user: User = await getConnectionManager().get().getRepository(User).findOne({ id: decoded["userid"] }); + let found_user: User = await getConnectionManager().get().getRepository(User).findOne({ id: decoded["id"] }); if (!found_user) { throw new UserNotFoundError() } - if (found_user.refreshTokenCount !== decoded["refreshtokencount"]) { + if (found_user.refreshTokenCount !== decoded["refreshTokenCount"]) { throw new RefreshTokenCountInvalidError() } found_user.refreshTokenCount++; diff --git a/src/models/actions/RefreshAuth.ts b/src/models/actions/RefreshAuth.ts index 1435436..ee263a8 100644 --- a/src/models/actions/RefreshAuth.ts +++ b/src/models/actions/RefreshAuth.ts @@ -27,7 +27,7 @@ export class RefreshAuth { if (!found_user) { throw new UserNotFoundError() } - if (found_user.refreshTokenCount !== decoded["refreshtokencount"]) { + if (found_user.refreshTokenCount !== decoded["refreshTokenCount"]) { throw new RefreshTokenCountInvalidError() } //Create the auth token