fix: address race condition in auth config initializer (#21655)

core-libs/core/src/auth/user-auth/config/auth-config-initializer.spec.ts

@@ -1,9 +1,11 @@
 import { TestBed } from '@angular/core/testing';
-import { Config, ConfigInitializerService, WindowRef } from '@spartacus/core';
-import { Observable, of } from 'rxjs';
+import { delay, Observable, of } from 'rxjs';
+import { Config } from '../../../config';
+import { ConfigInitializerService } from '../../../config/config-initializer';
 import { BaseSiteService } from '../../../site-context/facade/base-site.service';
 import { BASE_SITE_CONTEXT_ID } from '../../../site-context/providers/context-ids';
 import { SiteContextParamsService } from '../../../site-context/services';
+import { WindowRef } from '../../../window';
 import { AuthConfig } from '../config/auth-config';
 import { AuthConfigInitializer } from './auth-config-initializer';
 
@@ -216,5 +218,43 @@ describe('AuthConfigInitializer', () => {
         expect(config.authentication?.client_id).toEqual(expected);
       });
     });
+
+    describe('initialization race conditions', () => {
+      let expected: Config;
+      beforeEach(() => {
+        mockAuthConfig.authentication.initializerOptions.baseSiteSuffix = true;
+        mockAuthConfig.authentication.initializerOptions.addBaseSiteToRedirectUri =
+          true;
+
+        expected = <Config>{
+          authentication: {
+            client_id: `${mockClientId}_${mockActiveBaseSite}`,
+            OAuthLibConfig: {
+              redirectUri: `http://localhost:4200/${mockActiveBaseSite}`,
+            },
+          },
+        };
+      });
+
+      it('should handle slow baseSite request', async () => {
+        spyOn(baseSiteService, 'getActive').and.returnValue(
+          of(mockActiveBaseSite).pipe(delay(10))
+        );
+
+        const config = await service.configFactory();
+
+        expect(config).toEqual(expected);
+      });
+
+      it('should handle slow config request', async () => {
+        (configInitializerService.getStable as jasmine.Spy).and.returnValue(
+          of(authConfig).pipe(delay(10))
+        );
+
+        const config = await service.configFactory();
+
+        expect(config).toEqual(expected);
+      });
+    });
   });
 });

core-libs/core/src/auth/user-auth/config/auth-config-initializer.ts

@@ -5,8 +5,7 @@
  */
 
 import { inject, Injectable } from '@angular/core';
-import { firstValueFrom, Observable } from 'rxjs';
-import { map, take, withLatestFrom } from 'rxjs/operators';
+import { combineLatest, firstValueFrom, map, Observable } from 'rxjs';
 import { ConfigInitializer } from '../../../config/config-initializer/config-initializer';
 import { ConfigInitializerService } from '../../../config/config-initializer/config-initializer.service';
 import { BaseSiteService } from '../../../site-context/facade/base-site.service';
@@ -31,12 +30,13 @@ export class AuthConfigInitializer implements ConfigInitializer {
   protected isSSR = !this.windowRef.isBrowser();
 
   protected resolveConfig(): Observable<AuthConfig> {
-    return this.baseSiteService.getActive().pipe(
-      take(1),
-      withLatestFrom(
-        this.configInit.getStable('authentication.initializerOptions')
+    return combineLatest({
+      baseSite: this.baseSiteService.getActive(),
+      authConfig: this.configInit.getStable(
+        'authentication.initializerOptions'
       ),
-      map(([baseSite, authConfig]) => {
+    }).pipe(
+      map(({ baseSite, authConfig }) => {
         return {
           authentication: {
             client_id: this.generateClientId(baseSite, authConfig),