@open-rlb/ng-app 3.0.17 → 3.0.19

package/fesm2022/open-rlb-ng-app.mjs

@@ -3,7 +3,7 @@ import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@a
 import * as i0 from '@angular/core';
 import { InjectionToken, Injectable, Inject, Optional, EventEmitter, importProvidersFrom, makeStateKey, makeEnvironmentProviders, Pipe, Input, Component, PLATFORM_ID, NgModule, Directive, inject, APP_INITIALIZER, isDevMode } from '@angular/core';
 import * as i2 from '@angular/router';
-import { NavigationEnd, RoutesRecognized, RouterModule, Router, provideRouter, withDebugTracing } from '@angular/router';
+import { NavigationEnd, RoutesRecognized, RouterModule, Router, provideRouter } from '@angular/router';
 import * as i1$4 from '@angular/service-worker';
 import { provideServiceWorker } from '@angular/service-worker';
 import * as i1$8 from '@ngrx/effects';
@@ -1283,13 +1283,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImpo
         }] });
 
 class AuthenticationService {
-    constructor(oidcSecurityService, cookiesService, router, parseJwtService, store, log, envConfig, authConfig) {
+    constructor(oidcSecurityService, cookiesService, router, parseJwtService, store, log, localStorage, envConfig, authConfig) {
         this.oidcSecurityService = oidcSecurityService;
         this.cookiesService = cookiesService;
         this.router = router;
         this.parseJwtService = parseJwtService;
         this.store = store;
         this.log = log;
+        this.localStorage = localStorage;
         this.envConfig = envConfig;
         this.authConfig = authConfig;
         this.logger = this.log.for(this.constructor.name);
@@ -1317,7 +1318,6 @@ class AuthenticationService {
         // } else {
         return this.oidc.checkAuthMultiple(url)
             .pipe(tap(data => {
-            this.logger.warn(`oidc checkAuthMultiple check, response: ${JSON.stringify(data)}; looking for at least one isAuthenticated`);
             const authenticatedConfig = data.find(o => o.isAuthenticated);
             if (authenticatedConfig && authenticatedConfig.configId) {
                 this.logger.info(`User is authenticated with provider: ${authenticatedConfig.configId}. Updating Store.`);
@@ -1325,12 +1325,11 @@ class AuthenticationService {
                 this.store.dispatch(AuthActions.setCurrentProvider({
                     currentProvider: authenticatedConfig.configId
                 }));
-                // Redirect logic -> clean query params
-                const redirect = localStorage.getItem('loginRedirectUrl');
+                const redirect = this.localStorage.readLocal('loginRedirectUrl');
                 //const redirect = this.cookiesService.getCookie('loginRedirectUrl');
                 this.logger.info(`Correct provider dispatched, redirectUrl: ${redirect}`);
                 if (redirect) {
-                    localStorage.removeItem('loginRedirectUrl');
+                    this.localStorage.removeLocal('loginRedirectUrl');
                     // this.cookiesService.deleteCookie('loginRedirectUrl');
                     // setTimeout to prevent NavigationCancel
                     // this allows current angular navigation cycle (handle URL with code/state)  to complete
@@ -1339,12 +1338,12 @@ class AuthenticationService {
                     }, 0);
                 }
                 else {
-                    this.logger.info(`Correct provider dispatched, redirectUrl doesn't exist, navigate to root route: ${redirect}`);
-                    this.router.navigate([], {
-                        queryParams: {},
-                        replaceUrl: true,
-                        relativeTo: this.router.routerState.root
-                    });
+                    this.logger.info(`User authenticated, no redirectUrl found. Staying on current route.`);
+                    // this.router.navigate([], {
+                    //   queryParams: {},
+                    //   replaceUrl: true,
+                    //   relativeTo: this.router.routerState.root
+                    // });
                 }
             }
             else {
@@ -1363,7 +1362,7 @@ class AuthenticationService {
     login(targetUrl) {
         const returnUrl = targetUrl || this.router.url || '/';
         // this.cookiesService.setCookie('loginRedirectUrl', returnUrl, 1);
-        localStorage.setItem('loginRedirectUrl', returnUrl);
+        this.localStorage.writeLocal('loginRedirectUrl', returnUrl);
         this.logger.log(`call login method, loginRedirectUrl: ${returnUrl}`);
         // electron
         if (typeof (process) !== 'undefined' &&
@@ -1421,7 +1420,7 @@ class AuthenticationService {
     matchRoles(roles) {
         return this.accessToken$.pipe(map(token => this.parseJwtService.parseJwt(token)), map(payload => payload['roles']), map(userRoles => roles.some(role => userRoles.includes(role))));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: AuthenticationService, deps: [{ token: i1$5.OidcSecurityService }, { token: CookiesService }, { token: i2.Router }, { token: ParseJwtService }, { token: i1$1.Store }, { token: AppLoggerService }, { token: RLB_CFG_ENV, optional: true }, { token: RLB_CFG_AUTH, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: AuthenticationService, deps: [{ token: i1$5.OidcSecurityService }, { token: CookiesService }, { token: i2.Router }, { token: ParseJwtService }, { token: i1$1.Store }, { token: AppLoggerService }, { token: AppStorageService }, { token: RLB_CFG_ENV, optional: true }, { token: RLB_CFG_AUTH, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: AuthenticationService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: AuthenticationService, decorators: [{
@@ -1429,7 +1428,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: () => [{ type: i1$5.OidcSecurityService }, { type: CookiesService }, { type: i2.Router }, { type: ParseJwtService }, { type: i1$1.Store }, { type: AppLoggerService }, { type: undefined, decorators: [{
+        }], ctorParameters: () => [{ type: i1$5.OidcSecurityService }, { type: CookiesService }, { type: i2.Router }, { type: ParseJwtService }, { type: i1$1.Store }, { type: AppLoggerService }, { type: AppStorageService }, { type: undefined, decorators: [{
                     type: Optional
                 }, {
                     type: Inject,
@@ -3071,7 +3070,7 @@ function provideApp(app) {
             }, multi: true
         },];
     if (app.routes) {
-        providers.push(provideRouter(app.routes, withDebugTracing()));
+        providers.push(provideRouter(app.routes));
     }
     if (app.providers) {
         providers.push(...app.providers);