From 1a8a70ca4ae07b6cca2195ee968c309a49c0bcc7 Mon Sep 17 00:00:00 2001 From: mirovladimitrovski Date: Thu, 13 Jul 2023 11:24:14 +0200 Subject: [PATCH] fix: avoid using auth provider name in components --- src/services/cleeng.account.service.ts | 2 +- src/services/inplayer.account.service.ts | 4 ++-- src/utils/collection.ts | 2 +- types/account.d.ts | 4 +--- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/services/cleeng.account.service.ts b/src/services/cleeng.account.service.ts index e0b980d5b..bdedcad54 100644 --- a/src/services/cleeng.account.service.ts +++ b/src/services/cleeng.account.service.ts @@ -152,7 +152,7 @@ export const getPublisherConsents: GetPublisherConsents = async (config) => { const consents = ((response?.responseData?.consents || []) as CleengConsent[]).map( (cleengConsent): Consent => ({ type: REGISTER_FIELD_VARIANT.CHECKBOX, - provider: 'cleeng', + isCustomRegisterField: false, defaultValue: cleengConsent.enabledByDefault, name: cleengConsent.name, label: cleengConsent.label, diff --git a/src/services/inplayer.account.service.ts b/src/services/inplayer.account.service.ts index 589c47118..38aa8dbf5 100644 --- a/src/services/inplayer.account.service.ts +++ b/src/services/inplayer.account.service.ts @@ -175,7 +175,7 @@ export const getPublisherConsents: GetPublisherConsents = async (config) => { .map( (field): Consent => ({ type: field.type as ConsentFieldVariants, - provider: 'jwp', + isCustomRegisterField: true, defaultValue: field.type === REGISTER_FIELD_VARIANT.CHECKBOX ? field.default_value === 'true' : field.default_value, name: field.name, label: field.label, @@ -479,7 +479,7 @@ function getTermsConsent(): Consent { return { type: REGISTER_FIELD_VARIANT.CHECKBOX, - provider: 'jwp', + isCustomRegisterField: true, required: true, name: 'terms', label: i18next.t('account:registration.terms_consent', { termsUrl }), diff --git a/src/utils/collection.ts b/src/utils/collection.ts index f4dd7f6a4..0eea79f45 100644 --- a/src/utils/collection.ts +++ b/src/utils/collection.ts @@ -76,7 +76,7 @@ const formatConsentValues = (publisherConsents: Consent[] | null = [], customerC const consent = customerConsents?.find((customerConsent) => customerConsent.name === publisherConsent.name); if (consent) { - const value = publisherConsent.provider === 'cleeng' ? consent.state === 'accepted' : consent.value ?? ''; + const value = publisherConsent.isCustomRegisterField ? consent.value ?? '' : consent.state === 'accepted'; values[publisherConsent.name] = value; } }); diff --git a/types/account.d.ts b/types/account.d.ts index c1f60c945..c8ae5952c 100644 --- a/types/account.d.ts +++ b/types/account.d.ts @@ -218,13 +218,11 @@ export type UpdateCustomerArgs = { fullName?: string; }; -export type ConsentProvider = 'cleeng' | 'jwp'; - export type ConsentFieldVariants = 'input' | 'select' | 'country' | 'us_state' | 'radio' | 'checkbox' | 'datepicker'; export interface Consent { type: ConsentFieldVariantss; - provider: ConsentProvider; + isCustomRegisterField: boolean; defaultValue: string | boolean; name: string; label: string;