From 9a390c11dbebbae759669d0de041386b298e030c Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 11 Apr 2022 15:57:59 +0200 Subject: [PATCH] use Context interface in admin resolver --- backend/src/graphql/resolver/AdminResolver.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 1ed0422ef..481fb9bda 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -1,6 +1,4 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ -/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ - +import { Context } from '@/server/context' import { Resolver, Query, Arg, Args, Authorized, Mutation, Ctx, Int } from 'type-graphql' import { getCustomRepository, @@ -137,7 +135,7 @@ export class AdminResolver { @Mutation(() => Date, { nullable: true }) async deleteUser( @Arg('userId', () => Int) userId: number, - @Ctx() context: any, + @Ctx() context: Context, ): Promise { const user = await dbUser.findOne({ id: userId }) // user exists ? @@ -146,7 +144,7 @@ export class AdminResolver { } // moderator user disabled own account? const moderatorUser = context.user - if (moderatorUser.id === userId) { + if (moderatorUser && moderatorUser.id === userId) { throw new Error('Moderator can not delete his own account!') } // soft-delete user @@ -309,11 +307,11 @@ export class AdminResolver { @Mutation(() => Boolean) async confirmPendingCreation( @Arg('id', () => Int) id: number, - @Ctx() context: any, + @Ctx() context: Context, ): Promise { const pendingCreation = await AdminPendingCreation.findOneOrFail(id) const moderatorUser = context.user - if (moderatorUser.id === pendingCreation.userId) + if (moderatorUser && moderatorUser.id === pendingCreation.userId) throw new Error('Moderator can not confirm own pending creation') const user = await dbUser.findOneOrFail({ id: pendingCreation.userId }, { withDeleted: true })