feat(ui): Use app initializer

chutney/ui/src/app/app.module.ts

@@ -27,9 +27,9 @@ import { BsModalService, ModalModule } from 'ngx-bootstrap/modal';
 import { ThemeService } from '@core/theme/theme.service';
 import { DefaultMissingTranslationHandler, HttpLoaderFactory } from '@core/initializer/app.translate.factory';
 import { themeInitializer } from '@core/initializer/theme.initializer';
-import { OAuthModule, OAuthService } from 'angular-oauth2-oidc';
-import { SsoService } from '@core/services/sso.service';
-import { tap } from 'rxjs';
+import { OAuthModule } from 'angular-oauth2-oidc';
+import { ssoInitializer } from "@core/initializer/sso.initializer";
+import { SsoService } from "@core/services/sso.service";
 
 @NgModule({
   declarations: [
@@ -71,25 +71,17 @@ import { tap } from 'rxjs';
           useFactory: themeInitializer,
           deps: [ThemeService],
           multi: true
+      },
+      {
+          provide: APP_INITIALIZER,
+          useFactory: ssoInitializer,
+          deps: [SsoService],
+          multi: true
       }
   ],
   bootstrap: [AppComponent]
 })
-export class ChutneyAppModule {
-
-  constructor(private oauthService: OAuthService, private ssoOpenIdConnectService: SsoService) {
-    this.configureOAuth();
-  }
-
-  private configureOAuth() {
-    this.ssoOpenIdConnectService.fetchSsoConfig().pipe(
-      tap(ssoConfig => {
-        this.oauthService.configure(ssoConfig)
-        this.oauthService.loadDiscoveryDocumentAndTryLogin();
-      })
-    ).subscribe()
-  }
- }
+export class ChutneyAppModule {}
 
 
 

chutney/ui/src/app/core/components/login/login.component.ts

@@ -56,7 +56,6 @@ export class LoginComponent implements OnDestroy, OnInit {
     if (this.loginService.isAuthenticated()) {
         this.loginService.navigateAfterLogin();
     }
-    this.ssoService.fetchSsoConfig()
   }
 
   ngOnDestroy() {

chutney/ui/src/app/core/initializer/sso.initializer.ts

@@ -0,0 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: 2017-2024 Enedis
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+import { SsoService } from "@core/services/sso.service";
+
+export function ssoInitializer(ssoOpenIdConnectService: SsoService): () => void {
+    return () => ssoOpenIdConnectService.fetchSsoConfig()
+}

chutney/ui/src/app/core/services/sso.service.ts

@@ -8,7 +8,7 @@
 import { HttpClient } from '@angular/common/http';
 import { AuthConfig, OAuthService } from 'angular-oauth2-oidc';
 import { environment } from '@env/environment';
-import { Observable, map } from 'rxjs';
+import {Observable, map, tap} from 'rxjs';
 import { Injectable } from '@angular/core';
 
 interface SsoAuthConfig {
@@ -34,8 +34,8 @@ export class SsoService {
 
   constructor(private oauthService: OAuthService, private http: HttpClient) {}
 
-  fetchSsoConfig(): Observable<AuthConfig> {
-      return this.http.get<SsoAuthConfig>(environment.backend + this.resourceUrl).pipe(
+  fetchSsoConfig(): void {
+    this.http.get<SsoAuthConfig>(environment.backend + this.resourceUrl).pipe(
         map(ssoConfig => {
           this.ssoConfig = ssoConfig
           return {
@@ -47,8 +47,12 @@ export class SsoService {
             dummyClientSecret: ssoConfig.clientSecret,
             oidc: ssoConfig.oidc
           }
+        }),
+        tap(ssoConfig => {
+          this.oauthService.configure(ssoConfig)
+          this.oauthService.loadDiscoveryDocumentAndTryLogin();
         })
-      )
+    ).subscribe()
   }
 
   login() {