@open-rlb/ng-app 3.0.16 → 3.0.18

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

@@ -1317,7 +1317,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,19 +1324,25 @@ class AuthenticationService {
                 this.store.dispatch(AuthActions.setCurrentProvider({
                     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.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 {
@@ -1355,7 +1360,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' &&