@open-rlb/ng-app 3.0.11 → 3.0.13

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

@@ -156,10 +156,9 @@ const LEVEL_PRIORITIES = {
     debug: 4,
     log: 5,
 };
-class AppLoggerService extends AbstractLoggerService {
+class AppLoggerService {
     constructor() {
-        super();
-        this.currentLevel = 'off';
+        this.currentLevel = 'log';
         this.timestamps = true;
     }
     setLogLevel(level) {
@@ -1327,7 +1326,7 @@ class AuthenticationService {
                 this.logger.info(`Correct provider dispatched, redirectUrl: ${redirect}`);
                 if (redirect) {
                     this.cookiesService.deleteCookie('loginRedirectUrl');
-                    this.router.navigate([redirect], { queryParams: {} });
+                    this.router.navigateByUrl(redirect, { replaceUrl: true });
                 }
                 else {
                     this.router.navigate([], {
@@ -1350,9 +1349,10 @@ class AuthenticationService {
         }));
         //}
     }
-    login() {
-        this.cookiesService.setCookie('loginRedirectUrl', this.router.url || '/', 1);
-        this.logger.log(`call login method, loginRedirectUrl: ${this.router.url || '/'}`);
+    login(targetUrl) {
+        const returnUrl = targetUrl || this.router.url || '/';
+        this.cookiesService.setCookie('loginRedirectUrl', returnUrl, 1);
+        this.logger.log(`call login method, loginRedirectUrl: ${returnUrl}`);
         // electron
         if (typeof (process) !== 'undefined' &&
             typeof (process?.version) !== 'undefined' &&
@@ -1390,7 +1390,7 @@ class AuthenticationService {
     }
     get isAuthenticated$() {
         return this.oidc.isAuthenticated$.pipe(map((isAuthenticated) => {
-            this.logger.warn(`oidc isAuthenticated$ check, response: ${JSON.stringify(isAuthenticated)}; looking for isAuthenticated of ${this.currentProvider?.configId} configId`);
+            this.logger.log(`oidc isAuthenticated$ check, response: ${JSON.stringify(isAuthenticated)}; looking for isAuthenticated of ${this.currentProvider?.configId} configId`);
             return isAuthenticated.allConfigsAuthenticated.find(o => o.configId === this.currentProvider?.configId)?.isAuthenticated || false;
         }));
     }
@@ -2350,7 +2350,7 @@ const oauthGuard = (route, state) => {
     const authService = inject(AuthenticationService);
     return authService.isAuthenticated$.pipe(take(1), map((isAuthenticated) => {
         if (!isAuthenticated) {
-            authService.login();
+            authService.login(state.url);
             return false;
         }
         return true;