@open-rlb/ng-app 3.0.10 → 3.0.12

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

@@ -1327,7 +1327,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 +1350,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' &&
@@ -2350,7 +2351,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;
@@ -2994,7 +2995,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImpo
         }] });
 
 function authInitializer(authService) {
-    console.warn("authInitializer!!");
     return () => authService.checkAuthMultiple();
 }