From 070f84f21b2a1605f07d890d397a59481eca86f5 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 4 Apr 2023 19:47:50 +0200 Subject: [PATCH 1/2] Remove callKlickTippAPI method. --- backend/src/apis/KlicktippController.ts | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/backend/src/apis/KlicktippController.ts b/backend/src/apis/KlicktippController.ts index 710e2c611..6d59eaefc 100644 --- a/backend/src/apis/KlicktippController.ts +++ b/backend/src/apis/KlicktippController.ts @@ -97,15 +97,11 @@ export const addFieldsToSubscriber = async ( newemail = '', newsmsnumber = '', ) => { - return callKlickTippAPI( - async ({ email, fields, newemail, newsmsnumber }) => { - const isLogin = await loginKlicktippUser() - if (isLogin) { - const subscriberId = await klicktippConnector.subscriberSearch(email) - return klicktippConnector.subscriberUpdate(subscriberId, fields, newemail, newsmsnumber) - } - throw new LogError(`Could not add fields (${fields}) to subscriber ${email}`) - }, - { email, fields, newemail, newsmsnumber }, - ) + if (!CONFIG.KLICKTIPP) return true + const isLogin = await loginKlicktippUser() + if (isLogin) { + const subscriberId = await klicktippConnector.subscriberSearch(email) + return klicktippConnector.subscriberUpdate(subscriberId, fields, newemail, newsmsnumber) + } + return false } From 1505d9abf06163e3d3535c481148d9910e765bef Mon Sep 17 00:00:00 2001 From: elweyn Date: Wed, 5 Apr 2023 10:43:42 +0200 Subject: [PATCH 2/2] Change ACTION_NEWSLETTER to NEWSLETTER_ACTION --- ...UBSCRIBE_NEWSLETTER.ts => EVENT_NEWSLETTER_SUBSCRIBE.ts} | 4 ++-- ...SCRIBE_NEWSLETTER.ts => EVENT_NEWSLETTER_UNSUBSCRIBE.ts} | 4 ++-- backend/src/event/Event.ts | 4 ++-- backend/src/event/EventType.ts | 4 ++-- backend/src/graphql/resolver/KlicktippResolver.ts | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) rename backend/src/event/{EVENT_SUBSCRIBE_NEWSLETTER.ts => EVENT_NEWSLETTER_SUBSCRIBE.ts} (56%) rename backend/src/event/{EVENT_UNSUBSCRIBE_NEWSLETTER.ts => EVENT_NEWSLETTER_UNSUBSCRIBE.ts} (56%) diff --git a/backend/src/event/EVENT_SUBSCRIBE_NEWSLETTER.ts b/backend/src/event/EVENT_NEWSLETTER_SUBSCRIBE.ts similarity index 56% rename from backend/src/event/EVENT_SUBSCRIBE_NEWSLETTER.ts rename to backend/src/event/EVENT_NEWSLETTER_SUBSCRIBE.ts index a9656b6fa..51fb3d186 100644 --- a/backend/src/event/EVENT_SUBSCRIBE_NEWSLETTER.ts +++ b/backend/src/event/EVENT_NEWSLETTER_SUBSCRIBE.ts @@ -3,5 +3,5 @@ import { User as DbUser } from '@entity/User' import { Event, EventType } from './Event' -export const EVENT_SUBSCRIBE_NEWSLETTER = async (user: DbUser): Promise => - Event(EventType.SUBSCRIBE_NEWSLETTER, user, user).save() +export const EVENT_NEWSLETTER_SUBSCRIBE = async (user: DbUser): Promise => + Event(EventType.NEWSLETTER_SUBSCRIBE, user, user).save() diff --git a/backend/src/event/EVENT_UNSUBSCRIBE_NEWSLETTER.ts b/backend/src/event/EVENT_NEWSLETTER_UNSUBSCRIBE.ts similarity index 56% rename from backend/src/event/EVENT_UNSUBSCRIBE_NEWSLETTER.ts rename to backend/src/event/EVENT_NEWSLETTER_UNSUBSCRIBE.ts index 1b2561894..4e4d3e9e4 100644 --- a/backend/src/event/EVENT_UNSUBSCRIBE_NEWSLETTER.ts +++ b/backend/src/event/EVENT_NEWSLETTER_UNSUBSCRIBE.ts @@ -3,5 +3,5 @@ import { User as DbUser } from '@entity/User' import { Event, EventType } from './Event' -export const EVENT_UNSUBSCRIBE_NEWSLETTER = async (user: DbUser): Promise => - Event(EventType.UNSUBSCRIBE_NEWSLETTER, user, user).save() +export const EVENT_NEWSLETTER_UNSUBSCRIBE = async (user: DbUser): Promise => + Event(EventType.NEWSLETTER_UNSUBSCRIBE, user, user).save() diff --git a/backend/src/event/Event.ts b/backend/src/event/Event.ts index 05c0a78a9..2064a91f0 100644 --- a/backend/src/event/Event.ts +++ b/backend/src/event/Event.ts @@ -58,13 +58,13 @@ export { EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION } from './EVENT_EMAIL_ACCOUNT_MUL export { EVENT_EMAIL_ADMIN_CONFIRMATION } from './EVENT_EMAIL_ADMIN_CONFIRMATION' export { EVENT_EMAIL_CONFIRMATION } from './EVENT_EMAIL_CONFIRMATION' export { EVENT_EMAIL_FORGOT_PASSWORD } from './EVENT_EMAIL_FORGOT_PASSWORD' -export { EVENT_SUBSCRIBE_NEWSLETTER } from './EVENT_SUBSCRIBE_NEWSLETTER' +export { EVENT_NEWSLETTER_SUBSCRIBE } from './EVENT_NEWSLETTER_SUBSCRIBE' export { EVENT_TRANSACTION_SEND } from './EVENT_TRANSACTION_SEND' export { EVENT_TRANSACTION_RECEIVE } from './EVENT_TRANSACTION_RECEIVE' export { EVENT_TRANSACTION_LINK_CREATE } from './EVENT_TRANSACTION_LINK_CREATE' export { EVENT_TRANSACTION_LINK_DELETE } from './EVENT_TRANSACTION_LINK_DELETE' export { EVENT_TRANSACTION_LINK_REDEEM } from './EVENT_TRANSACTION_LINK_REDEEM' -export { EVENT_UNSUBSCRIBE_NEWSLETTER } from './EVENT_UNSUBSCRIBE_NEWSLETTER' +export { EVENT_NEWSLETTER_UNSUBSCRIBE } from './EVENT_NEWSLETTER_UNSUBSCRIBE' export { EVENT_USER_ACTIVATE_ACCOUNT } from './EVENT_USER_ACTIVATE_ACCOUNT' export { EVENT_USER_INFO_UPDATE } from './EVENT_USER_INFO_UPDATE' export { EVENT_USER_LOGIN } from './EVENT_USER_LOGIN' diff --git a/backend/src/event/EventType.ts b/backend/src/event/EventType.ts index 137bbfa09..b2b6f9322 100644 --- a/backend/src/event/EventType.ts +++ b/backend/src/event/EventType.ts @@ -21,13 +21,13 @@ export enum EventType { EMAIL_ADMIN_CONFIRMATION = 'EMAIL_ADMIN_CONFIRMATION', EMAIL_CONFIRMATION = 'EMAIL_CONFIRMATION', EMAIL_FORGOT_PASSWORD = 'EMAIL_FORGOT_PASSWORD', - SUBSCRIBE_NEWSLETTER = 'SUBSCRIBE_NEWSLETTER', + NEWSLETTER_SUBSCRIBE = 'NEWSLETTER_SUBSCRIBE', + NEWSLETTER_UNSUBSCRIBE = 'NEWSLETTER_UNSUBSCRIBE', TRANSACTION_SEND = 'TRANSACTION_SEND', TRANSACTION_RECEIVE = 'TRANSACTION_RECEIVE', TRANSACTION_LINK_CREATE = 'TRANSACTION_LINK_CREATE', TRANSACTION_LINK_DELETE = 'TRANSACTION_LINK_DELETE', TRANSACTION_LINK_REDEEM = 'TRANSACTION_LINK_REDEEM', - UNSUBSCRIBE_NEWSLETTER = 'UNSUBSCRIBE_NEWSLETTER', USER_ACTIVATE_ACCOUNT = 'ACTIVATE_ACCOUNT', USER_INFO_UPDATE = 'USER_INFO_UPDATE', USER_LOGIN = 'USER_LOGIN', diff --git a/backend/src/graphql/resolver/KlicktippResolver.ts b/backend/src/graphql/resolver/KlicktippResolver.ts index 03b591c4d..cb09822cf 100644 --- a/backend/src/graphql/resolver/KlicktippResolver.ts +++ b/backend/src/graphql/resolver/KlicktippResolver.ts @@ -2,7 +2,7 @@ import { Resolver, Authorized, Mutation, Ctx } from 'type-graphql' import { unsubscribe, klicktippSignIn } from '@/apis/KlicktippController' import { RIGHTS } from '@/auth/RIGHTS' -import { EVENT_UNSUBSCRIBE_NEWSLETTER, EVENT_SUBSCRIBE_NEWSLETTER } from '@/event/Event' +import { EVENT_NEWSLETTER_SUBSCRIBE, EVENT_NEWSLETTER_UNSUBSCRIBE } from '@/event/Event' import { Context, getUser } from '@/server/context' @Resolver() @@ -11,7 +11,7 @@ export class KlicktippResolver { @Mutation(() => Boolean) async unsubscribeNewsletter(@Ctx() context: Context): Promise { const user = getUser(context) - await EVENT_UNSUBSCRIBE_NEWSLETTER(user) + await EVENT_NEWSLETTER_UNSUBSCRIBE(user) return unsubscribe(user.emailContact.email) } @@ -19,7 +19,7 @@ export class KlicktippResolver { @Mutation(() => Boolean) async subscribeNewsletter(@Ctx() context: Context): Promise { const user = getUser(context) - await EVENT_SUBSCRIBE_NEWSLETTER(user) + await EVENT_NEWSLETTER_SUBSCRIBE(user) return klicktippSignIn(user.emailContact.email, user.language) } }