IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename klicktippSignIn to subscribe.

Browse Source
This commit is contained in:
elweyn 2023-05-05 13:11:36 +02:00
parent b9c0d4201b
commit 64d0200f99
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/apis/KlicktippController.ts
View File

@ -12,7 +12,7 @@ import KlicktippConnector from 'klicktipp-api'
const klicktippConnector = new KlicktippConnector() const klicktippConnector = new KlicktippConnector()
export const klicktippSignIn = async ( export const subscribe = async (
email: string, email: string,
language: string, language: string,
firstName?: string, firstName?: string,

4
backend/src/graphql/resolver/KlicktippResolver.ts
View File

@ -1,6 +1,6 @@
import { Resolver, Authorized, Mutation, Ctx } from 'type-graphql' import { Resolver, Authorized, Mutation, Ctx } from 'type-graphql'
import { unsubscribe, klicktippSignIn } from '@/apis/KlicktippController' import { unsubscribe, subscribe } from '@/apis/KlicktippController'
import { RIGHTS } from '@/auth/RIGHTS' import { RIGHTS } from '@/auth/RIGHTS'
import { EVENT_NEWSLETTER_SUBSCRIBE, EVENT_NEWSLETTER_UNSUBSCRIBE } from '@/event/Events' import { EVENT_NEWSLETTER_SUBSCRIBE, EVENT_NEWSLETTER_UNSUBSCRIBE } from '@/event/Events'
import { Context, getUser } from '@/server/context' import { Context, getUser } from '@/server/context'
@ -20,6 +20,6 @@ export class KlicktippResolver {
async subscribeNewsletter(@Ctx() context: Context): Promise<boolean> { async subscribeNewsletter(@Ctx() context: Context): Promise<boolean> {
const user = getUser(context) const user = getUser(context)
await EVENT_NEWSLETTER_SUBSCRIBE(user) await EVENT_NEWSLETTER_SUBSCRIBE(user)
return klicktippSignIn(user.emailContact.email, user.language) return subscribe(user.emailContact.email, user.language)
} }
} }

6
backend/src/graphql/resolver/UserResolver.test.ts
View File

@ -61,7 +61,7 @@ import { stephenHawking } from '@/seeds/users/stephen-hawking'
import { printTimeDuration } from '@/util/time' import { printTimeDuration } from '@/util/time'
import { objectValuesToArray } from '@/util/utilities' import { objectValuesToArray } from '@/util/utilities'
// import { klicktippSignIn } from '@/apis/KlicktippController' // import { subscribe } from '@/apis/KlicktippController'
jest.mock('@/emails/sendEmailVariants', () => { jest.mock('@/emails/sendEmailVariants', () => {
const originalModule = jest.requireActual('@/emails/sendEmailVariants') const originalModule = jest.requireActual('@/emails/sendEmailVariants')
@ -81,7 +81,7 @@ jest.mock('@/emails/sendEmailVariants', () => {
jest.mock('@/apis/KlicktippController', () => { jest.mock('@/apis/KlicktippController', () => {
return { return {
__esModule: true, __esModule: true,
klicktippSignIn: jest.fn(), subscribe: jest.fn(),
} }
}) })
*/ */
@ -558,7 +558,7 @@ describe('UserResolver', () => {
/* /*
it('calls the klicktipp API', () => { it('calls the klicktipp API', () => {
expect(klicktippSignIn).toBeCalledWith( expect(subscribe).toBeCalledWith(
user[0].email, user[0].email,
user[0].language, user[0].language,
user[0].firstName, user[0].firstName,

6
backend/src/graphql/resolver/UserResolver.ts
View File

@ -35,7 +35,7 @@ import { User } from '@model/User'
import { UserAdmin, SearchUsersResult } from '@model/UserAdmin' import { UserAdmin, SearchUsersResult } from '@model/UserAdmin'
import { UserRepository } from '@repository/User' import { UserRepository } from '@repository/User'
import { klicktippSignIn } from '@/apis/KlicktippController' import { subscribe } from '@/apis/KlicktippController'
import { encode } from '@/auth/JWT' import { encode } from '@/auth/JWT'
import { RIGHTS } from '@/auth/RIGHTS' import { RIGHTS } from '@/auth/RIGHTS'
import { CONFIG } from '@/config' import { CONFIG } from '@/config'
@ -469,9 +469,9 @@ export class UserResolver {
// TODO do we always signUp the user? How to handle things with old users? // TODO do we always signUp the user? How to handle things with old users?
if (userContact.emailOptInTypeId === OptInType.EMAIL_OPT_IN_REGISTER) { if (userContact.emailOptInTypeId === OptInType.EMAIL_OPT_IN_REGISTER) {
try { try {
await klicktippSignIn(userContact.email, user.language, user.firstName, user.lastName) await subscribe(userContact.email, user.language, user.firstName, user.lastName)
logger.debug( logger.debug(
`klicktippSignIn(${userContact.email}, ${user.language}, ${user.firstName}, ${user.lastName})`, `subscribe(${userContact.email}, ${user.language}, ${user.firstName}, ${user.lastName})`,
) )
} catch (e) { } catch (e) {
logger.error('Error subscribing to klicktipp', e) logger.error('Error subscribing to klicktipp', e)

2
backend/src/middleware/klicktippMiddleware.ts
View File

@ -19,7 +19,7 @@ import { klickTippLogger as logger } from '@/server/logger'
// // Do Something here before resolver is called // // Do Something here before resolver is called
// const result = await next() // const result = await next()
// // Do Something here after resolver is completed // // Do Something here after resolver is completed
// await klicktippSignIn(result.email, result.language, result.firstName, result.lastName) // await subscribe(result.email, result.language, result.firstName, result.lastName)
// return result // return result
// } // }