IS-10102 Make "initialUrl" required on LWA bootstrap

luisgoncalves · luisgoncalves · commit 63a2f69c56d7 · 2026-04-02T09:58:10.000+01:00
diff --git a/src/login-web-app/.nvmrc b/src/login-web-app/.nvmrc
diff --git a/src/login-web-app/index.html b/src/login-web-app/index.html
@@ -18,36 +18,28 @@
   </head>
   <body>
     <script>
-      function arg(name, required) {
-        if (required === undefined) {
-          required = true;
-        }
-
+      function arg(name) {
         const args = new URL(window.location.href).searchParams;
         const value = args.get(name);
         if (value) {
           return value;
         }
-
-        if (required) {
-          throw new Error(`Missing argument '${name}'`);
-        }
+        throw new Error(`Missing argument '${name}'`);
       }
 
-      const originalUrl = arg('originalUrl');
-      const haapi = {
-        clientId: arg('haapi_clientId'),
-        tokenEndpoint: arg('haapi_tokenEndpoint'),
+      // Set the configuration object expected by the application
+      window.__CONFIG__ = {
+        initialUrl: arg('initialUrl'),
+        haapi: {
+          clientId: arg('haapi_clientId'),
+          tokenEndpoint: arg('haapi_tokenEndpoint'),
+        },
       };
 
       // Change the current URL to match the original request to Identity Server, so that it looks like the
       // application was loaded directly by the server's template
+      const originalUrl = arg('originalUrl');
       window.history.replaceState(undefined, '', originalUrl);
-      // Set the configuration object expected by the application
-      window.__CONFIG__ = {
-        initialUrl: arg('initialUrl', false),
-        haapi,
-      };
     </script>
     <div id="root"></div>
     <script type="module" src="/src/main.tsx"></script>
diff --git a/src/login-web-app/loader-dev.vm.html b/src/login-web-app/loader-dev.vm.html
@@ -20,12 +20,10 @@
     <script>
       const query = new URLSearchParams({
         originalUrl: window.location.href,
+        initialUrl: '$_apiDrivenInitialUrl',
         haapi_clientId: '$_apiDrivenClientInfo.clientId',
         haapi_tokenEndpoint: '$_apiDrivenClientInfo.tokenEndpoint',
       });
-      #if ($_apiDrivenInitialUrl)
-      query.append('initialUrl', '$_apiDrivenInitialUrl');
-      #end
 
       const redirect = new URL('/', window.location.href);
       redirect.search = query.toString();
diff --git a/src/login-web-app/loader.vm.html b/src/login-web-app/loader.vm.html
@@ -19,7 +19,7 @@
   <body>
     <script>
       window.__CONFIG__ = {
-        initialUrl: #if ($_apiDrivenInitialUrl) '$_apiDrivenInitialUrl' #else undefined #end,
+        initialUrl: '$_apiDrivenInitialUrl',
         haapi: {
           clientId: '$_apiDrivenClientInfo.clientId',
           tokenEndpoint: '$_apiDrivenClientInfo.tokenEndpoint',
diff --git a/src/login-web-app/src/haapi-stepper/data-access/bootstrap-configuration.ts b/src/login-web-app/src/haapi-stepper/data-access/bootstrap-configuration.ts
@@ -1,7 +1,7 @@
 import { HaapiConfiguration } from '@curity/identityserver-haapi-web-driver';
 
 export interface BootstrapConfiguration {
-  initialUrl?: string;
+  initialUrl: string;
   haapi: HaapiConfiguration;
 }
 
diff --git a/src/login-web-app/src/haapi-stepper/feature/stepper/HaapiStepper.spec.tsx b/src/login-web-app/src/haapi-stepper/feature/stepper/HaapiStepper.spec.tsx
@@ -31,14 +31,10 @@ import { HaapiStepperActionStep, HaapiStepperFormAction } from './haapi-stepper.
 import type { BootstrapConfiguration } from '../../data-access/bootstrap-configuration';
 
 describe('HaapiStepper', () => {
-  const initializationHref = 'https://example.com/auth';
   const initialStepType = HAAPI_STEPS.AUTHENTICATION;
 
   beforeEach(() => {
     vi.clearAllMocks();
-    vi.stubGlobal('location', {
-      href: initializationHref,
-    });
     mockHaapiFetchStep(initialStepType);
   });
 
@@ -48,41 +44,20 @@ describe('HaapiStepper', () => {
   });
 
   describe('Steps', () => {
-    describe('initialization', () => {
-      afterEach(() => {
-        delete mockConfiguration.initialUrl;
-      });
-
-      it('should initialize the first step with the current location and render the children', async () => {
-        render(
-          <HaapiStepper>
-            <TestComponent />
-          </HaapiStepper>
-        );
-
-        expect(mockHaapiFetch).toHaveBeenCalledWith(initializationHref, { method: 'GET' });
-
-        const stepRendered = await screen.findByTestId('step-type');
-
-        expect(stepRendered).toHaveTextContent(initialStepType);
-        expect(screen.queryByTestId('loading')).not.toBeInTheDocument();
-        expect(screen.queryByTestId('error')).not.toBeInTheDocument();
-      });
+    it('should initialize the first step with the bootstrap initial URL and render the children', async () => {
+      render(
+        <HaapiStepper>
+          <TestComponent />
+        </HaapiStepper>
+      );
 
-      it('should initialize the first step with the bootstrap initial URL', async () => {
-        const initialUrl = 'https://example.com/other';
-        mockConfiguration.initialUrl = initialUrl;
+      expect(mockHaapiFetch).toHaveBeenCalledWith(mockConfiguration.initialUrl, { method: 'GET' });
 
-        render(
-          <HaapiStepper>
-            <TestComponent />
-          </HaapiStepper>
-        );
+      const stepRendered = await screen.findByTestId('step-type');
 
-        await waitFor(() => {
-          expect(mockHaapiFetch).toHaveBeenCalledWith(initialUrl, { method: 'GET' });
-        });
-      });
+      expect(stepRendered).toHaveTextContent(initialStepType);
+      expect(screen.queryByTestId('loading')).not.toBeInTheDocument();
+      expect(screen.queryByTestId('error')).not.toBeInTheDocument();
     });
 
     it('should go to the next step and provide the updated current step', async () => {
@@ -384,7 +359,7 @@ describe('HaapiStepper', () => {
             await goToNextStep(HAAPI_STEPS.POLLING, { bankId: true });
 
             const startButton = await screen.findByRole('button', { name: 'Start BankID' });
-            
+
             act(() => startButton.click());
 
             await waitFor(() => {
@@ -502,8 +477,13 @@ describe('HaapiStepper', () => {
 
       expect(historyData).toHaveLength(1);
       expect(historyData[0].step.type).toBe(initialStep);
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-      expect(historyData[0].triggeredByAction).toEqual({ ...previousStepTriggerActionKind, id: expect.anything() });
+      expect(historyData[0].triggeredByAction).toEqual({
+        ...previousStepTriggerActionKind,
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        id: expect.anything(),
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        href: expect.anything(),
+      });
       expect(historyData[0].triggeredByPayload).toBeUndefined();
 
       await goToNextStep(secondStep);
@@ -659,7 +639,9 @@ vi.mock('../../data-access/haapi-fetch-initializer', () => {
 });
 
 const mockConfiguration: Partial<BootstrapConfiguration> = vi.hoisted(() => {
-  return {};
+  return {
+    initialUrl: 'https://example.com/auth',
+  };
 });
 vi.mock('../../data-access/bootstrap-configuration', () => {
   return {
diff --git a/src/login-web-app/src/haapi-stepper/feature/stepper/HaapiStepper.tsx b/src/login-web-app/src/haapi-stepper/feature/stepper/HaapiStepper.tsx
@@ -442,9 +442,8 @@ function cancelPendingOperation(pendingOperation: RefObject<AbortController | No
 }
 
 function getInitialStepLink() {
-  const initialUrl = configuration.initialUrl ?? window.location.href;
   const initialStepLink: HaapiStepperLink = {
-    href: initialUrl,
+    href: configuration.initialUrl,
     rel: 'self',
     type: HAAPI_STEPPER_ELEMENT_TYPES.LINK,
     subtype: 'initial-link',

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import { HaapiConfiguration } from '@curity/identityserver-haapi-web-driver';`
`2`	`2`
`3`	`3`	`export interface BootstrapConfiguration {`
`4`		`- initialUrl?: string;`
	`4`	`+ initialUrl: string;`
`5`	`5`	`haapi: HaapiConfiguration;`
`6`	`6`	`}`
`7`	`7`