From c02cc81ad6e6dee2e351f96667e3ce71a8dc3c57 Mon Sep 17 00:00:00 2001 From: Julian Krauser Date: Sat, 8 Feb 2025 11:05:01 +0100 Subject: [PATCH] fix: postgres refresh requests fail userId --- src/command/refreshCommandHandler.ts | 5 ++--- src/service/user/userPermissionService.ts | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/command/refreshCommandHandler.ts b/src/command/refreshCommandHandler.ts index 5796851..1588449 100644 --- a/src/command/refreshCommandHandler.ts +++ b/src/command/refreshCommandHandler.ts @@ -23,7 +23,7 @@ export default abstract class RefreshCommandHandler { .into(refresh) .values({ token: refreshToken, - user: await UserService.getById(createRefresh.userId), + userId: createRefresh.userId, expiry: createRefresh.isFromPwa ? new Date(Date.now() + ms(PWA_REFRESH_EXPIRATION)) : new Date(Date.now() + ms(REFRESH_EXPIRATION)), @@ -47,8 +47,7 @@ export default abstract class RefreshCommandHandler { .createQueryBuilder() .delete() .from(refresh) - .where("refresh.token = :token", { token: deleteRefresh.token }) - .andWhere("refresh.userId = :userId", { userId: deleteRefresh.userId }) + .where({ token: deleteRefresh.token, userId: deleteRefresh.userId }) .execute() .then((res) => {}) .catch((err) => { diff --git a/src/service/user/userPermissionService.ts b/src/service/user/userPermissionService.ts index 7cb3ee6..0dee9da 100644 --- a/src/service/user/userPermissionService.ts +++ b/src/service/user/userPermissionService.ts @@ -13,7 +13,7 @@ export default abstract class UserPermissionService { return await dataSource .getRepository(userPermission) .createQueryBuilder("permission") - .where("permission.userId = :userId", { userId: userId }) + .where({ userId: userId }) .getMany() .then((res) => { return res;