fix: introduce AuthProxyService to reduce token calls

libs/angular-auth/src/lib/angular-auth.module.ts

@@ -6,6 +6,7 @@ import { TokenInterceptor } from './token.interceptor'
 import { AuthService } from './auth.service'
 import { AuthServiceWrapper } from './auth-service-wrapper'
 import { KeycloakAuthService } from './auth_services/keycloak-auth.service'
+import { AuthProxyService } from './auth-proxy.service'
 import { KeycloakService } from 'keycloak-angular'
 
 function appInitializer(configService: ConfigurationService, authService: AuthService) {
@@ -15,19 +16,38 @@ function appInitializer(configService: ConfigurationService, authService: AuthSe
   }
 }
 
-@NgModule({
-  imports: [CommonModule],
-  providers: [
-    AuthServiceWrapper,
-    { provide: HTTP_INTERCEPTORS, useClass: TokenInterceptor, multi: true },
+function provideAuthServices() {
+  return [AuthServiceWrapper, KeycloakAuthService, KeycloakService]
+}
+
+export function provideAuthService() {
+  return [
+    provideAuthServices(),
     {
       provide: APP_INITIALIZER,
       useFactory: appInitializer,
       deps: [ConfigurationService, AuthServiceWrapper],
       multi: true,
     },
-    KeycloakAuthService,
-    KeycloakService,
+  ]
+}
+
+export function provideTokenInterceptor() {
+  return [
+    AuthProxyService,
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: TokenInterceptor,
+      multi: true,
+    },
+  ]
+}
+
+@NgModule({
+  imports: [CommonModule],
+  providers: [
+    provideTokenInterceptor(),
+    provideAuthServices(), // Only needed as fallback if shell uses lib version without new auth mechanism
   ],
 })
 export class AngularAuthModule {}

libs/angular-auth/src/lib/auth-proxy.service.ts

@@ -0,0 +1,29 @@
+import { Injectable, inject } from '@angular/core'
+import './declarations'
+import { AuthServiceWrapper } from './auth-service-wrapper'
+
+@Injectable()
+export class AuthProxyService {
+  authServiceWrapper?: AuthServiceWrapper | null
+
+  getHeaderValues(): Record<string, string> {
+    return (
+      window.onecxAngularAuth?.authServiceProxy?.v1?.getHeaderValues() ??
+      this.authServiceWrapper?.getHeaderValues() ??
+      {}
+    )
+  }
+
+  async updateTokenIfNeeded(): Promise<boolean> {
+    if (!window.onecxAngularAuth?.authServiceProxy?.v1?.updateTokenIfNeeded) {
+      console.info('AuthProxyService uses injected fallback.')
+      this.authServiceWrapper = inject(AuthServiceWrapper, { optional: true })
+      await this.authServiceWrapper?.init()
+    }
+    return (
+      window.onecxAngularAuth?.authServiceProxy?.v1?.updateTokenIfNeeded() ??
+      this.authServiceWrapper?.updateTokenIfNeeded() ??
+      Promise.reject('No authServiceWrapper provided.')
+    )
+  }
+}

libs/angular-auth/src/lib/auth-service-wrapper.ts

@@ -6,6 +6,7 @@ import { Injectable, Injector } from '@angular/core'
 import { KeycloakAuthService } from './auth_services/keycloak-auth.service'
 import { loadRemoteModule } from '@angular-architects/module-federation'
 import { Config } from '@onecx/integration-interface'
+import './declarations'
 
 @Injectable()
 export class AuthServiceWrapper {
@@ -20,6 +21,16 @@ export class AuthServiceWrapper {
     this.eventsTopic$
       .pipe(filter((e) => e.type === 'authentication#logoutButtonClicked'))
       .subscribe(() => this.authService?.logout())
+    window.onecxAngularAuth ??= {}
+    window.onecxAngularAuth.authServiceProxy ??= {}
+    window.onecxAngularAuth.authServiceProxy.v1 ??= {
+      updateTokenIfNeeded: (): Promise<boolean> => {
+        return this.updateTokenIfNeeded()
+      },
+      getHeaderValues: (): Record<string, string> => {
+        return this.getHeaderValues()
+      },
+    }
   }
   async init(): Promise<boolean | undefined> {
     await this.configService.isInitialized

libs/angular-auth/src/lib/declarations.ts

@@ -0,0 +1,14 @@
+declare global {
+    interface Window {
+      onecxAngularAuth?: {
+        authServiceProxy?: {
+            v1?: {
+                getHeaderValues: () => Record<string, string>,
+                updateTokenIfNeeded: () => Promise<boolean>
+            }
+        }
+      }
+    }
+}
+
+export default globalThis

libs/angular-auth/src/lib/token.interceptor.ts

@@ -1,13 +1,13 @@
 import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http'
 import { Injectable } from '@angular/core'
 import { Observable, from, mergeMap } from 'rxjs'
-import { AuthServiceWrapper } from './auth-service-wrapper'
+import { AuthProxyService } from './auth-proxy.service'
 
 const WHITELIST = ['assets']
 
 @Injectable()
 export class TokenInterceptor implements HttpInterceptor {
-  constructor(private authService: AuthServiceWrapper) {}
+  constructor(private authService: AuthProxyService) {}
 
   intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
     const skip = WHITELIST.some((str) => request.url.includes(str))