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

package/api/index.d.ts

@@ -9,6 +9,7 @@ import { AXPApplicationLoader, AXPApplication, AXPFeatureLoader, AXPFeature, AXP
 import * as i3 from '@acorex/connectivity/utils';
 import * as i1 from '@acorex/platform/runtime';
 import { Observable } from 'rxjs';
+import { AXPUserAvatarProvider, AXPUserAvatarData } from '@acorex/platform/layout/components';
 import * as _acorex_modules_report_management from '@acorex/modules/report-management';
 import { AXPReportCategoryProvider, AXPReportCategory, AXPReportDefinitionProvider, AXPReportDefinition } from '@acorex/modules/report-management';
 
@@ -209,6 +210,15 @@ declare class AXMOidcTenantLoader implements AXPTenantLoader {
     static ɵprov: i0.ɵɵInjectableDeclaration<AXMOidcTenantLoader>;
 }
 
+declare class AXCApiUserAvatarProvider implements AXPUserAvatarProvider {
+    private userService;
+    private sessionService;
+    private http;
+    private readonly configs;
+    private readonly baseUrl;
+    provide(userId: string): Promise<AXPUserAvatarData>;
+}
+
 declare class APIGoogleStrategy extends AXPAuthStrategy {
     private aXMAuthConfigs;
     private oauthService;
@@ -423,5 +433,5 @@ declare const AXC_REPORT_DEFINITION_API_PROVIDER: {
     multi: boolean;
 };
 
-export { APIGoogleStrategy, AXCAPIOidcStrategy, AXCApiEntityStorageService, AXCApiModule, AXCReportCategoryApiProvider, AXCReportDefinitionApiProvider, AXCReportManagementApiModule, AXCReportManagementDataService, AXC_REPORT_CATEGORY_API_PROVIDER, AXC_REPORT_DEFINITION_API_PROVIDER, AXMConfigurationService, AXMOidcApplicationLoader, AXMOidcFeatureLoader, AXMOidcPermissionLoader, AXMOidcTenantLoader };
+export { APIGoogleStrategy, AXCAPIOidcStrategy, AXCApiEntityStorageService, AXCApiModule, AXCApiUserAvatarProvider, AXCReportCategoryApiProvider, AXCReportDefinitionApiProvider, AXCReportManagementApiModule, AXCReportManagementDataService, AXC_REPORT_CATEGORY_API_PROVIDER, AXC_REPORT_DEFINITION_API_PROVIDER, AXMConfigurationService, AXMOidcApplicationLoader, AXMOidcFeatureLoader, AXMOidcPermissionLoader, AXMOidcTenantLoader };
 export type { AXCReportCategoryApiItem, AXCReportCategoryApiResponse, AXCReportDefinitionApiItem, AXCReportDefinitionApiResponse, AXCReportLayoutDefinition, AXCReportParameter, AXCReportParameterGroup, AXPExecuteReportDto, AXPOAuthExternalCredentials, AXPUserPassCredentials, ApplicationConfiguration, Auth, Culture, IAuthenticationDataModel, Language, Localization, NameValue, Resource };

package/fesm2022/acorex-connectivity-api.mjs

@@ -8,11 +8,14 @@ import { kebabCase } from 'lodash-es';
 import { firstValueFrom, catchError, of, map, BehaviorSubject, tap, filter, take, switchMap, delay } from 'rxjs';
 import * as i2 from '@acorex/platform/auth';
 import { AXPAuthStrategy, AXPSessionService, JwtUtil, TimeUtil, PkceUtil, AXPAuthModule, AXP_TENANT_LOADER, AXP_APPLICATION_LOADER, AXP_PERMISSION_LOADER, AXP_FEATURE_LOADER } from '@acorex/platform/auth';
+import { AXP_USER_AVATAR_PROVIDER } from '@acorex/platform/layout/components';
 import { STRATEGY_CONFIG_TOKEN } from '@acorex/platform/layout/widgets';
 import * as i1$1 from 'angular-oauth2-oidc';
 import { OAuthService, OAuthModule } from 'angular-oauth2-oidc';
 import { AXM_AUTH_CONFIG_TOKEN } from '@acorex/modules/auth';
 import { Router } from '@angular/router';
+import { AXMUsersEntityService } from '@acorex/modules/security-management';
+import { AXPDataGenerator } from '@acorex/platform/core';
 import { AXCUtilsModule, AXCExternalAuthorizationService } from '@acorex/connectivity/utils';
 import { AXPRuntimeModule, provideCommandSetups } from '@acorex/platform/runtime';
 import { AXP_REPORT_CATEGORY_PROVIDER, AXP_REPORT_DEFINITION_PROVIDER } from '@acorex/modules/report-management';
@@ -789,6 +792,63 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
             type: Injectable
         }], ctorParameters: () => [{ type: i1.HttpClient }] });
 
+class AXCApiUserAvatarProvider {
+    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(' ') || ['', ''];
+                return {
+                    id: userInfo.sub || userId,
+                    username: userInfo.preferred_username || userInfo.name || '',
+                    firstName: firstName || userInfo.given_name || '',
+                    lastName: lastName || userInfo.family_name || '',
+                    status: 'online',
+                    avatarUrl: userInfo.picture || 'https://via.placeholder.com/150',
+                };
+            }
+            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}`);
+        }
+        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])}`,
+        };
+    }
+}
+
 //#endregion
 //#region ----   Helper Functions   ----
 // /**
@@ -1215,7 +1275,11 @@ class AXCApiModule {
                     selectValueStrategy: 'valueField',
                     lookupValueStrategy: 'valueField',
                 },
-            }
+            },
+            {
+                provide: AXP_USER_AVATAR_PROVIDER,
+                useClass: AXCApiUserAvatarProvider,
+            },
         ], imports: [OAuthModule.forRoot(),
             AXPAuthModule.forRoot({
                 strategies: [AXCAPIOidcStrategy],
@@ -1265,7 +1329,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
                                 selectValueStrategy: 'valueField',
                                 lookupValueStrategy: 'valueField',
                             },
-                        }
+                        },
+                        {
+                            provide: AXP_USER_AVATAR_PROVIDER,
+                            useClass: AXCApiUserAvatarProvider,
+                        },
                     ],
                 }]
         }] });
@@ -1545,5 +1613,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { APIGoogleStrategy, AXCAPIOidcStrategy, AXCApiEntityStorageService, AXCApiModule, AXCReportCategoryApiProvider, AXCReportDefinitionApiProvider, AXCReportManagementApiModule, AXCReportManagementDataService, AXC_REPORT_CATEGORY_API_PROVIDER, AXC_REPORT_DEFINITION_API_PROVIDER, AXMConfigurationService, AXMOidcApplicationLoader, AXMOidcFeatureLoader, AXMOidcPermissionLoader, AXMOidcTenantLoader };
+export { APIGoogleStrategy, AXCAPIOidcStrategy, AXCApiEntityStorageService, AXCApiModule, AXCApiUserAvatarProvider, AXCReportCategoryApiProvider, AXCReportDefinitionApiProvider, AXCReportManagementApiModule, AXCReportManagementDataService, AXC_REPORT_CATEGORY_API_PROVIDER, AXC_REPORT_DEFINITION_API_PROVIDER, AXMConfigurationService, AXMOidcApplicationLoader, AXMOidcFeatureLoader, AXMOidcPermissionLoader, AXMOidcTenantLoader };
 //# sourceMappingURL=acorex-connectivity-api.mjs.map