@open-rlb/ng-app 3.1.9 → 3.1.10

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

@@ -35,6 +35,7 @@ const RLB_CFG_PAGES = new InjectionToken(`${RLB_CFG}:pages`);
 const RLB_CFG_ENV = new InjectionToken(`${RLB_CFG}:env`);
 const RLB_CFG_AUTH = new InjectionToken(`${RLB_CFG}:auth`);
 const RLB_APP_NAVCOMP = new InjectionToken(`rlb.app.navcomp`);
+const RLB_CFG_ACL = new InjectionToken(`${RLB_CFG}:acl`);
 
 class TokenCookiesService {
     constructor(cookies) {
@@ -390,6 +391,24 @@ const initialSidebarState = {
     searchText: null
 };
 
+const AclActions = createActionGroup({
+    source: 'ACL',
+    events: {
+        'Load ACL': emptyProps(),
+        'Load ACL Success': props(),
+        'Load ACL Failure': props(),
+        'Reset': emptyProps(),
+    }
+});
+
+const aclFeatureKey = 'acl';
+const initialAclState = {
+    resources: null,
+    loading: false,
+    loaded: false,
+    error: null
+};
+
 class AbstractSupportService {
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AbstractSupportService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AbstractSupportService }); }
@@ -1361,8 +1380,45 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.3", ngImpor
                 }]
         }] });
 
+class AdminApiService {
+    constructor(httpClient, config, aclConfig) {
+        this.httpClient = httpClient;
+        this.config = config;
+        this.aclConfig = aclConfig;
+    }
+    resourcesByUser$() {
+        if (!this.aclConfig) {
+            throw new Error("ACL configuration is missing. Provide 'acl' in ProjectConfiguration.");
+        }
+        const endpoint = this.config.endpoints?.[this.aclConfig.endpointKey];
+        if (!endpoint) {
+            throw new Error(`Endpoint '${this.aclConfig.endpointKey}' not found in configuration.`);
+        }
+        const url = `${endpoint.baseUrl}/${this.aclConfig.path}`;
+        return this.httpClient.get(url).pipe(
+        //this.errorManagementService.manageUI('error', 'dialog')
+        );
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AdminApiService, deps: [{ token: i1$3.HttpClient }, { token: RLB_CFG, optional: true }, { token: RLB_CFG_ACL, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AdminApiService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AdminApiService, decorators: [{
+            type: Injectable,
+            args: [{ providedIn: 'root' }]
+        }], ctorParameters: () => [{ type: i1$3.HttpClient }, { type: undefined, decorators: [{
+                    type: Optional
+                }, {
+                    type: Inject,
+                    args: [RLB_CFG]
+                }] }, { type: undefined, decorators: [{
+                    type: Optional
+                }, {
+                    type: Inject,
+                    args: [RLB_CFG_ACL]
+                }] }] });
+
 class AuthenticationService {
-    constructor(oidcSecurityService, cookiesService, router, parseJwtService, store, log, localStorage, envConfig, authConfig) {
+    constructor(oidcSecurityService, cookiesService, router, parseJwtService, store, log, localStorage, adminApi, envConfig, authConfig, appconfig) {
         this.oidcSecurityService = oidcSecurityService;
         this.cookiesService = cookiesService;
         this.router = router;
@@ -1370,8 +1426,10 @@ class AuthenticationService {
         this.store = store;
         this.log = log;
         this.localStorage = localStorage;
+        this.adminApi = adminApi;
         this.envConfig = envConfig;
         this.authConfig = authConfig;
+        this.appconfig = appconfig;
         this.logger = this.log.for(this.constructor.name);
         this.logger.log('AuthenticationService initialized');
     }
@@ -1386,45 +1444,27 @@ class AuthenticationService {
         return this.authConfig?.providers.find((provider) => provider.configId === currentProvider);
     }
     checkAuthMultiple(url) {
-        // if (Capacitor.isNativePlatform()) {
-        //   console.log('Capacitor is native platform')
-        //   App.addListener('appUrlOpen', async ({ url }: { url: string }) => {
-        //     await this.zone.run(async () => {
-        //       const _url = `${environment.baseUrl}/${url.slice(url.indexOf('?'))}`
-        //       this.authorize(_url).subscribe();
-        //     })
-        //   });
-        // } else {
-        return this.oidc.checkAuthMultiple(url)
-            .pipe(tap(data => {
-            const authenticatedConfig = data.find(o => o.isAuthenticated);
+        return this.oidc.checkAuthMultiple(url).pipe(switchMap((responses) => {
+            const authenticatedConfig = responses.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
                 }));
-                const redirect = this.localStorage.readLocal('loginRedirectUrl');
-                //const redirect = this.cookiesService.getCookie('loginRedirectUrl');
-                this.logger.info(`Correct provider dispatched, redirectUrl: ${redirect}`);
-                if (redirect) {
-                    this.localStorage.removeLocal('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);
+                // Only fetch ACL if config is provided
+                if (this.appconfig.acl) {
+                    this.store.dispatch(AclActions.loadACL());
+                    return this.adminApi.resourcesByUser$().pipe(tap(resources => {
+                        this.store.dispatch(AclActions.loadACLSuccess({ resources }));
+                        this.handleRedirect();
+                    }), map(() => responses), catchError(() => of(responses)));
                 }
                 else {
-                    this.logger.info(`User authenticated, no redirectUrl found. Staying on current route.`);
+                    this.handleRedirect();
+                    return of(responses);
                 }
             }
-            else {
-                this.logger.warn(`No authenticatedConfig found for ${url}`);
-            }
+            return of(responses);
         }));
-        //}
     }
     login(targetUrl) {
         const returnUrl = targetUrl || this.router.url || '/';
@@ -1487,7 +1527,16 @@ class AuthenticationService {
     matchRoles(roles) {
         return this.accessToken$.pipe(map(token => this.parseJwtService.parseJwt(token)), map(payload => payload['roles']), map(userRoles => roles.some(role => userRoles.includes(role))));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AuthenticationService, deps: [{ token: i1$5.OidcSecurityService }, { token: CookiesService }, { token: i2.Router }, { token: ParseJwtService }, { token: i1$1.Store }, { token: AppLoggerService }, { token: AppStorageService }, { token: RLB_CFG_ENV, optional: true }, { token: RLB_CFG_AUTH, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    handleRedirect() {
+        const redirect = this.localStorage.readLocal('loginRedirectUrl');
+        if (redirect) {
+            this.localStorage.removeLocal('loginRedirectUrl');
+            setTimeout(() => {
+                this.router.navigateByUrl(redirect, { replaceUrl: true });
+            }, 0);
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AuthenticationService, deps: [{ token: i1$5.OidcSecurityService }, { token: CookiesService }, { token: i2.Router }, { token: ParseJwtService }, { token: i1$1.Store }, { token: AppLoggerService }, { token: AppStorageService }, { token: AdminApiService }, { token: RLB_CFG_ENV, optional: true }, { token: RLB_CFG_AUTH, optional: true }, { token: RLB_CFG, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AuthenticationService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AuthenticationService, decorators: [{
@@ -1495,7 +1544,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.3", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: () => [{ type: i1$5.OidcSecurityService }, { type: CookiesService }, { type: i2.Router }, { type: ParseJwtService }, { type: i1$1.Store }, { type: AppLoggerService }, { type: AppStorageService }, { type: undefined, decorators: [{
+        }], ctorParameters: () => [{ type: i1$5.OidcSecurityService }, { type: CookiesService }, { type: i2.Router }, { type: ParseJwtService }, { type: i1$1.Store }, { type: AppLoggerService }, { type: AppStorageService }, { type: AdminApiService }, { type: undefined, decorators: [{
                     type: Optional
                 }, {
                     type: Inject,
@@ -1505,6 +1554,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.3", ngImpor
                 }, {
                     type: Inject,
                     args: [RLB_CFG_AUTH]
+                }] }, { type: undefined, decorators: [{
+                    type: Optional
+                }, {
+                    type: Inject,
+                    args: [RLB_CFG]
                 }] }] });
 
 class TokenOauthInterceptor {
@@ -2985,7 +3039,7 @@ const authsFeature = createFeature({
     }))
 });
 const authReducer = authsFeature.reducer;
-const { selectAuthState, selectCurrentProvider, selectLoading } = authsFeature;
+const { selectAuthState, selectCurrentProvider, selectLoading: selectLoading$1 } = authsFeature;
 
 const navbarsFeature = createFeature({
     name: navbarsFeatureKey,
@@ -3076,6 +3130,47 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.3", ngImpor
                 }]
         }] });
 
+class AclEffects {
+    constructor(actions$, adminApi) {
+        this.actions$ = actions$;
+        this.adminApi = adminApi;
+        this.loadAclOnAuth$ = createEffect(() => {
+            return this.actions$.pipe(
+            // Listen for the action dispatched in AuthenticationService.checkAuthMultiple
+            ofType(AuthActions.setCurrentProvider), map$1(() => AclActions.loadACL()));
+        });
+        this.fetchAcl$ = createEffect(() => {
+            return this.actions$.pipe(ofType(AclActions.loadACL), switchMap$1(() => this.adminApi.resourcesByUser$().pipe(map$1(resources => AclActions.loadACLSuccess({ resources })), catchError(error => of(AclActions.loadACLFailure({ error }))))));
+        });
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AclEffects, deps: [{ token: i1$8.Actions }, { token: AdminApiService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AclEffects }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.1.3", ngImport: i0, type: AclEffects, decorators: [{
+            type: Injectable
+        }], ctorParameters: () => [{ type: i1$8.Actions }, { type: AdminApiService }] });
+
+const aclFeature = createFeature({
+    name: aclFeatureKey,
+    reducer: createReducer(initialAclState, on(AclActions.loadACL, (state) => ({
+        ...state,
+        loading: true,
+        loaded: false
+    })), on(AclActions.loadACLSuccess, (state, { resources }) => ({
+        ...state,
+        resources,
+        loaded: true,
+        loading: false
+    })), on(AclActions.loadACLFailure, (state, { error }) => ({
+        ...state,
+        error,
+        loading: false,
+        loaded: true // We mark as loaded to unblock the UI even if the fetch fails
+    })), on(AclActions.reset, () => ({ ...initialAclState })))
+});
+const aclReducer = aclFeature.reducer;
+const { selectAclState, selectResources, selectLoading, selectLoaded } = aclFeature;
+
 const verifyDeactivate = (component, currentRoute, currentState, nextState) => {
     return component.verifyDeactivate();
 };
@@ -3086,11 +3181,12 @@ function provideRlbConfig(env) {
         RlbAppModule,
         provideStore(),
         provideState(authsFeature),
-        provideEffects(AuthEffects),
+        provideEffects(AuthEffects, AppContextEffects, AclEffects),
         provideState(navbarsFeature),
         provideState(sidebarsFeature),
         provideState(appFeature),
-        provideEffects(AppContextEffects),
+        provideState(aclFeature),
+        // provideEffects(AppContextEffects),
         provideRouter(getDefaultRoutes(env.pages)),
         provideRlbCodeBrowserOAuth(env.auth),
         provideRlbI18n(env.i18n),
@@ -3111,6 +3207,7 @@ function provideRlbConfig(env) {
         { provide: RLB_CFG_CMS, useValue: env.cms },
         { provide: RLB_CFG_PAGES, useValue: env.pages },
         { provide: RLB_CFG_I18N, useValue: env.i18n },
+        { provide: RLB_CFG_ACL, useValue: env.acl },
         {
             provide: ModalRegistryOptions, useValue: {
                 modals: {
@@ -3158,5 +3255,5 @@ function flattenRoutes(routes, parentPath = '') {
  * Generated bundle index. Do not edit.
  */
 
-export { AbstractMdService, AbstractSupportService, AppBreadcrumbService, AppContainerComponent, AppContextActions, AppContextActionsInternal, AppLoggerService, AppStorageService, AppTemplateComponent, AppsService, AsMultiPipe, AsSinglePipe, AuthActions, AuthActionsInternal, AuthFeatureService, AuthenticationService, AutolinkPipe, BaseComponent, CmsComponent, CmsPipe, ContentComponent, CookiesService, ErrorManagementService, ErrorModalComponent, KeycloakProfileService, LanguageService, LeftComponentPipe, LocalCacheService, ModalAppsComponent, NavbarActions, NavbarActionsInternal, OauthPasswordService, ParseJwtService, PwaUpdaterService, RLB_APPS, RLB_APP_NAVCOMP, RLB_CFG, RLB_CFG_AUTH, RLB_CFG_CMS, RLB_CFG_ENV, RLB_CFG_I18N, RLB_CFG_PAGES, RightComponentPipe, RlbAppModule, RlbRole, SidebarActions, SidebarActionsInternal, StrapiService, ToastComponent, TokenOauthInterceptor, TranslateBrowserLoader, TruncatePipe, UtilsService, appContextFeatureKey, authsFeatureKey, getDefaultRoutes, initialAppContextState, initialAuthState, initialNavbarState, initialSidebarState, navbarsFeatureKey, oauthGuard, oauthPasswordGuard, provideApp, provideRlbCodeBrowserOAuth, provideRlbConfig, provideRlbI18n, sidebarsFeatureKey, translateBrowserLoaderFactory, verifyDeactivate };
+export { AbstractMdService, AbstractSupportService, AclActions, AppBreadcrumbService, AppContainerComponent, AppContextActions, AppContextActionsInternal, AppLoggerService, AppStorageService, AppTemplateComponent, AppsService, AsMultiPipe, AsSinglePipe, AuthActions, AuthActionsInternal, AuthFeatureService, AuthenticationService, AutolinkPipe, BaseComponent, CmsComponent, CmsPipe, ContentComponent, CookiesService, ErrorManagementService, ErrorModalComponent, KeycloakProfileService, LanguageService, LeftComponentPipe, LocalCacheService, ModalAppsComponent, NavbarActions, NavbarActionsInternal, OauthPasswordService, ParseJwtService, PwaUpdaterService, RLB_APPS, RLB_APP_NAVCOMP, RLB_CFG, RLB_CFG_ACL, RLB_CFG_AUTH, RLB_CFG_CMS, RLB_CFG_ENV, RLB_CFG_I18N, RLB_CFG_PAGES, RightComponentPipe, RlbAppModule, RlbRole, SidebarActions, SidebarActionsInternal, StrapiService, ToastComponent, TokenOauthInterceptor, TranslateBrowserLoader, TruncatePipe, UtilsService, aclFeatureKey, appContextFeatureKey, authsFeatureKey, getDefaultRoutes, initialAclState, initialAppContextState, initialAuthState, initialNavbarState, initialSidebarState, navbarsFeatureKey, oauthGuard, oauthPasswordGuard, provideApp, provideRlbCodeBrowserOAuth, provideRlbConfig, provideRlbI18n, sidebarsFeatureKey, translateBrowserLoaderFactory, verifyDeactivate };
 //# sourceMappingURL=open-rlb-ng-app.mjs.map