{"prompt":"You are comparing an AI-suggested code fix with actual changes made in a commit.\n\nYour task: Determine if the commit contains the essence of the AI fix and provide a confidence level.\n\n## AI-Suggested Fix\n\n**What it fixes:** @forgerock/sdk-request-middleware:nxTest, @forgerock/sdk-request-middleware:test\n\n**Description:** test(sdk-request-middleware): fix headers assertion in no-match test\n\n**Reasoning:** The ModifiedFetchArgs interface was changed to make headers required (from `headers?: Headers` to `headers: Headers`).\n\nThe test input was already updated to include `headers: new Headers()` to satisfy the new type requirement, but the assertion at line 57 still expected headers to be undefined.\n\nWhen no middleware matches the action type 'z', the middleware returns the request unchanged. Since the input now provides an empty Headers object, the output contains that same empty Headers object, no\n\n**Suggested Changes (diff):**\n```diff\ndiff --git a/packages/sdk-effects/sdk-request-middleware/src/lib/request-mware.test.ts b/packages/sdk-effects/sdk-request-middleware/src/lib/request-mware.test.ts\nindex 885fc47..acecbdc 100644\n--- a/packages/sdk-effects/sdk-request-middleware/src/lib/request-mware.test.ts\n+++ b/packages/sdk-effects/sdk-request-middleware/src/lib/request-mware.test.ts\n@@ -54,7 +54,7 @@ describe('Middleware should be called with an action', () => {\n },\n );\n const newReq = runMiddleware(middleware);\n- expect(newReq.headers).toBeUndefined();\n+ expect(newReq.headers).toStrictEqual(new Headers());\n expect(newReq.url.toString()).toBe('https://www.example.com/');\n });\n it('should run all middleware testing add action with payload', () => {\n\n```\n\n## Actual Commit Changes\n\n**Commit Diff:**\n```diff\ndiff --git a/e2e/journey-app/callback-map.ts b/e2e/journey-app/callback-map.ts\nnew file mode 100644\nindex 0000000000..1f7fc328dd\n--- /dev/null\n+++ b/e2e/journey-app/callback-map.ts\n@@ -0,0 +1,157 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+\n+import type {\n+ AttributeInputCallback,\n+ BaseCallback,\n+ ChoiceCallback,\n+ ConfirmationCallback,\n+ DeviceProfileCallback,\n+ HiddenValueCallback,\n+ KbaCreateCallback,\n+ MetadataCallback,\n+ NameCallback,\n+ PasswordCallback,\n+ PingOneProtectEvaluationCallback,\n+ PingOneProtectInitializeCallback,\n+ PollingWaitCallback,\n+ ReCaptchaCallback,\n+ ReCaptchaEnterpriseCallback,\n+ RedirectCallback,\n+ SelectIdPCallback,\n+ SuspendedTextOutputCallback,\n+ TermsAndConditionsCallback,\n+ TextInputCallback,\n+ TextOutputCallback,\n+ ValidatedCreatePasswordCallback,\n+ ValidatedCreateUsernameCallback,\n+} from '@forgerock/journey-client/types';\n+\n+import {\n+ attributeInputComponent,\n+ choiceComponent,\n+ confirmationComponent,\n+ deviceProfileComponent,\n+ hiddenValueComponent,\n+ kbaCreateComponent,\n+ metadataComponent,\n+ passwordComponent,\n+ pingProtectEvaluationComponent,\n+ pingProtectInitializeComponent,\n+ pollingWaitComponent,\n+ recaptchaComponent,\n+ recaptchaEnterpriseComponent,\n+ redirectComponent,\n+ selectIdpComponent,\n+ suspendedTextOutputComponent,\n+ termsAndConditionsComponent,\n+ textInputComponent,\n+ textOutputComponent,\n+ validatedPasswordComponent,\n+ validatedUsernameComponent,\n+} from './components/index.js';\n+\n+/**\n+ * Renders a callback component based on its type\n+ * @param journeyEl - The container element to append the component to\n+ * @param callback - The callback instance\n+ * @param idx - Index for generating unique IDs\n+ */\n+export function renderCallback(\n+ journeyEl: HTMLDivElement,\n+ callback: BaseCallback,\n+ idx: number,\n+): void {\n+ switch (callback.getType()) {\n+ case 'BooleanAttributeInputCallback':\n+ case 'NumberAttributeInputCallback':\n+ case 'StringAttributeInputCallback':\n+ attributeInputComponent(\n+ journeyEl,\n+ callback as AttributeInputCallback,\n+ idx,\n+ );\n+ break;\n+ case 'ChoiceCallback':\n+ choiceComponent(journeyEl, callback as ChoiceCallback, idx);\n+ break;\n+ case 'ConfirmationCallback':\n+ confirmationComponent(journeyEl, callback as ConfirmationCallback, idx);\n+ break;\n+ case 'DeviceProfileCallback':\n+ deviceProfileComponent(journeyEl, callback as DeviceProfileCallback, idx);\n+ break;\n+ case 'HiddenValueCallback':\n+ hiddenValueComponent(journeyEl, callback as HiddenValueCallback, idx);\n+ break;\n+ case 'KbaCreateCallback':\n+ kbaCreateComponent(journeyEl, callback as KbaCreateCallback, idx);\n+ break;\n+ case 'MetadataCallback':\n+ metadataComponent(journeyEl, callback as MetadataCallback, idx);\n+ break;\n+ case 'NameCallback':\n+ textInputComponent(journeyEl, callback as NameCallback, idx);\n+ break;\n+ case 'PasswordCallback':\n+ passwordComponent(journeyEl, callback as PasswordCallback, idx);\n+ break;\n+ case 'PingOneProtectEvaluationCallback':\n+ pingProtectEvaluationComponent(journeyEl, callback as PingOneProtectEvaluationCallback, idx);\n+ break;\n+ case 'PingOneProtectInitializeCallback':\n+ pingProtectInitializeComponent(journeyEl, callback as PingOneProtectInitializeCallback, idx);\n+ break;\n+ case 'PollingWaitCallback':\n+ pollingWaitComponent(journeyEl, callback as PollingWaitCallback, idx);\n+ break;\n+ case 'ReCaptchaCallback':\n+ recaptchaComponent(journeyEl, callback as ReCaptchaCallback, idx);\n+ break;\n+ case 'ReCaptchaEnterpriseCallback':\n+ recaptchaEnterpriseComponent(journeyEl, callback as ReCaptchaEnterpriseCallback, idx);\n+ break;\n+ case 'RedirectCallback':\n+ redirectComponent(journeyEl, callback as RedirectCallback, idx);\n+ break;\n+ case 'SelectIdPCallback':\n+ selectIdpComponent(journeyEl, callback as SelectIdPCallback, idx);\n+ break;\n+ case 'SuspendedTextOutputCallback':\n+ suspendedTextOutputComponent(journeyEl, callback as SuspendedTextOutputCallback, idx);\n+ break;\n+ case 'TermsAndConditionsCallback':\n+ termsAndConditionsComponent(journeyEl, callback as TermsAndConditionsCallback, idx);\n+ break;\n+ case 'TextInputCallback':\n+ textInputComponent(journeyEl, callback as TextInputCallback, idx);\n+ break;\n+ case 'TextOutputCallback':\n+ textOutputComponent(journeyEl, callback as TextOutputCallback, idx);\n+ break;\n+ case 'ValidatedCreatePasswordCallback':\n+ validatedPasswordComponent(journeyEl, callback as ValidatedCreatePasswordCallback, idx);\n+ break;\n+ case 'ValidatedCreateUsernameCallback':\n+ validatedUsernameComponent(journeyEl, callback as ValidatedCreateUsernameCallback, idx);\n+ break;\n+ default:\n+ console.warn(`Unknown callback type: ${callback.getType()}`);\n+ break;\n+ }\n+}\n+\n+/**\n+ * Renders all callbacks in a step\n+ * @param journeyEl - The container element to append components to\n+ * @param callbacks - Array of callback instances\n+ */\n+export function renderCallbacks(journeyEl: HTMLDivElement, callbacks: BaseCallback[]): void {\n+ callbacks.forEach((callback, idx) => {\n+ renderCallback(journeyEl, callback, idx);\n+ });\n+}\ndiff --git a/e2e/journey-app/components/README.md b/e2e/journey-app/components/README.md\nnew file mode 100644\nindex 0000000000..44c8096613\n--- /dev/null\n+++ b/e2e/journey-app/components/README.md\n@@ -0,0 +1,84 @@\n+# Journey App Components\n+\n+This directory contains UI components for rendering different types of journey callbacks in the e2e test application. Each component follows a consistent pattern and handles the specific requirements of its callback type.\n+\n+## Available Components\n+\n+### Input Components\n+\n+- **`attribute-input.ts`** - `AttributeInputCallback` - Handles string, number, and boolean attribute inputs with appropriate input types\n+- **`choice.ts`** - `ChoiceCallback` - Renders a select dropdown with available choices\n+- **`confirmation.ts`** - `ConfirmationCallback` - Creates radio buttons for confirmation options\n+- **`kba-create.ts`** - `KbaCreateCallback` - Two-field form for creating security questions and answers\n+- **`password.ts`** - `PasswordCallback` - Password input field\n+- **`text-input.ts`** - `NameCallback`, `TextInputCallback` - Generic text input component\n+- **`validated-password.ts`** - `ValidatedCreatePasswordCallback` - Password input with validation\n+- **`validated-username.ts`** - `ValidatedCreateUsernameCallback` - Username input with validation\n+\n+### Output Components\n+\n+- **`text-output.ts`** - `TextOutputCallback` - Displays text messages\n+- **`suspended-text-output.ts`** - `SuspendedTextOutputCallback` - Styled suspension message display\n+\n+### Interaction Components\n+\n+- **`redirect.ts`** - `RedirectCallback` - Button to trigger external redirects\n+- **`select-idp.ts`** - `SelectIdPCallback` - Radio buttons for identity provider selection\n+- **`terms-and-conditions.ts`** - `TermsAndConditionsCallback` - Terms display with acceptance checkbox\n+\n+### Security Components\n+\n+- **`recaptcha.ts`** - `ReCaptchaCallback` - reCAPTCHA challenge placeholder\n+- **`recaptcha-enterprise.ts`** - `ReCaptchaEnterpriseCallback` - reCAPTCHA Enterprise placeholder\n+- **`ping-protect-evaluation.ts`** - `PingOneProtectEvaluationCallback` - Risk assessment display\n+- **`ping-protect-initialize.ts`** - `PingOneProtectInitializeCallback` - Protection initialization\n+\n+### Utility Components\n+\n+- **`device-profile.ts`** - `DeviceProfileCallback` - Device profiling indicator\n+- **`hidden-value.ts`** - `HiddenValueCallback` - Hidden input field\n+- **`metadata.ts`** - `MetadataCallback` - Hidden metadata storage\n+- **`polling-wait.ts`** - `PollingWaitCallback` - Loading spinner with wait message\n+\n+## Component Pattern\n+\n+All components follow this consistent pattern:\n+\n+```typescript\n+export default function componentName(\n+ journeyEl: HTMLDivElement,\n+ callback: CallbackType,\n+ idx: number,\n+) {\n+ // Create DOM elements\n+ // Set up event listeners\n+ // Append to journeyEl\n+}\n+```\n+\n+### Parameters\n+\n+- **`journeyEl`** - The container element to append the component to\n+- **`callback`** - The callback instance with data and methods\n+- **`idx`** - Index for generating unique IDs\n+\n+### Usage Example\n+\n+```typescript\n+import { choiceComponent } from './components/index.js';\n+\n+// Render a choice callback\n+choiceComponent(containerDiv, choiceCallback, 0);\n+```\n+\n+## Implementation Notes\n+\n+- All components handle their own styling via inline CSS or style attributes\n+- Event listeners are set up to call appropriate callback methods\n+- Components generate unique IDs using the callback's input name or a fallback\n+- Error handling is implemented where appropriate\n+- Console logging is used for debugging and demonstration\n+\n+## Component States\n+\n+Some components like reCAPTCHA and PingOne Protect include simulation timeouts for demonstration purposes in the e2e testing environment. In production, these would integrate with actual third-party services.\ndiff --git a/e2e/journey-app/components/attribute-input.ts b/e2e/journey-app/components/attribute-input.ts\nnew file mode 100644\nindex 0000000000..fcf9f5038e\n--- /dev/null\n+++ b/e2e/journey-app/components/attribute-input.ts\n@@ -0,0 +1,51 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+import type { AttributeInputCallback } from '@forgerock/journey-client/types';\n+\n+export default function attributeInputComponent(\n+ journeyEl: HTMLDivElement,\n+ callback: AttributeInputCallback,\n+ idx: number,\n+) {\n+ const collectorKey = callback?.payload?.input?.[0].name || `collector-${idx}`;\n+ const label = document.createElement('label');\n+ const input = document.createElement('input');\n+\n+ label.htmlFor = collectorKey;\n+ label.innerText = callback.getPrompt();\n+\n+ // Determine input type based on attribute type\n+ const attributeType = callback.getType();\n+ if (attributeType === 'BooleanAttributeInputCallback') {\n+ input.type = 'checkbox';\n+ input.checked = (callback.getInputValue() as boolean) || false;\n+ } else if (attributeType === 'NumberAttributeInputCallback') {\n+ input.type = 'number';\n+ input.value = String(callback.getInputValue() || '');\n+ } else {\n+ input.type = 'text';\n+ input.value = String(callback.getInputValue() || '');\n+ }\n+\n+ input.id = collectorKey;\n+ input.name = collectorKey;\n+ input.required = callback.isRequired();\n+\n+ journeyEl?.appendChild(label);\n+ journeyEl?.appendChild(input);\n+\n+ journeyEl?.querySelector(`#${collectorKey}`)?.addEventListener('input', (event) => {\n+ const target = event.target as HTMLInputElement;\n+ if (attributeType === 'BooleanAttributeInputCallback') {\n+ callback.setInputValue(target.checked);\n+ } else if (attributeType === 'NumberAttributeInputCallback') {\n+ callback.setInputValue(Number(target.value));\n+ } else {\n+ callback.setInputValue(target.value);\n+ }\n+ });\n+}\ndiff --git a/e2e/journey-app/components/choice.ts b/e2e/journey-app/components/choice.ts\nnew file mode 100644\nindex 0000000000..e069054b4e\n--- /dev/null\n+++ b/e2e/journey-app/components/choice.ts\n@@ -0,0 +1,42 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+import type { ChoiceCallback } from '@forgerock/journey-client/types';\n+\n+export default function choiceComponent(\n+ journeyEl: HTMLDivElement,\n+ callback: ChoiceCallback,\n+ idx: number,\n+) {\n+ const collectorKey = callback?.payload?.input?.[0].name || `collector-${idx}`;\n+ const label = document.createElement('label');\n+ const select = document.createElement('select');\n+\n+ label.htmlFor = collectorKey;\n+ label.innerText = callback.getPrompt();\n+ select.id = collectorKey;\n+ select.name = collectorKey;\n+\n+ // Add choices as options\n+ const choices = callback.getChoices();\n+ const defaultChoice = callback.getDefaultChoice();\n+\n+ choices.forEach((choice, index) => {\n+ const option = document.createElement('option');\n+ option.value = String(index);\n+ option.text = choice;\n+ option.selected = index === defaultChoice;\n+ select.appendChild(option);\n+ });\n+\n+ journeyEl?.appendChild(label);\n+ journeyEl?.appendChild(select);\n+\n+ journeyEl?.querySelector(`#${collectorKey}`)?.addEventListener('change', (event) => {\n+ const selectedIndex = Number((event.target as HTMLSelectElement).value);\n+ callback.setChoiceIndex(selectedIndex);\n+ });\n+}\ndiff --git a/e2e/journey-app/components/confirmation.ts b/e2e/journey-app/components/confirmation.ts\nnew file mode 100644\nindex 0000000000..562c0e39ab\n--- /dev/null\n+++ b/e2e/journey-app/components/confirmation.ts\n@@ -0,0 +1,57 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+import type { ConfirmationCallback } from '@forgerock/journey-client/types';\n+\n+export default function confirmationComponent(\n+ journeyEl: HTMLDivElement,\n+ callback: ConfirmationCallback,\n+ idx: number,\n+) {\n+ const collectorKey = callback?.payload?.input?.[0].name || `collector-${idx}`;\n+ const label = document.createElement('label');\n+ const container = document.createElement('div');\n+\n+ label.innerText = callback.getPrompt();\n+ container.id = collectorKey;\n+\n+ // Get options and default option\n+ const options = callback.getOptions();\n+ const defaultOption = callback.getDefaultOption();\n+\n+ // Create radio buttons for each option\n+ options.forEach((option: string, index: number) => {\n+ const radioContainer = document.createElement('div');\n+ const radio = document.createElement('input');\n+ const radioLabel = document.createElement('label');\n+\n+ radio.type = 'radio';\n+ radio.id = `${collectorKey}-${index}`;\n+ radio.name = collectorKey;\n+ radio.value = String(index);\n+ radio.checked = index === defaultOption;\n+\n+ radioLabel.htmlFor = `${collectorKey}-${index}`;\n+ radioLabel.innerText = option;\n+\n+ radioContainer.appendChild(radio);\n+ radioContainer.appendChild(radioLabel);\n+ container.appendChild(radioContainer);\n+ });\n+\n+ journeyEl?.appendChild(label);\n+ journeyEl?.appendChild(container);\n+\n+ // Add event listener for radio button changes\n+ journeyEl?.querySelectorAll(`input[name=\"${collectorKey}\"]`)?.forEach((radio) => {\n+ radio.addEventListener('change', (event) => {\n+ if ((event.target as HTMLInputElement).checked) {\n+ const selectedIndex = Number((event.target as HTMLInputElement).value);\n+ callback.setOptionIndex(selectedIndex);\n+ }\n+ });\n+ });\n+}\ndiff --git a/e2e/journey-app/components/device-profile.ts b/e2e/journey-app/components/device-profile.ts\nnew file mode 100644\nindex 0000000000..c0d62e9223\n--- /dev/null\n+++ b/e2e/journey-app/components/device-profile.ts\n@@ -0,0 +1,32 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+import type { DeviceProfileCallback } from '@forgerock/journey-client/types';\n+\n+export default function deviceProfileComponent(\n+ journeyEl: HTMLDivElement,\n+ callback: DeviceProfileCallback,\n+ idx: number,\n+) {\n+ const collectorKey = callback?.payload?.input?.[0].name || `collector-${idx}`;\n+ const message = document.createElement('p');\n+\n+ message.id = collectorKey;\n+ message.innerText = 'Collecting device profile information...';\n+\n+ journeyEl?.appendChild(message);\n+\n+ // Device profile callback typically runs automatically\n+ // The callback will collect device information in the background\n+ setTimeout(() => {\n+ try {\n+ // Device profile collection is typically handled automatically by the callback\n+ console.log('Device profile collection initiated');\n+ } catch (error) {\n+ console.error('Device profile collection failed:', error);\n+ }\n+ }, 100);\n+}\ndiff --git a/e2e/journey-app/components/hidden-value.ts b/e2e/journey-app/components/hidden-value.ts\nnew file mode 100644\nindex 0000000000..8bbfc3d4e5\n--- /dev/null\n+++ b/e2e/journey-app/components/hidden-value.ts\n@@ -0,0 +1,26 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+import type { HiddenValueCallback } from '@forgerock/journey-client/types';\n+\n+export default function hiddenValueComponent(\n+ journeyEl: HTMLDivElement,\n+ callback: HiddenValueCallback,\n+ idx: number,\n+) {\n+ const collectorKey = callback?.payload?.input?.[0].name || `collector-${idx}`;\n+ const input = document.createElement('input');\n+\n+ input.type = 'hidden';\n+ input.id = collectorKey;\n+ input.name = collectorKey;\n+ input.value = String(callback.getInputValue() || '');\n+\n+ journeyEl?.appendChild(input);\n+\n+ // Hidden value callback typically doesn't require user interaction\n+ // The value is usually set programmatically or by the server\n+}\ndiff --git a/e2e/journey-app/components/index.ts b/e2e/journey-app/components/index.ts\nnew file mode 100644\nindex 0000000000..425c8560be\n--- /dev/null\n+++ b/e2e/journey-app/components/index.ts\n@@ -0,0 +1,35 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+\n+/**\n+ * Index file for journey-app callback components\n+ *\n+ * This file exports all the available component functions for rendering\n+ * journey callbacks in the e2e test application.\n+ */\n+\n+export { default as attributeInputComponent } from './attribute-input.js';\n+export { default as choiceComponent } from './choice.js';\n+export { default as confirmationComponent } from './confirmation.js';\n+export { default as deviceProfileComponent } from './device-profile.js';\n+export { default as hiddenValueComponent } from './hidden-value.js';\n+export { default as kbaCreateComponent } from './kba-create.js';\n+export { default as metadataComponent } from './metadata.js';\n+export { default as passwordComponent } from './password.js';\n+export { default as pingProtectEvaluationComponent } from './ping-protect-evaluation.js';\n+export { default as pingProtectInitializeComponent } from './ping-protect-initialize.js';\n+export { default as pollingWaitComponent } from './polling-wait.js';\n+export { default as recaptchaComponent } from './recaptcha.js';\n+export { default as recaptchaEnterpriseComponent } from './recaptcha-enterprise.js';\n+export { default as redirectComponent } from './redirect.js';\n+export { default as selectIdpComponent } from './select-idp.js';\n+export { default as suspendedTextOutputComponent } from './suspended-text-output.js';\n+export { default as termsAndConditionsComponent } from './terms-and-conditions.js';\n+export { default as textInputComponent } from './text-input.js';\n+export { default as textOutputComponent } from './text-output.js';\n+export { default as validatedPasswordComponent } from './validated-password.js';\n+export { default as validatedUsernameComponent } from './validated-username.js';\ndiff --git a/e2e/journey-app/components/kba-create.ts b/e2e/journey-app/components/kba-create.ts\nnew file mode 100644\nindex 0000000000..3bc3975dc9\n--- /dev/null\n+++ b/e2e/journey-app/components/kba-create.ts\n@@ -0,0 +1,62 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+import type { KbaCreateCallback } from '@forgerock/journey-client/types';\n+\n+export default function kbaCreateComponent(\n+ journeyEl: HTMLDivElement,\n+ callback: KbaCreateCallback,\n+ idx: number,\n+) {\n+ const collectorKey = callback?.payload?.input?.[0].name || `collector-${idx}`;\n+ const container = document.createElement('div');\n+ const questions = callback.getPredefinedQuestions();\n+\n+ container.id = collectorKey;\n+\n+ // Question field\n+ const questionLabel = document.createElement('label');\n+ questionLabel.htmlFor = `${collectorKey}-question`;\n+ // Add index to prompt to differentiate multiple KBA callbacks\n+ questionLabel.innerText = callback.getPrompt() + ' ' + idx;\n+\n+ // Iterate through predefined questions and create a select dropdown\n+ const questionInput = document.createElement('select');\n+ questionInput.id = `${collectorKey}-question`;\n+\n+ questions.forEach((question) => {\n+ const option = document.createElement('option');\n+ option.value = question;\n+ option.text = question;\n+ questionInput.appendChild(option);\n+ });\n+\n+ // Answer field\n+ const answerLabel = document.createElement('label');\n+ answerLabel.htmlFor = `${collectorKey}-answer`;\n+ answerLabel.innerText = 'Answer ' + idx + ':';\n+\n+ const answerInput = document.createElement('input');\n+ answerInput.type = 'text';\n+ answerInput.id = `${collectorKey}-answer`;\n+ answerInput.placeholder = 'Enter your answer';\n+\n+ container.appendChild(questionLabel);\n+ container.appendChild(questionInput);\n+ container.appendChild(answerLabel);\n+ container.appendChild(answerInput);\n+\n+ journeyEl?.appendChild(container);\n+\n+ // Event listeners\n+ questionInput.addEventListener('input', (event) => {\n+ callback.setQuestion((event.target as HTMLInputElement).value);\n+ });\n+\n+ answerInput.addEventListener('input', (event) => {\n+ callback.setAnswer((event.target as HTMLInputElement).value);\n+ });\n+}\ndiff --git a/e2e/journey-app/components/metadata.ts b/e2e/journey-app/components/metadata.ts\nnew file mode 100644\nindex 0000000000..f8ef98fd40\n--- /dev/null\n+++ b/e2e/journey-app/components/metadata.ts\n@@ -0,0 +1,27 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+import type { MetadataCallback } from '@forgerock/journey-client/types';\n+\n+export default function metadataComponent(\n+ journeyEl: HTMLDivElement,\n+ callback: MetadataCallback,\n+ idx: number,\n+) {\n+ const collectorKey = callback?.payload?.input?.[0].name || `collector-${idx}`;\n+\n+ // Metadata callback typically doesn't render UI elements\n+ // It's used to pass metadata information\n+ const hiddenInput = document.createElement('input');\n+ hiddenInput.type = 'hidden';\n+ hiddenInput.id = collectorKey;\n+ hiddenInput.name = collectorKey;\n+ hiddenInput.value = JSON.stringify(callback.getData());\n+\n+ journeyEl?.appendChild(hiddenInput);\n+\n+ console.log('Metadata callback data:', callback.getData());\n+}\ndiff --git a/e2e/journey-app/components/ping-protect-evaluation.ts b/e2e/journey-app/components/ping-protect-evaluation.ts\nnew file mode 100644\nindex 0000000000..90ce809036\n--- /dev/null\n+++ b/e2e/journey-app/components/ping-protect-evaluation.ts\n@@ -0,0 +1,23 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+import type { PingOneProtectEvaluationCallback } from '@forgerock/journey-client/types';\n+\n+export default function pingProtectEvaluationComponent(\n+ journeyEl: HTMLDivElement,\n+ callback: PingOneProtectEvaluationCallback,\n+ idx: number,\n+) {\n+ const collectorKey = callback?.payload?.input?.[0].name || `collector-${idx}`;\n+ const message = document.createElement('p');\n+\n+ message.id = collectorKey;\n+ message.innerText = 'Evaluating risk assessment...';\n+\n+ journeyEl?.appendChild(message);\n+\n+ // TODO: Implement PingOne Protect module evaluation here\n+}\ndiff --git a/e2e/journey-app/components/ping-protect-initialize.ts b/e2e/journey-app/components/ping-protect-initialize.ts\nnew file mode 100644\nindex 0000000000..c45215c6a4\n--- /dev/null\n+++ b/e2e/journey-app/components/ping-protect-initialize.ts\n@@ -0,0 +1,23 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+import type { PingOneProtectInitializeCallback } from '@forgerock/journey-client/types';\n+\n+export default function pingProtectInitializeComponent(\n+ journeyEl: HTMLDivElement,\n+ callback: PingOneProtectInitializeCallback,\n+ idx: number,\n+) {\n+ const collectorKey = callback?.payload?.input?.[0].name || `collector-${idx}`;\n+ const message = document.createElement('p');\n+\n+ message.id = collectorKey;\n+ message.innerText = 'Initializing PingOne Protect...';\n+\n+ journeyEl?.appendChild(message);\n+\n+ // TODO: Implement PingOne Protect module initialization here\n+}\ndiff --git a/e2e/journey-app/components/polling-wait.ts b/e2e/journey-app/components/polling-wait.ts\nnew file mode 100644\nindex 0000000000..3c861549d0\n--- /dev/null\n+++ b/e2e/journey-app/components/polling-wait.ts\n@@ -0,0 +1,48 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+import type { PollingWaitCallback } from '@forgerock/journey-client/types';\n+\n+export default function pollingWaitComponent(\n+ journeyEl: HTMLDivElement,\n+ callback: PollingWaitCallback,\n+ idx: number,\n+) {\n+ const collectorKey = callback?.payload?.input?.[0].name || `collector-${idx}`;\n+ const container = document.createElement('div');\n+ const message = document.createElement('p');\n+ const spinner = document.createElement('div');\n+\n+ container.id = collectorKey;\n+ message.innerText = callback.getMessage() || 'Please wait...';\n+\n+ // Simple spinner\n+ spinner.style.cssText = `\n+ width: 20px;\n+ height: 20px;\n+ border: 2px solid #f3f3f3;\n+ border-top: 2px solid #3498db;\n+ border-radius: 50%;\n+ animation: spin 1s linear infinite;\n+ margin: 10px 0;\n+ `;\n+\n+ // Add CSS animation\n+ const style = document.createElement('style');\n+ style.textContent = `\n+ @keyframes spin {\n+ 0% { transform: rotate(0deg); }\n+ 100% { transform: rotate(360deg); }\n+ }\n+ `;\n+ document.head.appendChild(style);\n+\n+ container.appendChild(message);\n+ container.appendChild(spinner);\n+ journeyEl?.appendChild(container);\n+\n+ // TODO: Use set timeout to submit for after delay\n+}\ndiff --git a/e2e/journey-app/components/recaptcha-enterprise.ts b/e2e/journey-app/components/recaptcha-enterprise.ts\nnew file mode 100644\nindex 0000000000..1254f04ccc\n--- /dev/null\n+++ b/e2e/journey-app/components/recaptcha-enterprise.ts\n@@ -0,0 +1,43 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+import type { ReCaptchaEnterpriseCallback } from '@forgerock/journey-client/types';\n+\n+export default function recaptchaEnterpriseComponent(\n+ journeyEl: HTMLDivElement,\n+ callback: ReCaptchaEnterpriseCallback,\n+ idx: number,\n+) {\n+ const collectorKey = callback?.payload?.input?.[0].name || `collector-${idx}`;\n+ const container = document.createElement('div');\n+ const message = document.createElement('p');\n+\n+ container.id = collectorKey;\n+ message.innerText = 'Please complete the reCAPTCHA Enterprise challenge';\n+\n+ // Create placeholder div for reCAPTCHA Enterprise\n+ const recaptchaDiv = document.createElement('div');\n+ recaptchaDiv.id = `recaptcha-enterprise-${collectorKey}`;\n+ recaptchaDiv.style.cssText = `\n+ border: 1px solid #ccc;\n+ padding: 20px;\n+ text-align: center;\n+ background-color: #f0f8ff;\n+ margin: 10px 0;\n+ `;\n+ recaptchaDiv.innerText =\n+ 'reCAPTCHA Enterprise placeholder (requires reCAPTCHA Enterprise script)';\n+\n+ container.appendChild(message);\n+ container.appendChild(recaptchaDiv);\n+ journeyEl?.appendChild(container);\n+\n+ // In a real implementation, you would load the reCAPTCHA Enterprise script\n+ // and initialize the widget here\n+ console.log('reCAPTCHA Enterprise callback initialized');\n+\n+ // TODO: Implement reCAPTCHA Enterprise integration here\n+}\ndiff --git a/e2e/journey-app/components/recaptcha.ts b/e2e/journey-app/components/recaptcha.ts\nnew file mode 100644\nindex 0000000000..60a7903502\n--- /dev/null\n+++ b/e2e/journey-app/components/recaptcha.ts\n@@ -0,0 +1,42 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+import type { ReCaptchaCallback } from '@forgerock/journey-client/types';\n+\n+export default function recaptchaComponent(\n+ journeyEl: HTMLDivElement,\n+ callback: ReCaptchaCallback,\n+ idx: number,\n+) {\n+ const collectorKey = callback?.payload?.input?.[0].name || `collector-${idx}`;\n+ const container = document.createElement('div');\n+ const message = document.createElement('p');\n+\n+ container.id = collectorKey;\n+ message.innerText = 'Please complete the reCAPTCHA challenge';\n+\n+ // Create placeholder div for reCAPTCHA\n+ const recaptchaDiv = document.createElement('div');\n+ recaptchaDiv.id = `recaptcha-${collectorKey}`;\n+ recaptchaDiv.style.cssText = `\n+ border: 1px solid #ccc;\n+ padding: 20px;\n+ text-align: center;\n+ background-color: #f9f9f9;\n+ margin: 10px 0;\n+ `;\n+ recaptchaDiv.innerText = 'reCAPTCHA placeholder (requires reCAPTCHA script)';\n+\n+ container.appendChild(message);\n+ container.appendChild(recaptchaDiv);\n+ journeyEl?.appendChild(container);\n+\n+ // In a real implementation, you would load the reCAPTCHA script\n+ // and initialize the widget here\n+ console.log('reCAPTCHA callback initialized');\n+\n+ // TODO: Implement reCAPTCHA integration here\n+}\ndiff --git a/e2e/journey-app/components/redirect.ts b/e2e/journey-app/components/redirect.ts\nnew file mode 100644\nindex 0000000000..f09619d6ab\n--- /dev/null\n+++ b/e2e/journey-app/components/redirect.ts\n@@ -0,0 +1,45 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+import type { RedirectCallback } from '@forgerock/journey-client/types';\n+\n+export default function redirectComponent(\n+ journeyEl: HTMLDivElement,\n+ callback: RedirectCallback,\n+ idx: number,\n+) {\n+ const collectorKey = callback?.payload?.input?.[0].name || `collector-${idx}`;\n+ const container = document.createElement('div');\n+ const message = document.createElement('p');\n+ const button = document.createElement('button');\n+\n+ container.id = collectorKey;\n+ message.innerText = 'You will be redirected to complete authentication';\n+ button.innerText = 'Continue to External Provider';\n+ button.style.cssText = `\n+ padding: 10px 20px;\n+ background-color: #007bff;\n+ color: white;\n+ border: none;\n+ border-radius: 4px;\n+ cursor: pointer;\n+ margin: 10px 0;\n+ `;\n+\n+ container.appendChild(message);\n+ container.appendChild(button);\n+ journeyEl?.appendChild(container);\n+\n+ button.addEventListener('click', () => {\n+ try {\n+ const redirectUrl = callback.getRedirectUrl();\n+ console.log('Redirecting to:', redirectUrl);\n+ window.location.href = redirectUrl;\n+ } catch (error) {\n+ console.error('Redirect failed:', error);\n+ }\n+ });\n+}\ndiff --git a/e2e/journey-app/components/select-idp.ts b/e2e/journey-app/components/select-idp.ts\nnew file mode 100644\nindex 0000000000..bf89dfac41\n--- /dev/null\n+++ b/e2e/journey-app/components/select-idp.ts\n@@ -0,0 +1,56 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+import type { SelectIdPCallback } from '@forgerock/journey-client/types';\n+\n+export default function selectIdpComponent(\n+ journeyEl: HTMLDivElement,\n+ callback: SelectIdPCallback,\n+ idx: number,\n+) {\n+ const collectorKey = callback?.payload?.input?.[0].name || `collector-${idx}`;\n+ const container = document.createElement('div');\n+ const label = document.createElement('label');\n+\n+ container.id = collectorKey;\n+ label.innerText = 'Select Identity Provider:';\n+\n+ const providers = callback.getProviders();\n+\n+ // Create select element for provider selection\n+ const select = document.createElement('select');\n+ select.id = collectorKey;\n+ select.name = collectorKey;\n+\n+ // Add default option\n+ const defaultOption = document.createElement('option');\n+ defaultOption.value = '';\n+ defaultOption.innerText = 'Choose a provider...';\n+ defaultOption.disabled = true;\n+ defaultOption.selected = true;\n+ select.appendChild(defaultOption);\n+\n+ // Create option elements for each provider\n+ providers.forEach((provider) => {\n+ const option = document.createElement('option');\n+ option.value = provider.provider;\n+ option.innerText = provider.provider;\n+ select.appendChild(option);\n+ });\n+\n+ container.appendChild(select);\n+\n+ journeyEl?.appendChild(label);\n+ journeyEl?.appendChild(container);\n+\n+ // Add event listener for provider selection\n+ select.addEventListener('change', (event) => {\n+ const selectedProvider = (event.target as HTMLSelectElement).value;\n+ if (selectedProvider) {\n+ callback.setProvider(selectedProvider);\n+ }\n+ });\n+}\ndiff --git a/e2e/journey-app/components/suspended-text-output.ts b/e2e/journey-app/components/suspended-text-output.ts\nnew file mode 100644\nindex 0000000000..88e27ef9a1\n--- /dev/null\n+++ b/e2e/journey-app/components/suspended-text-output.ts\n@@ -0,0 +1,34 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+import type { SuspendedTextOutputCallback } from '@forgerock/journey-client/types';\n+\n+export default function suspendedTextOutputComponent(\n+ journeyEl: HTMLDivElement,\n+ callback: SuspendedTextOutputCallback,\n+ idx: number,\n+) {\n+ const collectorKey = callback?.payload?.input?.[0].name || `collector-${idx}`;\n+ const container = document.createElement('div');\n+ const message = document.createElement('p');\n+\n+ container.id = collectorKey;\n+ message.innerText =\n+ callback.getMessage() || 'Authentication is suspended. Please contact your admin.';\n+ message.style.cssText = `\n+ padding: 15px;\n+ background-color: #fff3cd;\n+ border: 1px solid #ffeaa7;\n+ border-radius: 4px;\n+ color: #856404;\n+ margin: 10px 0;\n+ `;\n+\n+ container.appendChild(message);\n+ journeyEl?.appendChild(container);\n+\n+ console.log('Suspended text output callback:', callback.getMessage());\n+}\ndiff --git a/e2e/journey-app/components/terms-and-conditions.ts b/e2e/journey-app/components/terms-and-conditions.ts\nnew file mode 100644\nindex 0000000000..3ee44f2aa0\n--- /dev/null\n+++ b/e2e/journey-app/components/terms-and-conditions.ts\n@@ -0,0 +1,36 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+import type { TermsAndConditionsCallback } from '@forgerock/journey-client/types';\n+\n+export default function termsAndConditionsComponent(\n+ journeyEl: HTMLDivElement,\n+ callback: TermsAndConditionsCallback,\n+ idx: number,\n+) {\n+ const collectorKey = callback?.payload?.input?.[0].name || `collector-${idx}`;\n+ const label = document.createElement('label');\n+ const checkbox = document.createElement('input');\n+\n+ // Terms text area\n+ console.log(callback.getTerms);\n+\n+ // Checkbox for acceptance\n+ checkbox.type = 'checkbox';\n+ checkbox.id = collectorKey;\n+ checkbox.required = true;\n+\n+ label.htmlFor = collectorKey;\n+ label.innerText = ' I accept the terms and conditions';\n+\n+ journeyEl.appendChild(label);\n+ journeyEl.appendChild(checkbox);\n+\n+ checkbox.addEventListener('change', (event) => {\n+ const accepted = (event.target as HTMLInputElement).checked;\n+ callback.setAccepted(accepted);\n+ });\n+}\ndiff --git a/e2e/journey-app/components/text-input.ts b/e2e/journey-app/components/text-input.ts\nnew file mode 100644\nindex 0000000000..0a45074160\n--- /dev/null\n+++ b/e2e/journey-app/components/text-input.ts\n@@ -0,0 +1,34 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+import type { NameCallback, TextInputCallback } from '@forgerock/journey-client/types';\n+\n+export default function textComponent(\n+ journeyEl: HTMLDivElement,\n+ callback: NameCallback | TextInputCallback,\n+ idx: number,\n+) {\n+ const collectorKey = callback?.payload?.input?.[0].name || `collector-${idx}`;\n+ const label = document.createElement('label');\n+ const input = document.createElement('input');\n+\n+ label.htmlFor = collectorKey;\n+ label.innerText = callback.getPrompt();\n+ input.type = 'text';\n+ input.id = collectorKey;\n+ input.name = collectorKey;\n+\n+ journeyEl?.appendChild(label);\n+ journeyEl?.appendChild(input);\n+\n+ journeyEl?.querySelector(`#${collectorKey}`)?.addEventListener('input', (event) => {\n+ if (callback.getType() === 'NameCallback') {\n+ (callback as NameCallback).setName((event.target as HTMLInputElement).value);\n+ } else {\n+ (callback as TextInputCallback).setInputValue((event.target as HTMLInputElement).value);\n+ }\n+ });\n+}\ndiff --git a/e2e/journey-app/components/text-output.ts b/e2e/journey-app/components/text-output.ts\nnew file mode 100644\nindex 0000000000..ab83403d6f\n--- /dev/null\n+++ b/e2e/journey-app/components/text-output.ts\n@@ -0,0 +1,24 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+import type { TextOutputCallback } from '@forgerock/journey-client/types';\n+\n+export default function textComponent(\n+ journeyEl: HTMLDivElement,\n+ callback: TextOutputCallback,\n+ idx: number,\n+) {\n+ const collectorKey = callback?.payload?.input?.[0].name || `collector-${idx}`;\n+ const message = callback.getMessage() || '';\n+ const p = document.createElement('paragraph');\n+\n+ p.innerText = message;\n+ p.id = collectorKey;\n+\n+ console.log(message);\n+\n+ journeyEl?.appendChild(p);\n+}\ndiff --git a/e2e/journey-app/components/validated-password.ts b/e2e/journey-app/components/validated-password.ts\nnew file mode 100644\nindex 0000000000..4bfb81674f\n--- /dev/null\n+++ b/e2e/journey-app/components/validated-password.ts\n@@ -0,0 +1,29 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+import type { ValidatedCreatePasswordCallback } from '@forgerock/journey-client/types';\n+\n+export default function validatedPasswordComponent(\n+ journeyEl: HTMLDivElement,\n+ callback: ValidatedCreatePasswordCallback,\n+ idx: number,\n+) {\n+ const collectorKey = callback?.payload?.input?.[0].name || `collector-${idx}`;\n+ const label = document.createElement('label');\n+ const input = document.createElement('input');\n+\n+ label.htmlFor = collectorKey;\n+ label.innerText = callback.getPrompt();\n+ input.type = 'password';\n+ input.id = collectorKey;\n+ input.name = collectorKey;\n+\n+ journeyEl?.appendChild(label);\n+ journeyEl?.appendChild(input);\n+\n+ journeyEl?.querySelector(`#${collectorKey}`)?.addEventListener('input', (event) => {\n+ callback.setPassword((event.target as HTMLInputElement).value);\n+ });\n+}\ndiff --git a/e2e/journey-app/components/text.ts b/e2e/journey-app/components/validated-username.ts\nsimilarity index 81%\nrename from e2e/journey-app/components/text.ts\nrename to e2e/journey-app/components/validated-username.ts\nindex bca281d4a8..0efddfaebe 100644\n--- a/e2e/journey-app/components/text.ts\n+++ b/e2e/journey-app/components/validated-username.ts\n@@ -1,14 +1,14 @@\n-/*\n+/**\n * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n *\n * This software may be modified and distributed under the terms\n * of the MIT license. See the LICENSE file for details.\n */\n-import type { NameCallback } from '@forgerock/journey-client/types';\n+import type { ValidatedCreateUsernameCallback } from '@forgerock/journey-client/types';\n \n-export default function textComponent(\n+export default function validatedUsernameComponent(\n journeyEl: HTMLDivElement,\n- callback: NameCallback,\n+ callback: ValidatedCreateUsernameCallback,\n idx: number,\n ) {\n const collectorKey = callback?.payload?.input?.[0].name || `collector-${idx}`;\ndiff --git a/e2e/journey-app/main.ts b/e2e/journey-app/main.ts\nindex bc8a9eb0e4..30bb36b8d1 100644\n--- a/e2e/journey-app/main.ts\n+++ b/e2e/journey-app/main.ts\n@@ -8,14 +8,9 @@ import './style.css';\n \n import { journey } from '@forgerock/journey-client';\n \n-import type {\n- RequestMiddleware,\n- NameCallback,\n- PasswordCallback,\n-} from '@forgerock/journey-client/types';\n-\n-import textComponent from './components/text.js';\n-import passwordComponent from './components/password.js';\n+import type { RequestMiddleware } from '@forgerock/journey-client/types';\n+\n+import { renderCallbacks } from './callback-map.js';\n import { serverConfigs } from './server-configs.js';\n \n const qs = window.location.search;\n@@ -23,23 +18,34 @@ const searchParams = new URLSearchParams(qs);\n \n const config = serverConfigs[searchParams.get('clientId') || 'basic'];\n \n-const requestMiddleware: RequestMiddleware[] = [\n- (req, action, next) => {\n- switch (action.type) {\n- case 'JOURNEY_START':\n- if ((action.payload as any).type === 'service') {\n- console.log('Starting authentication with service');\n- }\n- break;\n- case 'JOURNEY_NEXT':\n- if (!('type' in (action.payload as any))) {\n- console.log('Continuing authentication with service');\n- }\n- break;\n- }\n- next();\n- },\n-];\n+let requestMiddleware: RequestMiddleware[] = [];\n+\n+if (searchParams.get('middleware') === 'true') {\n+ requestMiddleware = [\n+ (req, action, next) => {\n+ switch (action.type) {\n+ case 'JOURNEY_START':\n+ req.url.searchParams.set('start-authenticate-middleware', 'start-authentication');\n+ req.headers.append('x-start-authenticate-middleware', 'start-authentication');\n+ break;\n+ case 'JOURNEY_NEXT':\n+ req.url.searchParams.set('authenticate-middleware', 'authentication');\n+ req.headers.append('x-authenticate-middleware', 'authentication');\n+ break;\n+ }\n+ next();\n+ },\n+ (req, action, next) => {\n+ switch (action.type) {\n+ case 'END_SESSION':\n+ req.url.searchParams.set('end-session-middleware', 'end-session');\n+ req.headers.append('x-end-session-middleware', 'end-session');\n+ break;\n+ }\n+ next();\n+ },\n+ ];\n+}\n \n (async () => {\n const journeyClient = await journey({ config, requestMiddleware });\n@@ -48,7 +54,10 @@ const requestMiddleware: RequestMiddleware[] = [\n const formEl = document.getElementById('form') as HTMLFormElement;\n const journeyEl = document.getElementById('journey') as HTMLDivElement;\n \n- let step = await journeyClient.start();\n+ let step = await journeyClient.start({\n+ journey: searchParams.get('journey') || '',\n+ query: { noSession: searchParams.get('no-session') || 'false' },\n+ });\n \n function renderComplete() {\n if (step?.type !== 'LoginSuccess') {\n@@ -57,10 +66,12 @@ const requestMiddleware: RequestMiddleware[] = [\n \n const session = step.getSessionToken();\n \n+ console.log(`Session Token: ${session || 'none'}`);\n+\n journeyEl.innerHTML = `\n-

Complete

\n- Session:\n-

${session}

\n+

Complete

\n+ Session:\n+

${session}

\n \n `;\n \n@@ -82,9 +93,12 @@ const requestMiddleware: RequestMiddleware[] = [\n }\n \n const error = step.payload.message;\n+\n+ console.error(`Error: ${error}`);\n+\n if (errorEl) {\n errorEl.innerHTML = `\n-

${error}

\n+

${error}

\n `;\n }\n }\n@@ -105,23 +119,7 @@ const requestMiddleware: RequestMiddleware[] = [\n \n const callbacks = step.callbacks;\n \n- callbacks.forEach((callback, idx) => {\n- if (callback.getType() === 'NameCallback') {\n- const cb = callback as NameCallback;\n- textComponent(\n- journeyEl, // You can ignore this; it's just for rendering\n- cb, // This callback class\n- idx,\n- );\n- } else if (callback.getType() === 'PasswordCallback') {\n- const cb = callback as PasswordCallback;\n- passwordComponent(\n- journeyEl, // You can ignore this; it's just for rendering\n- cb, // This callback class\n- idx,\n- );\n- }\n- });\n+ renderCallbacks(journeyEl, callbacks);\n \n const submitBtn = document.createElement('button');\n submitBtn.type = 'submit';\n@@ -140,17 +138,21 @@ const requestMiddleware: RequestMiddleware[] = [\n /**\n * We can just call `next` here and not worry about passing any arguments\n */\n- step = await journeyClient.next(step);\n+ step = await journeyClient.next(step, {\n+ query: { noSession: searchParams.get('no-session') || 'false' },\n+ });\n \n /**\n * Recursively render the form with the new state\n */\n if (step?.type === 'Step') {\n+ console.log('Continuing journey to next step');\n renderForm();\n } else if (step?.type === 'LoginSuccess') {\n- console.log('Basic login successful');\n+ console.log('Journey completed successfully');\n renderComplete();\n } else if (step?.type === 'LoginFailure') {\n+ console.error('Journey failed');\n renderForm();\n renderError();\n } else {\ndiff --git a/e2e/journey-app/tsconfig.app.json b/e2e/journey-app/tsconfig.app.json\nindex a2b6a0685a..3000be2f63 100644\n--- a/e2e/journey-app/tsconfig.app.json\n+++ b/e2e/journey-app/tsconfig.app.json\n@@ -9,6 +9,7 @@\n \"./main.ts\",\n \"./helper.ts\",\n \"./server-configs.ts\",\n+ \"./callback-map.ts\",\n \"components/**/*.ts\"\n ],\n \"references\": [\ndiff --git a/e2e/journey-suites/src/choice-confirm-poll.test.ts b/e2e/journey-suites/src/choice-confirm-poll.test.ts\nnew file mode 100644\nindex 0000000000..24db060471\n--- /dev/null\n+++ b/e2e/journey-suites/src/choice-confirm-poll.test.ts\n@@ -0,0 +1,58 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+\n+import { expect, test } from '@playwright/test';\n+import { asyncEvents } from './utils/async-events.js';\n+import { username, password } from './utils/demo-user.js';\n+\n+test('Test happy paths on test page', async ({ page }) => {\n+ const { clickButton, navigate } = asyncEvents(page);\n+ await navigate('/?journey=TEST_LoginWithMiscCallbacks');\n+\n+ const messageArray: string[] = [];\n+\n+ // Listen for events on page\n+ page.on('console', async (msg) => {\n+ messageArray.push(msg.text());\n+ return Promise.resolve(true);\n+ });\n+\n+ expect(page.url()).toBe('http://localhost:5829/?journey=TEST_LoginWithMiscCallbacks');\n+\n+ // Perform basic login\n+ await page.getByLabel('User Name').fill(username);\n+ await clickButton('Submit', '/authenticate');\n+\n+ await page.getByLabel('Password').fill(password);\n+ await clickButton('Submit', '/authenticate');\n+\n+ // Message Node: Are you human?\n+ await page.getByText('Are you human?').isVisible();\n+ await page.getByLabel('Yes').click();\n+ await clickButton('Submit', '/authenticate');\n+\n+ // Choice Collector: Are you sure?\n+ await page.getByLabel('Are you sure?').selectOption('Yes');\n+ await clickButton('Submit', '/authenticate');\n+\n+ // Choice Collector: Are you sure?\n+ await page.getByLabel('Are you sure?').selectOption('Yes');\n+ await clickButton('Submit', '/authenticate');\n+\n+ await expect(page.getByText('Please wait while we process your request.')).toBeVisible();\n+ await page.waitForTimeout(1500); // Simulate wait for async poll\n+ await clickButton('Submit', '/authenticate');\n+\n+ await expect(page.getByText('Complete')).toBeVisible();\n+\n+ // Perform logout, wait for /authenticate to ensure logout completed and form is refreshed\n+ await clickButton('Logout', '/authenticate');\n+\n+ // Test assertions\n+ expect(messageArray.includes('Journey completed successfully')).toBe(true);\n+ expect(messageArray.includes('Logout successful')).toBe(true);\n+});\ndiff --git a/e2e/journey-suites/src/custom-paths.test.ts b/e2e/journey-suites/src/custom-paths.test.ts\nnew file mode 100644\nindex 0000000000..f848f8f1d2\n--- /dev/null\n+++ b/e2e/journey-suites/src/custom-paths.test.ts\n@@ -0,0 +1,38 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+\n+import { expect, test } from '@playwright/test';\n+import { asyncEvents } from './utils/async-events.js';\n+import { username, password } from './utils/demo-user.js';\n+\n+// Skipping test until AM Mock API is available that supports custom paths\n+test.skip('Test happy paths on test page', async ({ page }) => {\n+ const { clickButton, navigate } = asyncEvents(page);\n+ await navigate('/?paths=true&journey=Login');\n+\n+ const messageArray: string[] = [];\n+\n+ // Listen for events on page\n+ page.on('console', async (msg) => {\n+ messageArray.push(msg.text());\n+ return Promise.resolve(true);\n+ });\n+\n+ // Perform basic login\n+ await page.getByLabel('User Name').fill(username);\n+ await page.getByLabel('Password').fill(password);\n+ await clickButton('Submit', '/authenticate');\n+\n+ await expect(page.getByText('Complete')).toBeVisible();\n+\n+ // Perform logout, wait for /authenticate to ensure logout completed and form is refreshed\n+ await clickButton('Logout', '/authenticate');\n+\n+ // Test assertions\n+ expect(messageArray.includes('Journey completed successfully')).toBe(true);\n+ expect(messageArray.includes('Logout successful')).toBe(true);\n+});\ndiff --git a/e2e/journey-suites/src/device-profile.test.ts b/e2e/journey-suites/src/device-profile.test.ts\nnew file mode 100644\nindex 0000000000..65c8c348ee\n--- /dev/null\n+++ b/e2e/journey-suites/src/device-profile.test.ts\n@@ -0,0 +1,40 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+\n+import { expect, test } from '@playwright/test';\n+import { asyncEvents } from './utils/async-events.js';\n+import { username, password } from './utils/demo-user.js';\n+\n+test.skip('Test happy paths on test page', async ({ page }) => {\n+ const { clickButton, navigate } = asyncEvents(page);\n+ await navigate('/?journey=TEST_DeviceProfile');\n+\n+ const messageArray: string[] = [];\n+\n+ // Listen for events on page\n+ page.on('console', async (msg) => {\n+ messageArray.push(msg.text());\n+ return Promise.resolve(true);\n+ });\n+\n+ // Perform basic login\n+ await page.getByLabel('User Name').fill(username);\n+ await page.getByLabel('Password').fill(password);\n+ await clickButton('Submit', '/authenticate');\n+\n+ await expect(page.getByText('Collecting device profile')).toBeVisible();\n+\n+ await expect(page.getByText('Complete')).toBeVisible();\n+\n+ // Perform logout\n+ await clickButton('Logout', '/authenticate');\n+\n+ // Test assertions\n+ expect(messageArray.includes('Device profile collected successfully')).toBe(true);\n+ expect(messageArray.includes('Journey completed successfully')).toBe(true);\n+ expect(messageArray.includes('Logout successful')).toBe(true);\n+});\ndiff --git a/e2e/journey-suites/src/email-suspend.test.ts b/e2e/journey-suites/src/email-suspend.test.ts\nnew file mode 100644\nindex 0000000000..900d61b0a7\n--- /dev/null\n+++ b/e2e/journey-suites/src/email-suspend.test.ts\n@@ -0,0 +1,34 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+\n+import { expect, test } from '@playwright/test';\n+import { asyncEvents } from './utils/async-events.js';\n+import { username, password } from './utils/demo-user.js';\n+\n+test('Test happy paths on test page', async ({ page }) => {\n+ const { clickButton, navigate } = asyncEvents(page);\n+ await navigate('/?journey=TEST_LoginSuspendEmail');\n+\n+ const messageArray: string[] = [];\n+\n+ // Listen for events on page\n+ page.on('console', async (msg) => {\n+ messageArray.push(msg.text());\n+ return Promise.resolve(true);\n+ });\n+\n+ // Perform basic login\n+ await page.getByLabel('User Name').fill(username);\n+ await page.getByLabel('Password').fill(password);\n+ await clickButton('Submit', '/authenticate');\n+\n+ await expect(\n+ page.getByText(\n+ 'An email has been sent to the address you entered. Click the link in that email to proceed.',\n+ ),\n+ ).toBeVisible();\n+});\ndiff --git a/e2e/journey-suites/src/basic.test.ts b/e2e/journey-suites/src/login.test.ts\nsimilarity index 62%\nrename from e2e/journey-suites/src/basic.test.ts\nrename to e2e/journey-suites/src/login.test.ts\nindex ca40ceda1c..f048e6de15 100644\n--- a/e2e/journey-suites/src/basic.test.ts\n+++ b/e2e/journey-suites/src/login.test.ts\n@@ -10,8 +10,8 @@ import { asyncEvents } from './utils/async-events.js';\n import { username, password } from './utils/demo-user.js';\n \n test('Test happy paths on test page', async ({ page }) => {\n- const { navigate } = asyncEvents(page);\n- await navigate('/');\n+ const { clickButton, navigate } = asyncEvents(page);\n+ await navigate('/?journey=Login');\n \n const messageArray: string[] = [];\n \n@@ -21,21 +21,17 @@ test('Test happy paths on test page', async ({ page }) => {\n return Promise.resolve(true);\n });\n \n- expect(page.url()).toBe('http://localhost:5829/');\n-\n // Perform basic login\n await page.getByLabel('User Name').fill(username);\n await page.getByLabel('Password').fill(password);\n- await page.getByRole('button', { name: 'Submit' }).click();\n+ await clickButton('Submit', '/authenticate');\n+\n await expect(page.getByText('Complete')).toBeVisible();\n \n // Perform logout\n- await page.getByRole('button', { name: 'Logout' }).click();\n- await expect(page.getByRole('button', { name: 'Submit' })).toBeVisible();\n+ await clickButton('Logout', '/authenticate');\n \n // Test assertions\n- expect(messageArray.includes('Basic login successful')).toBe(true);\n+ expect(messageArray.includes('Journey completed successfully')).toBe(true);\n expect(messageArray.includes('Logout successful')).toBe(true);\n- expect(messageArray.includes('Starting authentication with service')).toBe(true);\n- expect(messageArray.includes('Continuing authentication with service')).toBe(true);\n });\ndiff --git a/e2e/journey-suites/src/no-session.test.ts b/e2e/journey-suites/src/no-session.test.ts\nnew file mode 100644\nindex 0000000000..679e6e9cba\n--- /dev/null\n+++ b/e2e/journey-suites/src/no-session.test.ts\n@@ -0,0 +1,35 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+\n+import { expect, test } from '@playwright/test';\n+import { asyncEvents } from './utils/async-events.js';\n+import { username, password } from './utils/demo-user.js';\n+\n+test('Test happy paths on test page', async ({ page }) => {\n+ const { clickButton, navigate } = asyncEvents(page);\n+ await navigate('/?journey=Login&no-session=true');\n+\n+ const messageArray: string[] = [];\n+\n+ // Listen for events on page\n+ page.on('console', async (msg) => {\n+ messageArray.push(msg.text());\n+ return Promise.resolve(true);\n+ });\n+\n+ expect(page.url()).toBe('http://localhost:5829/?journey=Login&no-session=true');\n+\n+ // Perform basic login\n+ await page.getByLabel('User Name').fill(username);\n+ await page.getByLabel('Password').fill(password);\n+ await clickButton('Submit', '/authenticate');\n+\n+ await expect(page.getByText('Complete')).toBeVisible();\n+\n+ // Test assertions\n+ await expect(messageArray.includes('Session Token: none')).toBe(true);\n+});\ndiff --git a/e2e/journey-suites/src/otp-register.ts b/e2e/journey-suites/src/otp-register.ts\nnew file mode 100644\nindex 0000000000..19a5b43e64\n--- /dev/null\n+++ b/e2e/journey-suites/src/otp-register.ts\n@@ -0,0 +1,46 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+\n+import { expect, test } from '@playwright/test';\n+import { asyncEvents } from './utils/async-events.js';\n+import { username, password } from './utils/demo-user.js';\n+\n+test('Test happy paths on test page', async ({ page }) => {\n+ const { clickButton, navigate } = asyncEvents(page);\n+ await navigate('/?journey=TEST_OTPRegistration');\n+\n+ const messageArray: string[] = [];\n+\n+ // Listen for events on page\n+ page.on('console', async (msg) => {\n+ messageArray.push(msg.text());\n+ return Promise.resolve(true);\n+ });\n+\n+ // Perform basic login\n+ await page.getByLabel('User Name').fill(username);\n+ await page.getByLabel('Password').fill(password);\n+ await clickButton('Submit', '/authenticate');\n+\n+ await expect(page.getByText('Complete')).toBeVisible();\n+\n+ // Test assertions\n+ expect(\n+ messageArray.includes(\n+ 'Scan the QR code image below with the ForgeRock Authenticator app to register your device with your login.',\n+ ),\n+ ).toBe(true);\n+ expect(messageArray.includes('otp')).toBe(true);\n+\n+ // TODO: Use when AM Mock API is available\n+ // expect(\n+ // messageArray.includes(\n+ // 'otpauth://totp/ForgeRock:jlowery?secret=QITSTC234FRIU8DD987DW3VPICFY======&issuer=ForgeRock&period=30&digits=6&b=032b75',\n+ // ),\n+ // ).toBe(true);\n+ // expect(messageArray.includes('Basic login with OTP registration step successful')).toBe(true);\n+});\ndiff --git a/e2e/journey-suites/src/protect.test.ts b/e2e/journey-suites/src/protect.test.ts\nnew file mode 100644\nindex 0000000000..bb7eb3ee11\n--- /dev/null\n+++ b/e2e/journey-suites/src/protect.test.ts\n@@ -0,0 +1,40 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+\n+import { expect, test } from '@playwright/test';\n+import { asyncEvents } from './utils/async-events.js';\n+import { username, password } from './utils/demo-user.js';\n+\n+test.skip('Test happy paths on test page', async ({ page }) => {\n+ const { clickButton, navigate } = asyncEvents(page);\n+ await navigate('/?journey=TEST_Protect');\n+\n+ const messageArray: string[] = [];\n+\n+ // Listen for events on page\n+ page.on('console', async (msg) => {\n+ messageArray.push(msg.text());\n+ return Promise.resolve(true);\n+ });\n+\n+ // Perform basic login\n+ await page.getByLabel('User Name').fill(username);\n+ await page.getByLabel('Password').fill(password);\n+ await clickButton('Submit', '/authenticate');\n+\n+ await expect(page.getByText('Collecting protect data')).toBeVisible();\n+\n+ await expect(page.getByText('Complete')).toBeVisible();\n+\n+ // Perform logout\n+ await clickButton('Logout', '/authenticate');\n+\n+ // Test assertions\n+ expect(messageArray.includes('Protect data collected successfully')).toBe(true);\n+ expect(messageArray.includes('Journey completed successfully')).toBe(true);\n+ expect(messageArray.includes('Logout successful')).toBe(true);\n+});\ndiff --git a/e2e/journey-suites/src/registration.test.ts b/e2e/journey-suites/src/registration.test.ts\nnew file mode 100644\nindex 0000000000..242ae04270\n--- /dev/null\n+++ b/e2e/journey-suites/src/registration.test.ts\n@@ -0,0 +1,66 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+\n+import { expect, test } from '@playwright/test';\n+import { asyncEvents } from './utils/async-events.js';\n+import { password } from './utils/demo-user.js';\n+\n+test('Test happy paths on test page', async ({ page }) => {\n+ const { clickButton, navigate } = asyncEvents(page);\n+ await navigate('/?journey=Registration');\n+\n+ // generate ID, 3 sections of random numbers: \"714524572-2799534390-3707617532\"\n+ const id = globalThis.crypto.getRandomValues(new Uint32Array(3)).join('-');\n+ const messageArray: string[] = [];\n+\n+ // Listen for events on page\n+ page.on('console', async (msg) => {\n+ messageArray.push(msg.text());\n+ return Promise.resolve(true);\n+ });\n+\n+ expect(page.url()).toBe('http://localhost:5829/?journey=Registration');\n+\n+ // Perform registration\n+ await page.getByLabel('Username').fill('testuser+' + id);\n+\n+ // Select email and fill with \"testuser+@example.com\"\n+ await page.getByLabel('Email Address').fill('testuser+' + id + '@example.com');\n+ // Select first name and fill with \"Sally\"\n+ await page.getByLabel('First Name').fill('Sally');\n+ // Select last name and fill with \"Tester\"\n+ await page.getByLabel('Last Name').fill('Tester');\n+ // Select \"Send me special offers and services\" and leave check\n+ await page.getByLabel('Send me special offers and services').check();\n+ // Select \"Send me news and updates\" and uncheck\n+ await page.getByLabel('Send me news and updates').check();\n+ // Fill password\n+ await page.getByLabel('Password').fill(password);\n+ // Select \"Select a security question 7\" dropdown and choose \"What's your favorite color?\"\n+ await page.getByLabel('Select a security question 7').selectOption(\"What's your favorite color?\");\n+ // Fill answer with \"Red\"\n+ await page.getByLabel('Answer 7').fill('Red');\n+ // Select \"Select a security question 8\" dropdown and choose \"Who was your first employer?\"\n+ await page\n+ .getByLabel('Select a security question 8')\n+ .selectOption('Who was your first employer?');\n+ // Fill answer with \"Pizza\"\n+ await page.getByLabel('Answer 8').fill('AAA Engineering');\n+\n+ await page.getByLabel('I accept the terms and conditions').check();\n+\n+ await clickButton('Submit', '/authenticate');\n+\n+ await expect(page.getByText('Complete')).toBeVisible();\n+\n+ // Perform logout\n+ await clickButton('Logout', '/authenticate');\n+\n+ // Test assertions\n+ expect(messageArray.includes('Journey completed successfully')).toBe(true);\n+ expect(messageArray.includes('Logout successful')).toBe(true);\n+});\ndiff --git a/e2e/journey-suites/src/request-middleware.test.ts b/e2e/journey-suites/src/request-middleware.test.ts\nnew file mode 100644\nindex 0000000000..be0e269113\n--- /dev/null\n+++ b/e2e/journey-suites/src/request-middleware.test.ts\n@@ -0,0 +1,63 @@\n+/*\n+ * Copyright (c) 2025 Ping Identity Corporation. All rights reserved.\n+ *\n+ * This software may be modified and distributed under the terms\n+ * of the MIT license. See the LICENSE file for details.\n+ */\n+\n+import { expect, test } from '@playwright/test';\n+import { asyncEvents } from './utils/async-events.js';\n+import { username, password } from './utils/demo-user.js';\n+\n+test.skip('Test happy paths on test page', async ({ page }) => {\n+ const { clickButton, navigate } = asyncEvents(page);\n+ await navigate('/?middleware=true&journey=Login');\n+\n+ const headerArray: Headers[] = [];\n+ const messageArray: string[] = [];\n+ const networkArray: string[] = [];\n+\n+ // Listen for events on page\n+ page.on('console', async (msg) => {\n+ messageArray.push(msg.text());\n+ return Promise.resolve(true);\n+ });\n+\n+ page.on('request', async (req) => {\n+ networkArray.push(`${new URL(req.url()).pathname}, ${req.resourceType()}`);\n+ });\n+\n+ page.on('request', async (req) => {\n+ const headers = req.headers();\n+\n+ headerArray.push(new Headers(headers));\n+ });\n+\n+ expect(page.url()).toBe('http://localhost:5829/?middleware=true&journey=Login');\n+\n+ // Perform basic login\n+ await page.getByLabel('User Name').fill(username);\n+ await page.getByLabel('Password').fill(password);\n+ await clickButton('Submit', '/authenticate');\n+\n+ await expect(page.getByText('Complete')).toBeVisible();\n+\n+ // Perform logout\n+ await clickButton('Logout', '/authenticate');\n+\n+ // Test assertions\n+ // test URL query parameters added to URL on networkArray\n+\n+ expect(networkArray).toContain('start-authenticate-middleware, fetch');\n+ expect(networkArray).toContain('authenticate-middleware, fetch');\n+ expect(networkArray).toContain('end-session-middleware, fetch');\n+\n+ expect(\n+ headerArray.find((headers) => headers.get('x-start-authenticate-middleware')),\n+ ).toBeTruthy();\n+ expect(headerArray.find((headers) => headers.get('x-authenticate-middleware'))).toBeTruthy();\n+ expect(headerArray.find((headers) => headers.get('x-end-session-middleware'))).toBeTruthy();\n+\n+ expect(messageArray.includes('Journey completed successfully')).toBe(true);\n+ expect(messageArray.includes('Logout successful')).toBe(true);\n+});\ndiff --git a/e2e/oidc-app/src/ping-am/index.html b/e2e/oidc-app/src/ping-am/index.html\nindex f1021f29e4..269c9ce9a4 100644\n--- a/e2e/oidc-app/src/ping-am/index.html\n+++ b/e2e/oidc-app/src/ping-am/index.html\n@@ -15,7 +15,8 @@\n

OIDC App | PingAM Login

\n \n \n- \n+ \n+ \n \n \n \ndiff --git a/e2e/oidc-app/src/ping-one/index.html b/e2e/oidc-app/src/ping-one/index.html\nindex f1a50104e1..08c30a4735 100644\n--- a/e2e/oidc-app/src/ping-one/index.html\n+++ b/e2e/oidc-app/src/ping-one/index.html\n@@ -15,7 +15,8 @@\n

OIDC App | P1 Login

\n \n \n- \n+ \n+ \n \n \n \ndiff --git a/e2e/oidc-app/src/utils/oidc-app.ts b/e2e/oidc-app/src/utils/oidc-app.ts\nindex eaa099bfff..a95f7daf4e 100644\n--- a/e2e/oidc-app/src/utils/oidc-app.ts\n+++ b/e2e/oidc-app/src/utils/oidc-app.ts\n@@ -103,11 +103,16 @@ export async function oidcApp({ config, urlParams }) {\n displayTokenResponse(response);\n });\n \n- document.getElementById('renew-tokens').addEventListener('click', async () => {\n+ document.getElementById('get-tokens-background').addEventListener('click', async () => {\n const response = await oidcClient.token.get({ backgroundRenew: true });\n displayTokenResponse(response);\n });\n \n+ document.getElementById('renew-tokens').addEventListener('click', async () => {\n+ const response = await oidcClient.token.get({ backgroundRenew: true, forceRenew: true });\n+ displayTokenResponse(response);\n+ });\n+\n document.getElementById('user-info-btn').addEventListener('click', async () => {\n const userInfo = await oidcClient.user.info();\n \ndiff --git a/e2e/oidc-suites/src/login.spec.ts b/e2e/oidc-suites/src/login.spec.ts\nindex 1443be4c3d..1d1523bc13 100644\n--- a/e2e/oidc-suites/src/login.spec.ts\n+++ b/e2e/oidc-suites/src/login.spec.ts\n@@ -17,41 +17,40 @@ import { asyncEvents } from './utils/async-events.js';\n \n test.describe('PingAM login and get token tests', () => {\n test('background login with valid credentials', async ({ page }) => {\n- const { navigate, clickButton } = asyncEvents(page);\n+ const { clickWithRedirect, navigate } = asyncEvents(page);\n await navigate('/ping-am/');\n- expect(page.url()).toBe('http://localhost:8443/ping-am/');\n \n- await clickButton('Login (Background)', '/authorize');\n+ await clickWithRedirect('Login (Background)', '**/am/XUI/**');\n \n await page.getByLabel('User Name').fill(pingAmUsername);\n await page.getByRole('textbox', { name: 'Password' }).fill(pingAmPassword);\n- await page.getByRole('button', { name: 'Next' }).click();\n+ await clickWithRedirect('Next', 'http://localhost:8443/ping-am/**');\n \n expect(page.url()).toContain('code');\n expect(page.url()).toContain('state');\n+\n await expect(page.locator('#accessToken-0')).not.toBeEmpty();\n });\n \n test('redirect login with valid credentials', async ({ page }) => {\n- const { navigate, clickButton } = asyncEvents(page);\n+ const { clickWithRedirect, navigate } = asyncEvents(page);\n await navigate('/ping-am/');\n- expect(page.url()).toBe('http://localhost:8443/ping-am/');\n \n- await clickButton('Login (Redirect)', '/authorize');\n+ await clickWithRedirect('Login (Redirect)', '**/am/XUI/**');\n \n await page.getByLabel('User Name').fill(pingAmUsername);\n await page.getByRole('textbox', { name: 'Password' }).fill(pingAmPassword);\n- await page.getByRole('button', { name: 'Next' }).click();\n+ await clickWithRedirect('Next', 'http://localhost:8443/ping-am/**');\n \n expect(page.url()).toContain('code');\n expect(page.url()).toContain('state');\n+\n await expect(page.locator('#accessToken-0')).not.toBeEmpty();\n });\n \n test('background login with invalid client id fails', async ({ page }) => {\n const { navigate } = asyncEvents(page);\n await navigate('/ping-am/?clientid=bad-id');\n- expect(page.url()).toBe('http://localhost:8443/ping-am/?clientid=bad-id');\n \n await page.getByRole('button', { name: 'Login (Background)' }).click();\n \n@@ -65,43 +64,40 @@ test.describe('PingAM login and get token tests', () => {\n \n test.describe('PingOne login and get token tests', () => {\n test('background login with valid credentials', async ({ page }) => {\n- const { navigate, clickButton } = asyncEvents(page);\n+ const { clickWithRedirect, navigate } = asyncEvents(page);\n await navigate('/ping-one/');\n- expect(page.url()).toBe('http://localhost:8443/ping-one/');\n \n- await clickButton('Login (Background)', '/authorize');\n+ await clickWithRedirect('Login (Background)', '**/signon/**');\n \n await page.getByLabel('Username').fill(pingOneUsername);\n await page.getByRole('textbox', { name: 'Password' }).fill(pingOnePassword);\n- await page.getByRole('button', { name: 'Sign On' }).click();\n+ await clickWithRedirect('Sign On', 'http://localhost:8443/ping-one/**');\n \n- await page.waitForURL('http://localhost:8443/ping-one/**');\n expect(page.url()).toContain('code');\n expect(page.url()).toContain('state');\n+\n await expect(page.locator('#accessToken-0')).not.toBeEmpty();\n });\n \n test('redirect login with valid credentials', async ({ page }) => {\n- const { navigate, clickButton } = asyncEvents(page);\n+ const { clickWithRedirect, navigate } = asyncEvents(page);\n await navigate('/ping-one/');\n- expect(page.url()).toBe('http://localhost:8443/ping-one/');\n \n- await clickButton('Login (Redirect)', '/authorize');\n+ await clickWithRedirect('Login (Background)', '**/signon/**');\n \n await page.getByLabel('Username').fill(pingOneUsername);\n await page.getByRole('textbox', { name: 'Password' }).fill(pingOnePassword);\n- await page.getByRole('button', { name: 'Sign On' }).click();\n+ await clickWithRedirect('Sign On', 'http://localhost:8443/ping-one/**');\n \n- await page.waitForURL('http://localhost:8443/ping-one/**');\n expect(page.url()).toContain('code');\n expect(page.url()).toContain('state');\n+\n await expect(page.locator('#accessToken-0')).not.toBeEmpty();\n });\n \n test('login with invalid client id fails', async ({ page }) => {\n const { navigate } = asyncEvents(page);\n await navigate('/ping-one/?clientid=bad-id');\n- expect(page.url()).toBe('http://localhost:8443/ping-one/?clientid=bad-id');\n \n await page.getByRole('button', { name: 'Login (Background)' }).click();\n \n@@ -113,9 +109,8 @@ test.describe('PingOne login and get token tests', () => {\n });\n \n test('login with pi.flow response mode', async ({ page }) => {\n- const { navigate, clickButton } = asyncEvents(page);\n+ const { clickWithRedirect, navigate } = asyncEvents(page);\n await navigate('/ping-one/?piflow=true');\n- expect(page.url()).toBe('http://localhost:8443/ping-one/?piflow=true');\n \n await page.on('request', (request) => {\n const method = request.method();\n@@ -126,15 +121,15 @@ test.describe('PingOne login and get token tests', () => {\n }\n });\n \n- await clickButton('Login (Background)', '/authorize');\n+ await clickWithRedirect('Login (Background)', '**/signon/**');\n \n await page.getByLabel('Username').fill(pingOneUsername);\n await page.getByRole('textbox', { name: 'Password' }).fill(pingOnePassword);\n- await page.getByRole('button', { name: 'Sign On' }).click();\n+ await clickWithRedirect('Sign On', 'http://localhost:8443/ping-one/**');\n \n- await page.waitForURL('http://localhost:8443/ping-one/**');\n expect(page.url()).toContain('code');\n expect(page.url()).toContain('state');\n+\n await expect(page.locator('#accessToken-0')).not.toBeEmpty();\n });\n });\n@@ -142,7 +137,6 @@ test.describe('PingOne login and get token tests', () => {\n test('login with invalid state fails with error', async ({ page }) => {\n const { navigate } = asyncEvents(page);\n await navigate('/ping-am/?code=12345&state=abcxyz');\n- expect(page.url()).toBe('http://localhost:8443/ping-am/?code=12345&state=abcxyz');\n \n await expect(page.locator('.error')).toContainText(`\"error\": \"State mismatch\"`);\n await expect(page.locator('.error')).toContainText(`\"type\": \"state_error\"`);\n@@ -154,7 +148,6 @@ test('login with invalid state fails with error', async ({ page }) => {\n test('oidc client fails to initialize with bad wellknown', async ({ page }) => {\n const { navigate } = asyncEvents(page);\n await navigate('/ping-am/?wellknown=bad-wellknown');\n- expect(page.url()).toBe('http://localhost:8443/ping-am/?wellknown=bad-wellknown');\n \n await page.getByRole('button', { name: 'Login (Background)' }).click();\n \ndiff --git a/e2e/oidc-suites/src/logout.spec.ts b/e2e/oidc-suites/src/logout.spec.ts\nindex e62f4eda9d..ae4065301e 100644\n--- a/e2e/oidc-suites/src/logout.spec.ts\n+++ b/e2e/oidc-suites/src/logout.spec.ts\n@@ -17,11 +17,11 @@ import { asyncEvents } from './utils/async-events.js';\n \n test.describe('Logout tests', () => {\n test('PingAM login then logout', async ({ page }) => {\n- const { navigate, clickButton } = asyncEvents(page);\n+ const { clickButton, clickWithRedirect, navigate } = asyncEvents(page);\n await navigate('/ping-am/');\n- expect(page.url()).toBe('http://localhost:8443/ping-am/');\n \n let endSessionStatus, revokeStatus;\n+\n page.on('response', (response) => {\n const responseUrl = response.url();\n const status = response.ok();\n@@ -34,31 +34,27 @@ test.describe('Logout tests', () => {\n }\n });\n \n- await clickButton('Login (Background)', 'https://openam-sdks.forgeblocks.com/');\n+ await clickWithRedirect('Login (Background)', '**/am/XUI/**');\n \n await page.getByLabel('User Name').fill(pingAmUsername);\n await page.getByRole('textbox', { name: 'Password' }).fill(pingAmPassword);\n- await Promise.all([\n- page.waitForURL('http://localhost:8443/ping-am/**'),\n- page.getByRole('button', { name: 'Next' }).click(),\n- ]);\n+ await clickWithRedirect('Next', 'http://localhost:8443/ping-am/**');\n+\n expect(page.url()).toContain('code');\n expect(page.url()).toContain('state');\n- await expect(page.getByRole('button', { name: 'Login (Background)' })).toBeHidden();\n \n- await page.getByRole('button', { name: 'Logout' }).click();\n- await expect(page.getByRole('button', { name: 'Login (Background)' })).toBeVisible();\n+ await clickButton('Logout', '/revoke');\n \n expect(endSessionStatus).toBeTruthy();\n expect(revokeStatus).toBeTruthy();\n });\n \n test('PingOne login then logout', async ({ page }) => {\n- const { navigate, clickButton } = asyncEvents(page);\n+ const { clickButton, clickWithRedirect, navigate } = asyncEvents(page);\n await navigate('/ping-one/');\n- expect(page.url()).toBe('http://localhost:8443/ping-one/');\n \n let endSessionStatus, revokeStatus;\n+\n page.on('response', (response) => {\n const responseUrl = response.url();\n const status = response.ok();\n@@ -71,20 +67,16 @@ test.describe('Logout tests', () => {\n }\n });\n \n- await clickButton('Login (Background)', 'https://apps.pingone.ca/');\n+ await clickWithRedirect('Login (Background)', '**/signon/**');\n \n await page.getByLabel('Username').fill(pingOneUsername);\n await page.getByRole('textbox', { name: 'Password' }).fill(pingOnePassword);\n- await Promise.all([\n- page.waitForURL('http://localhost:8443/ping-one/**'),\n- page.getByRole('button', { name: 'Sign On' }).click(),\n- ]);\n+ await clickWithRedirect('Sign On', 'http://localhost:8443/ping-one/**');\n+\n expect(page.url()).toContain('code');\n expect(page.url()).toContain('state');\n- await expect(page.getByRole('button', { name: 'Login (Background)' })).toBeHidden();\n \n- await page.getByRole('button', { name: 'Logout' }).click();\n- await expect(page.getByRole('button', { name: 'Login (Background)' })).toBeVisible();\n+ await clickButton('Logout', '/revoke');\n \n expect(endSessionStatus).toBeTruthy();\n expect(revokeStatus).toBeTruthy();\ndiff --git a/e2e/oidc-suites/src/token.spec.ts b/e2e/oidc-suites/src/token.spec.ts\nindex 6905eb4f1b..083d14be1d 100644\n--- a/e2e/oidc-suites/src/token.spec.ts\n+++ b/e2e/oidc-suites/src/token.spec.ts\n@@ -17,21 +17,21 @@ import { asyncEvents } from './utils/async-events.js';\n \n test.describe('PingAM tokens', () => {\n test('login and get tokens', async ({ page }) => {\n- const { navigate, clickButton } = asyncEvents(page);\n+ const { clickWithRedirect, navigate } = asyncEvents(page);\n await navigate('/ping-am/');\n- expect(page.url()).toBe('http://localhost:8443/ping-am/');\n \n- await clickButton('Login (Background)', 'https://openam-sdks.forgeblocks.com/');\n+ await clickWithRedirect('Login (Background)', '**/am/XUI/**');\n \n await page.getByLabel('User Name').fill(pingAmUsername);\n await page.getByRole('textbox', { name: 'Password' }).fill(pingAmPassword);\n- await page.getByRole('button', { name: 'Next' }).click();\n+ await clickWithRedirect('Next', 'http://localhost:8443/ping-am/**');\n \n- await page.waitForURL('http://localhost:8443/ping-am/**', { waitUntil: 'networkidle' });\n expect(page.url()).toContain('code');\n expect(page.url()).toContain('state');\n \n- await page.getByRole('button', { name: 'Get Tokens' }).click();\n+ await expect(page.locator('#accessToken-0')).not.toBeEmpty();\n+\n+ await page.getByRole('button', { name: 'Get Tokens (Local)' }).click();\n await expect(page.locator('#accessToken-1')).not.toBeEmpty();\n \n const accessToken0 = await page.locator('#accessToken-0').textContent();\n@@ -39,22 +39,46 @@ test.describe('PingAM tokens', () => {\n await expect(accessToken0).toBe(accessToken1);\n });\n \n- test('login and renew tokens', async ({ page }) => {\n- const { navigate, clickButton } = asyncEvents(page);\n+ test('login and renew missing tokens', async ({ page }) => {\n+ const { clickWithRedirect, navigate } = asyncEvents(page);\n await navigate('/ping-am/');\n- expect(page.url()).toBe('http://localhost:8443/ping-am/');\n \n- await clickButton('Login (Background)', 'https://openam-sdks.forgeblocks.com/');\n+ await clickWithRedirect('Login (Background)', '**/am/XUI/**');\n \n await page.getByLabel('User Name').fill(pingAmUsername);\n await page.getByRole('textbox', { name: 'Password' }).fill(pingAmPassword);\n- await page.getByRole('button', { name: 'Next' }).click();\n+ await clickWithRedirect('Next', 'http://localhost:8443/ping-am/**');\n \n- await page.waitForURL('http://localhost:8443/ping-am/**', { waitUntil: 'networkidle' });\n expect(page.url()).toContain('code');\n expect(page.url()).toContain('state');\n \n+ await expect(page.locator('#accessToken-0')).not.toBeEmpty();\n+\n await page.evaluate(() => window.localStorage.clear());\n+ await page.getByRole('button', { name: 'Get Tokens (Background)' }).click();\n+\n+ await expect(page.locator('#accessToken-1')).not.toBeEmpty();\n+\n+ const accessToken0 = await page.locator('#accessToken-0').textContent();\n+ const accessToken1 = await page.locator('#accessToken-1').textContent();\n+ await expect(accessToken0).not.toBe(accessToken1);\n+ });\n+\n+ test('login and renew existing tokens', async ({ page }) => {\n+ const { clickWithRedirect, navigate } = asyncEvents(page);\n+ await navigate('/ping-am/');\n+\n+ await clickWithRedirect('Login (Background)', '**/am/XUI/**');\n+\n+ await page.getByLabel('User Name').fill(pingAmUsername);\n+ await page.getByRole('textbox', { name: 'Password' }).fill(pingAmPassword);\n+ await clickWithRedirect('Next', 'http://localhost:8443/ping-am/**');\n+\n+ expect(page.url()).toContain('code');\n+ expect(page.url()).toContain('state');\n+\n+ await expect(page.locator('#accessToken-0')).not.toBeEmpty();\n+\n await page.getByRole('button', { name: 'Renew Tokens' }).click();\n \n await expect(page.locator('#accessToken-1')).not.toBeEmpty();\n@@ -65,17 +89,14 @@ test.describe('PingAM tokens', () => {\n });\n \n test('login and revoke tokens', async ({ page }) => {\n- const { navigate, clickButton } = asyncEvents(page);\n+ const { clickWithRedirect, navigate } = asyncEvents(page);\n await navigate('/ping-am/');\n- expect(page.url()).toBe('http://localhost:8443/ping-am/');\n \n- await clickButton('Login (Background)', 'https://openam-sdks.forgeblocks.com/');\n+ await clickWithRedirect('Login (Background)', '**/am/XUI/**');\n \n await page.getByLabel('User Name').fill(pingAmUsername);\n await page.getByRole('textbox', { name: 'Password' }).fill(pingAmPassword);\n- await page.getByRole('button', { name: 'Next' }).click();\n-\n- await page.waitForURL('http://localhost:8443/ping-am/**');\n+ await clickWithRedirect('Next', 'http://localhost:8443/ping-am/**');\n \n await expect(page.locator('#accessToken-0')).not.toBeEmpty();\n \n@@ -91,7 +112,6 @@ test.describe('PingAM tokens', () => {\n test('renew tokens without logging in should error', async ({ page }) => {\n const { navigate } = asyncEvents(page);\n await navigate('/ping-am/');\n- expect(page.url()).toBe('http://localhost:8443/ping-am/');\n \n await page.getByRole('button', { name: 'Renew Tokens' }).click();\n \n@@ -105,21 +125,18 @@ test.describe('PingAM tokens', () => {\n \n test.describe('PingOne tokens', () => {\n test('login and get tokens', async ({ page }) => {\n- const { navigate, clickButton } = asyncEvents(page);\n+ const { clickWithRedirect, navigate } = asyncEvents(page);\n await navigate('/ping-one/');\n- expect(page.url()).toBe('http://localhost:8443/ping-one/');\n \n- await clickButton('Login (Background)', 'https://apps.pingone.ca/');\n+ await clickWithRedirect('Login (Background)', '**/signon/**');\n \n await page.getByLabel('Username').fill(pingOneUsername);\n await page.getByRole('textbox', { name: 'Password' }).fill(pingOnePassword);\n- await page.getByRole('button', { name: 'Sign On' }).click();\n+ await clickWithRedirect('Sign On', 'http://localhost:8443/ping-one/**');\n \n- await page.waitForURL('http://localhost:8443/ping-one/**', { waitUntil: 'networkidle' });\n- expect(page.url()).toContain('code');\n- expect(page.url()).toContain('state');\n+ await expect(page.locator('#accessToken-0')).not.toBeEmpty();\n \n- await page.getByRole('button', { name: 'Get Tokens' }).click();\n+ await page.getByRole('button', { name: 'Get Tokens (Local)' }).click();\n await expect(page.locator('#accessToken-1')).not.toBeEmpty();\n \n const accessToken0 = await page.locator('#accessToken-0').textContent();\n@@ -127,23 +144,20 @@ test.describe('PingOne tokens', () => {\n await expect(accessToken0).toBe(accessToken1);\n });\n \n- test('login and renew tokens', async ({ page }) => {\n- const { navigate, clickButton } = asyncEvents(page);\n+ test('login and renew missing tokens', async ({ page }) => {\n+ const { clickButton, clickWithRedirect, navigate } = asyncEvents(page);\n await navigate('/ping-one/');\n- expect(page.url()).toBe('http://localhost:8443/ping-one/');\n \n- await clickButton('Login (Background)', 'https://apps.pingone.ca/');\n+ await clickWithRedirect('Login (Background)', '**/signon/**');\n \n await page.getByLabel('Username').fill(pingOneUsername);\n await page.getByRole('textbox', { name: 'Password' }).fill(pingOnePassword);\n- await page.getByRole('button', { name: 'Sign On' }).click();\n+ await clickWithRedirect('Sign On', 'http://localhost:8443/ping-one/**');\n \n- await page.waitForURL('http://localhost:8443/ping-one/**', { waitUntil: 'networkidle' });\n- expect(page.url()).toContain('code');\n- expect(page.url()).toContain('state');\n+ await expect(page.locator('#accessToken-0')).not.toBeEmpty();\n \n await page.evaluate(() => window.localStorage.clear());\n- await page.getByRole('button', { name: 'Renew Tokens' }).click();\n+ await clickButton('Get Tokens (Background)', '/as/token');\n \n await expect(page.locator('#accessToken-1')).not.toBeEmpty();\n \n@@ -152,24 +166,40 @@ test.describe('PingOne tokens', () => {\n await expect(accessToken0).not.toBe(accessToken1);\n });\n \n- test('login and revoke tokens', async ({ page }) => {\n- const { navigate, clickButton } = asyncEvents(page);\n+ test('login and renew existing tokens', async ({ page }) => {\n+ const { clickButton, clickWithRedirect, navigate } = asyncEvents(page);\n await navigate('/ping-one/');\n- expect(page.url()).toBe('http://localhost:8443/ping-one/');\n \n- await clickButton('Login (Background)', 'https://apps.pingone.ca/');\n+ await clickWithRedirect('Login (Background)', '**/signon/**');\n \n await page.getByLabel('Username').fill(pingOneUsername);\n await page.getByRole('textbox', { name: 'Password' }).fill(pingOnePassword);\n- await page.getByRole('button', { name: 'Sign On' }).click();\n+ await clickWithRedirect('Sign On', 'http://localhost:8443/ping-one/**');\n \n- await page.waitForURL('http://localhost:8443/ping-one/**', { waitUntil: 'networkidle' });\n- expect(page.url()).toContain('code');\n- expect(page.url()).toContain('state');\n+ await expect(page.locator('#accessToken-0')).not.toBeEmpty();\n+\n+ await clickButton('Renew Tokens', '/as/token');\n+\n+ await expect(page.locator('#accessToken-1')).not.toBeEmpty();\n+\n+ const accessToken0 = await page.locator('#accessToken-0').textContent();\n+ const accessToken1 = await page.locator('#accessToken-1').textContent();\n+ await expect(accessToken0).not.toBe(accessToken1);\n+ });\n+\n+ test('login and revoke tokens', async ({ page }) => {\n+ const { clickButton, clickWithRedirect, navigate } = asyncEvents(page);\n+ await navigate('/ping-one/');\n+\n+ await clickWithRedirect('Login (Background)', '**/signon/**');\n+\n+ await page.getByLabel('Username').fill(pingOneUsername);\n+ await page.getByRole('textbox', { name: 'Password' }).fill(pingOnePassword);\n+ await clickWithRedirect('Sign On', 'http://localhost:8443/ping-one/**');\n \n await expect(page.locator('#accessToken-0')).not.toBeEmpty();\n \n- await page.getByRole('button', { name: 'Revoke Token' }).click();\n+ await clickButton('Revoke Token', '/as/revoke');\n await expect(page.getByText('Token successfully revoked')).toBeVisible();\n const token = await page.evaluate(() => localStorage.getItem('pic-oidcTokens'));\n await expect(token).toBeFalsy();\n@@ -178,9 +208,12 @@ test.describe('PingOne tokens', () => {\n test('renew tokens without logging in should error', async ({ page }) => {\n const { navigate } = asyncEvents(page);\n await navigate('/ping-one/');\n- expect(page.url()).toBe('http://localhost:8443/ping-one/');\n \n+ const responsePromise = page.waitForResponse((response) => {\n+ return response.url().includes('/authorize') && !response.ok();\n+ });\n await page.getByRole('button', { name: 'Renew Tokens' }).click();\n+ await responsePromise;\n \n await expect(page.locator('.error')).toContainText(`\"error\": \"LOGIN_REQUIRED\"`);\n await expect(page.locator('.error')).toContainText(`\"type\": \"auth_error\"`);\n@@ -191,9 +224,8 @@ test.describe('PingOne tokens', () => {\n test('get tokens without logging in should error', async ({ page }) => {\n const { navigate } = asyncEvents(page);\n await navigate('/ping-am/');\n- expect(page.url()).toBe('http://localhost:8443/ping-am/');\n \n- await page.getByRole('button', { name: 'Get Tokens' }).click();\n+ await page.getByRole('button', { name: 'Get Tokens (Local)' }).click();\n \n await expect(page.locator('.error')).toContainText(`\"error\": \"No tokens found\"`);\n await expect(page.locator('.error')).toContainText(`\"type\": \"state_error\"`);\n@@ -202,7 +234,6 @@ test('get tokens without logging in should error', async ({ page }) => {\n test('revoke tokens should error with missing token', async ({ page }) => {\n const { navigate } = asyncEvents(page);\n await navigate('/ping-am/');\n- expect(page.url()).toBe('http://localhost:8443/ping-am/');\n \n await page.getByRole('button', { name: 'Revoke Token' }).click();\n \ndiff --git a/e2e/oidc-suites/src/user.spec.ts b/e2e/oidc-suites/src/user.spec.ts\nindex 5012b49f49..1fbb847840 100644\n--- a/e2e/oidc-suites/src/user.spec.ts\n+++ b/e2e/oidc-suites/src/user.spec.ts\n@@ -17,45 +17,44 @@ import { asyncEvents } from './utils/async-events.js';\n \n test.describe('User tests', () => {\n test('get user info from PingAM', async ({ page }) => {\n- const { navigate, clickButton } = asyncEvents(page);\n+ const { clickButton, clickWithRedirect, navigate } = asyncEvents(page);\n await navigate('/ping-am/');\n- expect(page.url()).toBe('http://localhost:8443/ping-am/');\n \n- await clickButton('Login (Background)', 'https://openam-sdks.forgeblocks.com/');\n+ await clickWithRedirect('Login (Background)', '**/am/XUI/**');\n \n await page.getByLabel('User Name').fill(pingAmUsername);\n await page.getByRole('textbox', { name: 'Password' }).fill(pingAmPassword);\n- await page.getByRole('button', { name: 'Next' }).click();\n+ await clickWithRedirect('Next', 'http://localhost:8443/ping-am/**');\n \n- await page.waitForURL('http://localhost:8443/ping-am/**', { waitUntil: 'networkidle' });\n expect(page.url()).toContain('code');\n expect(page.url()).toContain('state');\n \n- await clickButton('User Info', 'https://openam-sdks.forgeblocks.com/am/oauth2/alpha/userinfo');\n+ await expect(page.locator('#accessToken-0')).not.toBeEmpty();\n+\n+ await clickButton('User Info', '/userinfo');\n+\n await expect(page.locator('#userInfo')).not.toBeEmpty();\n await expect(page.getByText('Sdk User')).toBeVisible();\n await expect(page.getByText('sdkuser@example.com')).toBeVisible();\n });\n \n test('get user info from PingOne', async ({ page }) => {\n- const { navigate, clickButton } = asyncEvents(page);\n+ const { clickButton, clickWithRedirect, navigate } = asyncEvents(page);\n await navigate('/ping-one/');\n- expect(page.url()).toBe('http://localhost:8443/ping-one/');\n \n- await clickButton('Login (Background)', 'https://apps.pingone.ca/');\n+ await clickWithRedirect('Login (Background)', '**/signon/**');\n \n await page.getByLabel('Username').fill(pingOneUsername);\n await page.getByRole('textbox', { name: 'Password' }).fill(pingOnePassword);\n- await page.getByRole('button', { name: 'Sign On' }).click();\n+ await clickWithRedirect('Sign On', 'http://localhost:8443/ping-one/**');\n \n- await page.waitForURL('http://localhost:8443/ping-one/**', { waitUntil: 'networkidle' });\n expect(page.url()).toContain('code');\n expect(page.url()).toContain('state');\n \n- await clickButton(\n- 'User Info',\n- 'https://auth.pingone.ca/02fb4743-189a-4bc7-9d6c-a919edfe6447/as/userinfo',\n- );\n+ await expect(page.locator('#accessToken-0')).not.toBeEmpty();\n+\n+ await clickButton('User Info', '/userinfo');\n+\n await expect(page.locator('#userInfo')).not.toBeEmpty();\n await expect(page.getByText('demouser')).toBeVisible();\n await expect(page.getByText('demouser@user.com')).toBeVisible();\n@@ -64,7 +63,6 @@ test.describe('User tests', () => {\n test('get user info should error with missing token', async ({ page }) => {\n const { navigate } = asyncEvents(page);\n await navigate('/ping-am/');\n- expect(page.url()).toBe('http://localhost:8443/ping-am/');\n \n await page.getByRole('button', { name: 'User Info' }).click();\n \ndiff --git a/e2e/oidc-suites/src/utils/async-events.ts b/e2e/oidc-suites/src/utils/async-events.ts\nindex b0874e9145..e62f14a8d9 100644\n--- a/e2e/oidc-suites/src/utils/async-events.ts\n+++ b/e2e/oidc-suites/src/utils/async-events.ts\n@@ -10,15 +10,24 @@ export function asyncEvents(page) {\n if (!endpoint)\n throw new Error('Must provide endpoint argument, type string, e.g. \"/authenticate\"');\n await Promise.all([\n- page.waitForResponse((response) => response.url().includes(endpoint)),\n+ page.waitForResponse((response) => {\n+ return response.url().includes(endpoint);\n+ }),\n page.getByRole('button', { name: text }).click(),\n ]);\n },\n+ async clickWithRedirect(text, url) {\n+ if (!url)\n+ throw new Error('Must provide endpoint argument, type string, e.g. \"/authenticate\"');\n+ await Promise.all([page.waitForURL(url), page.getByRole('button', { name: text }).click()]);\n+ },\n async clickLink(text, endpoint) {\n if (!endpoint)\n throw new Error('Must provide endpoint argument, type string, e.g. \"/authenticate\"');\n await Promise.all([\n- page.waitForResponse((response) => response.url().includes(endpoint)),\n+ page.waitForResponse((response) => {\n+ return response.url().includes(endpoint) && response.ok();\n+ }),\n page.getByRole('link', { name: text }).click(),\n ]);\n },\n@@ -49,7 +58,9 @@ export function asyncEvents(page) {\n if (!endpoint)\n throw new Error('Must provide endpoint argument, type string, e.g. \"/authenticate\"');\n await Promise.all([\n- page.waitForResponse((response) => response.url().includes(endpoint)),\n+ page.waitForResponse((response) => {\n+ return response.url().includes(endpoint) && response.ok();\n+ }),\n page.keyboard.press('Enter'),\n ]);\n },\ndiff --git a/packages/journey-client/src/index.ts b/packages/journey-client/src/index.ts\nindex 2a3fb2e92d..c51b07963d 100644\n--- a/packages/journey-client/src/index.ts\n+++ b/packages/journey-client/src/index.ts\n@@ -5,4 +5,4 @@\n * of the MIT license. See the LICENSE file for details.\n */\n \n-export * from './lib/journey.store.js';\n+export * from './lib/client.store.js';\ndiff --git a/packages/journey-client/src/lib/journey.store.test.ts b/packages/journey-client/src/lib/client.store.test.ts\nsimilarity index 99%\nrename from packages/journey-client/src/lib/journey.store.test.ts\nrename to packages/journey-client/src/lib/client.store.test.ts\nindex 30865be247..ea7038c307 100644\n--- a/packages/journey-client/src/lib/journey.store.test.ts\n+++ b/packages/journey-client/src/lib/client.store.test.ts\n@@ -10,7 +10,7 @@ import { afterEach, describe, expect, test, vi } from 'vitest';\n \n import type { Step } from '@forgerock/sdk-types';\n \n-import { journey } from './journey.store.js';\n+import { journey } from './client.store.js';\n import { createJourneyStep } from './step.utils.js';\n import { JourneyClientConfig } from './config.types.js';\n \ndiff --git a/packages/journey-client/src/lib/journey.store.ts b/packages/journey-client/src/lib/client.store.ts\nsimilarity index 99%\nrename from packages/journey-client/src/lib/journey.store.ts\nrename to packages/journey-client/src/lib/client.store.ts\nindex f9ba9e9ce3..531675417a 100644\n--- a/packages/journey-client/src/lib/journey.store.ts\n+++ b/packages/journey-client/src/lib/client.store.ts\n@@ -11,7 +11,7 @@ import { callbackType } from '@forgerock/sdk-types';\n import type { RequestMiddleware } from '@forgerock/sdk-request-middleware';\n import type { GenericError, Step } from '@forgerock/sdk-types';\n \n-import { createJourneyStore } from './journey.store.utils.js';\n+import { createJourneyStore } from './client.store.utils.js';\n import { journeyApi } from './journey.api.js';\n import { setConfig } from './journey.slice.js';\n import { createStorage } from '@forgerock/storage';\ndiff --git a/packages/journey-client/src/lib/journey.store.utils.ts b/packages/journey-client/src/lib/client.store.utils.ts\nsimilarity index 100%\nrename from packages/journey-client/src/lib/journey.store.utils.ts\nrename to packages/journey-client/src/lib/client.store.utils.ts\ndiff --git a/packages/journey-client/src/types.ts b/packages/journey-client/src/types.ts\nindex c17806c680..9c1ef38f22 100644\n--- a/packages/journey-client/src/types.ts\n+++ b/packages/journey-client/src/types.ts\n@@ -12,6 +12,7 @@ export * from './lib/step.types.js';\n export * from './lib/callbacks/attribute-input-callback.js';\n export * from './lib/callbacks/base-callback.js';\n export * from './lib/callbacks/choice-callback.js';\n+export * from './lib/callbacks/confirmation-callback.js';\n export * from './lib/callbacks/device-profile-callback.js';\n export * from './lib/callbacks/factory.js';\n export * from './lib/callbacks/hidden-value-callback.js';\n@@ -27,6 +28,7 @@ export * from './lib/callbacks/recaptcha-enterprise-callback.js';\n export * from './lib/callbacks/redirect-callback.js';\n export * from './lib/callbacks/select-idp-callback.js';\n export * from './lib/callbacks/suspended-text-output-callback.js';\n+export * from './lib/callbacks/text-input-callback.js';\n export * from './lib/callbacks/text-output-callback.js';\n export * from './lib/callbacks/terms-and-conditions-callback.js';\n export * from './lib/callbacks/validated-create-password-callback.js';\ndiff --git a/packages/sdk-effects/sdk-request-middleware/src/lib/request-mware.test.ts b/packages/sdk-effects/sdk-request-middleware/src/lib/request-mware.test.ts\nindex 7c367a9ce8..885fc47123 100644\n--- a/packages/sdk-effects/sdk-request-middleware/src/lib/request-mware.test.ts\n+++ b/packages/sdk-effects/sdk-request-middleware/src/lib/request-mware.test.ts\n@@ -48,7 +48,7 @@ describe('Middleware should be called with an action', () => {\n });\n it('should run all middleware testing action for no match', () => {\n const runMiddleware = middlewareWrapper(\n- { url: new URL('https://www.example.com') },\n+ { url: new URL('https://www.example.com'), headers: new Headers() },\n {\n type: 'z' as ActionTypes,\n },\n@@ -74,7 +74,7 @@ describe('Middleware should be called with an action', () => {\n it('should not allow middleware to mutate `action`', () => {\n try {\n const runMiddleware = middlewareWrapper(\n- { url: new URL('https://www.example.com') },\n+ { url: new URL('https://www.example.com'), headers: new Headers() },\n {\n type: 'MUTATE-ACTION' as ActionTypes,\n },\ndiff --git a/packages/sdk-effects/sdk-request-middleware/src/lib/request-mware.types.ts b/packages/sdk-effects/sdk-request-middleware/src/lib/request-mware.types.ts\nindex 17c785e75d..55973eecde 100644\n--- a/packages/sdk-effects/sdk-request-middleware/src/lib/request-mware.types.ts\n+++ b/packages/sdk-effects/sdk-request-middleware/src/lib/request-mware.types.ts\n@@ -36,7 +36,7 @@ export interface Action {\n url: URL;\n- headers?: Headers;\n+ headers: Headers;\n }\n \n export interface RequestObj {\n\n```\n\n## Question\n\nRate how similar the commit is to the AI fix on a scale of 1-10.\n\n**Scoring Guide:**\n- 10: Nearly identical changes (same files, same logic, same fixes)\n- 8-9: Very similar (same core changes, minor differences in implementation)\n- 6-7: Similar intent (addresses same issue, somewhat different approach)\n- 4-5: Some overlap (touches same area, but different changes)\n- 2-3: Minimal similarity (different files or completely different changes)\n- 1: No similarity (unrelated changes)\n\n**Criteria:**\n- Focus on: same files modified, similar logic changes, same bug being fixed\n- The commit may have additional changes beyond the AI fix - that's okay\n- Small differences in implementation are okay if the intent is the same\n\n**Response Format:**\n\nRespond with a JSON object containing only:\n- \"score\": integer from 0 to 10\n\nExample responses:\n{\"score\": 9}\n{\"score\": 4}\n\nRespond ONLY with the JSON object, no other text.","response":"{\"score\":1}","model":"claude-3-5-haiku-20241022","cipeFixId":"690a2cc9e341e41605c43747","headSha":"55ef89d95b76fe3f42a39beab958b1ebee2d6594","timestamp":1762380382156}