chore: pr-comments

ryanbas21 · ryanbas21 · commit e600c7e8fb62 · 2026-04-07T20:31:00.000-06:00
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -31,7 +31,9 @@ runs:
         registry-url: 'https://registry.npmjs.org'
 
     - name: Update npm
-      run: npm install -g npm@latest
+      run: |
+        corepack enable
+        corepack install -g npm@latest
       shell: bash
 
     - name: Install dependencies
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
         with:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
-      - run: npx nx-cloud fix-ci
+      - run: pnpm nx fix-ci
         if: always()
 
       - uses: codecov/codecov-action@v5
diff --git a/e2e/davinci-app/components/qr-code.ts b/e2e/davinci-app/components/qr-code.ts
@@ -22,9 +22,9 @@ export default function (formEl: HTMLFormElement, collector: QrCodeCollector) {
   img.setAttribute('data-testid', 'qr-code-image');
   container.appendChild(img);
 
-  if (collector.output.fallbackText) {
+  if (collector.output.label) {
     const fallback = document.createElement('p');
-    fallback.innerText = `Manual code: ${collector.output.fallbackText}`;
+    fallback.innerText = `Manual code: ${collector.output.label}`;
     fallback.setAttribute('data-testid', 'qr-code-fallback');
     container.appendChild(fallback);
   }
diff --git a/e2e/davinci-suites/src/qr-code.test.ts b/e2e/davinci-suites/src/qr-code.test.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license. See the LICENSE file for details.
+ */
+import { expect, test } from '@playwright/test';
+import { asyncEvents } from './utils/async-events.js';
+import { password, username } from './utils/demo-user.js';
+
+const qrCodeUrl =
+  '/?clientId=c12743f9-08e8-4420-a624-71bbb08e9fe1&acr_values=9da1b93991bcd577947da228ad4c741f';
+
+test('QR code renders after navigating through device registration flow', async ({ page }) => {
+  const { navigate } = asyncEvents(page);
+
+  await navigate(qrCodeUrl);
+
+  // Step 1: Login
+  await page.getByRole('button', { name: 'USER_LOGIN' }).click();
+  await page.waitForEvent('requestfinished');
+
+  await page.getByLabel('Username').fill(username);
+  await page.getByLabel('Password').fill(password);
+  await page.getByRole('button', { name: 'Sign On' }).click();
+  await page.waitForEvent('requestfinished');
+
+  // Step 2: Select device registration
+  await page.getByRole('button', { name: 'DEVICE_REGISTRATION' }).click();
+  await page.waitForEvent('requestfinished');
+
+  // Step 3: Choose "Mobile App" from the device selection screen
+  await expect(page.getByText('MFA Device Selection - Registration')).toBeVisible();
+  await page.getByRole('button', { name: 'Mobile App' }).click();
+  await page.waitForEvent('requestfinished');
+
+  // Step 4: QR code should now be visible
+  const qrImage = page.locator('[data-testid="qr-code-image"]');
+  await expect(qrImage).toBeVisible({ timeout: 10000 });
+
+  // Verify the image has a base64-encoded src
+  const src = await qrImage.getAttribute('src');
+  expect(src).toBeTruthy();
+  expect(src).toContain('data:image/png;base64,');
+
+  // Verify fallback text is displayed if present
+  const fallback = page.locator('[data-testid="qr-code-fallback"]');
+  const fallbackVisible = await fallback.isVisible();
+  if (fallbackVisible) {
+    const fallbackText = await fallback.textContent();
+    expect(fallbackText).toBeTruthy();
+  }
+});
diff --git a/packages/davinci-client/src/lib/collector.types.ts b/packages/davinci-client/src/lib/collector.types.ts
@@ -508,7 +508,6 @@ export interface QrCodeCollectorBase {
     label: string;
     type: string;
     src: string;
-    fallbackText: string;
   };
 }
 
diff --git a/packages/davinci-client/src/lib/collector.utils.test.ts b/packages/davinci-client/src/lib/collector.utils.test.ts
@@ -812,7 +812,7 @@ describe('No Value Collectors', () => {
 });
 
 describe('returnQrCodeCollector', () => {
-  it('should return a valid QrCodeCollector with src and fallbackText', () => {
+  it('should return a valid QrCodeCollector with src and label from fallbackText', () => {
     const mockField: QrCodeField = {
       type: 'QR_CODE',
       key: 'qr-code-field',
@@ -828,10 +828,9 @@ describe('returnQrCodeCollector', () => {
       name: 'qr-code-field-2',
       output: {
         key: 'qr-code-field-2',
-        label: 'data:image/png;base64,abc123',
+        label: '04ZKS2KCIWKXT8FHRX',
         type: 'QR_CODE',
         src: 'data:image/png;base64,abc123',
-        fallbackText: '04ZKS2KCIWKXT8FHRX',
       },
     });
   });
@@ -851,10 +850,9 @@ describe('returnQrCodeCollector', () => {
       name: 'qr-code-field-0',
       output: {
         key: 'qr-code-field-0',
-        label: 'data:image/png;base64,abc123',
+        label: '',
         type: 'QR_CODE',
         src: 'data:image/png;base64,abc123',
-        fallbackText: '',
       },
     });
   });
diff --git a/packages/davinci-client/src/lib/collector.utils.ts b/packages/davinci-client/src/lib/collector.utils.ts
@@ -680,7 +680,7 @@ export function returnObjectValueCollector(
  * @returns {NoValueCollector} The constructed NoValueCollector object.
  */
 export function returnNoValueCollector<
-  Field extends ReadOnlyField,
+  Field extends ReadOnlyField | QrCodeField,
   CollectorType extends NoValueCollectorTypes = 'NoValueCollector',
 >(field: Field, idx: number, collectorType: CollectorType) {
   let error = '';
@@ -722,31 +722,20 @@ export function returnReadOnlyCollector(field: ReadOnlyField, idx: number) {
  * @returns {QrCodeCollectorBase} The constructed QrCodeCollector object.
  */
 export function returnQrCodeCollector(field: QrCodeField, idx: number): QrCodeCollectorBase {
-  let error = '';
-  if (!('content' in field) || !field.content) {
-    error = `${error}Content is not found in the field object. `;
-  }
+  const base = returnNoValueCollector(field, idx, 'QrCodeCollector');
+
+  let error = base.error || '';
   if (!('key' in field) || !field.key) {
     error = `${error}Key is not found in the field object. `;
   }
-  if (!('type' in field)) {
-    error = `${error}Type is not found in the field object. `;
-  }
-
-  const key = field.key || field.type;
 
   return {
-    category: 'NoValueCollector',
+    ...base,
     error: error || null,
-    type: 'QrCodeCollector',
-    id: `${key}-${idx}`,
-    name: `${key}-${idx}`,
     output: {
-      key: `${key}-${idx}`,
-      label: field.content || '',
-      type: field.type,
+      ...base.output,
+      label: field.fallbackText || '',
       src: field.content || '',
-      fallbackText: field.fallbackText || '',
     },
   };
 }
diff --git a/packages/davinci-client/src/lib/node.reducer.test.ts b/packages/davinci-client/src/lib/node.reducer.test.ts
@@ -442,10 +442,9 @@ describe('The node collector reducer', () => {
         name: 'qr-code-field-0',
         output: {
           key: 'qr-code-field-0',
-          label: 'data:image/png;base64,abc123',
+          label: '04ZKS2KCIWKXT8FHRX',
           type: 'QR_CODE',
           src: 'data:image/png;base64,abc123',
-          fallbackText: '04ZKS2KCIWKXT8FHRX',
         },
       } satisfies QrCodeCollector,
     ]);
diff --git a/packages/davinci-client/tsconfig.lib.json b/packages/davinci-client/tsconfig.lib.json
@@ -13,7 +13,7 @@
     "noImplicitOverride": true,
     "declaration": true,
     "declarationMap": true,
-    "skipLibCheck": false,
+    "skipLibCheck": true,
     "sourceMap": true,
     "lib": ["es2022", "dom", "dom.iterable"]
   },

Original file line number	Diff line number	Diff line change
`@@ -508,7 +508,6 @@ export interface QrCodeCollectorBase {`
`508`	`508`	`label: string;`
`509`	`509`	`type: string;`
`510`	`510`	`src: string;`
`511`		`- fallbackText: string;`
`512`	`511`	`};`
`513`	`512`	`}`
`514`	`513`