From 64454b6fa2069bda298d340f77887e95a8030b64 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 27 Apr 2022 11:11:30 +0200
Subject: [PATCH] remove moderator from create pending creation mutation args,
 use context instead to get moderator ID

---
 backend/src/graphql/arg/CreatePendingCreationArgs.ts | 5 +----
 backend/src/graphql/resolver/AdminResolver.ts        | 9 ++++++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/src/graphql/arg/CreatePendingCreationArgs.ts b/backend/src/graphql/arg/CreatePendingCreationArgs.ts
index 0cadf5e62..11c345465 100644
--- a/backend/src/graphql/arg/CreatePendingCreationArgs.ts
+++ b/backend/src/graphql/arg/CreatePendingCreationArgs.ts
@@ -1,4 +1,4 @@
-import { ArgsType, Field, InputType, Int } from 'type-graphql'
+import { ArgsType, Field, InputType } from 'type-graphql'
 import Decimal from 'decimal.js-light'
 
 @InputType()
@@ -15,7 +15,4 @@ export default class CreatePendingCreationArgs {
 
   @Field(() => String)
   creationDate: string
-
-  @Field(() => Int)
-  moderator: number
 }
diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts
index 757b6d6dd..779d81c99 100644
--- a/backend/src/graphql/resolver/AdminResolver.ts
+++ b/backend/src/graphql/resolver/AdminResolver.ts
@@ -170,7 +170,8 @@ export class AdminResolver {
   @Authorized([RIGHTS.CREATE_PENDING_CREATION])
   @Mutation(() => [Number])
   async createPendingCreation(
-    @Args() { email, amount, memo, creationDate, moderator }: CreatePendingCreationArgs,
+    @Args() { email, amount, memo, creationDate }: CreatePendingCreationArgs,
+    @Ctx() context: Context,
   ): Promise<Decimal[]> {
     const user = await dbUser.findOne({ email }, { withDeleted: true })
     if (!user) {
@@ -182,6 +183,7 @@ export class AdminResolver {
     if (!user.emailChecked) {
       throw new Error('Creation could not be saved, Email is not activated')
     }
+    const moderator = getUser(context)
     const creations = await getUserCreation(user.id)
     const creationDateObj = new Date(creationDate)
     if (isCreationValid(creations, amount, creationDateObj)) {
@@ -191,7 +193,7 @@ export class AdminResolver {
       adminPendingCreation.created = new Date()
       adminPendingCreation.date = creationDateObj
       adminPendingCreation.memo = memo
-      adminPendingCreation.moderator = moderator
+      adminPendingCreation.moderator = moderator.id
 
       await AdminPendingCreation.save(adminPendingCreation)
     }
@@ -203,12 +205,13 @@ export class AdminResolver {
   async createPendingCreations(
     @Arg('pendingCreations', () => [CreatePendingCreationArgs])
     pendingCreations: CreatePendingCreationArgs[],
+    @Ctx() context: Context,
   ): Promise<CreatePendingCreations> {
     let success = false
     const successfulCreation: string[] = []
     const failedCreation: string[] = []
     for (const pendingCreation of pendingCreations) {
-      await this.createPendingCreation(pendingCreation)
+      await this.createPendingCreation(pendingCreation, context)
         .then(() => {
           successfulCreation.push(pendingCreation.email)
           success = true