From 4c8e3f229dcc81d4882a26ec5fa0cf21f4dac29f Mon Sep 17 00:00:00 2001 From: diallolatoile Date: Mon, 10 Nov 2025 01:28:04 +0000 Subject: [PATCH] feat: add DCB User Service API - Authentication system with KEYCLOAK - Modular architecture with services for each feature --- package-lock.json | 9 +- package.json | 3 +- src/app/app.ts | 50 +- src/app/core/models/dcb-bo-hub-user.model.ts | 160 +++- src/app/core/services/auth.service.ts | 140 ++- ... => hub-users-roles-management.service.ts} | 384 +++++--- src/app/core/services/menu.service.ts | 17 +- src/app/core/services/permissions.service.ts | 20 +- src/app/layouts/components/data.ts | 19 +- .../user-profile/user-profile.component.html | 12 +- .../user-profile/user-profile.component.ts | 98 +- src/app/modules/auth/unauthorized.ts | 2 +- .../hub-users-list/hub-users-list.html} | 255 +++-- .../hub-users-list/hub-users-list.ts | 597 ++++++++++++ .../hub-users-profile/hub-users-profile.html} | 124 ++- .../hub-users-profile/hub-users-profile.ts | 545 +++++++++++ .../hub-users.html} | 290 +++--- .../hub-users-management/hub-users.service.ts | 390 ++++++++ .../hub-users.ts | 714 ++++++++------ .../merchant-users-list.html} | 134 ++- .../merchant-users-list.ts | 517 ++++++++++ .../merchant-users-profile.html} | 393 +++----- .../merchant-users-profile.ts} | 296 +++--- .../hub-users-management/merchant-users.html | 882 ++++++++++++++++++ .../merchant-users.service.ts | 351 +++++++ .../hub-users-management/merchant-users.ts | 806 ++++++++++++++++ src/app/modules/hub-users/hub-users.html | 557 ----------- src/app/modules/hub-users/hub-users.routes.ts | 16 - src/app/modules/hub-users/hub-users.spec.ts | 2 - src/app/modules/hub-users/list/list.spec.ts | 2 - src/app/modules/hub-users/list/list.ts | 372 -------- .../hub-users/models/hub-user.model.ts | 115 --- .../hub-users/models/hub-userl-v1.mode.ts | 54 -- .../modules/hub-users/models/user.model.ts | 311 ------ .../modules/hub-users/profile/profile.spec.ts | 2 - src/app/modules/hub-users/profile/profile.ts | 378 -------- .../modules/hub-users/services/api.service.ts | 78 -- .../hub-users/services/hub-users.service.ts | 361 ------- src/app/modules/hub-users/structure.txt | 15 - .../modules/merchant-users/config/config.html | 436 --------- .../merchant-users/config/config.spec.ts | 2 - .../modules/merchant-users/config/config.ts | 317 ------- .../modules/merchant-users/list/list.spec.ts | 2 - src/app/modules/merchant-users/list/list.ts | 695 -------------- .../merchant-users/merchant-users.spec.ts | 2 - .../modules/merchant-users/merchant-users.ts | 744 --------------- .../models/merchant-user.model.ts | 115 --- .../models/partners-config.model.ts | 531 ----------- .../merchant-users/profile/profile.spec.ts | 2 - .../services/merchant-users.service.ts | 331 ------- .../services/partner-config.service.ts | 233 ----- .../modules/merchant-users/stats/stats.html | 249 ----- .../merchant-users/stats/stats.spec.ts | 2 - src/app/modules/merchant-users/stats/stats.ts | 15 - src/app/modules/merchant-users/types.ts | 6 - src/app/modules/modules.routes.ts | 52 +- src/app/modules/profile/profile.html | 569 +++++++---- src/app/modules/profile/profile.ts | 567 ++++++++--- src/main.ts | 13 +- 59 files changed, 6759 insertions(+), 7595 deletions(-) rename src/app/core/services/{role-management.service.ts => hub-users-roles-management.service.ts} (53%) rename src/app/modules/{hub-users/list/list.html => hub-users-management/hub-users-list/hub-users-list.html} (55%) create mode 100644 src/app/modules/hub-users-management/hub-users-list/hub-users-list.ts rename src/app/modules/{hub-users/profile/profile.html => hub-users-management/hub-users-profile/hub-users-profile.html} (80%) create mode 100644 src/app/modules/hub-users-management/hub-users-profile/hub-users-profile.ts rename src/app/modules/{merchant-users/merchant-users.html => hub-users-management/hub-users.html} (71%) create mode 100644 src/app/modules/hub-users-management/hub-users.service.ts rename src/app/modules/{hub-users => hub-users-management}/hub-users.ts (54%) rename src/app/modules/{merchant-users/list/list.html => hub-users-management/merchant-users-list/merchant-users-list.html} (77%) create mode 100644 src/app/modules/hub-users-management/merchant-users-list/merchant-users-list.ts rename src/app/modules/{merchant-users/profile/profile.html => hub-users-management/merchant-users-profile/merchant-users-profile.html} (56%) rename src/app/modules/{merchant-users/profile/profile.ts => hub-users-management/merchant-users-profile/merchant-users-profile.ts} (63%) create mode 100644 src/app/modules/hub-users-management/merchant-users.html create mode 100644 src/app/modules/hub-users-management/merchant-users.service.ts create mode 100644 src/app/modules/hub-users-management/merchant-users.ts delete mode 100644 src/app/modules/hub-users/hub-users.html delete mode 100644 src/app/modules/hub-users/hub-users.routes.ts delete mode 100644 src/app/modules/hub-users/hub-users.spec.ts delete mode 100644 src/app/modules/hub-users/list/list.spec.ts delete mode 100644 src/app/modules/hub-users/list/list.ts delete mode 100644 src/app/modules/hub-users/models/hub-user.model.ts delete mode 100644 src/app/modules/hub-users/models/hub-userl-v1.mode.ts delete mode 100644 src/app/modules/hub-users/models/user.model.ts delete mode 100644 src/app/modules/hub-users/profile/profile.spec.ts delete mode 100644 src/app/modules/hub-users/profile/profile.ts delete mode 100644 src/app/modules/hub-users/services/api.service.ts delete mode 100644 src/app/modules/hub-users/services/hub-users.service.ts delete mode 100644 src/app/modules/hub-users/structure.txt delete mode 100644 src/app/modules/merchant-users/config/config.html delete mode 100644 src/app/modules/merchant-users/config/config.spec.ts delete mode 100644 src/app/modules/merchant-users/config/config.ts delete mode 100644 src/app/modules/merchant-users/list/list.spec.ts delete mode 100644 src/app/modules/merchant-users/list/list.ts delete mode 100644 src/app/modules/merchant-users/merchant-users.spec.ts delete mode 100644 src/app/modules/merchant-users/merchant-users.ts delete mode 100644 src/app/modules/merchant-users/models/merchant-user.model.ts delete mode 100644 src/app/modules/merchant-users/models/partners-config.model.ts delete mode 100644 src/app/modules/merchant-users/profile/profile.spec.ts delete mode 100644 src/app/modules/merchant-users/services/merchant-users.service.ts delete mode 100644 src/app/modules/merchant-users/services/partner-config.service.ts delete mode 100644 src/app/modules/merchant-users/stats/stats.html delete mode 100644 src/app/modules/merchant-users/stats/stats.spec.ts delete mode 100644 src/app/modules/merchant-users/stats/stats.ts delete mode 100644 src/app/modules/merchant-users/types.ts diff --git a/package-lock.json b/package-lock.json index 2e7b434..4b51b4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -63,8 +63,7 @@ "quill": "^2.0.3", "rxjs": "~7.8.2", "simplebar-angular": "^3.3.2", - "tslib": "^2.8.1", - "zone.js": "^0.15.1" + "tslib": "^2.8.1" }, "devDependencies": { "@angular/build": "^20.3.6", @@ -11060,12 +11059,6 @@ "peerDependencies": { "zod": "^3.24.1" } - }, - "node_modules/zone.js": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.15.1.tgz", - "integrity": "sha512-XE96n56IQpJM7NAoXswY3XRLcWFW83xe0BiAOeMD7K5k5xecOeul3Qcpx6GqEeeHNkW5DWL5zOyTbEfB4eti8w==", - "license": "MIT" } } } diff --git a/package.json b/package.json index 5d13b45..0aa92f0 100644 --- a/package.json +++ b/package.json @@ -66,8 +66,7 @@ "quill": "^2.0.3", "rxjs": "~7.8.2", "simplebar-angular": "^3.3.2", - "tslib": "^2.8.1", - "zone.js": "^0.15.1" + "tslib": "^2.8.1" }, "devDependencies": { "@angular/build": "^20.3.6", diff --git a/src/app/app.ts b/src/app/app.ts index c7df4f5..c2d2b33 100644 --- a/src/app/app.ts +++ b/src/app/app.ts @@ -1,4 +1,4 @@ -import { Component, inject, OnInit } from '@angular/core'; +import { Component, inject, OnInit, ChangeDetectorRef } from '@angular/core'; import { ActivatedRoute, NavigationEnd, Router, RouterOutlet } from '@angular/router'; import * as tablerIcons from '@ng-icons/tabler-icons'; import * as tablerIconsFill from '@ng-icons/tabler-icons/fill'; @@ -22,33 +22,55 @@ export class App implements OnInit { private router = inject(Router); private activatedRoute = inject(ActivatedRoute); private authService = inject(AuthService); + private cdr = inject(ChangeDetectorRef); async ngOnInit(): Promise { + this.setupTitleListener(); + + setTimeout(async () => { + await this.initializeAuth(); + }); + } + + private async initializeAuth(): Promise { try { const isAuthenticated = await this.authService.initialize(); - - if (!isAuthenticated && this.router.url === '/') { - this.router.navigate(['/auth/login']); - } else if (isAuthenticated && this.router.url === '/') { - this.router.navigate(['/dcb-dashboard']); - } + + setTimeout(() => { + this.handleInitialNavigation(isAuthenticated); + }); } catch (error) { console.error('Error during authentication initialization:', error); - this.router.navigate(['/auth/login']); + setTimeout(() => { + this.router.navigate(['/auth/login']); + }); } - - this.setupTitleListener(); } - private checkPublicRouteRedirection(): void { + private handleInitialNavigation(isAuthenticated: boolean): void { const currentUrl = this.router.url; - const publicRoutes = ['/auth/login', '/auth/reset-password', '/auth/forgot-password']; - // Si l'utilisateur est authentifié et sur une route publique, rediriger vers la page d'accueil - if (publicRoutes.includes(currentUrl)) { + if (!isAuthenticated && this.shouldRedirectToLogin(currentUrl)) { + this.router.navigate(['/auth/login']); + } else if (isAuthenticated && this.shouldRedirectToDashboard(currentUrl)) { this.router.navigate(['/dcb-dashboard']); } + + this.cdr.detectChanges(); + } + + private shouldRedirectToLogin(url: string): boolean { + return url === '/' || !this.isPublicRoute(url); + } + + private shouldRedirectToDashboard(url: string): boolean { + return url === '/' || this.isPublicRoute(url); + } + + private isPublicRoute(url: string): boolean { + const publicRoutes = ['/auth/login', '/auth/reset-password', '/auth/forgot-password']; + return publicRoutes.some(route => url.startsWith(route)); } private setupTitleListener(): void { diff --git a/src/app/core/models/dcb-bo-hub-user.model.ts b/src/app/core/models/dcb-bo-hub-user.model.ts index 514749e..2d52bc7 100644 --- a/src/app/core/models/dcb-bo-hub-user.model.ts +++ b/src/app/core/models/dcb-bo-hub-user.model.ts @@ -1,46 +1,61 @@ +// === ENUMS COHÉRENTS === export enum UserType { HUB = 'HUB', - MERCHANT = 'MERCHANT', - MERCHANT_USER = 'MERCHANT_USER' + MERCHANT_PARTNER = 'MERCHANT' } export enum UserRole { - // HUB roles - DCB_ADMIN = 'DCB_ADMIN', - DCB_SUPPORT = 'DCB_SUPPORT', - DCB_PARTNER = 'DCB_PARTNER', - - // MERCHANT roles - DCB_PARTNER_ADMIN = 'DCB_PARTNER_ADMIN', - DCB_PARTNER_MANAGER = 'DCB_PARTNER_MANAGER', - DCB_PARTNER_SUPPORT = 'DCB_PARTNER_SUPPORT' + // Rôles Hub (sans merchantPartnerId) + DCB_ADMIN = 'dcb-admin', + DCB_SUPPORT = 'dcb-support', + DCB_PARTNER = 'dcb-partner', + + // Rôles Merchant Partner (avec merchantPartnerId obligatoire) + DCB_PARTNER_ADMIN = 'dcb-partner-admin', + DCB_PARTNER_MANAGER = 'dcb-partner-manager', + DCB_PARTNER_SUPPORT = 'dcb-partner-support' } -// === BASE USER MODEL === -export interface BaseUserDto { +// Enum pour le contexte Angular (identique à l'ancien) +export enum UserContext { + HUB = 'HUB', + MERCHANT = 'MERCHANT' +} + +// Ajoutez cette interface dans vos modèles +export interface GlobalUsersOverview { + hubUsers: User[]; + merchantUsers: User[]; + statistics: { + totalHubUsers: number; + totalMerchantUsers: number; + totalUsers: number; + }; +} + +export interface UsersStatistics { + totalHubUsers: number; + totalMerchantUsers: number; + totalUsers: number; +} + +// === MODÈLE USER PRINCIPAL === +export interface User { id: string; username: string; email: string; firstName: string; lastName: string; - role: UserRole; enabled: boolean; emailVerified: boolean; - createdBy: string; - createdByUsername: string; + userType: UserType; // HUB ou MERCHANT + merchantPartnerId?: string; + role: UserRole; + createdBy?: string; + createdByUsername?: string; createdTimestamp: number; lastLogin?: number; - userType: UserType; -} - -// === EXTENSIONS === -export interface HubUserDto extends BaseUserDto { - userType: UserType.HUB; -} - -export interface MerchantUserDto extends BaseUserDto { - userType: UserType.MERCHANT; - merchantPartnerId: string; + profileImage?: string | null } // === DTOs CRUD === @@ -50,10 +65,11 @@ export interface CreateUserDto { firstName: string; lastName: string; password: string; + userType: UserType; role: UserRole; enabled?: boolean; emailVerified?: boolean; - merchantPartnerId?: string; // obligatoire si MERCHANT + merchantPartnerId?: string; } export interface UpdateUserDto { @@ -61,6 +77,7 @@ export interface UpdateUserDto { lastName?: string; email?: string; enabled?: boolean; + role?: UserRole; } export interface ResetPasswordDto { @@ -71,7 +88,7 @@ export interface ResetPasswordDto { // === PAGINATION / STATS === export interface PaginatedUserResponse { - users: BaseUserDto[]; + users: User[]; total: number; page: number; limit: number; @@ -93,6 +110,7 @@ export interface AvailableRole { label: string; description: string; allowedForCreation: boolean; + userType: UserType; } export interface AvailableRolesResponse { @@ -110,4 +128,88 @@ export interface SearchUsersParams { role?: UserRole; enabled?: boolean; userType?: UserType; + merchantPartnerId?: string; + page?: number; + limit?: number; } + +// === UTILITAIRES === +export class UserUtils { + static isHubUser(user: User): boolean { + return user.userType === UserType.HUB; + } + + static isMerchantPartnerUser(user: User): boolean { + return user.userType === UserType.MERCHANT_PARTNER; + } + + static hasRole(user: User, role: UserRole): boolean { + if (!user.role) return false; + return user.role.includes(role); + } + + static getRoleDisplayName(role: UserRole): string { + const roleNames = { + [UserRole.DCB_ADMIN]: 'DCB Admin', + [UserRole.DCB_SUPPORT]: 'DCB Support', + [UserRole.DCB_PARTNER]: 'DCB Partner', + [UserRole.DCB_PARTNER_ADMIN]: 'Partner Admin', + [UserRole.DCB_PARTNER_MANAGER]: 'Partner Manager', + [UserRole.DCB_PARTNER_SUPPORT]: 'Partner Support' + }; + return roleNames[role] || role; + } + + static getUserTypeDisplayName(userType: UserType): string { + const typeNames = { + [UserType.HUB]: 'Hub', + [UserType.MERCHANT_PARTNER]: 'Merchant Partner' + }; + return typeNames[userType] || userType; + } + + // Méthode pour convertir UserContext (Angular) en UserType (API) + static contextToUserType(context: UserContext): UserType { + return context === UserContext.HUB ? UserType.HUB : UserType.MERCHANT_PARTNER; + } + + // Méthode pour convertir UserType (API) en UserContext (Angular) + static userTypeToContext(userType: UserType): UserContext { + return userType === UserType.HUB ? UserContext.HUB : UserContext.MERCHANT; + } + + static validateUserCreation(user: CreateUserDto): string[] { + const errors: string[] = []; + + // Validation merchantPartnerId + if (user.userType === UserType.MERCHANT_PARTNER && !user.merchantPartnerId) { + errors.push('merchantPartnerId est obligatoire pour les utilisateurs Merchant Partner'); + } + + if (user.userType === UserType.HUB && user.merchantPartnerId) { + errors.push('merchantPartnerId ne doit pas être défini pour les utilisateurs Hub'); + } + + if (!user.role) { + errors.push('Un rôle doit être assigné'); + } + + // Validation cohérence rôle/type + const hubRoles = [UserRole.DCB_ADMIN, UserRole.DCB_SUPPORT, UserRole.DCB_PARTNER]; + const merchantRoles = [UserRole.DCB_PARTNER_ADMIN, UserRole.DCB_PARTNER_MANAGER, UserRole.DCB_PARTNER_SUPPORT]; + + if (user.userType === UserType.HUB && user.role) { + if (!hubRoles.includes(user.role)) { + errors.push(`Rôle invalide pour un utilisateur Hub: ${user.role}`); + } + } + + if (user.userType === UserType.MERCHANT_PARTNER && user.role) { + if (!merchantRoles.includes(user.role)) { + errors.push(`Rôle invalide pour un utilisateur Merchant Partner: ${user.role}`); + } + } + + return errors; + } +} \ No newline at end of file diff --git a/src/app/core/services/auth.service.ts b/src/app/core/services/auth.service.ts index d22b6ea..62da742 100644 --- a/src/app/core/services/auth.service.ts +++ b/src/app/core/services/auth.service.ts @@ -6,11 +6,9 @@ import { BehaviorSubject, Observable, throwError, tap, catchError } from 'rxjs'; import { firstValueFrom } from 'rxjs'; import { + User, UserType, UserRole, - BaseUserDto, - HubUserDto, - MerchantUserDto } from '@core/models/dcb-bo-hub-user.model'; // === INTERFACES DTO AUTH === @@ -57,13 +55,12 @@ export interface TokenValidationResponseDto { }) export class AuthService { private readonly http = inject(HttpClient); - private readonly router = inject(Router); private readonly tokenKey = 'access_token'; private readonly refreshTokenKey = 'refresh_token'; private authState$ = new BehaviorSubject(this.isAuthenticated()); - private userProfile$ = new BehaviorSubject(null); + private userProfile$ = new BehaviorSubject(null); private initialized$ = new BehaviorSubject(false); // === INITIALISATION DE L'APPLICATION === @@ -72,31 +69,42 @@ export class AuthService { * Initialise l'authentification au démarrage de l'application */ async initialize(): Promise { + + await new Promise(resolve => setTimeout(resolve, 0)); + try { const token = this.getAccessToken(); if (!token) { - this.initialized$.next(true); + setTimeout(() => { + this.initialized$.next(true); + }); return false; } if (this.isTokenExpired(token)) { const refreshSuccess = await this.tryRefreshToken(); - this.initialized$.next(true); + setTimeout(() => { + this.initialized$.next(true); + }); return refreshSuccess; } // Token valide : charger le profil utilisateur await firstValueFrom(this.loadUserProfile()); - this.authState$.next(true); - this.initialized$.next(true); + setTimeout(() => { + this.authState$.next(true); + this.initialized$.next(true); + }); return true; } catch (error) { this.clearAuthData(); - this.initialized$.next(true); + setTimeout(() => { + this.initialized$.next(true); + }); return false; } } @@ -112,7 +120,7 @@ export class AuthService { } try { - const response = await firstValueFrom(this.refreshAccessToken()); + await firstValueFrom(this.refreshAccessToken()); await firstValueFrom(this.loadUserProfile()); this.authState$.next(true); return true; @@ -188,15 +196,66 @@ export class AuthService { /** * Chargement du profil utilisateur */ - loadUserProfile(): Observable { - return this.http.get( + loadUserProfile(): Observable { + return this.http.get( `${environment.iamApiUrl}/auth/profile` ).pipe( - tap(profile => this.userProfile$.next(profile)), - catchError(error => throwError(() => error)) + tap(apiResponse => { + // Déterminer le type d'utilisateur + const userType = this.determineUserType(apiResponse); + // Mapper vers le modèle User + const userProfile = this.mapToUserModel(apiResponse, userType); + + this.userProfile$.next(userProfile); + }), + catchError(error => { + console.error('❌ Erreur chargement profil:', error); + return throwError(() => error); + }) ); } + /** + * Détermine le type d'utilisateur basé sur la réponse API + */ + private determineUserType(apiUser: any): UserType { + + const hubRoles = [UserRole.DCB_ADMIN || UserRole.DCB_SUPPORT]; + const merchantRoles = [UserRole.DCB_PARTNER || UserRole.DCB_PARTNER_ADMIN || UserRole.DCB_PARTNER_MANAGER || UserRole.DCB_PARTNER_SUPPORT]; + + // Logique pour déterminer le type d'utilisateur + if (apiUser.clientRoles?.[0].includes(merchantRoles)) { + return UserType.MERCHANT_PARTNER; + } else if (apiUser.clientRoles?.[0].includes(hubRoles)) { + return UserType.HUB; + } else { + console.warn('Type d\'utilisateur non reconnu, rôle:', apiUser.clientRoles?.[0]); + return UserType.HUB; // Fallback + } + } + + private mapToUserModel(apiUser: any, userType: UserType): User { + const mappedUser: User = { + id: apiUser.id || apiUser.userId || '', + username: apiUser.username || apiUser.userName || '', + email: apiUser.email || '', + firstName: apiUser.firstName || apiUser.firstname || apiUser.given_name || '', + lastName: apiUser.lastName || apiUser.lastname || apiUser.family_name || '', + enabled: apiUser.enabled ?? apiUser.active ?? true, + emailVerified: apiUser.emailVerified ?? apiUser.email_verified ?? false, + userType: userType, + merchantPartnerId: apiUser.merchantPartnerId || apiUser.partnerId || apiUser.merchantId || null, + role: apiUser.clientRoles || apiUser.clientRoles?.[0] || '', // Gérer rôle unique ou tableau + createdBy: apiUser.createdBy || apiUser.creatorId || null, + createdByUsername: apiUser.createdByUsername || apiUser.creatorUsername || null, + createdTimestamp: apiUser.createdTimestamp || apiUser.createdAt || apiUser.creationDate || Date.now(), + lastLogin: apiUser.lastLogin || apiUser.lastLoginAt || apiUser.lastConnection || null + }; + + console.log('✅ Utilisateur mappé:', mappedUser); + return mappedUser; + } + // === GESTION DE SESSION === private handleLoginSuccess(response: LoginResponseDto): void { @@ -232,7 +291,7 @@ export class AuthService { return this.authState$.asObservable(); } - getUserProfile(): Observable { + getUserProfile(): Observable { return this.userProfile$.asObservable(); } @@ -322,55 +381,72 @@ export class AuthService { if (hubRoles.includes(role)) { return UserType.HUB; } else if (merchantRoles.includes(role)) { - return UserType.MERCHANT; + return UserType.MERCHANT_PARTNER; } return null; } + /** + * Récupère les clientRoles du profil utilisateur + */ + getCurrentUserClientRoles(): UserRole | null { + const profile = this.userProfile$.value; + return profile?.role || null; + } + + /** + * Récupère le rôle principal du profil utilisateur + */ + getCurrentUserPrimaryRole(): UserRole | null { + const clientRoles = this.getCurrentUserClientRoles(); + return clientRoles || null; + } + /** * Vérifie si l'utilisateur courant est un utilisateur Hub */ isHubUser(): boolean { - return this.getCurrentUserType() === UserType.HUB; + const profile = this.userProfile$.value; + return profile?.userType === UserType.HUB; } /** * Vérifie si l'utilisateur courant est un utilisateur Marchand */ isMerchantUser(): boolean { - return this.getCurrentUserType() === UserType.MERCHANT; + const profile = this.userProfile$.value; + return profile?.userType === UserType.MERCHANT_PARTNER; } /** * Vérifie si l'utilisateur courant a un rôle spécifique */ hasRole(role: UserRole): boolean { - return this.getCurrentUserRoles().includes(role); + const clientRoles = this.getCurrentUserClientRoles(); + return clientRoles === role; } /** * Vérifie si l'utilisateur courant a au moins un des rôles spécifiés */ - hasAnyRole(roles: UserRole[]): boolean { - const userRoles = this.getCurrentUserRoles(); - return roles.some(role => userRoles.includes(role)); + hasAnyRole(role: UserRole): boolean { + const userRoles = this.getCurrentUserClientRoles(); + return userRoles === role; } /** * Vérifie si l'utilisateur courant peut gérer les utilisateurs Hub */ canManageHubUsers(): boolean { - const hubAdminRoles = [UserRole.DCB_ADMIN, UserRole.DCB_SUPPORT]; - return this.hasAnyRole(hubAdminRoles); + return this.hasAnyRole(UserRole.DCB_ADMIN) || this.hasAnyRole(UserRole.DCB_SUPPORT); } /** * Vérifie si l'utilisateur courant peut gérer les utilisateurs Marchands */ canManageMerchantUsers(): boolean { - const allowedRoles = [UserRole.DCB_ADMIN, UserRole.DCB_SUPPORT, UserRole.DCB_PARTNER]; - return this.hasAnyRole(allowedRoles); + return this.hasAnyRole(UserRole.DCB_ADMIN) || this.hasAnyRole(UserRole.DCB_PARTNER); } // === MÉTHODES UTILITAIRES === @@ -379,7 +455,7 @@ export class AuthService { return this.authState$.asObservable(); } - getProfile(): Observable { + getProfile(): Observable { return this.getUserProfile(); } @@ -396,10 +472,7 @@ export class AuthService { */ getCurrentMerchantPartnerId(): string | null { const profile = this.userProfile$.value; - if (profile && 'merchantPartnerId' in profile) { - return (profile as MerchantUserDto).merchantPartnerId || null; - } - return null; + return profile?.merchantPartnerId || null; } /** @@ -414,8 +487,7 @@ export class AuthService { * Vérifie si l'utilisateur peut visualiser tous les marchands */ canViewAllMerchants(): boolean { - const hubAdminRoles = [UserRole.DCB_ADMIN, UserRole.DCB_SUPPORT]; - return this.hasAnyRole(hubAdminRoles); + return this.hasAnyRole(UserRole.DCB_ADMIN) || this.hasAnyRole(UserRole.DCB_PARTNER); } // === TOKENS === diff --git a/src/app/core/services/role-management.service.ts b/src/app/core/services/hub-users-roles-management.service.ts similarity index 53% rename from src/app/core/services/role-management.service.ts rename to src/app/core/services/hub-users-roles-management.service.ts index 45d5032..51c5ad9 100644 --- a/src/app/core/services/role-management.service.ts +++ b/src/app/core/services/hub-users-roles-management.service.ts @@ -1,7 +1,8 @@ import { Injectable, inject } from '@angular/core'; -import { HubUsersService } from '../../modules/hub-users/services/hub-users.service'; +import { HubUsersService } from '@modules/hub-users-management/hub-users.service'; +import { MerchantUsersService } from '@modules/hub-users-management/merchant-users.service'; import { BehaviorSubject, Observable, map, tap, of, catchError } from 'rxjs'; -import { UserRole } from '@core/models/dcb-bo-hub-user.model'; +import { UserRole, UserType, AvailableRole } from '@core/models/dcb-bo-hub-user.model'; export interface RolePermission { canCreateUsers: boolean; @@ -13,28 +14,11 @@ export interface RolePermission { canAccessAdmin: boolean; canAccessSupport: boolean; canAccessPartner: boolean; - assignableRoles: UserRole[]; // Ajout de cette propriété -} - -// Interface simplifiée pour la réponse API -export interface AvailableRoleResponse { - value: UserRole; - label: string; - description: string; - allowedForCreation?: boolean; -} - -export interface AvailableRolesResponse { - roles: AvailableRoleResponse[]; -} - -// Interface étendue pour l'usage interne avec les permissions -export interface AvailableRole extends AvailableRoleResponse { - permissions: RolePermission; + assignableRoles: UserRole[]; } export interface AvailableRolesWithPermissions { - roles: AvailableRole[]; + roles: (AvailableRole & { permissions: RolePermission })[]; } @Injectable({ @@ -42,102 +26,87 @@ export interface AvailableRolesWithPermissions { }) export class RoleManagementService { private hubUsersService = inject(HubUsersService); + private merchantUsersService = inject(MerchantUsersService); private availableRoles$ = new BehaviorSubject(null); private currentUserRole$ = new BehaviorSubject(null); /** - * Charge les rôles disponibles depuis l'API et les enrichit avec les permissions + * Charge les rôles Hub disponibles */ - loadAvailableRoles(): Observable { + loadAvailableHubRoles(): Observable { return this.hubUsersService.getAvailableHubRoles().pipe( - map(apiResponse => { - // Enrichir les rôles de l'API avec les permissions - const rolesWithPermissions: AvailableRole[] = apiResponse.roles.map(role => ({ + map(apiResponse => ({ + roles: apiResponse.roles.map(role => ({ ...role, permissions: this.getPermissionsForRole(role.value) - })); - - const result: AvailableRolesWithPermissions = { - roles: rolesWithPermissions - }; - - this.availableRoles$.next(result); - return result; - }), - catchError(error => { - console.error('Error loading available roles:', error); - // Fallback avec les rôles par défaut - const defaultRoles: AvailableRolesWithPermissions = { - roles: [ - { - value: UserRole.DCB_ADMIN, - label: 'DCB Admin', - description: 'Full administrative access to the entire system', - permissions: this.getPermissionsForRole(UserRole.DCB_ADMIN) - }, - { - value: UserRole.DCB_SUPPORT, - label: 'DCB Support', - description: 'Support access with limited administrative capabilities', - permissions: this.getPermissionsForRole(UserRole.DCB_SUPPORT) - }, - { - value: UserRole.DCB_PARTNER, - label: 'DCB Partner', - description: 'Merchant partner with access to their own merchant ecosystem', - permissions: this.getPermissionsForRole(UserRole.DCB_PARTNER) - }, - { - value: UserRole.DCB_PARTNER_ADMIN, - label: 'Partner Admin', - description: 'Administrateur partenaire marchand', - permissions: this.getPermissionsForRole(UserRole.DCB_PARTNER_ADMIN) - }, - { - value: UserRole.DCB_PARTNER_MANAGER, - label: 'Partner Manager', - description: 'Manager partenaire marchand', - permissions: this.getPermissionsForRole(UserRole.DCB_PARTNER_MANAGER) - }, - { - value: UserRole.DCB_PARTNER_SUPPORT, - label: 'Partner Support', - description: 'Support partenaire marchand', - permissions: this.getPermissionsForRole(UserRole.DCB_PARTNER_SUPPORT) - } - ] - }; - - this.availableRoles$.next(defaultRoles); - return of(defaultRoles); - }) + })) + })), + tap(roles => this.availableRoles$.next(roles)), + catchError(error => this.getDefaultHubRoles(error)) ); } /** - * Récupère les rôles disponibles depuis le cache ou l'API + * Charge les rôles Marchands disponibles */ - getAvailableRoles(): Observable { - const cached = this.availableRoles$.value; - if (cached) { - return of(cached); - } - return this.loadAvailableRoles(); + loadAvailableMerchantRoles(): Observable { + return this.merchantUsersService.getAvailableMerchantRoles().pipe( + map(apiResponse => ({ + roles: apiResponse.roles.map(role => ({ + ...role, + permissions: this.getPermissionsForRole(role.value) + })) + })), + tap(roles => this.availableRoles$.next(roles)), + catchError(error => this.getDefaultMerchantRoles(error)) + ); } /** - * Récupère les rôles disponibles sous forme simplifiée (pour les selects) + * Rôles Hub par défaut en cas d'erreur */ - getAvailableRolesSimple(): Observable { - return this.getAvailableRoles().pipe( - map(response => response.roles.map(role => ({ - value: role.value, - label: role.label, - description: role.description, - allowedForCreation: role.allowedForCreation - }))) - ); + private getDefaultHubRoles(error?: any): Observable { + console.error('Error loading hub roles:', error); + const defaultRoles: AvailableRolesWithPermissions = { + roles: [ + UserRole.DCB_ADMIN, + UserRole.DCB_SUPPORT, + UserRole.DCB_PARTNER + ].map(role => ({ + value: role, + label: this.getRoleLabel(role), + description: this.getRoleDescription(role), + allowedForCreation: true, + userType: UserType.HUB, + permissions: this.getPermissionsForRole(role) + })) + }; + this.availableRoles$.next(defaultRoles); + return of(defaultRoles); + } + + /** + * Rôles Marchands par défaut en cas d'erreur + */ + private getDefaultMerchantRoles(error?: any): Observable { + console.error('Error loading merchant roles:', error); + const defaultRoles: AvailableRolesWithPermissions = { + roles: [ + UserRole.DCB_PARTNER_ADMIN, + UserRole.DCB_PARTNER_MANAGER, + UserRole.DCB_PARTNER_SUPPORT + ].map(role => ({ + value: role, + label: this.getRoleLabel(role), + description: this.getRoleDescription(role), + allowedForCreation: true, + userType: UserType.MERCHANT_PARTNER, + permissions: this.getPermissionsForRole(role) + })) + }; + this.availableRoles$.next(defaultRoles); + return of(defaultRoles); } /** @@ -154,11 +123,22 @@ export class RoleManagementService { return this.currentUserRole$.asObservable(); } + /** + * Récupère la valeur actuelle du rôle utilisateur (synchrone) + */ + getCurrentUserRoleValue(): UserRole | null { + return this.currentUserRole$.value; + } + /** * Récupère les permissions détaillées selon le rôle */ - getPermissionsForRole(role: UserRole): RolePermission { - const allRoles = Object.values(UserRole); + getPermissionsForRole(role: UserRole | null): RolePermission { + if (!role) { + return this.getDefaultPermissions(); + } + + const allRoles = this.getAllRoles(); const hubRoles = [UserRole.DCB_SUPPORT, UserRole.DCB_PARTNER, UserRole.DCB_PARTNER_ADMIN, UserRole.DCB_PARTNER_MANAGER, UserRole.DCB_PARTNER_SUPPORT]; const merchantRoles = [UserRole.DCB_PARTNER_ADMIN, UserRole.DCB_PARTNER_MANAGER, UserRole.DCB_PARTNER_SUPPORT]; @@ -188,7 +168,7 @@ export class RoleManagementService { canAccessAdmin: false, canAccessSupport: true, canAccessPartner: true, - assignableRoles: hubRoles, + assignableRoles: hubRoles, }; case UserRole.DCB_PARTNER: @@ -198,10 +178,10 @@ export class RoleManagementService { canDeleteUsers: true, canManageRoles: true, canViewStats: true, - canManageMerchants: true, - canAccessAdmin: true, - canAccessSupport: true, - canAccessPartner: true, + canManageMerchants: false, + canAccessAdmin: false, + canAccessSupport: false, + canAccessPartner: false, assignableRoles: merchantRoles }; @@ -209,20 +189,20 @@ export class RoleManagementService { return { canCreateUsers: true, canEditUsers: true, - canDeleteUsers: false, + canDeleteUsers: true, canManageRoles: true, canViewStats: true, canManageMerchants: true, canAccessAdmin: false, canAccessSupport: false, canAccessPartner: true, - assignableRoles: [UserRole.DCB_PARTNER_ADMIN, UserRole.DCB_PARTNER_MANAGER, UserRole.DCB_PARTNER_SUPPORT] + assignableRoles: [UserRole.DCB_PARTNER_MANAGER, UserRole.DCB_PARTNER_SUPPORT] }; case UserRole.DCB_PARTNER_MANAGER: return { - canCreateUsers: true, - canEditUsers: true, + canCreateUsers: false, + canEditUsers: false, canDeleteUsers: false, canManageRoles: false, canViewStats: true, @@ -243,34 +223,47 @@ export class RoleManagementService { canManageMerchants: false, canAccessAdmin: false, canAccessSupport: false, - canAccessPartner: false, + canAccessPartner: true, assignableRoles: [] }; default: - return { - canCreateUsers: false, - canEditUsers: false, - canDeleteUsers: false, - canManageRoles: false, - canViewStats: true, - canManageMerchants: true, - canAccessAdmin: false, - canAccessSupport: false, - canAccessPartner: false, - assignableRoles: [] - }; + return this.getDefaultPermissions(); } } + /** + * Permissions par défaut (rôle inconnu ou non défini) + */ + private getDefaultPermissions(): RolePermission { + return { + canCreateUsers: false, + canEditUsers: false, + canDeleteUsers: false, + canManageRoles: false, + canViewStats: false, + canManageMerchants: false, + canAccessAdmin: false, + canAccessSupport: false, + canAccessPartner: false, + assignableRoles: [] + }; + } + /** * Vérifie si un rôle peut être attribué par l'utilisateur courant */ canAssignRole(currentUserRole: UserRole | null, targetRole: UserRole): boolean { if (!currentUserRole) return false; - // SEUL DCB_PARTNER peut attribuer tous les rôles - if (currentUserRole === UserRole.DCB_PARTNER, currentUserRole === UserRole.DCB_ADMIN, currentUserRole === UserRole.DCB_SUPPORT) { + // Rôles qui peuvent attribuer tous les rôles + const fullPermissionRoles = [ + UserRole.DCB_ADMIN, + UserRole.DCB_SUPPORT, + UserRole.DCB_PARTNER + ]; + + if (fullPermissionRoles.includes(currentUserRole)) { return true; } @@ -345,35 +338,60 @@ export class RoleManagementService { /** * Récupère le libellé d'un rôle */ - getRoleLabel(role: UserRole): string { - const roleLabels: { [key in UserRole]: string } = { - [UserRole.DCB_ADMIN]: 'Administrateur DCB', - [UserRole.DCB_SUPPORT]: 'Support DCB', - [UserRole.DCB_PARTNER]: 'Partenaire DCB', - [UserRole.DCB_PARTNER_ADMIN]: 'Admin Partenaire', - [UserRole.DCB_PARTNER_MANAGER]: 'Manager Partenaire', - [UserRole.DCB_PARTNER_SUPPORT]: 'Support Partenaire' + getRoleLabel(role: string): string { + const userRole = role as UserRole; + switch (userRole) { + case UserRole.DCB_ADMIN: + return 'Administrateur DCB'; + case UserRole.DCB_SUPPORT: + return 'Support DCB'; + case UserRole.DCB_PARTNER: + return 'Partenaire DCB'; + case UserRole.DCB_PARTNER_ADMIN: + return 'Admin Partenaire'; + case UserRole.DCB_PARTNER_MANAGER: + return 'Manager Partenaire'; + case UserRole.DCB_PARTNER_SUPPORT: + return 'Support Partenaire'; + default: + return role; + } + } + + /** + * Récupère la description d'un rôle + */ + getRoleDescription(role: string | UserRole): string { + const userRole = role as UserRole; + const roleDescriptions: { [key in UserRole]: string } = { + [UserRole.DCB_ADMIN]: 'Administrateur système avec tous les accès', + [UserRole.DCB_SUPPORT]: 'Support technique avec accès étendus', + [UserRole.DCB_PARTNER]: 'Partenaire commercial principal', + [UserRole.DCB_PARTNER_ADMIN]: 'Administrateur de partenaire marchand', + [UserRole.DCB_PARTNER_MANAGER]: 'Manager opérationnel partenaire', + [UserRole.DCB_PARTNER_SUPPORT]: 'Support technique partenaire' }; - return roleLabels[role] || 'Rôle inconnu'; + return roleDescriptions[userRole] || 'Description non disponible'; } /** * Récupère la classe CSS pour un badge de rôle */ - getRoleBadgeClass(role: UserRole): string { - switch (role) { + getRoleBadgeClass(role: string): string { + const userRole = role as UserRole; + switch (userRole) { case UserRole.DCB_ADMIN: return 'bg-danger'; case UserRole.DCB_SUPPORT: return 'bg-info'; case UserRole.DCB_PARTNER: + return 'bg-primary'; + case UserRole.DCB_PARTNER_ADMIN: + return 'bg-warning'; + case UserRole.DCB_PARTNER_MANAGER: return 'bg-success'; - case UserRole.DCB_PARTNER_ADMIN: - return 'bg-danger'; - case UserRole.DCB_PARTNER_MANAGER: - return 'bg-warning text-dark'; - case UserRole.DCB_PARTNER_SUPPORT: - return 'bg-info text-white'; + case UserRole.DCB_PARTNER_SUPPORT: + return 'bg-secondary'; default: return 'bg-secondary'; } @@ -382,8 +400,9 @@ export class RoleManagementService { /** * Récupère l'icône pour un rôle */ - getRoleIcon(role: UserRole): string { - switch (role) { + getRoleIcon(role: string): string { + const userRole = role as UserRole; + switch (userRole) { case UserRole.DCB_ADMIN: return 'lucideShield'; case UserRole.DCB_SUPPORT: @@ -391,7 +410,7 @@ export class RoleManagementService { case UserRole.DCB_PARTNER: return 'lucideBuilding'; case UserRole.DCB_PARTNER_ADMIN: - return 'lucideShield'; + return 'lucideShieldCheck'; case UserRole.DCB_PARTNER_MANAGER: return 'lucideUserCog'; case UserRole.DCB_PARTNER_SUPPORT: @@ -401,6 +420,7 @@ export class RoleManagementService { } } + /** * Vérifie si un rôle est un rôle administrateur */ @@ -426,7 +446,11 @@ export class RoleManagementService { * Vérifie si un rôle est un rôle marchand */ isMerchantRole(role: UserRole): boolean { - const merchantRoles = [UserRole.DCB_PARTNER_ADMIN, UserRole.DCB_PARTNER_MANAGER, UserRole.DCB_PARTNER_SUPPORT]; + const merchantRoles = [ + UserRole.DCB_PARTNER_ADMIN, + UserRole.DCB_PARTNER_MANAGER, + UserRole.DCB_PARTNER_SUPPORT + ]; return merchantRoles.includes(role); } @@ -442,23 +466,71 @@ export class RoleManagementService { */ getAssignableRoles(currentUserRole: UserRole | null): UserRole[] { if (!currentUserRole) return []; - - const permissions = this.getPermissionsForRole(currentUserRole); - return permissions.assignableRoles; + return this.getPermissionsForRole(currentUserRole).assignableRoles; } /** - * Récupère uniquement les rôles Hub (DCB_ADMIN, DCB_SUPPORT, DCB_PARTNER) + * Récupère les rôles Hub assignables (pour le composant unifié) + */ + getAssignableHubRoles(currentUserRole: UserRole | null): UserRole[] { + if (!currentUserRole) return []; + + const allHubRoles = this.getHubRoles(); + const permissions = this.getPermissionsForRole(currentUserRole); + + return allHubRoles.filter(role => + permissions.assignableRoles.includes(role) + ); + } + + /** + * Récupère les rôles Marchands assignables (pour le composant unifié) + */ + getAssignableMerchantRoles(currentUserRole: UserRole | null): UserRole[] { + if (!currentUserRole) return []; + + const allMerchantRoles = this.getMerchantRoles(); + const permissions = this.getPermissionsForRole(currentUserRole); + + return allMerchantRoles.filter(role => + permissions.assignableRoles.includes(role) + ); + } + + /** + * Récupère uniquement les rôles Hub */ getHubRoles(): UserRole[] { - return [UserRole.DCB_ADMIN, UserRole.DCB_SUPPORT, UserRole.DCB_PARTNER]; + return [ + UserRole.DCB_ADMIN, + UserRole.DCB_SUPPORT, + UserRole.DCB_PARTNER + ]; } /** * Récupère uniquement les rôles Marchands */ getMerchantRoles(): UserRole[] { - return [UserRole.DCB_PARTNER_ADMIN, UserRole.DCB_PARTNER_MANAGER, UserRole.DCB_PARTNER_SUPPORT]; + return [ + UserRole.DCB_PARTNER_ADMIN, + UserRole.DCB_PARTNER_MANAGER, + UserRole.DCB_PARTNER_SUPPORT + ]; + } + + /** + * Vérifie si l'utilisateur a un rôle spécifique + */ + hasRole(userRole: UserRole | null, targetRole: UserRole): boolean { + return userRole === targetRole; + } + + /** + * Vérifie si l'utilisateur a au moins un des rôles spécifiés + */ + hasAnyRole(userRole: UserRole | null, targetRoles: UserRole[]): boolean { + return userRole ? targetRoles.includes(userRole) : false; } /** @@ -466,5 +538,13 @@ export class RoleManagementService { */ clearCache(): void { this.availableRoles$.next(null); + this.currentUserRole$.next(null); + } + + /** + * Récupère les rôles disponibles (observable) + */ + getAvailableRoles(): Observable { + return this.availableRoles$.asObservable(); } } \ No newline at end of file diff --git a/src/app/core/services/menu.service.ts b/src/app/core/services/menu.service.ts index 745285b..5b2ba5d 100644 --- a/src/app/core/services/menu.service.ts +++ b/src/app/core/services/menu.service.ts @@ -76,11 +76,6 @@ export class MenuService { icon: 'lucideCreditCard', url: '/transactions', }, - { - label: 'Gestions Merchants/Partenaires', - icon: 'lucideStore', - url: '/merchant-partners' - }, { label: 'Opérateurs', icon: 'lucideServer', @@ -104,12 +99,18 @@ export class MenuService { { label: 'Utilisateurs & Sécurité', isTitle: true }, { - label: 'Gestion des Utilisateurs', + label: 'Utilisateurs Hub', icon: 'lucideUsers', - url: '/users', + url: '/hub-users-management', + }, + { + label: 'Utilisateurs Merchants/Partenaires', + icon: 'lucideStore', + url: '/merchant-users-management' }, - { label: 'Configuration', isTitle: true }, + { label: 'Configurations', isTitle: true }, + { label: 'Merchant Configs', icon: 'lucideStore', url: '/merchant-configs' }, { label: 'Paramètres Système', icon: 'lucideSettings', url: '/settings' }, { label: 'Intégrations Externes', icon: 'lucidePlug', url: '/integrations' }, diff --git a/src/app/core/services/permissions.service.ts b/src/app/core/services/permissions.service.ts index 99e5e2b..3d41aca 100644 --- a/src/app/core/services/permissions.service.ts +++ b/src/app/core/services/permissions.service.ts @@ -23,8 +23,14 @@ export class PermissionsService { module: 'transactions', roles: this.allRoles, }, + // Users Admin et Support { - module: 'merchant-partners', + module: 'hub-users-management', + roles: [UserRole.DCB_ADMIN, UserRole.DCB_SUPPORT], + }, + // Merchant Users + { + module: 'merchant-users-management', roles: this.allRoles, }, // Operators - Admin seulement @@ -46,16 +52,18 @@ export class PermissionsService { 'retry': [UserRole.DCB_ADMIN] } }, - // Users - Admin et Support - { - module: 'users', - roles: [UserRole.DCB_ADMIN, UserRole.DCB_SUPPORT] - }, // Settings - Tout le monde { module: 'settings', roles: this.allRoles }, + + // Settings - Tout le monde + { + module: 'merchant-configs', + roles: this.allRoles + }, + // Integrations - Admin seulement { module: 'integrations', diff --git a/src/app/layouts/components/data.ts b/src/app/layouts/components/data.ts index 183e322..73cd7cd 100644 --- a/src/app/layouts/components/data.ts +++ b/src/app/layouts/components/data.ts @@ -59,11 +59,6 @@ export const menuItems: MenuItemType[] = [ icon: 'lucideCreditCard', url: '/transactions', }, - { - label: 'Gestions Merchants/Partners', - icon: 'lucideStore', - url: '/merchant-partners' - }, { label: 'Opérateurs', icon: 'lucideServer', @@ -104,18 +99,26 @@ export const menuItems: MenuItemType[] = [ // --------------------------- { label: 'Utilisateurs & Sécurité', isTitle: true }, { - label: 'Gestion des Utilisateurs', + label: 'Utilisateurs Hub', icon: 'lucideUsers', isCollapsed: true, children: [ - { label: 'Liste des Utilisateurs', url: '/users' }, + { label: 'Liste des Utilisateurs', url: '/hub-users-management' }, ], }, + { + label: 'Utilisateurs Merchants/Partners', + icon: 'lucideStore', + url: '/merchant-users-management' + }, + + // --------------------------- // Paramètres & Intégrations // --------------------------- - { label: 'Configuration', isTitle: true }, + { label: 'Configurations', isTitle: true }, + { label: 'Merchant Configs', icon: 'lucideStore', url: '/merchant-configs' }, { label: 'Paramètres Système', icon: 'lucideSettings', url: '/settings' }, { label: 'Intégrations Externes', icon: 'lucidePlug', url: '/integrations' }, diff --git a/src/app/layouts/components/sidenav/components/user-profile/user-profile.component.html b/src/app/layouts/components/sidenav/components/user-profile/user-profile.component.html index 109656c..ba11d2b 100644 --- a/src/app/layouts/components/sidenav/components/user-profile/user-profile.component.html +++ b/src/app/layouts/components/sidenav/components/user-profile/user-profile.component.html @@ -3,10 +3,16 @@ src="assets/images/users/user-2.jpg" class="rounded-circle me-2" width="36" + height="36" alt="user-image" + onerror="this.src='assets/images/users/user-default.jpg'" />
-
{{ user?.firstName }} - {{ user?.lastName }}
-
Administrateur
+
+ {{ getUserInitials() }} | {{ getDisplayName() }} +
+
+ {{ getUserRole(user) }} +
- + \ No newline at end of file diff --git a/src/app/layouts/components/sidenav/components/user-profile/user-profile.component.ts b/src/app/layouts/components/sidenav/components/user-profile/user-profile.component.ts index cd9db9e..a20c8c9 100644 --- a/src/app/layouts/components/sidenav/components/user-profile/user-profile.component.ts +++ b/src/app/layouts/components/sidenav/components/user-profile/user-profile.component.ts @@ -1,7 +1,9 @@ -import { Component, inject, ChangeDetectorRef } from '@angular/core'; +import { Component, inject, OnInit, OnDestroy, ChangeDetectorRef } from '@angular/core'; import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap'; import { userDropdownItems } from '@layouts/components/data'; import { AuthService } from '@/app/core/services/auth.service'; +import { User, UserRole } from '@core/models/dcb-bo-hub-user.model'; +import { Subject, takeUntil } from 'rxjs'; @Component({ selector: 'app-user-profile', @@ -9,27 +11,87 @@ import { AuthService } from '@/app/core/services/auth.service'; imports: [NgbCollapseModule], templateUrl: './user-profile.component.html', }) -export class UserProfileComponent { +export class UserProfileComponent implements OnInit, OnDestroy { private authService = inject(AuthService); private cdr = inject(ChangeDetectorRef); + + private destroy$ = new Subject(); + + user: User | null = null; + isLoading = true; - user: any = null; - - constructor() { + ngOnInit(): void { this.loadUser(); - this.authService.onAuthState().subscribe(() => this.loadUser()); + + // Subscribe to auth state changes + this.authService.getAuthState() + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: (isAuthenticated) => { + if (isAuthenticated) { + this.loadUser(); + } else { + this.user = null; + this.isLoading = false; + } + } + }); } - loadUser() { - this.authService.getProfile().subscribe({ - next: profile => { - this.user = profile; - this.cdr.detectChanges(); - }, - error: () => { - this.user = null; - this.cdr.detectChanges(); - } - }); + loadUser(): void { + this.isLoading = true; + + this.authService.getProfile() + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: (profile) => { + this.user = profile; + this.isLoading = false; + }, + error: (error) => { + console.error('Failed to load user profile:', error); + this.user = null; + this.isLoading = false; + } + }); } -} + + ngOnDestroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + // Helper methods for template + getUserInitials(): string { + if (!this.user?.firstName || !this.user?.lastName) { + return 'UU'; // User Unknown + } + return `${this.user.firstName.charAt(0)}${this.user.lastName.charAt(0)}`.toUpperCase(); + } + + getDisplayName(): string { + if (!this.user) return 'Utilisateur'; + return `${this.user.firstName} ${this.user.lastName}`.trim() || this.user.username || 'Utilisateur'; + } + + // Get user role with proper mapping + getUserRole(user: User | null): string { + if (!user) return 'Utilisateur'; + + // Use role from profile or fallback to token roles + const role = user.role || this.authService.getCurrentUserRoles(); + + // Map role to display name + const roleDisplayNames: { [key in UserRole]: string } = { + [UserRole.DCB_ADMIN]: 'Administrateur', + [UserRole.DCB_SUPPORT]: 'Support Technique', + [UserRole.DCB_PARTNER]: 'Partenaire', + [UserRole.DCB_PARTNER_ADMIN]: 'Admin Partenaire', + [UserRole.DCB_PARTNER_MANAGER]: 'Manager Partenaire', + [UserRole.DCB_PARTNER_SUPPORT]: 'Support Partenaire', + }; + + const primaryRole = role; + return roleDisplayNames[primaryRole] || 'Utilisateur'; + } +} \ No newline at end of file diff --git a/src/app/modules/auth/unauthorized.ts b/src/app/modules/auth/unauthorized.ts index 957bd5b..44c4286 100644 --- a/src/app/modules/auth/unauthorized.ts +++ b/src/app/modules/auth/unauthorized.ts @@ -51,7 +51,7 @@ import { credits, currentYear } from '@/app/constants'
- Rôles requis : Administrateur, Gestionnaire ou Support + Rôles requis : Administrateur, Partenaire ou Support
diff --git a/src/app/modules/hub-users/list/list.html b/src/app/modules/hub-users-management/hub-users-list/hub-users-list.html similarity index 55% rename from src/app/modules/hub-users/list/list.html rename to src/app/modules/hub-users-management/hub-users-list/hub-users-list.html index 60ee7ef..b7b7e4b 100644 --- a/src/app/modules/hub-users/list/list.html +++ b/src/app/modules/hub-users-management/hub-users-list/hub-users-list.html @@ -1,12 +1,38 @@ - + Gérez les accès utilisateurs de votre plateforme DCB + > + + Gérez les accès utilisateurs de votre plateforme DCB
+ + @if (isAdminView) { +
+
+
+
+ +
+ Vue Administrative Globale : Vous visualisez tous les utilisateurs Hub et Merchant de la plateforme + @if (showStatistics) { +
+ + {{ getHubUsersCount() }} utilisateurs Hub • + {{ getMerchantUsersCount() }} utilisateurs Merchant • + {{ getTotalUsersCountAdmin() }} total + + } +
+
+
+
+
+ } +
@@ -19,53 +45,127 @@ [class.active]="roleFilter === 'all'" (click)="filterByRole('all')" > - Tous ({{ allUsers.length }}) - - - - + + + @if (isAdminView) { + + + + + + + } @else { + + + + + }
+ + + @if (isAdminView) { +
+ +
+ }
+
- @if (canCreateUsers) { + @if (showCreateButton) { } +
- +
-
+
@@ -73,44 +173,44 @@
+
- - - + +
+
-
+
- + @for (role of availableRoles; track role.value) { }
-
-
- - -
+ +
+
@@ -130,6 +230,7 @@
{{ error }}
+
} @@ -140,6 +241,14 @@ + + @if (showUserTypeColumn()) { + + } + + @if (showMerchantPartnerColumn()) { + + } - + @for (user of displayedUsers; track user.id) { + + @if (showUserTypeColumn()) { + + } + + @if (showMerchantPartnerColumn()) { + + } -
TypeMerchant Partner
Utilisateur @@ -152,12 +261,7 @@
-
- Rôle - -
- 		Rôle Principal
Statut @@ -176,6 +280,33 @@
+ + {{ user.userType === UserType.HUB ? 'Hub' : 'Merchant' }} + + + @if (user.merchantPartnerId) { +
+
+ +
+
+ + {{ user.merchantPartnerId.substring(0, 8) }}... + +
+
+ } @else { + - + } +
@@ -229,7 +360,7 @@ } - @if (canDeleteUsers) { + @if (showDeleteButton) {
+
Aucun utilisateur trouvé

Aucun utilisateur ne correspond à vos critères de recherche.

- @if (canCreateUsers) { - diff --git a/src/app/modules/hub-users-management/hub-users-list/hub-users-list.ts b/src/app/modules/hub-users-management/hub-users-list/hub-users-list.ts new file mode 100644 index 0000000..398f864 --- /dev/null +++ b/src/app/modules/hub-users-management/hub-users-list/hub-users-list.ts @@ -0,0 +1,597 @@ +import { Component, inject, OnInit, Output, EventEmitter, ChangeDetectorRef, Input, OnDestroy } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { NgIcon } from '@ng-icons/core'; +import { NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap'; +import { Observable, Subject, map, of } from 'rxjs'; +import { catchError, takeUntil } from 'rxjs/operators'; + +import { + PaginatedUserResponse, + User, + UserRole, + UserType, + UserUtils +} from '@core/models/dcb-bo-hub-user.model'; + +import { HubUsersService } from '../hub-users.service'; +import { RoleManagementService } from '@core/services/hub-users-roles-management.service'; +import { AuthService } from '@core/services/auth.service'; +import { UiCard } from '@app/components/ui-card'; + +@Component({ + selector: 'app-hub-users-list', + standalone: true, + imports: [ + CommonModule, + FormsModule, + NgIcon, + UiCard, + NgbPaginationModule + ], + templateUrl: './hub-users-list.html', +}) +export class HubUsersList implements OnInit, OnDestroy { + private authService = inject(AuthService); + private hubUsersService = inject(HubUsersService); + protected roleService = inject(RoleManagementService); + private cdRef = inject(ChangeDetectorRef); + private destroy$ = new Subject(); + + // Configuration + readonly UserRole = UserRole; + readonly UserType = UserType; + readonly UserUtils = UserUtils; + + // Inputs + @Input() canCreateUsers: boolean = false; + @Input() canDeleteUsers: boolean = false; + + // Outputs + + @Output() userSelected = new EventEmitter(); + @Output() openCreateUserModal = new EventEmitter(); + @Output() openResetPasswordModal = new EventEmitter(); + @Output() openDeleteUserModal = new EventEmitter(); + + // Données + allUsers: User[] = []; + filteredUsers: User[] = []; + displayedUsers: User[] = []; + + // États + loading = false; + error = ''; + + // Recherche et filtres + searchTerm = ''; + statusFilter: 'all' | 'enabled' | 'disabled' = 'all'; + emailVerifiedFilter: 'all' | 'verified' | 'not-verified' = 'all'; + roleFilter: UserRole | 'all' = 'all'; + contextFilter: 'all' | 'hub' | 'merchant' = 'all'; + + // Pagination + currentPage = 1; + itemsPerPage = 10; + totalItems = 0; + totalPages = 0; + + // Tri + sortField: keyof User = 'username'; + sortDirection: 'asc' | 'desc' = 'asc'; + + // Rôles disponibles pour le filtre + availableRoles: { value: UserRole | 'all'; label: string, description: string }[] = []; + + // Permissions + currentUserRole: UserRole | null = null; + canViewAllUsers = false; + + // Statistiques + statistics: any = null; + + // Getters pour la logique conditionnelle + get showCreateButton(): boolean { + return this.canCreateUsers; + } + + get showDeleteButton(): boolean { + return this.canDeleteUsers; + } + + ngOnInit() { + this.loadCurrentUserPermissions(); + this.initializeAvailableRoles(); + } + + ngOnDestroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + private loadCurrentUserPermissions() { + this.authService.getUserProfile() + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: (user) => { + this.currentUserRole = this.extractUserRole(user); + this.canViewAllUsers = this.canViewAllUsersCheck(this.currentUserRole); + + console.log('Hub User Context Loaded:', { + role: this.currentUserRole, + canViewAllUsers: this.canViewAllUsers + }); + + this.loadUsers(); + }, + error: (error) => { + console.error('Error loading current user permissions:', error); + this.fallbackPermissions(); + this.loadUsers(); + } + }); + } + + private extractUserRole(user: any): UserRole | null { + const userRoles = this.authService.getCurrentUserRoles(); + if (userRoles && userRoles.length > 0) { + return userRoles[0]; + } + return null; + } + + private canViewAllUsersCheck(role: UserRole | null): boolean { + if (!role) return false; + + const canViewAllRoles = [ + UserRole.DCB_ADMIN, + UserRole.DCB_SUPPORT + ]; + + return canViewAllRoles.includes(role); + } + + private fallbackPermissions(): void { + this.currentUserRole = this.authService.getCurrentUserRole(); + this.canViewAllUsers = this.canViewAllUsersCheck(this.currentUserRole); + } + + private initializeAvailableRoles() { + this.availableRoles = [ + { value: 'all', label: 'Tous les rôles', description: 'Tous les Roles' }, + { value: UserRole.DCB_ADMIN, label: 'DCB Admin', description: 'Administrateur système' }, + { value: UserRole.DCB_SUPPORT, label: 'DCB Support', description: 'Support technique' }, + { value: UserRole.DCB_PARTNER, label: 'DCB Partner', description: 'Partenaire commercial' }, + ]; + } + + loadUsers() { + this.loading = true; + this.error = ''; + + if (this.canViewAllUsers) { + // Vue admin : tous les utilisateurs (Hub + Merchant) + this.loadAllUsers(); + } else { + // Vue normale : utilisateurs Hub seulement + this.loadHubUsers(); + } + } + + private loadAllUsers() { + this.hubUsersService.getAllUsers() + .pipe( + takeUntil(this.destroy$), + catchError(error => { + console.error('Error loading all users:', error); + this.error = 'Erreur lors du chargement de tous les utilisateurs'; + return of(null); + }) + ) + .subscribe({ + next: (overview) => { + if (overview) { + // Combiner Hub + Merchant users + this.allUsers = [...overview.hubUsers, ...overview.merchantUsers]; + this.statistics = overview.statistics; + + console.log(`✅ Admin view: ${overview.hubUsers.length} hub + ${overview.merchantUsers.length} merchant users`); + this.applyFiltersAndPagination(); + } + this.loading = false; + this.cdRef.detectChanges(); + }, + error: () => { + this.loading = false; + this.allUsers = []; + this.filteredUsers = []; + this.displayedUsers = []; + this.cdRef.detectChanges(); + } + }); + } + + private loadHubUsers() { + this.hubUsersService.getHubUsers() + .pipe( + map((response: PaginatedUserResponse) => response.users), + takeUntil(this.destroy$), + catchError(error => { + console.error('Error loading hub users:', error); + this.error = 'Erreur lors du chargement des utilisateurs Hub'; + return of([] as User[]); + }) + ) + .subscribe({ + next: (users) => { + this.allUsers = users || []; + console.log(`✅ Loaded ${this.allUsers.length} hub users`); + this.applyFiltersAndPagination(); + this.loading = false; + this.cdRef.detectChanges(); + }, + error: () => { + this.error = 'Erreur lors du chargement des utilisateurs Hub'; + this.loading = false; + this.allUsers = []; + this.filteredUsers = []; + this.displayedUsers = []; + this.cdRef.detectChanges(); + } + }); + } + + get isAdminView(): boolean { + return this.canViewAllUsers; + } + + get showStatistics(): boolean { + return this.isAdminView && this.statistics !== null; + } + + get viewDescription(): string { + if (this.isAdminView) { + return 'Vue administrative - Tous les utilisateurs (Hub + Merchant)'; + } else { + return 'Utilisateurs Hub DCB'; + } + } + + // Recherche et filtres + onSearch() { + this.currentPage = 1; + this.applyFiltersAndPagination(); + } + + onClearFilters() { + this.searchTerm = ''; + this.statusFilter = 'all'; + this.emailVerifiedFilter = 'all'; + this.roleFilter = 'all'; + this.contextFilter = 'all'; + this.currentPage = 1; + this.applyFiltersAndPagination(); + } + + applyFiltersAndPagination() { + if (!this.allUsers) { + this.allUsers = []; + } + + // Appliquer les filtres + this.filteredUsers = this.allUsers.filter(user => { + const matchesSearch = !this.searchTerm || + user.username.toLowerCase().includes(this.searchTerm.toLowerCase()) || + user.email.toLowerCase().includes(this.searchTerm.toLowerCase()) || + (user.firstName && user.firstName.toLowerCase().includes(this.searchTerm.toLowerCase())) || + (user.lastName && user.lastName.toLowerCase().includes(this.searchTerm.toLowerCase())); + + const matchesStatus = this.statusFilter === 'all' || + (this.statusFilter === 'enabled' && user.enabled) || + (this.statusFilter === 'disabled' && !user.enabled); + + const matchesEmailVerified = this.emailVerifiedFilter === 'all' || + (this.emailVerifiedFilter === 'verified' && user.emailVerified) || + (this.emailVerifiedFilter === 'not-verified' && !user.emailVerified); + + const matchesRole = this.roleFilter === 'all' || + (user.role && user.role.includes(this.roleFilter)); + + // Filtre par contexte (seulement pour la vue admin) + const matchesContext = !this.isAdminView || + (this.contextFilter === 'all' || + (this.contextFilter === 'hub' && user.userType === UserType.HUB) || + (this.contextFilter === 'merchant' && user.userType === UserType.MERCHANT_PARTNER)); + + return matchesSearch && matchesStatus && matchesEmailVerified && matchesRole && matchesContext; + }); + + // Appliquer le tri + this.filteredUsers.sort((a, b) => { + const aValue = a[this.sortField]; + const bValue = b[this.sortField]; + + if (aValue === bValue) return 0; + + let comparison = 0; + if (typeof aValue === 'string' && typeof bValue === 'string') { + comparison = aValue.localeCompare(bValue); + } else if (typeof aValue === 'number' && typeof bValue === 'number') { + comparison = aValue - bValue; + } else if (typeof aValue === 'boolean' && typeof bValue === 'boolean') { + comparison = (aValue === bValue) ? 0 : aValue ? -1 : 1; + } + + return this.sortDirection === 'asc' ? comparison : -comparison; + }); + + // Calculer la pagination + this.totalItems = this.filteredUsers.length; + this.totalPages = Math.ceil(this.totalItems / this.itemsPerPage); + + // Appliquer la pagination + const startIndex = (this.currentPage - 1) * this.itemsPerPage; + const endIndex = startIndex + this.itemsPerPage; + this.displayedUsers = this.filteredUsers.slice(startIndex, endIndex); + } + + // Tri + sort(field: keyof User) { + if (this.sortField === field) { + this.sortDirection = this.sortDirection === 'asc' ? 'desc' : 'asc'; + } else { + this.sortField = field; + this.sortDirection = 'asc'; + } + this.applyFiltersAndPagination(); + } + + getSortIcon(field: string): string { + if (this.sortField !== field) return 'lucideArrowUpDown'; + return this.sortDirection === 'asc' ? 'lucideArrowUp' : 'lucideArrowDown'; + } + + // Pagination + onPageChange(page: number) { + this.currentPage = page; + this.applyFiltersAndPagination(); + } + + getStartIndex(): number { + return (this.currentPage - 1) * this.itemsPerPage + 1; + } + + getEndIndex(): number { + return Math.min(this.currentPage * this.itemsPerPage, this.totalItems); + } + + // Actions + viewUserProfile(userId: string) { + this.userSelected.emit(userId); + } + + resetPasswordRequested(user: User) { + this.openResetPasswordModal.emit(user.id); + } + + deleteUserRequested(user: User) { + this.openDeleteUserModal.emit(user.id); + } + + enableUser(user: User) { + this.hubUsersService.enableHubUser(user.id) + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: (updatedUser) => { + const index = this.allUsers.findIndex(u => u.id === user.id); + if (index !== -1) { + this.allUsers[index] = updatedUser; + } + this.applyFiltersAndPagination(); + this.cdRef.detectChanges(); + }, + error: (error) => { + console.error('Error enabling hub user:', error); + this.error = 'Erreur lors de l\'activation de l\'utilisateur'; + this.cdRef.detectChanges(); + } + }); + } + + disableUser(user: User) { + this.hubUsersService.disableHubUser(user.id) + .pipe(takeUntil(this.destroy$)) + .subscribe({ + next: (updatedUser) => { + const index = this.allUsers.findIndex(u => u.id === user.id); + if (index !== -1) { + this.allUsers[index] = updatedUser; + } + this.applyFiltersAndPagination(); + this.cdRef.detectChanges(); + }, + error: (error) => { + console.error('Error disabling hub user:', error); + this.error = 'Erreur lors de la désactivation de l\'utilisateur'; + this.cdRef.detectChanges(); + } + }); + } + + // Utilitaires d'affichage + getStatusBadgeClass(user: User): string { + if (!user.enabled) return 'badge bg-danger'; + if (!user.emailVerified) return 'badge bg-warning'; + return 'badge bg-success'; + } + + getStatusText(user: User): string { + if (!user.enabled) return 'Désactivé'; + if (!user.emailVerified) return 'Email non vérifié'; + return 'Actif'; + } + + getRoleBadgeClass(role: string | UserRole): string { + return this.roleService.getRoleBadgeClass(role); + } + + getRoleLabel(role: string | UserRole): string { + return this.roleService.getRoleLabel(role); + } + + getRoleIcon(role: string | UserRole): string { + return this.roleService.getRoleIcon(role); + } + + getRoleDescription(role: string | UserRole): string { + const roleInfo = this.availableRoles.find(r => r.value === role); + return roleInfo?.description || 'Description non disponible'; + } + + formatTimestamp(timestamp: number): string { + if (!timestamp) return 'Non disponible'; + return new Date(timestamp).toLocaleDateString('fr-FR', { + year: 'numeric', + month: 'short', + day: 'numeric', + hour: '2-digit', + minute: '2-digit' + }); + } + + getUserInitials(user: User): string { + return (user.firstName?.charAt(0) || '') + (user.lastName?.charAt(0) || '') || 'U'; + } + + getUserDisplayName(user: User): string { + if (user.firstName && user.lastName) { + return `${user.firstName} ${user.lastName}`; + } + return user.username; + } + + getEnabledUsersCount(): number { + return this.allUsers.filter(user => user.enabled).length; + } + + getDisabledUsersCount(): number { + return this.allUsers.filter(user => !user.enabled).length; + } + + userHasRole(user: User, role: UserRole): boolean { + return UserUtils.hasRole(user, role); + } + + // Recherche rapide par rôle + filterByRole(role: UserRole | 'all') { + this.roleFilter = role; + this.currentPage = 1; + this.applyFiltersAndPagination(); + } + + // Recharger les données + refreshData() { + this.loadUsers(); + } + + // Méthodes pour le template + getCardTitle(): string { + return 'Liste des Utilisateurs Hub'; + } + + getHelperText(): string { + return 'Gérez les accès utilisateurs de votre plateforme DCB'; + } + + getHelperIcon(): string { + return 'lucideUsers'; + } + + getContextAlertClass(): string { + return this.isAdminView ? 'alert-warning' : 'alert-secondary'; + } + + getContextIcon(): string { + return this.isAdminView ? 'lucideShield' : 'lucideUsers'; + } + + getContextTitle(): string { + return this.isAdminView ? 'Vue Administrative Globale :' : 'Utilisateurs Hub DCB :'; + } + + getContextDescription(): string { + return this.isAdminView + ? 'Vous visualisez tous les utilisateurs Hub et Merchant de la plateforme' + : 'Gérez les accès utilisateurs de votre plateforme DCB'; + } + + showContextAlert(): boolean { + return true; + } + + // Méthode pour compter les utilisateurs par rôle + getUsersCountByRole(role: UserRole): number { + if (!this.allUsers || this.allUsers.length === 0) return 0; + + return this.allUsers.filter(user => + user.role && user.role.includes(role) + ).length; + } + + getLoadingText(): string { + return 'Chargement des utilisateurs...'; + } + + getEmptyStateTitle(): string { + return 'Aucun utilisateur trouvé'; + } + + getEmptyStateDescription(): string { + return 'Aucun utilisateur ne correspond à vos critères de recherche.'; + } + + getEmptyStateButtonText(): string { + return 'Créer le premier utilisateur'; + } + + getColumnCount(): number { + return this.isAdminView ? 7 : 6; + } + + showUserTypeColumn(): boolean { + return this.isAdminView; + } + + showMerchantPartnerColumn(): boolean { + return this.isAdminView; + } + + // Statistiques + getTotalUsersCount(): number { + return this.allUsers.length; + } + + getActiveUsersCount(): number { + return this.allUsers.filter(user => user.enabled).length; + } + + getVerifiedUsersCount(): number { + return this.allUsers.filter(user => user.emailVerified).length; + } + + // Méthodes spécifiques pour la vue admin + getHubUsersCount(): number { + if (!this.isAdminView || !this.statistics) return 0; + return this.statistics.totalHubUsers || 0; + } + + getMerchantUsersCount(): number { + if (!this.isAdminView || !this.statistics) return 0; + return this.statistics.totalMerchantUsers || 0; + } + + getTotalUsersCountAdmin(): number { + if (!this.isAdminView || !this.statistics) return 0; + return this.statistics.totalUsers || 0; + } +} \ No newline at end of file diff --git a/src/app/modules/hub-users/profile/profile.html b/src/app/modules/hub-users-management/hub-users-profile/hub-users-profile.html similarity index 80% rename from src/app/modules/hub-users/profile/profile.html rename to src/app/modules/hub-users-management/hub-users-profile/hub-users-profile.html index 09c1cd1..d362905 100644 --- a/src/app/modules/hub-users/profile/profile.html +++ b/src/app/modules/hub-users-management/hub-users-profile/hub-users-profile.html @@ -8,14 +8,14 @@ @if (user) { {{ getUserDisplayName() }} } @else { - Profil Utilisateur + Profil Utilisateur Hub }
} @@ -104,6 +105,7 @@
{{ success }}
+
} @@ -115,7 +117,7 @@ -

Chargement du profil...

+

Chargement du profil utilisateur Hub...

} @@ -139,8 +141,13 @@
{{ getUserDisplayName() }}

@{{ user.username }}

+ + + Utilisateur Hub + + - + {{ getStatusText() }} @@ -155,12 +162,12 @@
- Créé le {{ formatTimestamp(user.createdTimestamp) }} + Créé le {{ getCreationDate() }}
@if (user.lastLogin) {
- Dernière connexion : {{ formatTimestamp(user.lastLogin) }} + Dernière connexion : {{ getLastLoginDate() }}
} @@ -170,60 +177,68 @@
-
Rôle Utilisateur
- @if (canManageRoles && !isEditing) { +
+ Rôle Utilisateur +
+ @if (showRoleManagement()) { Modifiable }
- +
- - - {{ getRoleLabel(user.role) }} - - - {{ getRoleDescription(user.role) }} - + @if (getUserRole()) { +
+ + + {{ getRoleLabel(user.role) }} + +
+ + + + {{ getRoleDescription(user.role) }} + + } @else { + Aucun rôle + }
- @if (canManageRoles && !isEditing) { + @if (showRoleManagement()) {
- +
- @if (updatingRoles) { + @if (updatingRole) { Mise à jour en cours... } @else { - Sélectionnez un nouveau rôle pour cet utilisateur + Sélectionnez un nouveau rôle principal pour cet utilisateur }
- } @else if (!canManageRoles) { + } @else if (!canManageRoles()) {
@@ -243,16 +258,16 @@
Créé par : -
{{ user.createdByUsername || 'Système' }}
+
{{ getCreatorName() }}
Date de création : -
{{ formatTimestamp(user.createdTimestamp) }}
+
{{ getCreationDate() }}
Type d'utilisateur :
- {{ user.userType }} + Utilisateur Hub
@@ -289,7 +304,7 @@ type="button" class="btn btn-success btn-sm" (click)="saveProfile()" - [disabled]="saving" + [disabled]="saving || !isFormValid()" > @if (saving) { } + +
+ +
+
+ + + {{ getRoleLabel(user.role) }} + +
+
+
+ {{ getUserRoleDisplay() }} +
+
+ @if (!isEditing) {
@@ -421,19 +454,19 @@
- {{ formatTimestamp(user.createdTimestamp) }} + {{ getCreationDate() }}
- {{ user.createdByUsername || 'Système' }} + {{ getCreatorName() }}
- {{ user.userType }} + Utilisateur Hub
@@ -444,7 +477,7 @@
- @if (!isEditing && canEditUsers) { + @if (!isEditing && canEditUser()) {
Actions de Gestion
@@ -455,13 +488,14 @@
- @if (user.enabled) { + @if (user.enabled && canToggleStatus()) { - } @else { + } @else if (!user.enabled && canToggleStatus()) { + } +
+
+
+
+ } + +
-
+
- +

- Créer un nouvel utilisateur marchand + Créer un nouvel utilisateur Hub

+
Le mot de passe doit contenir au moins 8 caractères.
@@ -229,56 +268,56 @@ } - +
- @if (canManageAllRoles) { - - - Vous pouvez attribuer tous les rôles - + @if (canManageRoles) { + Sélectionnez le rôle principal à assigner à cet utilisateur } @else { - - - Permissions de rôle limitées - + Vous ne pouvez pas modifier les rôles disponibles }
- @if (roleSelect.invalid && roleSelect.touched) { -
- Le rôle est requis -
- } +
+ + +
+ +
+ + Utilisateur Hub + +
+
+ Tous les utilisateurs créés ici sont des utilisateurs Hub +
- @if (!canManageAllRoles) { + @if (!canManageRoles) {
@@ -295,23 +334,22 @@
} - - @if (newMerchantUser.role) { + @if (newUser.role) {
Rôle sélectionné : - - {{ getRoleDisplayName(newMerchantUser.role) }} + + {{ getRoleLabel(newUser.role) }}
- {{ getRoleDescription(newMerchantUser.role) }} + {{ getRoleDescription(newUser.role) }}
@@ -326,7 +364,7 @@ class="form-check-input" type="checkbox" id="enabledSwitch" - [(ngModel)]="newMerchantUser.enabled" + [(ngModel)]="newUser.enabled" name="enabled" [disabled]="creatingUser" checked @@ -344,7 +382,7 @@ class="form-check-input" type="checkbox" id="emailVerifiedSwitch" - [(ngModel)]="newMerchantUser.emailVerified" + [(ngModel)]="newUser.emailVerified" name="emailVerified" [disabled]="creatingUser" > @@ -360,8 +398,7 @@
Informations système :
- • Merchant Partner ID : {{ currentMerchantPartnerId || 'Chargement...' }}
- • Type d'utilisateur : MERCHANT
+ • Type d'utilisateur : HUB
• Créé par : Utilisateur courant
• Votre rôle : {{ currentUserRole || 'Non défini' }} @@ -382,7 +419,7 @@
@@ -447,9 +484,9 @@
- {{ getRoleDisplayName(selectedUserForReset.role) }} + {{ getRoleLabel(selectedUserForReset.role) }} - • Merchant Partner: {{ selectedUserForReset.merchantPartnerId }} + • Type: Hub
@@ -460,17 +497,27 @@ - +
+ + +
Le mot de passe doit contenir au moins 8 caractères.
@@ -573,9 +620,13 @@
-
Êtes-vous sûr de vouloir supprimer cet utilisateur ?
+
Êtes-vous sûr de vouloir supprimer cet utilisateur Hub ?

- Cette action est irréversible. Toutes les données de cet utilisateur marchand seront définitivement perdues. + Cette action est irréversible. Toutes les données de + @if (selectedUserForDelete) { + {{ selectedUserForDelete.username }} + } + seront définitivement perdues.

@@ -592,12 +643,17 @@
Email : {{ selectedUserForDelete.email }}
- Rôle : + Rôle Principal : - {{ getRoleDisplayName(selectedUserForDelete.role) }} + {{ getRoleLabel(selectedUserForDelete.role) }} + @if (selectedUserForDelete.role && selectedUserForDelete.role.length > 1) { +
+ Rôles supplémentaires : + {{ selectedUserForDelete.role.length - 1 }} + }
- Merchant Partner : {{ selectedUserForDelete.merchantPartnerId }} + Type : Utilisateur Hub
@@ -631,7 +687,7 @@ type="button" class="btn btn-danger" (click)="confirmDeleteUser()" - [disabled]="deletingUser || !selectedUserForDelete" + [disabled]="deletingUser || !selectedUserForDelete || !canDeleteUsers" > @if (deletingUser) {