diff --git a/.changeset/long-singers-do.md b/.changeset/long-singers-do.md deleted file mode 100644 index b4214ab..0000000 --- a/.changeset/long-singers-do.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@forgerock/davinci-client': minor ---- - -A new PhoneNumberExtensionCollector has been added to support phone number fields that include an extension. When a DaVinci PHONE_NUMBER field has showExtension: true, the SDK now produces a PhoneNumberExtensionCollector instead of a PhoneNumberCollector. diff --git a/.gitignore b/.gitignore index 327a931..518e1a3 100644 --- a/.gitignore +++ b/.gitignore @@ -95,6 +95,3 @@ GEMINI.md .claude/worktrees .claude/settings.local.json .opensource - -# Polaris -.polaris-setup-progress.json diff --git a/e2e/davinci-app/components/object-value.ts b/e2e/davinci-app/components/object-value.ts index e5c4459..77e964d 100644 --- a/e2e/davinci-app/components/object-value.ts +++ b/e2e/davinci-app/components/object-value.ts @@ -8,9 +8,6 @@ import type { DeviceAuthenticationCollector, DeviceRegistrationCollector, PhoneNumberCollector, - PhoneNumberExtensionCollector, - PhoneNumberExtensionInputValue, - PhoneNumberInputValue, Updater, } from '@forgerock/davinci-client/types'; @@ -22,16 +19,11 @@ import type { */ export default function objectValueComponent( formEl: HTMLFormElement, - collector: - | DeviceRegistrationCollector - | DeviceAuthenticationCollector - | PhoneNumberCollector - | PhoneNumberExtensionCollector, + collector: DeviceRegistrationCollector | DeviceAuthenticationCollector | PhoneNumberCollector, updater: | Updater | Updater - | Updater - | Updater, + | Updater, submitForm: () => void, ) { if ( @@ -69,7 +61,7 @@ export default function objectValueComponent( buttonEl.textContent = option.label; formEl.appendChild(buttonEl); } - } else if (collector.type === 'PhoneNumberCollector') { + } else { const phoneLabel = document.createElement('label'); phoneLabel.textContent = collector.output.label || 'Phone Number'; phoneLabel.className = 'object-options-title'; @@ -81,9 +73,6 @@ export default function objectValueComponent( phoneInput.setAttribute('name', 'phone-number-input'); phoneInput.setAttribute('placeholder', 'Enter phone number'); - formEl.appendChild(phoneLabel); - formEl.appendChild(phoneInput); - // Add change event listener phoneInput.addEventListener('change', (event) => { // Properly type the event target @@ -95,73 +84,13 @@ export default function objectValueComponent( return; } - const phoneNumberInputValue: PhoneNumberInputValue = { + updater({ phoneNumber: selectedValue, countryCode: collector.output.value?.countryCode || '', - }; - const phoneNumberUpdater = updater as Updater; - phoneNumberUpdater(phoneNumberInputValue); + } as any); }); - } else if (collector.type === 'PhoneNumberExtensionCollector') { - const phoneLabel = document.createElement('label'); - phoneLabel.textContent = collector.output.label || 'Phone Number'; - phoneLabel.className = 'object-options-title'; - phoneLabel.setAttribute('for', 'phone-number-input-1'); - - const phoneInput = document.createElement('input'); - phoneInput.setAttribute('type', 'tel'); - phoneInput.setAttribute('id', 'phone-number-input-1'); - phoneInput.setAttribute('name', 'phone-number-input-1'); - phoneInput.setAttribute('placeholder', 'Enter phone number'); - - const extensionLabel = document.createElement('label'); - extensionLabel.textContent = collector.output.extensionLabel || 'Extension'; - extensionLabel.className = 'object-options-title'; - extensionLabel.setAttribute('for', 'extension-input-1'); - - const extensionInput = document.createElement('input'); - extensionInput.setAttribute('type', 'text'); - extensionInput.setAttribute('id', 'extension-input-1'); - extensionInput.setAttribute('name', 'extension-input-1'); - extensionInput.setAttribute('placeholder', 'Enter extension'); - - const divEl = document.createElement('div'); - divEl.style = 'display: flex; gap: 8px;'; - divEl.appendChild(phoneLabel); - divEl.appendChild(phoneInput); - divEl.appendChild(extensionLabel); - divEl.appendChild(extensionInput); - - formEl.appendChild(divEl); - const phoneNumberExtensionUpdater = updater as Updater; - - // Add change event listener for phone number input - phoneInput.addEventListener('change', (event) => { - const target = event.target as HTMLInputElement; - const phoneValue = target.value; - const extensionValue = extensionInput.value; - const phoneNumberExtensionInputValue: PhoneNumberExtensionInputValue = { - phoneNumber: phoneValue, - countryCode: collector.output.value?.countryCode || '', - extension: extensionValue, - }; - - phoneNumberExtensionUpdater(phoneNumberExtensionInputValue); - }); - - // Add change event listener for extension input - extensionInput.addEventListener('change', (event) => { - const target = event.target as HTMLInputElement; - const extensionValue = target.value; - const phoneValue = phoneInput.value; - const phoneNumberExtensionInputValue: PhoneNumberExtensionInputValue = { - phoneNumber: phoneValue, - countryCode: collector.output.value?.countryCode || '', - extension: extensionValue, - }; - - phoneNumberExtensionUpdater(phoneNumberExtensionInputValue); - }); + formEl.appendChild(phoneLabel); + formEl.appendChild(phoneInput); } } diff --git a/e2e/davinci-app/main.ts b/e2e/davinci-app/main.ts index 119a4de..85249a8 100644 --- a/e2e/davinci-app/main.ts +++ b/e2e/davinci-app/main.ts @@ -250,10 +250,7 @@ const urlParams = new URLSearchParams(window.location.search); formEl, // You can ignore this; it's just for rendering collector, // This is the plain object of the collector ); - } else if ( - collector.type === 'PhoneNumberCollector' || - collector.type === 'PhoneNumberExtensionCollector' - ) { + } else if (collector.type === 'PhoneNumberCollector') { objectValueComponent( formEl, // You can ignore this; it's just for rendering collector, // This is the plain object of the collector diff --git a/e2e/davinci-suites/src/basic.test.ts b/e2e/davinci-suites/src/basic.test.ts index 1da585d..63f8bb7 100644 --- a/e2e/davinci-suites/src/basic.test.ts +++ b/e2e/davinci-suites/src/basic.test.ts @@ -40,15 +40,9 @@ test('Test happy paths on test page', async ({ page }) => { return true; } }); - const signoff = page.waitForResponse((response) => { - if (response.url().includes('/signoff') && response.status() === 302) { - return true; - } - }); await logoutButton.click(); await revokeCall; - await signoff; - await expect(page.getByText('Username/Password Form')).toBeVisible(); + await expect(page.getByText('Username/Password Form')).toBeVisible({ timeout: 15000 }); }); test('ensure query params passed to start are sent off in authorize call', async ({ page }) => { const { navigate } = asyncEvents(page); diff --git a/e2e/davinci-suites/src/form-fields.test.ts b/e2e/davinci-suites/src/form-fields.test.ts index 8c009f6..0ad89d3 100644 --- a/e2e/davinci-suites/src/form-fields.test.ts +++ b/e2e/davinci-suites/src/form-fields.test.ts @@ -31,8 +31,7 @@ test('Should render form fields', async ({ page }) => { await page.locator('#combobox-field-key-3').check(); await page.locator('#combobox-field-key-2').uncheck(); - await page.locator('#phone-number-input-1').fill('1234567890'); - await page.locator('#extension-input-1').fill('7890'); + await page.locator('#phone-number-input').fill('1234567890'); await expect(page.getByRole('button', { name: 'Flow Button' })).toBeVisible(); await expect(page.getByRole('button', { name: 'Flow Link' })).toBeVisible(); @@ -43,10 +42,9 @@ test('Should render form fields', async ({ page }) => { await page.getByRole('button', { name: 'Submit' }).click(); const request = await requestPromise; - const postData = request.postData(); - const parsedData = postData ? JSON.parse(postData) : {}; - const data = parsedData.parameters.data; + const parsedData = JSON.parse(request.postData()); + const data = parsedData.parameters.data; expect(data.actionKey).toBe('submit'); expect(data.formData).toStrictEqual({ 'text-input-key': 'The input', @@ -57,7 +55,6 @@ test('Should render form fields', async ({ page }) => { 'phone-field': { phoneNumber: '1234567890', countryCode: 'GB', - extension: '7890', // Tests PhoneNumberExtensionCollector }, }); }); diff --git a/e2e/davinci-suites/src/phone-number-field.test.ts b/e2e/davinci-suites/src/phone-number-field.test.ts index fc1017a..134138c 100644 --- a/e2e/davinci-suites/src/phone-number-field.test.ts +++ b/e2e/davinci-suites/src/phone-number-field.test.ts @@ -105,7 +105,6 @@ test.describe('Device registration tests', () => { await page.getByRole('button', { name: 'Text Message' }).click(); await expect(page.getByText('SDK Automation [JS] - Enter Phone Number')).toBeVisible(); await page.getByRole('textbox', { name: 'Enter Phone Number' }).fill('3035550100'); - await expect(page.getByText('Extension')).not.toBeVisible(); // Tests standard PhoneNumberCollector await page.getByRole('button', { name: 'Submit' }).click(); await expect(page.getByText('SMS/Voice MFA Registered')).toBeVisible(); diff --git a/packages/davinci-client/src/lib/client.store.ts b/packages/davinci-client/src/lib/client.store.ts index e99dc64..04f29f7 100644 --- a/packages/davinci-client/src/lib/client.store.ts +++ b/packages/davinci-client/src/lib/client.store.ts @@ -46,7 +46,6 @@ import type { MultiValueCollectors, FidoRegistrationInputValue, FidoAuthenticationInputValue, - PhoneNumberExtensionInputValue, } from './collector.types.js'; import type { InitFlow, @@ -339,7 +338,6 @@ export async function davinci({ | string | string[] | PhoneNumberInputValue - | PhoneNumberExtensionInputValue | FidoRegistrationInputValue | FidoAuthenticationInputValue, index?: number, diff --git a/packages/davinci-client/src/lib/collector.types.test-d.ts b/packages/davinci-client/src/lib/collector.types.test-d.ts index ecaabcb..5fe6330 100644 --- a/packages/davinci-client/src/lib/collector.types.test-d.ts +++ b/packages/davinci-client/src/lib/collector.types.test-d.ts @@ -27,14 +27,6 @@ import type { ReadOnlyCollector, QrCodeCollector, AgreementCollector, - PhoneNumberCollector, - PhoneNumberExtensionCollector, - ObjectValueCollectorWithObjectValue, - InferValueObjectCollectorType, - PhoneNumberInputValue, - PhoneNumberOutputValue, - PhoneNumberExtensionInputValue, - PhoneNumberExtensionOutputValue, } from './collector.types.js'; describe('Collector Types', () => { @@ -366,112 +358,6 @@ describe('Collector Types', () => { expectTypeOf(tCollector).toMatchTypeOf(); }); - - it('should correctly infer PhoneNumberCollector Type', () => { - const tCollector: InferValueObjectCollectorType<'PhoneNumberCollector'> = { - category: 'ObjectValueCollector', - error: null, - type: 'PhoneNumberCollector', - id: '', - name: '', - input: { - key: '', - value: { countryCode: '', phoneNumber: '' }, - type: '', - validation: null, - }, - output: { - key: '', - label: '', - type: '', - value: { countryCode: '', phoneNumber: '' }, - }, - }; - - expectTypeOf(tCollector).toEqualTypeOf(); - }); - }); - - describe('ObjectValueCollector Types', () => { - it('should correctly infer PhoneNumberExtensionCollector Type', () => { - const tCollector: InferValueObjectCollectorType<'PhoneNumberExtensionCollector'> = { - category: 'ObjectValueCollector', - error: null, - type: 'PhoneNumberExtensionCollector', - id: '', - name: '', - input: { - key: '', - value: { countryCode: '', phoneNumber: '', extension: '' }, - type: '', - validation: null, - }, - output: { - key: '', - label: '', - type: '', - extensionLabel: '', - value: {}, - }, - }; - - expectTypeOf(tCollector).toEqualTypeOf(); - }); - - it('should validate PhoneNumberExtensionCollector structure', () => { - expectTypeOf() - .toHaveProperty('category') - .toEqualTypeOf<'ObjectValueCollector'>(); - expectTypeOf() - .toHaveProperty('type') - .toEqualTypeOf<'PhoneNumberExtensionCollector'>(); - expectTypeOf< - PhoneNumberExtensionCollector['input']['value'] - >().toEqualTypeOf(); - expectTypeOf< - PhoneNumberExtensionCollector['output']['value'] - >().toEqualTypeOf(); - }); - - it('should validate PhoneNumberCollector structure', () => { - expectTypeOf().toEqualTypeOf< - ObjectValueCollectorWithObjectValue< - 'PhoneNumberCollector', - PhoneNumberInputValue, - PhoneNumberOutputValue - > - >(); - expectTypeOf() - .toHaveProperty('category') - .toEqualTypeOf<'ObjectValueCollector'>(); - expectTypeOf() - .toHaveProperty('type') - .toEqualTypeOf<'PhoneNumberCollector'>(); - expectTypeOf().toEqualTypeOf(); - }); - - it('should validate PhoneNumberCollector base type constraints', () => { - const collector: PhoneNumberCollector = { - category: 'ObjectValueCollector', - type: 'PhoneNumberCollector', - error: null, - id: 'test', - name: 'Test', - input: { - key: 'phone', - value: { countryCode: '+1', phoneNumber: '5555555555' }, - type: 'string', - validation: null, - }, - output: { - key: 'phone', - label: 'Phone Number', - type: 'phone', - value: { countryCode: '+1', phoneNumber: '5555555555' }, - }, - }; - expectTypeOf(collector).toEqualTypeOf(); - }); }); describe('InferNoValueCollectorType', () => { diff --git a/packages/davinci-client/src/lib/collector.types.ts b/packages/davinci-client/src/lib/collector.types.ts index cb9f8f1..d99ebac 100644 --- a/packages/davinci-client/src/lib/collector.types.ts +++ b/packages/davinci-client/src/lib/collector.types.ts @@ -267,7 +267,6 @@ export type ObjectValueCollectorTypes = | 'DeviceAuthenticationCollector' | 'DeviceRegistrationCollector' | 'PhoneNumberCollector' - | 'PhoneNumberExtensionCollector' | 'ObjectOptionsCollector' | 'ObjectValueCollector' | 'ObjectSelectCollector'; @@ -305,18 +304,6 @@ export interface PhoneNumberOutputValue { phoneNumber?: string; } -export interface PhoneNumberExtensionInputValue { - countryCode: string; - phoneNumber: string; - extension: string; -} - -export interface PhoneNumberExtensionOutputValue { - countryCode?: string; - phoneNumber?: string; - extension?: string; -} - export interface ObjectOptionsCollectorWithStringValue< T extends ObjectValueCollectorTypes, V = string, @@ -389,27 +376,6 @@ export interface ObjectValueCollectorWithObjectValue< }; } -export interface PhoneNumberExtensionCollector { - category: 'ObjectValueCollector'; - error: string | null; - type: 'PhoneNumberExtensionCollector'; - id: string; - name: string; - input: { - key: string; - value: PhoneNumberExtensionInputValue; - type: string; - validation: (ValidationRequired | ValidationPhoneNumber)[] | null; - }; - output: { - key: string; - label: string; - type: string; - extensionLabel: string; - value: PhoneNumberExtensionOutputValue; - }; -} - export type InferValueObjectCollectorType = T extends 'DeviceAuthenticationCollector' ? DeviceAuthenticationCollector @@ -417,17 +383,14 @@ export type InferValueObjectCollectorType = ? DeviceRegistrationCollector : T extends 'PhoneNumberCollector' ? PhoneNumberCollector - : T extends 'PhoneNumberExtensionCollector' - ? PhoneNumberExtensionCollector - : - | ObjectOptionsCollectorWithObjectValue<'ObjectValueCollector'> - | ObjectOptionsCollectorWithStringValue<'ObjectValueCollector'>; + : + | ObjectOptionsCollectorWithObjectValue<'ObjectValueCollector'> + | ObjectOptionsCollectorWithStringValue<'ObjectValueCollector'>; export type ObjectValueCollectors = | DeviceAuthenticationCollector | DeviceRegistrationCollector | PhoneNumberCollector - | PhoneNumberExtensionCollector | ObjectOptionsCollectorWithObjectValue<'ObjectSelectCollector'> | ObjectOptionsCollectorWithStringValue<'ObjectSelectCollector'>; diff --git a/packages/davinci-client/src/lib/collector.utils.test.ts b/packages/davinci-client/src/lib/collector.utils.test.ts index 7b47a6f..c9d1381 100644 --- a/packages/davinci-client/src/lib/collector.utils.test.ts +++ b/packages/davinci-client/src/lib/collector.utils.test.ts @@ -31,7 +31,6 @@ import type { DeviceRegistrationField, FidoAuthenticationField, FidoRegistrationField, - PhoneNumberExtensionField, PhoneNumberField, ProtectField, QrCodeField, @@ -44,9 +43,7 @@ import type { import type { MultiSelectCollector, PhoneNumberCollector, - PhoneNumberExtensionCollector, PhoneNumberOutputValue, - PhoneNumberExtensionOutputValue, ValidatedTextCollector, } from './collector.types.js'; @@ -563,7 +560,7 @@ describe('Object value collectors', () => { }); }); -describe('returnObjectValueCollector with phone fields', () => { +describe('returnPhoneNumberCollector', () => { it('input value is empty when no prefill or default country code', () => { const mockField: PhoneNumberField = { key: 'phone-number-key', @@ -772,112 +769,6 @@ describe('returnObjectValueCollector with phone fields', () => { }, }); }); - - it('showExtension true returns PhoneNumberExtensionCollector', () => { - const mockField: PhoneNumberExtensionField = { - key: 'phone-number-key', - defaultCountryCode: null, - label: 'Phone Number', - type: 'PHONE_NUMBER', - required: false, - validatePhoneNumber: false, - showExtension: true, - extensionLabel: 'Extension', - }; - const result = returnObjectValueCollector(mockField, 1, {}); - expect(result.type).toBe('PhoneNumberExtensionCollector'); - }); - - it('creates a full PhoneNumberExtensionCollector with all fields', () => { - const mockField: PhoneNumberExtensionField = { - key: 'phone-number-key', - defaultCountryCode: 'US', - label: 'Phone Number', - type: 'PHONE_NUMBER', - required: true, - validatePhoneNumber: true, - showExtension: true, - extensionLabel: 'Extension', - }; - const result = returnObjectValueCollector(mockField, 1, {}) as PhoneNumberExtensionCollector; - expect(result).toEqual({ - category: 'ObjectValueCollector', - error: null, - type: 'PhoneNumberExtensionCollector', - id: 'phone-number-key-1', - name: 'phone-number-key', - input: { - key: mockField.key, - value: { - countryCode: 'US', - phoneNumber: '', - extension: '', - }, - type: mockField.type, - validation: [ - { - message: 'Value cannot be empty', - rule: true, - type: 'required', - }, - { - message: 'Phone number should be validated', - rule: true, - type: 'validatePhoneNumber', - }, - ], - }, - output: { - key: mockField.key, - label: mockField.label, - type: mockField.type, - extensionLabel: 'Extension', - value: { - countryCode: 'US', - phoneNumber: '', - extension: '', - }, - }, - }); - }); - - it('prefilled extension is set on collector', () => { - const mockField: PhoneNumberExtensionField = { - key: 'phone-number-key', - defaultCountryCode: null, - label: 'Phone Number', - type: 'PHONE_NUMBER', - required: false, - validatePhoneNumber: false, - showExtension: true, - extensionLabel: 'Extension', - }; - const prefillMock: PhoneNumberExtensionOutputValue = { - phoneNumber: '1234567890', - extension: '123', - }; - const result = returnObjectValueCollector( - mockField, - 1, - prefillMock, - ) as PhoneNumberExtensionCollector; - expect(result.input.value.extension).toBe('123'); - expect(result.output.value?.extension).toBe('123'); - expect(result.output.extensionLabel).toBe('Extension'); - }); - - it('PhoneNumberCollector does not have extensionLabel in output', () => { - const mockField: PhoneNumberField = { - key: 'phone-number-key', - defaultCountryCode: null, - label: 'Phone Number', - type: 'PHONE_NUMBER', - required: false, - validatePhoneNumber: false, - }; - const result = returnObjectValueCollector(mockField, 1, {}); - expect(result.output).not.toHaveProperty('extensionLabel'); - }); }); describe('No Value Collectors', () => { diff --git a/packages/davinci-client/src/lib/collector.utils.ts b/packages/davinci-client/src/lib/collector.utils.ts index 4d639d9..6233c32 100644 --- a/packages/davinci-client/src/lib/collector.utils.ts +++ b/packages/davinci-client/src/lib/collector.utils.ts @@ -31,7 +31,6 @@ import type { ObjectValueAutoCollectorTypes, QrCodeCollectorBase, AgreementCollector, - PhoneNumberExtensionOutputValue, } from './collector.types.js'; import type { DeviceAuthenticationField, @@ -50,7 +49,6 @@ import type { ValidatedField, AgreementField, ReadOnlyFields, - PhoneNumberExtensionField, } from './davinci.types.js'; /** @@ -578,18 +576,9 @@ export function returnMultiSelectCollector(field: MultiSelectField, idx: number, * @returns {ObjectCollector} The constructed ObjectCollector object. */ export function returnObjectCollector< - Field extends - | DeviceAuthenticationField - | DeviceRegistrationField - | PhoneNumberField - | PhoneNumberExtensionField, + Field extends DeviceAuthenticationField | DeviceRegistrationField | PhoneNumberField, CollectorType extends ObjectValueCollectorTypes = 'ObjectValueCollector', ->( - field: Field, - idx: number, - collectorType: CollectorType, - prefillData?: PhoneNumberOutputValue | PhoneNumberExtensionOutputValue, -) { +>(field: Field, idx: number, collectorType: CollectorType, prefillData?: PhoneNumberOutputValue) { let error = ''; if (!('key' in field)) { error = `${error}Key is not found in the field object. `; @@ -612,7 +601,6 @@ export function returnObjectCollector< let options; let defaultValue; - let extensionLabel: string | null = null; if (field.type === 'DEVICE_AUTHENTICATION') { if (!('options' in field)) { @@ -669,26 +657,10 @@ export function returnObjectCollector< const prefilledCountryCode = prefillData?.countryCode; const prefilledPhone = prefillData?.phoneNumber; - - if ('showExtension' in field && field.showExtension === true) { - const prefilledExtension = - prefillData && 'extension' in prefillData ? prefillData.extension : ''; - - // PhoneNumberExtensionCollector default value - defaultValue = { - countryCode: prefilledCountryCode ? prefilledCountryCode : field.defaultCountryCode || '', - phoneNumber: prefilledPhone || '', - extension: prefilledExtension ?? '', - }; - - extensionLabel = field.extensionLabel; - } else { - // PhoneNumberCollector default value - defaultValue = { - countryCode: prefilledCountryCode ? prefilledCountryCode : field.defaultCountryCode || '', - phoneNumber: prefilledPhone || '', - }; - } + defaultValue = { + countryCode: prefilledCountryCode ? prefilledCountryCode : field.defaultCountryCode || '', + phoneNumber: prefilledPhone || '', + }; } return { @@ -708,7 +680,6 @@ export function returnObjectCollector< label: field.label, type: field.type, ...(options && { options: options || [] }), - ...(extensionLabel !== null && { extensionLabel }), ...(defaultValue && { value: defaultValue }), }, } as InferValueObjectCollectorType; @@ -734,25 +705,11 @@ export function returnObjectSelectCollector( } export function returnObjectValueCollector( - field: PhoneNumberField | PhoneNumberExtensionField, + field: PhoneNumberField, idx: number, - prefillData: PhoneNumberOutputValue | PhoneNumberExtensionOutputValue, + prefillData: PhoneNumberOutputValue, ) { - if ('showExtension' in field && field.showExtension === true) { - return returnObjectCollector( - field, - idx, - 'PhoneNumberExtensionCollector', - prefillData as PhoneNumberExtensionOutputValue, - ); - } - - return returnObjectCollector( - field, - idx, - 'PhoneNumberCollector', - prefillData as PhoneNumberOutputValue, - ); + return returnObjectCollector(field, idx, 'PhoneNumberCollector', prefillData); } /** diff --git a/packages/davinci-client/src/lib/davinci.types.ts b/packages/davinci-client/src/lib/davinci.types.ts index b73488f..2b0f21f 100644 --- a/packages/davinci-client/src/lib/davinci.types.ts +++ b/packages/davinci-client/src/lib/davinci.types.ts @@ -168,16 +168,11 @@ export type PhoneNumberField = { type: 'PHONE_NUMBER'; key: string; label: string; - required: boolean; defaultCountryCode: string | null; + required: boolean; validatePhoneNumber: boolean; }; -export type PhoneNumberExtensionField = PhoneNumberField & { - showExtension: boolean; - extensionLabel: string; -}; - export type ProtectField = { type: 'PROTECT'; key: string; @@ -253,7 +248,6 @@ export type ComplexValueFields = | DeviceAuthenticationField | DeviceRegistrationField | PhoneNumberField - | PhoneNumberExtensionField | FidoRegistrationField | FidoAuthenticationField | PollingField; diff --git a/packages/davinci-client/src/lib/node.reducer.test.ts b/packages/davinci-client/src/lib/node.reducer.test.ts index 2d2ba36..723afbe 100644 --- a/packages/davinci-client/src/lib/node.reducer.test.ts +++ b/packages/davinci-client/src/lib/node.reducer.test.ts @@ -14,7 +14,6 @@ import type { FidoRegistrationCollector, MultiSelectCollector, PhoneNumberCollector, - PhoneNumberExtensionCollector, PollingCollector, ProtectCollector, QrCodeCollector, @@ -848,14 +847,6 @@ describe('The phone number collector reducer', () => { required: false, }, ], - formData: { - value: { - 'phone-number-key': { - countryCode: 'US', - phoneNumber: '1234567890', - }, - }, - }, }, }; expect(nodeCollectorReducer(undefined, action)).toEqual([ @@ -869,7 +860,7 @@ describe('The phone number collector reducer', () => { key: 'phone-number-key', value: { countryCode: 'US', - phoneNumber: '1234567890', + phoneNumber: '', }, type: 'PHONE_NUMBER', validation: null, @@ -880,7 +871,7 @@ describe('The phone number collector reducer', () => { type: 'PHONE_NUMBER', value: { countryCode: 'US', - phoneNumber: '1234567890', + phoneNumber: '', }, }, }, @@ -920,7 +911,6 @@ describe('The phone number collector reducer', () => { type: 'PHONE_NUMBER', value: { countryCode: '', - phoneNumber: '', }, }, }, @@ -947,190 +937,6 @@ describe('The phone number collector reducer', () => { type: 'PHONE_NUMBER', value: { countryCode: '', - phoneNumber: '', - }, - }, - }, - ]); - }); -}); - -describe('The phone number extension collector reducer', () => { - it('should populate phone number extension collector', () => { - const action = { - type: 'node/next', - payload: { - fields: [ - { - key: 'phone-number-key', - defaultCountryCode: null, - label: 'Phone Number', - type: 'PHONE_NUMBER', - required: false, - showExtension: true, - extensionLabel: 'Extension', - }, - ], - }, - }; - expect(nodeCollectorReducer(undefined, action)).toEqual([ - { - category: 'ObjectValueCollector', - error: null, - type: 'PhoneNumberExtensionCollector', - id: 'phone-number-key-0', - name: 'phone-number-key', - input: { - key: 'phone-number-key', - value: { - countryCode: '', - phoneNumber: '', - extension: '', - }, - type: 'PHONE_NUMBER', - validation: null, - }, - output: { - key: 'phone-number-key', - label: 'Phone Number', - type: 'PHONE_NUMBER', - extensionLabel: 'Extension', - value: { - countryCode: '', - phoneNumber: '', - extension: '', - }, - }, - }, - ]); - }); - - it('should populate phone number extension collector with default value', () => { - const action = { - type: 'node/next', - payload: { - fields: [ - { - key: 'phone-number-key', - defaultCountryCode: 'US', - label: 'Phone Number', - type: 'PHONE_NUMBER', - required: false, - showExtension: true, - extensionLabel: 'Extension', - }, - ], - formData: { - value: { - 'phone-number-key': { - countryCode: 'US', - phoneNumber: '1234567890', - extension: '123', - }, - }, - }, - }, - }; - expect(nodeCollectorReducer(undefined, action)).toEqual([ - { - category: 'ObjectValueCollector', - error: null, - type: 'PhoneNumberExtensionCollector', - id: 'phone-number-key-0', - name: 'phone-number-key', - input: { - key: 'phone-number-key', - value: { - countryCode: 'US', - phoneNumber: '1234567890', - extension: '123', - }, - type: 'PHONE_NUMBER', - validation: null, - }, - output: { - key: 'phone-number-key', - label: 'Phone Number', - type: 'PHONE_NUMBER', - extensionLabel: 'Extension', - value: { - countryCode: 'US', - phoneNumber: '1234567890', - extension: '123', - }, - }, - }, - ]); - }); - - it('should handle collector updates', () => { - const action = { - type: 'node/update', - payload: { - id: 'phone-number-key-0', - value: { - countryCode: 'US', - phoneNumber: '555-555-5555', - extension: '456', - }, - }, - }; - const state: PhoneNumberExtensionCollector[] = [ - { - category: 'ObjectValueCollector', - error: null, - type: 'PhoneNumberExtensionCollector', - id: 'phone-number-key-0', - name: 'phone-number-key', - input: { - key: 'phone-number-key', - value: { - countryCode: '', - phoneNumber: '', - extension: '', - }, - type: 'PHONE_NUMBER', - validation: null, - }, - output: { - key: 'phone-number-key', - label: 'Phone Number', - type: 'PHONE_NUMBER', - value: { - countryCode: '', - phoneNumber: '', - extension: '', - }, - extensionLabel: 'Extension', - }, - }, - ]; - expect(nodeCollectorReducer(state, action)).toStrictEqual([ - { - category: 'ObjectValueCollector', - error: null, - type: 'PhoneNumberExtensionCollector', - id: 'phone-number-key-0', - name: 'phone-number-key', - input: { - key: 'phone-number-key', - value: { - countryCode: 'US', - phoneNumber: '555-555-5555', - extension: '456', - }, - type: 'PHONE_NUMBER', - validation: null, - }, - output: { - key: 'phone-number-key', - label: 'Phone Number', - type: 'PHONE_NUMBER', - extensionLabel: 'Extension', - value: { - countryCode: '', - phoneNumber: '', - extension: '', }, }, }, diff --git a/packages/davinci-client/src/lib/node.reducer.ts b/packages/davinci-client/src/lib/node.reducer.ts index 3c84780..9162351 100644 --- a/packages/davinci-client/src/lib/node.reducer.ts +++ b/packages/davinci-client/src/lib/node.reducer.ts @@ -59,9 +59,6 @@ import type { FidoRegistrationInputValue, QrCodeCollector, AgreementCollector, - PhoneNumberExtensionOutputValue, - PhoneNumberExtensionCollector, - PhoneNumberExtensionInputValue, } from './collector.types.js'; /** @@ -80,7 +77,6 @@ export const updateCollectorValues = createAction<{ | string | string[] | PhoneNumberInputValue - | PhoneNumberExtensionInputValue | FidoRegistrationInputValue | FidoAuthenticationInputValue; index?: number; @@ -103,7 +99,6 @@ const initialCollectorValues: ( | DeviceAuthenticationCollector | DeviceRegistrationCollector | PhoneNumberCollector - | PhoneNumberExtensionCollector | ReadOnlyCollector | ValidatedTextCollector | UnknownCollector @@ -184,9 +179,7 @@ export const nodeCollectorReducer = createReducer(initialCollectorValues, (build return returnPasswordCollector(field, idx); } case 'PHONE_NUMBER': { - const prefillData = data as - | PhoneNumberOutputValue - | PhoneNumberExtensionOutputValue; + const prefillData = data as PhoneNumberOutputValue; return returnObjectValueCollector(field, idx, prefillData); } case 'TEXT': { @@ -326,25 +319,6 @@ export const nodeCollectorReducer = createReducer(initialCollectorValues, (build collector.input.value = action.payload.value; } - if (collector.type === 'PhoneNumberExtensionCollector') { - if (typeof action.payload.id !== 'string') { - throw new Error('Index argument must be a string'); - } - if (typeof action.payload.value !== 'object') { - throw new Error('Value argument must be an object'); - } - if ( - !('phoneNumber' in action.payload.value) || - !('countryCode' in action.payload.value) || - !('extension' in action.payload.value) - ) { - throw new Error( - 'Value argument must contain a phoneNumber, countryCode, and extension property', - ); - } - collector.input.value = action.payload.value; - } - if (collector.type === 'FidoRegistrationCollector') { if (typeof action.payload.id !== 'string') { throw new Error('Index argument must be a string'); diff --git a/packages/davinci-client/src/lib/node.types.test-d.ts b/packages/davinci-client/src/lib/node.types.test-d.ts index 86c3a4e..4fbd409 100644 --- a/packages/davinci-client/src/lib/node.types.test-d.ts +++ b/packages/davinci-client/src/lib/node.types.test-d.ts @@ -31,7 +31,6 @@ import { DeviceRegistrationCollector, DeviceAuthenticationCollector, PhoneNumberCollector, - PhoneNumberExtensionCollector, UnknownCollector, ProtectCollector, PollingCollector, @@ -234,7 +233,6 @@ describe('Node Types', () => { | DeviceAuthenticationCollector | DeviceRegistrationCollector | PhoneNumberCollector - | PhoneNumberExtensionCollector | ReadOnlyCollector | SingleSelectCollector | ValidatedTextCollector diff --git a/packages/davinci-client/src/lib/node.types.ts b/packages/davinci-client/src/lib/node.types.ts index 52759bf..a3572fb 100644 --- a/packages/davinci-client/src/lib/node.types.ts +++ b/packages/davinci-client/src/lib/node.types.ts @@ -28,7 +28,6 @@ import type { FidoAuthenticationCollector, QrCodeCollector, AgreementCollector, - PhoneNumberExtensionCollector, } from './collector.types.js'; import type { Links } from './davinci.types.js'; @@ -45,7 +44,6 @@ export type Collectors = | DeviceAuthenticationCollector | DeviceRegistrationCollector | PhoneNumberCollector - | PhoneNumberExtensionCollector | ReadOnlyCollector | ValidatedTextCollector | ProtectCollector