chore: setup-tests-normalize-config

Author: ryanbas21

.claude/settings.local.json

@@ -0,0 +1,15 @@
+{
+  "permissions": {
+    "allow": [
+      "mcp__serena__search_for_pattern",
+      "mcp__serena__list_dir",
+      "mcp__serena__find_file",
+      "mcp__serena__read_file",
+      "WebSearch",
+      "WebFetch(domain:github.com)",
+      "WebFetch(domain:raw.githubusercontent.com)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

e2e/am-mock-api/package.json

@@ -6,7 +6,6 @@
   "keywords": [],
   "license": "ISC",
   "author": "",
-  "type": "module",
   "main": "./index.js",
   "dependencies": {
     "@types/express": "^4.17.17",

e2e/journey-app/main.ts

@@ -23,6 +23,8 @@ const searchParams = new URLSearchParams(qs);
 
 const config = serverConfigs[searchParams.get('clientId') || 'basic'];
 
+const tree = searchParams.get('tree') ?? 'UsernamePassword';
+
 const requestMiddleware: RequestMiddleware[] = [
   (req, action, next) => {
     switch (action.type) {
@@ -42,13 +44,13 @@ const requestMiddleware: RequestMiddleware[] = [
 ];
 
 (async () => {
-  const journeyClient = await journey({ config, requestMiddleware });
+  const journeyClient = await journey({ config: config, requestMiddleware });
 
   const errorEl = document.getElementById('error') as HTMLDivElement;
   const formEl = document.getElementById('form') as HTMLFormElement;
   const journeyEl = document.getElementById('journey') as HTMLDivElement;
 
-  let step = await journeyClient.start();
+  let step = await journeyClient.start({ journey: tree });
 
   function renderComplete() {
     if (step?.type !== 'LoginSuccess') {
@@ -70,7 +72,7 @@ const requestMiddleware: RequestMiddleware[] = [
 
       console.log('Logout successful');
 
-      step = await journeyClient.start();
+      step = await journeyClient.start({ journey: tree });
 
       renderForm();
     });

e2e/journey-app/server-configs.ts

@@ -9,8 +9,8 @@ import type { JourneyClientConfig } from '@forgerock/journey-client/types';
 export const serverConfigs: Record<string, JourneyClientConfig> = {
   basic: {
     serverConfig: {
-      baseUrl: 'https://openam-sdks.forgeblocks.com/am/',
+      baseUrl: 'http://localhost:9443/am',
     },
-    realmPath: '/alpha',
+    realmPath: 'root',
   },
 };

e2e/journey-suites/playwright.config.ts

@@ -27,9 +27,6 @@ const config: PlaywrightTestConfig = {
     process.env.CI == 'false'
       ? {
           command: 'pnpm watch @forgerock/journey-app',
-          port: 5829,
-          ignoreHTTPSErrors: true,
-          reuseExistingServer: !process.env.CI,
           cwd: workspaceRoot,
         }
       : undefined,
@@ -40,6 +37,13 @@ const config: PlaywrightTestConfig = {
       reuseExistingServer: !process.env.CI,
       cwd: workspaceRoot,
     },
+    {
+      command: 'pnpm nx serve am-mock-api',
+      port: 5829,
+      ignoreHTTPSErrors: true,
+      reuseExistingServer: !process.env.CI,
+      cwd: workspaceRoot,
+    },
   ].filter(Boolean),
 };
 

e2e/journey-suites/src/basic.test.ts

@@ -7,7 +7,6 @@
 
 import { expect, test } from '@playwright/test';
 import { asyncEvents } from './utils/async-events.js';
-import { username, password } from './utils/demo-user.js';
 
 test('Test happy paths on test page', async ({ page }) => {
   const { navigate } = asyncEvents(page);
@@ -24,8 +23,8 @@ test('Test happy paths on test page', async ({ page }) => {
   expect(page.url()).toBe('http://localhost:5829/');
 
   // Perform basic login
-  await page.getByLabel('User Name').fill(username);
-  await page.getByLabel('Password').fill(password);
+  await page.getByLabel('User Name').fill('sdkuser');
+  await page.getByLabel('Password').fill('password');
   await page.getByRole('button', { name: 'Submit' }).click();
   await expect(page.getByText('Complete')).toBeVisible();
 

package.json

@@ -34,7 +34,7 @@
     "test": "CI=true nx affected:test",
     "test:e2e": "CI=true nx affected:e2e",
     "verdaccio": "nx local-registry",
-    "watch": "nx watch-deps"
+    "watch": "nx vite:watch-deps"
   },
   "lint-staged": {
     "*": [

packages/journey-client/src/lib/journey.store.test.ts

@@ -238,6 +238,65 @@ describe('journey-client', () => {
     });
   });
 
+  describe('baseUrl normalization', () => {
+    test('should add trailing slash to baseUrl without one', async () => {
+      const configWithoutSlash: JourneyClientConfig = {
+        serverConfig: {
+          baseUrl: 'http://localhost:9443/am',
+        },
+        realmPath: 'root',
+      };
+
+      const mockStepResponse: Step = { authId: 'test-auth-id', callbacks: [] };
+      mockFetch.mockResolvedValue(new Response(JSON.stringify(mockStepResponse)));
+
+      const client = await journey({ config: configWithoutSlash });
+      await client.start();
+
+      expect(mockFetch).toHaveBeenCalledTimes(1);
+      const request = mockFetch.mock.calls[0][0] as Request;
+      expect(request.url).toBe('http://localhost:9443/am/json/realms/root/authenticate');
+    });
+
+    test('should preserve trailing slash if already present', async () => {
+      const configWithSlash: JourneyClientConfig = {
+        serverConfig: {
+          baseUrl: 'http://localhost:9443/am/',
+        },
+        realmPath: 'root',
+      };
+
+      const mockStepResponse: Step = { authId: 'test-auth-id', callbacks: [] };
+      mockFetch.mockResolvedValue(new Response(JSON.stringify(mockStepResponse)));
+
+      const client = await journey({ config: configWithSlash });
+      await client.start();
+
+      expect(mockFetch).toHaveBeenCalledTimes(1);
+      const request = mockFetch.mock.calls[0][0] as Request;
+      expect(request.url).toBe('http://localhost:9443/am/json/realms/root/authenticate');
+    });
+
+    test('should work with baseUrl without context path', async () => {
+      const configNoContext: JourneyClientConfig = {
+        serverConfig: {
+          baseUrl: 'http://localhost:9443',
+        },
+        realmPath: 'root',
+      };
+
+      const mockStepResponse: Step = { authId: 'test-auth-id', callbacks: [] };
+      mockFetch.mockResolvedValue(new Response(JSON.stringify(mockStepResponse)));
+
+      const client = await journey({ config: configNoContext });
+      await client.start();
+
+      expect(mockFetch).toHaveBeenCalledTimes(1);
+      const request = mockFetch.mock.calls[0][0] as Request;
+      expect(request.url).toBe('http://localhost:9443/json/realms/root/authenticate');
+    });
+  });
+
   // TODO: Add tests for endSession when the test environment AbortSignal issue is resolved
   // test('endSession() should call the sessions endpoint with DELETE method', async () => {
   //   mockFetch.mockResolvedValue(new Response('', { status: 200 }));

packages/journey-client/src/lib/journey.store.ts

@@ -22,6 +22,26 @@ import type { JourneyClientConfig } from './config.types.js';
 import type { RedirectCallback } from './callbacks/redirect-callback.js';
 import { NextOptions, StartParam, ResumeOptions } from './interfaces.js';
 
+/**
+ * Normalizes the serverConfig to ensure baseUrl has a trailing slash.
+ * This is required for the resolve() function to work correctly with context paths like /am.
+ */
+function normalizeConfig(config: JourneyClientConfig): JourneyClientConfig {
+  if (config.serverConfig?.baseUrl) {
+    const url = config.serverConfig.baseUrl;
+    if (url.charAt(url.length - 1) !== '/') {
+      return {
+        ...config,
+        serverConfig: {
+          ...config.serverConfig,
+          baseUrl: url + '/',
+        },
+      };
+    }
+  }
+  return config;
+}
+
 export async function journey({
   config,
   requestMiddleware,
@@ -36,8 +56,11 @@ export async function journey({
 }) {
   const log = loggerFn({ level: logger?.level || 'error', custom: logger?.custom });
 
-  const store = createJourneyStore({ requestMiddleware, logger: log, config });
-  store.dispatch(setConfig(config));
+  // Normalize config to ensure baseUrl has trailing slash
+  const normalizedConfig = normalizeConfig(config);
+
+  const store = createJourneyStore({ requestMiddleware, logger: log, config: normalizedConfig });
+  store.dispatch(setConfig(normalizedConfig));
 
   const stepStorage = createStorage<{ step: Step }>({
     type: 'sessionStorage',