Merge pull request #2885 from gradido/2785-remove-email-from-subscribe-unsubscribe

fix(backend): subscription get's email and languages from user

backend/src/graphql/arg/SubscribeNewsletterArgs.ts

@@ -1,10 +0,0 @@
-import { ArgsType, Field } from 'type-graphql'
-
-@ArgsType()
-export default class SubscribeNewsletterArgs {
-  @Field(() => String)
-  email: string
-
-  @Field(() => String)
-  language: string
-}

backend/src/graphql/resolver/KlicktippResolver.ts

@@ -1,7 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
-import { Resolver, Query, Authorized, Arg, Mutation, Args } from 'type-graphql'
+import { Resolver, Query, Authorized, Arg, Mutation, Ctx } from 'type-graphql'
-
-import SubscribeNewsletterArgs from '@arg/SubscribeNewsletterArgs'
 
 import {
   getKlickTippUser,
@@ -10,6 +8,7 @@ import {
   klicktippSignIn,
 } from '@/apis/KlicktippController'
 import { RIGHTS } from '@/auth/RIGHTS'
+import { Context, getUser } from '@/server/context'
 
 @Resolver()
 export class KlicktippResolver {
@@ -27,15 +26,15 @@ export class KlicktippResolver {
 
   @Authorized([RIGHTS.UNSUBSCRIBE_NEWSLETTER])
   @Mutation(() => Boolean)
-  async unsubscribeNewsletter(@Arg('email') email: string): Promise<boolean> {
+  async unsubscribeNewsletter(@Ctx() context: Context): Promise<boolean> {
-    return await unsubscribe(email)
+    const user = getUser(context)
+    return unsubscribe(user.emailContact.email)
   }
 
   @Authorized([RIGHTS.SUBSCRIBE_NEWSLETTER])
   @Mutation(() => Boolean)
-  async subscribeNewsletter(
+  async subscribeNewsletter(@Ctx() context: Context): Promise<boolean> {
-    @Args() { email, language }: SubscribeNewsletterArgs,
+    const user = getUser(context)
-  ): Promise<boolean> {
+    return klicktippSignIn(user.emailContact.email, user.language)
-    return await klicktippSignIn(email, language)
   }
 }

frontend/src/components/UserSettings/UserNewsletter.spec.js

@@ -60,9 +60,6 @@ describe('UserCard_Newsletter', () => {
       it('calls the unsubscribe mutation', () => {
         expect(mockAPIcall).toBeCalledWith({
           mutation: unsubscribeNewsletter,
-          variables: {
-            email: 'peter@lustig.de',
-          },
         })
       })
 
@@ -89,10 +86,6 @@ describe('UserCard_Newsletter', () => {
       it('calls the subscribe mutation', () => {
         expect(mockAPIcall).toBeCalledWith({
           mutation: subscribeNewsletter,
-          variables: {
-            email: 'peter@lustig.de',
-            language: 'de',
-          },
         })
       })
 

frontend/src/components/UserSettings/UserNewsletter.vue

@@ -41,10 +41,6 @@ export default {
       this.$apollo
         .mutate({
           mutation: this.newsletterState ? subscribeNewsletter : unsubscribeNewsletter,
-          variables: {
-            email: this.$store.state.email,
-            language: this.newsletterState ? this.$store.state.language : undefined,
-          },
         })
         .then(() => {
           this.$store.commit('newsletterState', this.newsletterState)

frontend/src/graphql/mutations.js

@@ -1,14 +1,14 @@
 import gql from 'graphql-tag'
 
 export const subscribeNewsletter = gql`
-  mutation($email: String!, $language: String!) {
+  mutation {
-    subscribeNewsletter(email: $email, language: $language)
+    subscribeNewsletter
   }
 `
 
 export const unsubscribeNewsletter = gql`
-  mutation($email: String!) {
+  mutation {
-    unsubscribeNewsletter(email: $email)
+    unsubscribeNewsletter
   }
 `