@open-rlb/ng-app 3.0.15 → 3.0.17

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 } from '@angular/router';
+import { NavigationEnd, RoutesRecognized, RouterModule, Router, provideRouter, withDebugTracing } from '@angular/router';
 import * as i1$4 from '@angular/service-worker';
 import { provideServiceWorker } from '@angular/service-worker';
 import * as i1$8 from '@ngrx/effects';
@@ -1326,13 +1326,20 @@ class AuthenticationService {
                     currentProvider: authenticatedConfig.configId
                 }));
                 // Redirect logic -> clean query params
-                const redirect = this.cookiesService.getCookie('loginRedirectUrl');
+                const redirect = localStorage.getItem('loginRedirectUrl');
+                //const redirect = this.cookiesService.getCookie('loginRedirectUrl');
                 this.logger.info(`Correct provider dispatched, redirectUrl: ${redirect}`);
                 if (redirect) {
-                    this.cookiesService.deleteCookie('loginRedirectUrl');
-                    this.router.navigateByUrl(redirect, { replaceUrl: true });
+                    localStorage.removeItem('loginRedirectUrl');
+                    // this.cookiesService.deleteCookie('loginRedirectUrl');
+                    // setTimeout to prevent NavigationCancel
+                    // this allows current angular navigation cycle (handle URL with code/state)  to complete
+                    setTimeout(() => {
+                        this.router.navigateByUrl(redirect, { replaceUrl: true });
+                    }, 0);
                 }
                 else {
+                    this.logger.info(`Correct provider dispatched, redirectUrl doesn't exist, navigate to root route: ${redirect}`);
                     this.router.navigate([], {
                         queryParams: {},
                         replaceUrl: true,
@@ -1355,7 +1362,8 @@ class AuthenticationService {
     }
     login(targetUrl) {
         const returnUrl = targetUrl || this.router.url || '/';
-        this.cookiesService.setCookie('loginRedirectUrl', returnUrl, 1);
+        // this.cookiesService.setCookie('loginRedirectUrl', returnUrl, 1);
+        localStorage.setItem('loginRedirectUrl', returnUrl);
         this.logger.log(`call login method, loginRedirectUrl: ${returnUrl}`);
         // electron
         if (typeof (process) !== 'undefined' &&
@@ -3063,7 +3071,7 @@ function provideApp(app) {
             }, multi: true
         },];
     if (app.routes) {
-        providers.push(provideRouter(app.routes));
+        providers.push(provideRouter(app.routes, withDebugTracing()));
     }
     if (app.providers) {
         providers.push(...app.providers);