@open-rlb/ng-app 3.0.8 → 3.0.10

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

@@ -446,6 +446,11 @@ class AppsService {
         this.store.dispatch(AppContextActions.setCurrentApp({ app, mode: viewMode, url }));
     }
     initAuthProviders(store, confAuth) {
+        const currentProviderInStore = this.store.selectSignal((state) => state[authsFeatureKey].currentProvider)();
+        if (currentProviderInStore) {
+            this.logger.info(`Auth provider already set to '${currentProviderInStore}' by Initializer. AppsService initAuthProviders skipping init.`);
+            return;
+        }
         if (!confAuth?.providers?.length) {
             this.logger.warn('No auth providers configured.');
             return;
@@ -1310,13 +1315,38 @@ class AuthenticationService {
         return this.oidc.checkAuthMultiple(url)
             .pipe(tap(data => {
             this.logger.warn(`oidc checkAuthMultiple check, response: ${JSON.stringify(data)}; looking for at least one isAuthenticated`);
-            if (data.some(o => o.isAuthenticated)) {
+            const authenticatedConfig = data.find(o => o.isAuthenticated);
+            if (authenticatedConfig && authenticatedConfig.configId) {
+                this.logger.info(`User is authenticated with provider: ${authenticatedConfig.configId}. Updating Store.`);
+                // first dispatch to prevent recalculate in apps service
+                this.store.dispatch(AuthActions.setCurrentProvider({
+                    currentProvider: authenticatedConfig.configId
+                }));
+                // Redirect logic -> clean query params
                 const redirect = this.cookiesService.getCookie('loginRedirectUrl');
+                this.logger.info(`Correct provider dispatched, redirectUrl: ${redirect}`);
                 if (redirect) {
                     this.cookiesService.deleteCookie('loginRedirectUrl');
-                    this.router.navigate([redirect]);
+                    this.router.navigate([redirect], { queryParams: {} });
                 }
+                else {
+                    this.router.navigate([], {
+                        queryParams: {},
+                        replaceUrl: true,
+                        relativeTo: this.router.routerState.root
+                    });
+                }
+            }
+            else {
+                this.logger.warn(`No authenticatedConfig found for ${url}`);
             }
+            // if (data.some(o => o.isAuthenticated)) {
+            //   const redirect = this.cookiesService.getCookie('loginRedirectUrl');
+            //   if (redirect) {
+            //     this.cookiesService.deleteCookie('loginRedirectUrl');
+            //     this.router.navigate([redirect]);
+            //   }
+            // }
         }));
         //}
     }