@acorex/modules 20.6.0-next.7 → 20.6.0-next.8

package/fesm2022/{acorex-modules-security-management-acorex-modules-security-management-B6bWjwlY.mjs → acorex-modules-security-management-acorex-modules-security-management-Dh6b7amt.mjs}

@@ -1,5 +1,5 @@
 import { AXMDeviceSessionsService, AXMDeviceSessionsServiceImpl } from '@acorex/modules/auth';
-import { createAllQueryView, AXPEntityCommandScope, AXPEntityQueryType, AXPSearchCommandProvider, AXPRefreshEvent, AXP_ROOT_CONFIG_TOKEN, AXP_MENU_PROVIDER, AXP_SEARCH_PROVIDER } from '@acorex/platform/common';
+import { createAllQueryView, AXPEntityCommandScope, AXPEntityQueryType, AXPSearchCommandProvider, AXPRefreshEvent, AXP_MENU_PROVIDER, AXP_SEARCH_PROVIDER } from '@acorex/platform/common';
 import * as i2 from '@acorex/platform/layout/widget-core';
 import { AXPWidgetsCatalog, AXPWidgetGroupEnum, AXPWidgetCoreModule, AXPValueWidgetComponent, AXPColumnWidgetComponent, AXPLayoutBaseWidgetComponent } from '@acorex/platform/layout/widget-core';
 import { entityMasterCrudActions, AXMEntityCrudServiceImpl, entityMasterRecordActions, AXPEntityService, AXPEntityResolver, AXPEntityDefinitionRegistryService, AXP_ENTITY_DEFINITION_LOADER } from '@acorex/platform/layout/entity';
@@ -12,8 +12,6 @@ import { AXDialogService } from '@acorex/components/dialog';
 import { AXLoadingDialogService } from '@acorex/components/loading-dialog';
 import * as i2$2 from '@acorex/core/translation';
 import { AXTranslationService, AXTranslationModule } from '@acorex/core/translation';
-import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { firstValueFrom } from 'rxjs';
 import { AXPDataGenerator, AXP_DATASOURCE_DEFINITION_PROVIDER, AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER } from '@acorex/platform/core';
 import { AXP_USER_AVATAR_PROVIDER, AXPThemeLayoutBlockComponent, AXPStateMessageComponent } from '@acorex/platform/layout/components';
 import { AXP_NAME_PROPERTY, AXP_DATA_PATH_PROPERTY, AXP_DISABLED_PROPERTY } from '@acorex/platform/layout/widgets';
@@ -2170,56 +2168,42 @@ class AXMUserAvatarProvider {
     constructor() {
         this.userService = inject(AXMUsersEntityService);
         this.sessionService = inject(AXPSessionService);
-        this.http = inject(HttpClient);
-        this.configs = inject(AXP_ROOT_CONFIG_TOKEN);
-        this.baseUrl = this.configs.baseUrl;
     }
     async provide(userId) {
-        // Check if requesting current user info
-        const currentUser = this.sessionService.user;
-        const isCurrentUser = currentUser?.id === userId;
-        if (isCurrentUser) {
-            // Use OpenIddict /connect/userinfo endpoint for current user
-            try {
-                // Extract base URL without /api suffix and add /connect/userinfo
-                const authority = this.baseUrl.replace(/\/api$/, '');
-                const userInfoUrl = `${authority}/connect/userinfo`;
-                const token = this.sessionService.getToken();
-                // Add Authorization header if token exists (interceptor will also add it, but explicit is better)
-                const headers = new HttpHeaders();
-                if (token) {
-                    headers.set('Authorization', `Bearer ${token}`);
-                }
-                const userInfo = await firstValueFrom(this.http.get(userInfoUrl, { headers }));
-                const [firstName, lastName] = (userInfo.name || userInfo.sub || '').split(' ') || ['', ''];
+        // Try entity service first
+        try {
+            const user = await this.userService.getOne(userId);
+            if (user) {
+                const [firstName, lastName] = user.displayName.split(' ') || ['', ''];
                 return {
-                    id: userInfo.sub || userId,
-                    username: userInfo.preferred_username || userInfo.name || '',
-                    firstName: firstName || userInfo.given_name || '',
-                    lastName: lastName || userInfo.family_name || '',
+                    id: user.id,
+                    username: user.username,
+                    firstName: firstName || '',
+                    lastName: lastName || '',
                     status: 'online',
-                    avatarUrl: userInfo.picture || 'https://via.placeholder.com/150',
+                    avatarUrl: `https://avatar.iran.liara.run/public/${AXPDataGenerator.pick([35, 22, 16, 6, 31])}`,
                 };
             }
-            catch (error) {
-                console.error('Failed to load userinfo from /connect/userinfo, falling back to entity service', error);
-                // Fallback to entity service if userinfo endpoint fails
-            }
         }
-        // Use entity service for other users or as fallback
-        const user = await this.userService.getOne(userId);
-        if (!user) {
-            throw new Error(`User not found for ${userId}`);
+        catch (error) {
+            // If entity service fails, fallback to session service for current user
+            console.debug('Failed to load user from entity service, falling back to session data', error);
+        }
+        // Fallback: Use session service data for current user (mock mode)
+        const currentUser = this.sessionService.user;
+        if (currentUser && currentUser.id === userId) {
+            const [firstName, lastName] = (currentUser.title || currentUser.name || '').split(' ') || ['', ''];
+            return {
+                id: currentUser.id,
+                username: currentUser.name || '',
+                firstName: firstName || '',
+                lastName: lastName || '',
+                status: 'online',
+                avatarUrl: currentUser.avatar || `https://avatar.iran.liara.run/public/${AXPDataGenerator.pick([35, 22, 16, 6, 31])}`,
+            };
         }
-        const [firstName, lastName] = user.displayName.split(' ');
-        return {
-            id: user.id,
-            username: user.username,
-            firstName: firstName,
-            lastName: lastName,
-            status: 'online',
-            avatarUrl: `https://avatar.iran.liara.run/public/${AXPDataGenerator.pick([35, 22, 16, 6, 31])}`,
-        };
+        // If all fallbacks fail, throw error
+        throw new Error(`User not found for ${userId}`);
     }
 }
 
@@ -2516,7 +2500,7 @@ class AXMSecurityManagementModule {
                 multi: true,
                 useFactory: async () => {
                     const injector = inject(Injector);
-                    const provider = (await import('./acorex-modules-security-management-permission-definition.provider-DPI8gT7K.mjs')).AXMPermissionDefinitionProvider;
+                    const provider = (await import('./acorex-modules-security-management-permission-definition.provider-DJvuPqFx.mjs')).AXMPermissionDefinitionProvider;
                     return new provider(injector);
                 },
             },
@@ -2594,7 +2578,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
                             multi: true,
                             useFactory: async () => {
                                 const injector = inject(Injector);
-                                const provider = (await import('./acorex-modules-security-management-permission-definition.provider-DPI8gT7K.mjs')).AXMPermissionDefinitionProvider;
+                                const provider = (await import('./acorex-modules-security-management-permission-definition.provider-DJvuPqFx.mjs')).AXMPermissionDefinitionProvider;
                                 return new provider(injector);
                             },
                         },
@@ -3134,4 +3118,4 @@ var permissionsWidgetDesigner_component = /*#__PURE__*/Object.freeze({
  */
 
 export { AXMPermissionsKeys as A, RootConfig as R, AXMSecurityManagementDeviceSessionsEntityModule as a, AXMSecurityManagementRolesEntityService as b, AXMSecurityManagementRolesEntityServiceImpl as c, AXMUsersEntityService as d, AXMUsersEntityServiceImpl as e, factory$3 as f, AXMPolicyService as g, AXMPolicyServiceImpl as h, AXPSecurityManagementMenuKeys as i, AXMSecurityManagementModule as j, AXPPermissionsEditorComponent as k, AXPPermissionsEditorPopupComponent as l, AXMPermissionsModule as m, AXPPermissionsWidgetViewComponent as n, AXPPermissionsWidgetEditComponent as o, policyFactory as p, AXPPermissionsWidgetColumnComponent as q, AXPPermissionsWidgetPrintComponent as r, AXPPermissionsWidgetDesignerComponent as s, AXPPermissionsWidget as t };
-//# sourceMappingURL=acorex-modules-security-management-acorex-modules-security-management-B6bWjwlY.mjs.map
+//# sourceMappingURL=acorex-modules-security-management-acorex-modules-security-management-Dh6b7amt.mjs.map