From 79bede5e35cb8f01e67f2196b8f229aad9d0367c Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 24 Mar 2023 09:33:52 +0100 Subject: [PATCH 1/5] feat(backend): add fields to subscriber --- backend/src/apis/KlicktippController.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/backend/src/apis/KlicktippController.ts b/backend/src/apis/KlicktippController.ts index a291bb945..bb3e79831 100644 --- a/backend/src/apis/KlicktippController.ts +++ b/backend/src/apis/KlicktippController.ts @@ -79,3 +79,16 @@ export const getKlicktippTagMap = async () => { } return '' } + +export const addFieldsToSubscriber = async ( + email: string, + fields: any = {}, + newemail = '', + newsmsnumber = '', +) => { + const isLogin = await loginKlicktippUser() + if (isLogin) { + const subscriberId = await klicktippConnector.subscriberSearch(email) + return await klicktippConnector.subscriberUpdate(subscriberId, fields, newemail, newsmsnumber) + } +} From 20a80d56a68e31a8b16ce076392a74b014ab6d01 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 4 Apr 2023 09:09:37 +0200 Subject: [PATCH 2/5] Add callCklickTippAPI to addFieldsToSubscriber --- backend/src/apis/KlicktippController.ts | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/backend/src/apis/KlicktippController.ts b/backend/src/apis/KlicktippController.ts index d94b4e132..91c92c855 100644 --- a/backend/src/apis/KlicktippController.ts +++ b/backend/src/apis/KlicktippController.ts @@ -143,9 +143,15 @@ export const addFieldsToSubscriber = async ( newemail = '', newsmsnumber = '', ) => { - const isLogin = await loginKlicktippUser() - if (isLogin) { - const subscriberId = await klicktippConnector.subscriberSearch(email) - return await klicktippConnector.subscriberUpdate(subscriberId, fields, 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 }, + ) } From 070f84f21b2a1605f07d890d397a59481eca86f5 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 4 Apr 2023 19:47:50 +0200 Subject: [PATCH 3/5] 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 59cb0ce4b9477f6cd94cc4f55f8e2d56e8b64edc Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 4 May 2023 14:59:38 +0200 Subject: [PATCH 4/5] use yarn dev for federation to autoreload on codechange --- federation/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/federation/Dockerfile b/federation/Dockerfile index 959252d29..81b95010e 100644 --- a/federation/Dockerfile +++ b/federation/Dockerfile @@ -86,7 +86,7 @@ RUN cd ../database && yarn run build FROM build as test # Run command -CMD /bin/sh -c "yarn run start" +CMD /bin/sh -c "yarn run dev" ################################################################################## # PRODUCTION (Does contain only "binary"- and static-files to reduce image size) # From 67d1ae7d1b2df4f30bac71d68db7840b77a3e4ce Mon Sep 17 00:00:00 2001 From: mahula Date: Fri, 5 May 2023 13:26:16 +0200 Subject: [PATCH 5/5] update jest-canvas-mock version to resolve window mock problem in tests --- frontend/package.json | 2 +- frontend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 8515ca209..f07284da6 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -44,7 +44,7 @@ "graphql": "^15.5.1", "identity-obj-proxy": "^3.0.0", "jest": "^26.6.3", - "jest-canvas-mock": "^2.3.1", + "jest-canvas-mock": "^2.5.0", "jwt-decode": "^3.1.2", "portal-vue": "^2.1.7", "prettier": "^2.2.1", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 9e8fdd81d..7cc8e5fe5 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -8657,10 +8657,10 @@ javascript-stringify@^1.6.0: resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-1.6.0.tgz#142d111f3a6e3dae8f4a9afd77d45855b5a9cce3" integrity sha1-FC0RHzpuPa6PSpr9d9RYVbWpzOM= -jest-canvas-mock@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/jest-canvas-mock/-/jest-canvas-mock-2.3.1.tgz#9535d14bc18ccf1493be36ac37dd349928387826" - integrity sha512-5FnSZPrX3Q2ZfsbYNE3wqKR3+XorN8qFzDzB5o0golWgt6EOX1+emBnpOc9IAQ+NXFj8Nzm3h7ZdE/9H0ylBcg== +jest-canvas-mock@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/jest-canvas-mock/-/jest-canvas-mock-2.5.0.tgz#3e60f87f77ddfa273cf8e7e4ea5f86fa827c7117" + integrity sha512-s2bmY2f22WPMzhB2YA93kiyf7CAfWAnV/sFfY9s48IVOrGmwui1eSFluDPesq1M+7tSC1hJAit6mzO0ZNXvVBA== dependencies: cssfontparser "^1.2.1" moo-color "^1.0.2"