Refactor authentication handling to utilize LoginStrategy and improve error management

apps/isa-app/src/app/app.component.ts

@@ -1,5 +1,5 @@
 import { DOCUMENT } from '@angular/common';
-import { Component, effect, HostListener, Inject, OnInit, Renderer2, signal, untracked } from '@angular/core';
+import { Component, effect, HostListener, inject, Inject, Injector, OnInit, Renderer2, signal, untracked } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { SwUpdate } from '@angular/service-worker';
 import { ApplicationService } from '@core/application';
@@ -10,7 +10,7 @@ import { asapScheduler, interval, Subscription } from 'rxjs';
 import { UserStateService } from '@swagger/isa';
 import { IsaLogProvider } from './providers';
 import { EnvironmentService } from '@core/environment';
-import { AuthService } from '@core/auth';
+import { AuthService, LoginStrategy } from '@core/auth';
 import { UiMessageModalComponent, UiModalService } from '@ui/modal';
 import { injectOnline$ } from './services/network-status.service';
 import { toSignal } from '@angular/core/rxjs-interop';
@@ -35,6 +35,8 @@ import { animate, style, transition, trigger } from '@angular/animations';
   ],
 })
 export class AppComponent implements OnInit {
+  readonly injector = inject(Injector);
+
   $online = toSignal(injectOnline$());
 
   $offlineBannerVisible = signal(false);
@@ -180,15 +182,9 @@ export class AppComponent implements OnInit {
     if (this._document.hidden && this._authService.isAuthenticated()) {
       this._authService.refresh();
     } else if (!this._authService.isAuthenticated()) {
-      return this._modal
-        .open({
-          content: UiMessageModalComponent,
-          title: 'Sie sind nicht mehr angemeldet',
-          data: { message: 'Sie werden neu angemeldet' },
-        })
-        .afterClosed$.subscribe(() => {
-          this._authService.login();
-        });
+      const strategy = this.injector.get(LoginStrategy);
+
+      return strategy.login('Sie sind nicht mehr angemeldet');
     }
   }
 }

apps/isa-app/src/app/app.module.ts

@@ -81,6 +81,7 @@ export function _appInitializerFactory(config: Config, injector: Injector) {
         const state = injector.get(RootStateService);
         await state.init();
       } else {
+        statusElement.innerHTML = 'Authentifizierung wird durchgeführt...';
         const strategy = injector.get(LoginStrategy);
         await strategy.login();
       }

apps/isa-app/src/app/interceptors/http-error.interceptor.ts

@@ -1,9 +1,9 @@
-import { Injectable } from '@angular/core';
+import { inject, Injectable, Injector } from '@angular/core';
 import { HttpInterceptor, HttpEvent, HttpHandler, HttpRequest, HttpErrorResponse } from '@angular/common/http';
-import { NEVER, Observable, throwError } from 'rxjs';
+import { from, NEVER, Observable, throwError } from 'rxjs';
 import { UiMessageModalComponent, UiModalService } from '@ui/modal';
 import { catchError, filter, mergeMap, takeUntil, tap } from 'rxjs/operators';
-import { AuthService } from '@core/auth';
+import { AuthService, LoginStrategy } from '@core/auth';
 import { IsaLogProvider } from '../providers';
 import { LogLevel } from '@core/logger';
 import { injectOnline$ } from '../services/network-status.service';
@@ -11,6 +11,7 @@ import { injectOnline$ } from '../services/network-status.service';
 @Injectable()
 export class HttpErrorInterceptor implements HttpInterceptor {
   readonly offline$ = injectOnline$().pipe(filter((online) => !online));
+  readonly injector = inject(Injector);
 
   constructor(
     private _modal: UiModalService,
@@ -27,18 +28,9 @@ export class HttpErrorInterceptor implements HttpInterceptor {
 
   handleError(error: HttpErrorResponse): Observable<any> {
     if (error.status === 401) {
-      return this._modal
-        .open({
-          content: UiMessageModalComponent,
-          title: 'Sie sind nicht mehr angemeldet',
-          data: { message: 'Sie werden neu angemeldet' },
-        })
-        .afterClosed$.pipe(
-          tap(() => {
-            this._auth.login();
-          }),
-          mergeMap(() => NEVER),
-        );
+      const strategy = this.injector.get(LoginStrategy);
+
+      return from(strategy.login('Sie sind nicht mehr angemeldet')).pipe(mergeMap(() => NEVER));
     }
 
     if (!error.url.endsWith('/isa/logging')) {

apps/isa-app/src/core/auth/auth.service.ts

@@ -47,8 +47,9 @@ export class AuthService {
 
     this._oAuthService.setupAutomaticSilentRefresh();
 
-    await this._oAuthService.loadDiscoveryDocumentAndTryLogin();
-
+    try {
+      await this._oAuthService.loadDiscoveryDocumentAndTryLogin();
+    } catch (error) {}
     this._initialized.next(true);
   }
 

apps/isa-app/src/core/auth/login.strategy.ts

@@ -21,7 +21,7 @@ export class LoginStrategy {
     let loginModalResult: UiModalResult<boolean>;
 
     try {
-      if (this.environmentService.isMobileDevice()) {
+      if (true || this.environmentService.isMobileDevice()) {
         do {
           const loginModal = this.modal.open({
             content: UiConfirmModalComponent,