From 47bf651ba3ba2009e409e2d9bf24f82f9493df9a Mon Sep 17 00:00:00 2001 From: clauspeterhuebner <86960882+clauspeterhuebner@users.noreply.github.com> Date: Wed, 12 Jul 2023 22:53:38 +0200 Subject: [PATCH 1/3] Update backend/src/graphql/directive/isAuthorized.ts good hint, many thx... Co-authored-by: Moriz Wahl --- backend/src/graphql/directive/isAuthorized.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/directive/isAuthorized.ts b/backend/src/graphql/directive/isAuthorized.ts index 733201776..04579a3f9 100644 --- a/backend/src/graphql/directive/isAuthorized.ts +++ b/backend/src/graphql/directive/isAuthorized.ts @@ -38,7 +38,7 @@ export const isAuthorized: AuthChecker = async ({ context }, rights) => }) context.user = user context.role = ROLE_USER - if (user.userRoles && user.userRoles.length > 0) { + if (user.userRoles?.length > 0) { switch (user.userRoles[0].role) { case ROLE_NAMES.ROLE_NAME_ADMIN: context.role = ROLE_ADMIN From 1456d4a74abc553b3ef466211ed616606fdcb70f Mon Sep 17 00:00:00 2001 From: clauspeterhuebner <86960882+clauspeterhuebner@users.noreply.github.com> Date: Thu, 13 Jul 2023 13:34:33 +0200 Subject: [PATCH 2/3] Update backend/src/graphql/resolver/UserResolver.test.ts Co-authored-by: Moriz Wahl --- backend/src/graphql/resolver/UserResolver.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts index 6a9ca7590..9925e96b3 100644 --- a/backend/src/graphql/resolver/UserResolver.test.ts +++ b/backend/src/graphql/resolver/UserResolver.test.ts @@ -165,7 +165,7 @@ describe('UserResolver', () => { createdAt: expect.any(Date), // emailChecked: false, language: 'de', - userRoles: [], // expect.any(Array), + userRoles: [], deletedAt: null, publisherId: 1234, referrerId: null, From f00c5cd9cbf4ca6fe6597fd3d445f3ff77d19c75 Mon Sep 17 00:00:00 2001 From: clauspeterhuebner <86960882+clauspeterhuebner@users.noreply.github.com> Date: Thu, 13 Jul 2023 13:36:12 +0200 Subject: [PATCH 3/3] Update backend/src/graphql/resolver/UserResolver.test.ts Co-authored-by: Moriz Wahl --- backend/src/graphql/resolver/UserResolver.test.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts index 9925e96b3..20565dad8 100644 --- a/backend/src/graphql/resolver/UserResolver.test.ts +++ b/backend/src/graphql/resolver/UserResolver.test.ts @@ -350,10 +350,6 @@ describe('UserResolver', () => { peter.userRoles[0].userId = peter.id await peter.userRoles[0].save() - peter = await User.findOneOrFail({ - where: { id: user[0].id }, - relations: ['userRoles'], - }) // date statement const actualDate = new Date()