From d5317c258ac138c9dc14c48e91f35b9fc2176c34 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 16 Sep 2021 13:01:53 +0200
Subject: [PATCH] Refactor of method name, adding Authorized in before response
 Type, KlickTipp check on Subscribed instead of not Unsubscribed.

---
 backend/src/graphql/models/KlickTipp.ts            | 2 +-
 backend/src/graphql/resolvers/KlicktippResolver.ts | 8 ++++----
 backend/src/middleware/klicktippMiddleware.ts      | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/backend/src/graphql/models/KlickTipp.ts b/backend/src/graphql/models/KlickTipp.ts
index 38e439c7e..a7dd9eead 100644
--- a/backend/src/graphql/models/KlickTipp.ts
+++ b/backend/src/graphql/models/KlickTipp.ts
@@ -5,7 +5,7 @@ import { ObjectType, Field } from 'type-graphql'
 @ObjectType()
 export class KlickTipp {
   constructor(json: any) {
-    this.newsletterState = json.status !== 'unsubscribed'
+    this.newsletterState = json.status === 'Subscribed'
   }
 
   @Field(() => Boolean)
diff --git a/backend/src/graphql/resolvers/KlicktippResolver.ts b/backend/src/graphql/resolvers/KlicktippResolver.ts
index bc4d29e30..6d8381993 100644
--- a/backend/src/graphql/resolvers/KlicktippResolver.ts
+++ b/backend/src/graphql/resolvers/KlicktippResolver.ts
@@ -12,26 +12,26 @@ import { SubscribeNewsletterArguments } from '../inputs/KlickTippInputs'
 
 @Resolver()
 export class KlicktippResolver {
-  @Query(() => String)
   @Authorized()
+  @Query(() => String)
   async getKlicktippUser(@Arg('email') email: string): Promise<string> {
     return await getKlickTippUser(email)
   }
 
-  @Query(() => String)
   @Authorized()
+  @Query(() => String)
   async getKlicktippTagMap(): Promise<string> {
     return await getKlicktippTagMap()
   }
 
-  @Mutation(() => Boolean)
   @Authorized()
+  @Mutation(() => Boolean)
   async unsubscribeNewsletter(@Arg('email') email: string): Promise<boolean> {
     return await unsubscribe(email)
   }
 
-  @Mutation(() => Boolean)
   @Authorized()
+  @Mutation(() => Boolean)
   async subscribeNewsletter(
     @Args() { email, language }: SubscribeNewsletterArguments,
   ): Promise<boolean> {
diff --git a/backend/src/middleware/klicktippMiddleware.ts b/backend/src/middleware/klicktippMiddleware.ts
index 69f745c02..8b8118c0f 100644
--- a/backend/src/middleware/klicktippMiddleware.ts
+++ b/backend/src/middleware/klicktippMiddleware.ts
@@ -1,5 +1,5 @@
 import { MiddlewareFn } from 'type-graphql'
-import { signin, getKlickTippUser } from '../apis/KlicktippController'
+import { signIn, getKlickTippUser } from '../apis/KlicktippController'
 import { KlickTipp } from '../graphql/models/KlickTipp'
 
 export const klicktippRegistrationMiddleware: MiddlewareFn = async (
@@ -11,11 +11,12 @@ export const klicktippRegistrationMiddleware: MiddlewareFn = async (
   // Do Something here before resolver is called
   const result = await next()
   // Do Something here after resolver is completed
-  signin(result.email, result.language, result.firstName, result.lastName)
+  await signIn(result.email, result.language, result.firstName, result.lastName)
   return result
 }
 
 export const klicktippNewsletterStateMiddleware: MiddlewareFn = async (
+  /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
   { root, args, context, info },
   next,
 ) => {