From 191099d8a537bdbd4c2ea8959aef6b6383a40327 Mon Sep 17 00:00:00 2001 From: diallolatoile Date: Tue, 4 Nov 2025 21:06:17 +0000 Subject: [PATCH] feat: add DCB User Service API - Authentication system with KEYCLOAK - Modular architecture with services for each feature --- src/app/core/directive/has-role.directive.ts | 6 +- src/app/core/guards/auth.guard.ts | 41 +- src/app/core/guards/public.guard.ts | 15 +- src/app/core/guards/role.guard.ts | 2 +- src/app/core/interceptors/auth.interceptor.ts | 37 +- .../models/dcb-bo-hub-user.model.ts} | 101 +++-- src/app/core/services/auth.service.ts | 316 ++++++++++----- src/app/core/services/menu.service.ts | 2 +- src/app/core/services/permissions.service.ts | 179 ++------- .../core/services/role-management.service.ts | 169 ++++++-- .../user-profile/user-profile.component.ts | 2 +- .../components/user-profile/user-profile.html | 28 +- .../components/user-profile/user-profile.ts | 1 - .../users.html => hub-users/hub-users.html} | 45 ++- .../hub-users.routes.ts} | 4 +- src/app/modules/hub-users/hub-users.spec.ts | 2 + .../users.ts => hub-users/hub-users.ts} | 134 +++++-- .../{users => hub-users}/list/list.html | 0 .../{users => hub-users}/list/list.spec.ts | 0 .../modules/{users => hub-users}/list/list.ts | 127 ++++-- .../hub-users/models/hub-user.model.ts | 115 ++++++ .../models/hub-userl-v1.mode.ts} | 0 .../{users => hub-users}/models/user.model.ts | 0 .../{users => hub-users}/profile/profile.html | 0 .../profile/profile.spec.ts | 0 .../{users => hub-users}/profile/profile.ts | 81 ++-- .../services/api.service.ts | 0 .../hub-users/services/hub-users.service.ts | 361 +++++++++++++++++ .../{users => hub-users}/structure.txt | 0 .../merchant-partners.spec.ts | 2 - .../config/config.html | 0 .../config/config.spec.ts | 0 .../config/config.ts | 0 .../list/list.html | 0 .../list/list.spec.ts | 0 .../list/list.ts | 378 ++++++++++++------ .../merchant-users.html} | 152 ++++++- .../merchant-users/merchant-users.spec.ts | 2 + .../merchant-users.ts} | 364 ++++++++++++++--- .../models/merchant-user.model.ts | 115 ++++++ .../models/partners-config.model.ts | 0 .../profile/profile.html | 218 +++++++--- .../profile/profile.spec.ts | 0 .../profile/profile.ts | 287 ++++++++----- .../services/merchant-users.service.ts} | 284 +++++++------ .../services/partner-config.service.ts | 0 .../stats/stats.html | 0 .../stats/stats.spec.ts | 0 .../stats/stats.ts | 2 +- .../types.ts | 0 src/app/modules/modules.routes.ts | 8 +- src/app/modules/profile/profile.ts | 61 ++- .../modules/users/services/users.service.ts | 325 --------------- src/app/modules/users/users.spec.ts | 2 - 54 files changed, 2634 insertions(+), 1334 deletions(-) rename src/app/{modules/merchant-partners/models/merchant-user.model.ts => core/models/dcb-bo-hub-user.model.ts} (54%) rename src/app/modules/{users/users.html => hub-users/hub-users.html} (93%) rename src/app/modules/{users/users.routes.ts => hub-users/hub-users.routes.ts} (84%) create mode 100644 src/app/modules/hub-users/hub-users.spec.ts rename src/app/modules/{users/users.ts => hub-users/hub-users.ts} (77%) rename src/app/modules/{users => hub-users}/list/list.html (100%) rename src/app/modules/{users => hub-users}/list/list.spec.ts (100%) rename src/app/modules/{users => hub-users}/list/list.ts (71%) create mode 100644 src/app/modules/hub-users/models/hub-user.model.ts rename src/app/modules/{users/models/hub-user.model.ts => hub-users/models/hub-userl-v1.mode.ts} (100%) rename src/app/modules/{users => hub-users}/models/user.model.ts (100%) rename src/app/modules/{users => hub-users}/profile/profile.html (100%) rename src/app/modules/{users => hub-users}/profile/profile.spec.ts (100%) rename src/app/modules/{users => hub-users}/profile/profile.ts (79%) rename src/app/modules/{users => hub-users}/services/api.service.ts (100%) create mode 100644 src/app/modules/hub-users/services/hub-users.service.ts rename src/app/modules/{users => hub-users}/structure.txt (100%) delete mode 100644 src/app/modules/merchant-partners/merchant-partners.spec.ts rename src/app/modules/{merchant-partners => merchant-users}/config/config.html (100%) rename src/app/modules/{merchant-partners => merchant-users}/config/config.spec.ts (100%) rename src/app/modules/{merchant-partners => merchant-users}/config/config.ts (100%) rename src/app/modules/{merchant-partners => merchant-users}/list/list.html (100%) rename src/app/modules/{merchant-partners => merchant-users}/list/list.spec.ts (100%) rename src/app/modules/{merchant-partners => merchant-users}/list/list.ts (54%) rename src/app/modules/{merchant-partners/merchant-partners.html => merchant-users/merchant-users.html} (74%) create mode 100644 src/app/modules/merchant-users/merchant-users.spec.ts rename src/app/modules/{merchant-partners/merchant-partners.ts => merchant-users/merchant-users.ts} (55%) create mode 100644 src/app/modules/merchant-users/models/merchant-user.model.ts rename src/app/modules/{merchant-partners => merchant-users}/models/partners-config.model.ts (100%) rename src/app/modules/{merchant-partners => merchant-users}/profile/profile.html (69%) rename src/app/modules/{merchant-partners => merchant-users}/profile/profile.spec.ts (100%) rename src/app/modules/{merchant-partners => merchant-users}/profile/profile.ts (60%) rename src/app/modules/{merchant-partners/services/merchant-partners.service.ts => merchant-users/services/merchant-users.service.ts} (64%) rename src/app/modules/{merchant-partners => merchant-users}/services/partner-config.service.ts (100%) rename src/app/modules/{merchant-partners => merchant-users}/stats/stats.html (100%) rename src/app/modules/{merchant-partners => merchant-users}/stats/stats.spec.ts (100%) rename src/app/modules/{merchant-partners => merchant-users}/stats/stats.ts (83%) rename src/app/modules/{merchant-partners => merchant-users}/types.ts (100%) delete mode 100644 src/app/modules/users/services/users.service.ts delete mode 100644 src/app/modules/users/users.spec.ts diff --git a/src/app/core/directive/has-role.directive.ts b/src/app/core/directive/has-role.directive.ts index 0beca08..fb4bc8d 100644 --- a/src/app/core/directive/has-role.directive.ts +++ b/src/app/core/directive/has-role.directive.ts @@ -1,6 +1,7 @@ import { Directive, Input, TemplateRef, ViewContainerRef, inject, OnDestroy } from '@angular/core'; import { AuthService } from '../services/auth.service'; import { Subscription } from 'rxjs'; +import { UserRole } from '@core/models/dcb-bo-hub-user.model'; @Directive({ selector: '[hasRole]', @@ -16,7 +17,10 @@ export class HasRoleDirective implements OnDestroy { const requiredRoles = Array.isArray(roles) ? roles : [roles]; const userRoles = this.authService.getCurrentUserRoles(); - const hasAccess = requiredRoles.some(role => userRoles.includes(role)); + const hasAccess = requiredRoles.some(role => userRoles.includes( + UserRole.DCB_ADMIN || UserRole.DCB_PARTNER || UserRole.DCB_SUPPORT + || UserRole.DCB_PARTNER_ADMIN || UserRole.DCB_PARTNER_MANAGER || UserRole.DCB_PARTNER_SUPPORT + )); if (hasAccess) { this.viewContainer.createEmbeddedView(this.templateRef); diff --git a/src/app/core/guards/auth.guard.ts b/src/app/core/guards/auth.guard.ts index 95f40da..b4464c1 100644 --- a/src/app/core/guards/auth.guard.ts +++ b/src/app/core/guards/auth.guard.ts @@ -10,42 +10,43 @@ export const authGuard: CanActivateFn = (route: ActivatedRouteSnapshot, state: R const roleService = inject(RoleService); const router = inject(Router); - // Attendre que l'initialisation soit terminée + // Attendre que l'initialisation du service Auth soit terminée return authService.getInitializedState().pipe( switchMap(initialized => { if (!initialized) { return of(false); } - // Vérifier l'authentification + // 🔒 Étape 1 : Vérifier si déjà authentifié if (authService.isAuthenticated()) { return of(checkRoleAccess(route, roleService, router, state.url)); } - // Tentative de rafraîchissement du token + // 🔄 Étape 2 : Tenter un rafraîchissement du token s’il existe const refreshToken = authService.getRefreshToken(); if (refreshToken) { - - return authService.refreshToken().pipe( + return authService.refreshAccessToken().pipe( tap(() => { + // Recharger les rôles après un refresh réussi roleService.refreshRoles(); }), map(() => checkRoleAccess(route, roleService, router, state.url)), - catchError((error) => { + catchError(() => { + // En cas d’échec de refresh → déconnexion + redirection login authService.logout().subscribe(); return of(redirectToLogin(router, state.url)); }) ); } - // Redirection vers login + // 🚫 Étape 3 : Aucun token → redirection vers login return of(redirectToLogin(router, state.url)); }), - catchError(error => { + catchError(() => { return of(redirectToLogin(router, state.url)); }) ); -} +}; /** * Vérifie l'accès basé sur les rôles requis @@ -57,7 +58,8 @@ function checkRoleAccess( currentUrl: string ): boolean { const requiredRoles = route.data?.['roles'] as string[]; - + + // Si aucun rôle requis → accès autorisé if (!requiredRoles || requiredRoles.length === 0) { return true; } @@ -65,11 +67,12 @@ function checkRoleAccess( const hasRequiredRole = roleService.hasAnyRole(requiredRoles); const currentUserRoles = roleService.getCurrentUserRoles(); + // ✅ L’utilisateur possède un des rôles requis if (hasRequiredRole) { return true; } - // Rediriger vers la page non autorisée + // ❌ Sinon → rediriger vers une page "non autorisée" router.navigate(['/unauthorized'], { queryParams: { requiredRoles: requiredRoles.join(','), @@ -83,21 +86,13 @@ function checkRoleAccess( } /** - * Redirige vers la page de login avec les paramètres appropriés + * Redirige vers la page de login avec un returnUrl */ -function redirectToLogin( - router: Router, - returnUrl: string, -): boolean { - const queryParams: any = { - returnUrl: returnUrl - }; - - // Message spécifique selon la raison +function redirectToLogin(router: Router, returnUrl: string): boolean { router.navigate(['/auth/login'], { - queryParams, + queryParams: { returnUrl }, replaceUrl: true }); return false; -} \ No newline at end of file +} diff --git a/src/app/core/guards/public.guard.ts b/src/app/core/guards/public.guard.ts index edece89..0cb3749 100644 --- a/src/app/core/guards/public.guard.ts +++ b/src/app/core/guards/public.guard.ts @@ -8,27 +8,28 @@ export const publicGuard: CanActivateFn = () => { const authService = inject(AuthService); const router = inject(Router); - // Si l'utilisateur est déjà authentifié, le rediriger vers le dashboard + // 🔒 Si l'utilisateur est déjà authentifié → redirection vers le tableau de bord if (authService.isAuthenticated()) { router.navigate(['/dcb-dashboard'], { replaceUrl: true }); return false; } - // Vérifier si un refresh token est disponible + // 🔄 Vérifier si un refresh token est disponible const refreshToken = authService.getRefreshToken(); if (refreshToken) { - return authService.refreshToken().pipe( + return authService.refreshAccessToken().pipe( map(() => { + // ✅ Rafraîchissement réussi → redirection vers le dashboard router.navigate(['/dcb-dashboard'], { replaceUrl: true }); return false; }), - catchError((error) => { - // En cas d'erreur, autoriser l'accès à la page publique + catchError(() => { + // ❌ Rafraîchissement échoué → autoriser l’accès à la page publique return of(true); }) ); } - // L'utilisateur n'est pas connecté, autoriser l'accès à la page publique + // 👤 Aucun token → accès autorisé à la page publique return true; -}; \ No newline at end of file +}; diff --git a/src/app/core/guards/role.guard.ts b/src/app/core/guards/role.guard.ts index bbf0a14..9ef29a3 100644 --- a/src/app/core/guards/role.guard.ts +++ b/src/app/core/guards/role.guard.ts @@ -21,7 +21,7 @@ export const roleGuard: CanActivateFn = (route: ActivatedRouteSnapshot, state) = // Récupérer les rôles depuis le token const userRoles = authService.getCurrentUserRoles(); - + if (!userRoles || userRoles.length === 0) { router.navigate(['/unauthorized']); return false; diff --git a/src/app/core/interceptors/auth.interceptor.ts b/src/app/core/interceptors/auth.interceptor.ts index b5665f3..e574f23 100644 --- a/src/app/core/interceptors/auth.interceptor.ts +++ b/src/app/core/interceptors/auth.interceptor.ts @@ -9,26 +9,31 @@ export const authInterceptor: HttpInterceptorFn = (req, next) => { const authService = inject(AuthService); const router = inject(Router); - // Exclusion des endpoints d'authentification + // Exclure les requêtes d’authentification (login, refresh, logout) if (isAuthRequest(req)) { return next(req); } const token = authService.getAccessToken(); + // Si un token existe, l’ajouter aux requêtes API if (token && isApiRequest(req)) { const cloned = addToken(req, token); - + return next(cloned).pipe( catchError((error: HttpErrorResponse) => { + // Si le token est expiré → tentative de refresh if (error.status === 401 && !req.url.includes('/auth/refresh')) { return handle401Error(authService, router, req, next); } + + // Autres erreurs → propager return throwError(() => error); }) ); } + // Si pas de token → requête normale return next(req); }; @@ -42,35 +47,41 @@ function addToken(req: HttpRequest, token: string): HttpRequest { }); } +/** + * Gestion du renouvellement de token en cas d’erreur 401 + */ function handle401Error( authService: AuthService, router: Router, req: HttpRequest, next: HttpHandlerFn ) { - return authService.refreshToken().pipe( + return authService.refreshAccessToken().pipe( switchMap((response: LoginResponseDto) => { const newRequest = addToken(req, response.access_token); return next(newRequest); }), catchError((refreshError) => { - authService.logout().subscribe(); - router.navigate(['/auth/login']); + authService.logout().subscribe(() => { + router.navigate(['/auth/login'], { replaceUrl: true }); + }); return throwError(() => refreshError); }) ); } +/** + * Détecte si la requête cible une API de ton backend + */ function isApiRequest(req: HttpRequest): boolean { - return req.url.includes('/api/') || req.url.includes('/auth/'); + // Ajuste ici selon ton backend (ex : '/api/', '/v1/', etc.) + return req.url.includes('/api/v1/') || req.url.includes('/auth/'); } +/** + * Exclut les endpoints liés à l’authentification + */ function isAuthRequest(req: HttpRequest): boolean { - const authEndpoints = [ - '/auth/login', - '/auth/refresh', - '/auth/logout' - ]; - + const authEndpoints = ['/auth/login', '/auth/refresh', '/auth/logout']; return authEndpoints.some(endpoint => req.url.includes(endpoint)); -} \ No newline at end of file +} diff --git a/src/app/modules/merchant-partners/models/merchant-user.model.ts b/src/app/core/models/dcb-bo-hub-user.model.ts similarity index 54% rename from src/app/modules/merchant-partners/models/merchant-user.model.ts rename to src/app/core/models/dcb-bo-hub-user.model.ts index 4ee1400..514749e 100644 --- a/src/app/modules/merchant-partners/models/merchant-user.model.ts +++ b/src/app/core/models/dcb-bo-hub-user.model.ts @@ -1,25 +1,62 @@ -export enum UserRole { - DCB_PARTNER_ADMIN = 'DCB_PARTNER_ADMIN', - DCB_PARTNER_MANAGER = 'DCB_PARTNER_MANAGER', - DCB_PARTNER_SUPPORT = 'DCB_PARTNER_SUPPORT', - DCB_PARTNER = 'DCB_PARTNER', - DCB_ADMIN = 'DCB_ADMIN', - DCB_SUPPORT = 'DCB_SUPPORT' +export enum UserType { + HUB = 'HUB', + MERCHANT = 'MERCHANT', + MERCHANT_USER = 'MERCHANT_USER' } -export interface CreateMerchantUserDto { +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' +} + +// === BASE USER MODEL === +export interface BaseUserDto { + id: string; + username: string; + email: string; + firstName: string; + lastName: string; + role: UserRole; + enabled: boolean; + emailVerified: boolean; + 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; +} + +// === DTOs CRUD === +export interface CreateUserDto { username: string; email: string; firstName: string; lastName: string; password: string; - role: UserRole.DCB_PARTNER_ADMIN | UserRole.DCB_PARTNER_MANAGER | UserRole.DCB_PARTNER_SUPPORT; + role: UserRole; enabled?: boolean; emailVerified?: boolean; - merchantPartnerId: string; + merchantPartnerId?: string; // obligatoire si MERCHANT } -export interface UpdateMerchantUserDto { +export interface UpdateUserDto { firstName?: string; lastName?: string; email?: string; @@ -27,28 +64,21 @@ export interface UpdateMerchantUserDto { } export interface ResetPasswordDto { + userId?: string; newPassword: string; temporary?: boolean; } -export interface MerchantUserResponse { - id: string; - username: string; - email: string; - firstName: string; - lastName: string; - role: UserRole.DCB_PARTNER_ADMIN | UserRole.DCB_PARTNER_MANAGER | UserRole.DCB_PARTNER_SUPPORT; - enabled: boolean; - emailVerified: boolean; - merchantPartnerId: string; - createdBy: string; - createdByUsername: string; - createdTimestamp: number; - lastLogin?: number; - userType: 'MERCHANT'; +// === PAGINATION / STATS === +export interface PaginatedUserResponse { + users: BaseUserDto[]; + total: number; + page: number; + limit: number; + totalPages: number; } -export interface MerchantUsersStatsResponse { +export interface MerchantPartnerStatsResponse { totalAdmins: number; totalManagers: number; totalSupport: number; @@ -57,6 +87,7 @@ export interface MerchantUsersStatsResponse { inactiveUsers: number; } +// === ROLES === export interface AvailableRole { value: UserRole; label: string; @@ -68,13 +99,15 @@ export interface AvailableRolesResponse { roles: AvailableRole[]; } -export interface SearchMerchantUsersParams { - query?: string; - role?: UserRole.DCB_PARTNER_ADMIN | UserRole.DCB_PARTNER_MANAGER | UserRole.DCB_PARTNER_SUPPORT; - enabled?: boolean; -} - export interface RoleOperationResponse { message: string; success: boolean; -} \ No newline at end of file +} + +// === SEARCH === +export interface SearchUsersParams { + query?: string; + role?: UserRole; + enabled?: boolean; + userType?: UserType; +} diff --git a/src/app/core/services/auth.service.ts b/src/app/core/services/auth.service.ts index 8390064..d22b6ea 100644 --- a/src/app/core/services/auth.service.ts +++ b/src/app/core/services/auth.service.ts @@ -1,11 +1,19 @@ -// src/app/core/services/auth.service.ts import { Injectable, inject } from '@angular/core'; import { HttpClient, HttpErrorResponse } from '@angular/common/http'; import { Router } from '@angular/router'; import { environment } from '@environments/environment'; -import { BehaviorSubject, Observable, throwError, tap, catchError, map, of } from 'rxjs'; +import { BehaviorSubject, Observable, throwError, tap, catchError } from 'rxjs'; +import { firstValueFrom } from 'rxjs'; -// Interfaces pour les DTOs de l'API +import { + UserType, + UserRole, + BaseUserDto, + HubUserDto, + MerchantUserDto +} from '@core/models/dcb-bo-hub-user.model'; + +// === INTERFACES DTO AUTH === export interface LoginDto { username: string; password: string; @@ -31,23 +39,6 @@ export interface AuthStatusResponseDto { status: string; } -export interface UserProfileDto { - id: string; - username: string; - email: string; - firstName: string; - lastName: string; - roles: string[]; - enabled: boolean; - emailVerified: boolean; - merchantPartnerId: string; - createdBy: string; - createdByUsername: string; - createdTimestamp: number; - lastLogin?: number; - userType: string; -} - export interface TokenValidationResponseDto { valid: boolean; user: { @@ -72,7 +63,7 @@ export class AuthService { 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 === @@ -95,8 +86,8 @@ export class AuthService { return refreshSuccess; } - // Token valide, vérifier le profil utilisateur - await this.loadUserProfile().toPromise(); + // Token valide : charger le profil utilisateur + await firstValueFrom(this.loadUserProfile()); this.authState$.next(true); this.initialized$.next(true); @@ -121,8 +112,9 @@ export class AuthService { } try { - // Convertir l'Observable en Promise pour l'initialisation - const response = await this.refreshToken().toPromise(); + const response = await firstValueFrom(this.refreshAccessToken()); + await firstValueFrom(this.loadUserProfile()); + this.authState$.next(true); return true; } catch (error) { this.clearAuthData(); @@ -137,7 +129,7 @@ export class AuthService { return this.initialized$.asObservable(); } - // === MÉTHODES EXISTANTES AVEC AMÉLIORATIONS === + // === MÉTHODES D'AUTHENTIFICATION === /** * Connexion utilisateur @@ -149,16 +141,16 @@ export class AuthService { ).pipe( tap(response => { this.handleLoginSuccess(response); - this.loadUserProfile().subscribe(); // Charger le profil après connexion + this.loadUserProfile().subscribe(); }), catchError(error => this.handleLoginError(error)) ); } /** - * Rafraîchissement du token + * Rafraîchissement du token d'accès */ - refreshToken(): Observable { + refreshAccessToken(): Observable { const refreshToken = this.getRefreshToken(); if (!refreshToken) { @@ -169,9 +161,7 @@ export class AuthService { `${environment.iamApiUrl}/auth/refresh`, { refresh_token: refreshToken } ).pipe( - tap(response => { - this.handleLoginSuccess(response); - }), + tap(response => this.handleLoginSuccess(response)), catchError(error => { this.clearAuthData(); return throwError(() => error); @@ -187,11 +177,9 @@ export class AuthService { `${environment.iamApiUrl}/auth/logout`, {} ).pipe( - tap(() => { - this.clearAuthData(); - }), + tap(() => this.clearAuthData()), catchError(error => { - this.clearAuthData(); // Nettoyer même en cas d'erreur + this.clearAuthData(); return throwError(() => error); }) ); @@ -200,22 +188,17 @@ 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 => { - return throwError(() => error); - }) + tap(profile => this.userProfile$.next(profile)), + catchError(error => throwError(() => error)) ); } - /** - * Gestion de la connexion réussie - */ + // === GESTION DE SESSION === + private handleLoginSuccess(response: LoginResponseDto): void { if (response.access_token) { localStorage.setItem(this.tokenKey, response.access_token); @@ -228,9 +211,6 @@ export class AuthService { } } - /** - * Nettoyage des données d'authentification - */ private clearAuthData(): void { localStorage.removeItem(this.tokenKey); localStorage.removeItem(this.refreshTokenKey); @@ -238,9 +218,8 @@ export class AuthService { this.userProfile$.next(null); } - /** - * Validation du token - */ + // === VALIDATION DU TOKEN === + validateToken(): Observable { return this.http.get( `${environment.iamApiUrl}/auth/validate` @@ -253,70 +232,193 @@ export class AuthService { return this.authState$.asObservable(); } - getUserProfile(): Observable { + getUserProfile(): Observable { return this.userProfile$.asObservable(); } - /** - * Récupère les rôles de l'utilisateur courant - */ -getCurrentUserRoles(): string[] { - const token = this.getAccessToken(); - if (!token) return []; + // === GESTION DES RÔLES ET TYPES === - try { - const payload = JSON.parse(atob(token.split('.')[1])); - const decoded: any = payload; - - // Récupérer tous les rôles de tous les clients - if (decoded.resource_access) { - const allRoles: string[] = []; + getCurrentUserRoles(): UserRole[] { + const token = this.getAccessToken(); + if (!token) return []; + + try { + const payload = JSON.parse(atob(token.split('.')[1])); - Object.values(decoded.resource_access).forEach((client: any) => { - if (client?.roles) { - allRoles.push(...client.roles); - } - }); - - return [...new Set(allRoles)]; + // Mapping des rôles Keycloak vers vos rôles DCB + const roleMappings: { [key: string]: UserRole } = { + // Rôles administrateur + 'admin': UserRole.DCB_ADMIN, + 'dcb-admin': UserRole.DCB_ADMIN, + 'administrator': UserRole.DCB_ADMIN, + + // Rôles support + 'support': UserRole.DCB_SUPPORT, + 'dcb-support': UserRole.DCB_SUPPORT, + + // Rôles partenaire + 'partner': UserRole.DCB_PARTNER, + 'dcb-partner': UserRole.DCB_PARTNER, + + // Rôles admin partenaire + 'partner-admin': UserRole.DCB_PARTNER_ADMIN, + 'dcb-partner-admin': UserRole.DCB_PARTNER_ADMIN, + + // Rôles manager partenaire + 'partner-manager': UserRole.DCB_PARTNER_MANAGER, + 'dcb-partner-manager': UserRole.DCB_PARTNER_MANAGER, + + // Rôles support partenaire + 'partner-support': UserRole.DCB_PARTNER_SUPPORT, + 'dcb-partner-support': UserRole.DCB_PARTNER_SUPPORT, + }; + + let allRoles: string[] = []; + + // Collecter tous les rôles du token + if (payload.resource_access) { + Object.values(payload.resource_access).forEach((client: any) => { + if (client?.roles) { + allRoles = allRoles.concat(client.roles); + } + }); + } + + if (payload.realm_access?.roles) { + allRoles = allRoles.concat(payload.realm_access.roles); + } + + const mappedRoles = allRoles + .map(role => roleMappings[role.toLowerCase()]) + .filter(role => role !== undefined); + + return mappedRoles; + + } catch (error) { + console.error('❌ Error:', error); + return []; } - - return []; - } catch { - return []; } -} -/** - * Observable de l'état d'authentification - */ -onAuthState(): Observable { - return this.authState$.asObservable(); -} + /** + * Récupère le rôle principal de l'utilisateur courant + */ + getCurrentUserRole(): UserRole | null { + const roles = this.getCurrentUserRoles(); + return roles.length > 0 ? roles[0] : null; + } -/** - * Récupère le profil utilisateur - */ -getProfile(): Observable { - return this.getUserProfile(); -} + /** + * Récupère le type d'utilisateur courant + */ + getCurrentUserType(): UserType | null { + const role = this.getCurrentUserRole(); + if (!role) return null; -/** - * Vérifie si l'utilisateur a un rôle spécifique - */ -hasRole(role: string): boolean { - return this.getCurrentUserRoles().includes(role); -} + // Déterminer le type d'utilisateur basé sur le rôle + 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]; -/** - * Vérifie si l'utilisateur a un des rôles spécifiés - */ -hasAnyRole(roles: string[]): boolean { - const userRoles = this.getCurrentUserRoles(); - return roles.some(role => userRoles.includes(role)); -} + if (hubRoles.includes(role)) { + return UserType.HUB; + } else if (merchantRoles.includes(role)) { + return UserType.MERCHANT; + } - // === GETTERS POUR LES TOKENS === + return null; + } + + /** + * Vérifie si l'utilisateur courant est un utilisateur Hub + */ + isHubUser(): boolean { + return this.getCurrentUserType() === UserType.HUB; + } + + /** + * Vérifie si l'utilisateur courant est un utilisateur Marchand + */ + isMerchantUser(): boolean { + return this.getCurrentUserType() === UserType.MERCHANT; + } + + /** + * Vérifie si l'utilisateur courant a un rôle spécifique + */ + hasRole(role: UserRole): boolean { + return this.getCurrentUserRoles().includes(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)); + } + + /** + * 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); + } + + /** + * 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); + } + + // === MÉTHODES UTILITAIRES === + + onAuthState(): Observable { + return this.authState$.asObservable(); + } + + getProfile(): Observable { + return this.getUserProfile(); + } + + /** + * Récupère l'ID de l'utilisateur courant + */ + getCurrentUserId(): string | null { + const profile = this.userProfile$.value; + return profile?.id || null; + } + + /** + * Récupère le merchantPartnerId de l'utilisateur courant (si marchand) + */ + getCurrentMerchantPartnerId(): string | null { + const profile = this.userProfile$.value; + if (profile && 'merchantPartnerId' in profile) { + return (profile as MerchantUserDto).merchantPartnerId || null; + } + return null; + } + + /** + * Vérifie si le profil fourni est celui de l'utilisateur courant + */ + isCurrentUserProfile(userId: string): boolean { + const currentUserId = this.getCurrentUserId(); + return currentUserId === userId; + } + + /** + * Vérifie si l'utilisateur peut visualiser tous les marchands + */ + canViewAllMerchants(): boolean { + const hubAdminRoles = [UserRole.DCB_ADMIN, UserRole.DCB_SUPPORT]; + return this.hasAnyRole(hubAdminRoles); + } + + // === TOKENS === getAccessToken(): string | null { return localStorage.getItem(this.tokenKey); @@ -326,7 +428,7 @@ hasAnyRole(roles: string[]): boolean { return localStorage.getItem(this.refreshTokenKey); } - // === METHODES PRIVEES === + // === GESTION DES ERREURS === private handleLoginError(error: HttpErrorResponse): Observable { let errorMessage = 'Login failed'; @@ -342,7 +444,7 @@ hasAnyRole(roles: string[]): boolean { return throwError(() => new Error(errorMessage)); } - // === VERIFICATIONS D'ETAT === + // === VERIFICATIONS === isAuthenticated(): boolean { const token = this.getAccessToken(); diff --git a/src/app/core/services/menu.service.ts b/src/app/core/services/menu.service.ts index c93252e..745285b 100644 --- a/src/app/core/services/menu.service.ts +++ b/src/app/core/services/menu.service.ts @@ -135,7 +135,7 @@ export class MenuService { { label: 'Déconnexion', icon: 'tablerLogout2', - class: 'fw-semibold text-danger' + url: '/auth/logout', }, ]; } diff --git a/src/app/core/services/permissions.service.ts b/src/app/core/services/permissions.service.ts index 53708be..99e5e2b 100644 --- a/src/app/core/services/permissions.service.ts +++ b/src/app/core/services/permissions.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; +import { UserRole } from '@core/models/dcb-bo-hub-user.model'; export interface ModulePermission { module: string; @@ -9,193 +10,105 @@ export interface ModulePermission { @Injectable({ providedIn: 'root' }) export class PermissionsService { private readonly permissions: ModulePermission[] = [ - // Dashboard + // Dashboard - Tout le monde { module: 'dcb-dashboard', - roles: [ - 'dcb-admin', - 'dcb-partner', - 'dcb-support', - 'dcb-partner-admin', - 'dcb-partner-manager', - 'dcb-partner-support' - ], + roles: this.allRoles, }, - { module: 'auth', - roles: [ - 'dcb-admin', - 'dcb-partner', - 'dcb-support', - 'dcb-partner-admin', - 'dcb-partner-manager', - 'dcb-partner-support' - ], + roles: this.allRoles, }, - - // Transactions { module: 'transactions', - roles: [ - 'dcb-admin', - 'dcb-partner', - 'dcb-support', - 'dcb-partner-admin', - 'dcb-partner-manager', - 'dcb-partner-support' - ], + roles: this.allRoles, }, - - // Merchants/Partners { module: 'merchant-partners', - roles: [ - 'dcb-admin', - 'dcb-partner', - 'dcb-support', - 'dcb-partner-admin', - 'dcb-partner-manager', - 'dcb-partner-support'], + roles: this.allRoles, }, - - // Operators (Admin only) + // Operators - Admin seulement { module: 'operators', - roles: ['dcb-admin'], + roles: [UserRole.DCB_ADMIN], children: { - 'config': ['dcb-admin'], - 'stats': ['dcb-admin'] + 'config': [UserRole.DCB_ADMIN], + 'stats': [UserRole.DCB_ADMIN] } }, - - // Webhooks + // Webhooks - Admin et Partner { module: 'webhooks', - roles: ['dcb-admin', 'dcb-partner'], + roles: [UserRole.DCB_ADMIN, UserRole.DCB_PARTNER], children: { - 'history': ['dcb-admin', 'dcb-partner'], - 'status': ['dcb-admin', 'dcb-partner'], - 'retry': ['dcb-admin'] + 'history': [UserRole.DCB_ADMIN, UserRole.DCB_PARTNER], + 'status': [UserRole.DCB_ADMIN, UserRole.DCB_PARTNER], + 'retry': [UserRole.DCB_ADMIN] } }, - - // Users (Admin only) + // Users - Admin et Support { module: 'users', - roles: ['dcb-admin', 'dcb-support'] + roles: [UserRole.DCB_ADMIN, UserRole.DCB_SUPPORT] }, - - // Support (All authenticated users) + // Settings - Tout le monde { module: 'settings', - roles: [ - 'dcb-admin', - 'dcb-partner', - 'dcb-support', - 'dcb-partner-admin', - 'dcb-partner-manager', - 'dcb-partner-support' - ] + roles: this.allRoles }, - - // Integrations (Admin only) + // Integrations - Admin seulement { module: 'integrations', - roles: ['dcb-admin'] + roles: [UserRole.DCB_ADMIN] }, - - // Support (All authenticated users) + // Modules publics - Tout le monde { module: 'support', - roles: [ - 'dcb-admin', - 'dcb-partner', - 'dcb-support', - 'dcb-partner-admin', - 'dcb-partner-manager', - 'dcb-partner-support' - ] + roles: this.allRoles }, - - // Profile (All authenticated users) { module: 'profile', - roles: [ - 'dcb-admin', - 'dcb-partner', - 'dcb-support', - 'dcb-partner-admin', - 'dcb-partner-manager', - 'dcb-partner-support' - ] + roles: this.allRoles }, - - // Documentation (All authenticated users) { module: 'documentation', - roles: [ - 'dcb-admin', - 'dcb-partner', - 'dcb-support', - 'dcb-partner-admin', - 'dcb-partner-manager', - 'dcb-partner-support' - ] + roles: this.allRoles }, - - // Help (All authenticated users) { module: 'help', - roles: [ - 'dcb-admin', - 'dcb-partner', - 'dcb-support', - 'dcb-partner-admin', - 'dcb-partner-manager', - 'dcb-partner-support' - ] + roles: this.allRoles }, - - // About (All authenticated users) { module: 'about', - roles: [ - 'dcb-admin', - 'dcb-partner', - 'dcb-support', - 'dcb-partner-admin', - 'dcb-partner-manager', - 'dcb-partner-support' - ] + roles: this.allRoles } ]; + // Tous les rôles DCB + private get allRoles(): string[] { + return Object.values(UserRole); + } + canAccessModule(modulePath: string, userRoles: string[]): boolean { - if (!userRoles || userRoles.length === 0) { - return false; - } + if (!userRoles?.length) return false; const [mainModule, subModule] = modulePath.split('/'); const permission = this.findPermission(mainModule); if (!permission) { - console.warn(`No permission configuration for module: ${mainModule}`); + console.warn(`No permission for module: ${mainModule}`); return false; } - // Check main module access - const hasModuleAccess = this.hasAnyRole(permission.roles, userRoles); - if (!hasModuleAccess) return false; + // Vérifier accès module principal + const hasMainAccess = this.hasAnyRole(permission.roles, userRoles); + if (!hasMainAccess) return false; - // Check sub-module access if specified + // Vérifier sous-module si nécessaire if (subModule && permission.children) { - const subModuleRoles = permission.children[subModule]; - if (!subModuleRoles) { - console.warn(`No permission configuration for submodule: ${mainModule}/${subModule}`); - return false; - } - return this.hasAnyRole(subModuleRoles, userRoles); + const subRoles = permission.children[subModule]; + if (!subRoles) return false; + return this.hasAnyRole(subRoles, userRoles); } return true; @@ -206,12 +119,8 @@ export class PermissionsService { } private hasAnyRole(requiredRoles: string[], userRoles: string[]): boolean { - return requiredRoles.some(role => userRoles.includes(role)); - } - - getAccessibleModules(userRoles: string[]): string[] { - return this.permissions - .filter(permission => this.hasAnyRole(permission.roles, userRoles)) - .map(permission => permission.module); + return requiredRoles.some(required => + userRoles.some(user => user.toLowerCase() === required.toLowerCase()) + ); } } \ No newline at end of file diff --git a/src/app/core/services/role-management.service.ts b/src/app/core/services/role-management.service.ts index 42ee966..45d5032 100644 --- a/src/app/core/services/role-management.service.ts +++ b/src/app/core/services/role-management.service.ts @@ -1,7 +1,7 @@ -// src/app/core/services/role-management.service.ts import { Injectable, inject } from '@angular/core'; -import { HubUsersService, UserRole } from '../../modules/users/services/users.service'; +import { HubUsersService } from '../../modules/hub-users/services/hub-users.service'; import { BehaviorSubject, Observable, map, tap, of, catchError } from 'rxjs'; +import { UserRole } from '@core/models/dcb-bo-hub-user.model'; export interface RolePermission { canCreateUsers: boolean; @@ -13,6 +13,7 @@ export interface RolePermission { canAccessAdmin: boolean; canAccessSupport: boolean; canAccessPartner: boolean; + assignableRoles: UserRole[]; // Ajout de cette propriété } // Interface simplifiée pour la réponse API @@ -20,6 +21,7 @@ export interface AvailableRoleResponse { value: UserRole; label: string; description: string; + allowedForCreation?: boolean; } export interface AvailableRolesResponse { @@ -85,6 +87,24 @@ export class RoleManagementService { 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) } ] }; @@ -114,13 +134,12 @@ export class RoleManagementService { map(response => response.roles.map(role => ({ value: role.value, label: role.label, - description: role.description + description: role.description, + allowedForCreation: role.allowedForCreation }))) ); } - // ... (le reste des méthodes reste identique) - /** * Définit le rôle de l'utilisateur courant */ @@ -139,6 +158,10 @@ export class RoleManagementService { * Récupère les permissions détaillées selon le rôle */ getPermissionsForRole(role: UserRole): RolePermission { + const allRoles = Object.values(UserRole); + 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]; + switch (role) { case UserRole.DCB_ADMIN: return { @@ -150,10 +173,53 @@ export class RoleManagementService { canManageMerchants: true, canAccessAdmin: true, canAccessSupport: true, - canAccessPartner: true + canAccessPartner: true, + assignableRoles: allRoles }; case UserRole.DCB_SUPPORT: + return { + canCreateUsers: true, + canEditUsers: true, + canDeleteUsers: false, + canManageRoles: true, + canViewStats: true, + canManageMerchants: true, + canAccessAdmin: false, + canAccessSupport: true, + canAccessPartner: true, + assignableRoles: hubRoles, + }; + + case UserRole.DCB_PARTNER: + return { + canCreateUsers: true, + canEditUsers: true, + canDeleteUsers: true, + canManageRoles: true, + canViewStats: true, + canManageMerchants: true, + canAccessAdmin: true, + canAccessSupport: true, + canAccessPartner: true, + assignableRoles: merchantRoles + }; + + case UserRole.DCB_PARTNER_ADMIN: + return { + canCreateUsers: true, + canEditUsers: true, + canDeleteUsers: false, + 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] + }; + + case UserRole.DCB_PARTNER_MANAGER: return { canCreateUsers: true, canEditUsers: true, @@ -162,21 +228,23 @@ export class RoleManagementService { canViewStats: true, canManageMerchants: true, canAccessAdmin: false, - canAccessSupport: true, - canAccessPartner: true + canAccessSupport: false, + canAccessPartner: true, + assignableRoles: [] }; - case UserRole.DCB_PARTNER: + case UserRole.DCB_PARTNER_SUPPORT: return { canCreateUsers: false, canEditUsers: false, canDeleteUsers: false, canManageRoles: false, - canViewStats: false, + canViewStats: true, canManageMerchants: false, canAccessAdmin: false, canAccessSupport: false, - canAccessPartner: true + canAccessPartner: false, + assignableRoles: [] }; default: @@ -185,11 +253,12 @@ export class RoleManagementService { canEditUsers: false, canDeleteUsers: false, canManageRoles: false, - canViewStats: false, - canManageMerchants: false, + canViewStats: true, + canManageMerchants: true, canAccessAdmin: false, canAccessSupport: false, - canAccessPartner: false + canAccessPartner: false, + assignableRoles: [] }; } } @@ -200,17 +269,14 @@ export class RoleManagementService { canAssignRole(currentUserRole: UserRole | null, targetRole: UserRole): boolean { if (!currentUserRole) return false; - // Seuls les admins peuvent attribuer tous les rôles - if (currentUserRole === UserRole.DCB_ADMIN) { + // SEUL DCB_PARTNER peut attribuer tous les rôles + if (currentUserRole === UserRole.DCB_PARTNER, currentUserRole === UserRole.DCB_ADMIN, currentUserRole === UserRole.DCB_SUPPORT) { return true; } - // Les supports ne peuvent créer que d'autres supports - if (currentUserRole === UserRole.DCB_SUPPORT) { - return targetRole === UserRole.DCB_SUPPORT; - } - - return false; + // Pour les autres rôles, utiliser les permissions définies + const permissions = this.getPermissionsForRole(currentUserRole); + return permissions.assignableRoles.includes(targetRole); } /** @@ -280,16 +346,15 @@ export class RoleManagementService { * Récupère le libellé d'un rôle */ getRoleLabel(role: UserRole): string { - switch (role) { - case UserRole.DCB_ADMIN: - return 'Administrateur DCB'; - case UserRole.DCB_SUPPORT: - return 'Support DCB'; - case UserRole.DCB_PARTNER: - return 'Partenaire DCB'; - default: - return 'Rôle inconnu'; - } + 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' + }; + return roleLabels[role] || 'Rôle inconnu'; } /** @@ -303,9 +368,12 @@ export class RoleManagementService { return 'bg-info'; case UserRole.DCB_PARTNER: return 'bg-success'; - case UserRole.DCB_PARTNER_ADMIN: return 'bg-danger'; - case UserRole.DCB_PARTNER_MANAGER: return 'bg-success'; - case UserRole.DCB_PARTNER_SUPPORT: return 'bg-info'; + 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'; default: return 'bg-secondary'; } @@ -354,11 +422,19 @@ export class RoleManagementService { return role === UserRole.DCB_PARTNER; } + /** + * 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]; + return merchantRoles.includes(role); + } + /** * Récupère tous les rôles disponibles sous forme de tableau */ getAllRoles(): UserRole[] { - return [UserRole.DCB_ADMIN, UserRole.DCB_SUPPORT, UserRole.DCB_PARTNER]; + return Object.values(UserRole); } /** @@ -367,15 +443,22 @@ export class RoleManagementService { getAssignableRoles(currentUserRole: UserRole | null): UserRole[] { if (!currentUserRole) return []; - if (currentUserRole === UserRole.DCB_ADMIN) { - return this.getAllRoles(); - } + const permissions = this.getPermissionsForRole(currentUserRole); + return permissions.assignableRoles; + } - if (currentUserRole === UserRole.DCB_SUPPORT) { - return [UserRole.DCB_SUPPORT]; - } + /** + * Récupère uniquement les rôles Hub (DCB_ADMIN, DCB_SUPPORT, DCB_PARTNER) + */ + getHubRoles(): UserRole[] { + return [UserRole.DCB_ADMIN, UserRole.DCB_SUPPORT, UserRole.DCB_PARTNER]; + } - return []; + /** + * Récupère uniquement les rôles Marchands + */ + getMerchantRoles(): UserRole[] { + return [UserRole.DCB_PARTNER_ADMIN, UserRole.DCB_PARTNER_MANAGER, UserRole.DCB_PARTNER_SUPPORT]; } /** 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 906ebfe..cd9db9e 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 @@ -23,7 +23,7 @@ export class UserProfileComponent { loadUser() { this.authService.getProfile().subscribe({ next: profile => { - this.user = profile; + this.user = profile; this.cdr.detectChanges(); }, error: () => { diff --git a/src/app/layouts/components/topbar/components/user-profile/user-profile.html b/src/app/layouts/components/topbar/components/user-profile/user-profile.html index 383530b..b0c25dc 100644 --- a/src/app/layouts/components/topbar/components/user-profile/user-profile.html +++ b/src/app/layouts/components/topbar/components/user-profile/user-profile.html @@ -24,24 +24,16 @@ @if (item.isDivider) {
- } - - - @if (!item.isHeader && !item.isDivider) { - - - {{ item.label }} - - } + } @if (!item.isHeader && !item.isDivider && item.url) { + + + + + } } diff --git a/src/app/layouts/components/topbar/components/user-profile/user-profile.ts b/src/app/layouts/components/topbar/components/user-profile/user-profile.ts index 30126ce..30dd1d8 100644 --- a/src/app/layouts/components/topbar/components/user-profile/user-profile.ts +++ b/src/app/layouts/components/topbar/components/user-profile/user-profile.ts @@ -32,7 +32,6 @@ export class UserProfile implements OnInit, OnDestroy { ngOnInit() { this.loadDropdownItems() - // Optionnel : réagir aux changements d'authentification this.subscription = this.authService.onAuthState().subscribe(() => { this.loadDropdownItems() }) diff --git a/src/app/modules/users/users.html b/src/app/modules/hub-users/hub-users.html similarity index 93% rename from src/app/modules/users/users.html rename to src/app/modules/hub-users/hub-users.html index 059b7d6..d365f0b 100644 --- a/src/app/modules/users/users.html +++ b/src/app/modules/hub-users/hub-users.html @@ -57,7 +57,7 @@ Liste des Utilisateurs - @if (selectedUserId) { - @@ -244,25 +244,28 @@ - @if (newUser.role) { + + @if (newUser.role && isMerchantRole(newUser.role)) {
-
-
- -
- Rôle sélectionné : - - {{ roleService.getRoleLabel(newUser.role) }} - -
- - {{ getRoleDescription(newUser.role) }} - -
-
+ + +
+ Sélectionnez le partenaire marchand auquel cet utilisateur sera associé
} @@ -315,7 +318,7 @@
@@ -78,7 +84,29 @@ }
+
+ +
+ +
+ {{ currentMerchantPartnerId || 'Chargement...' }} + +
+ @if (!currentMerchantPartnerId) { +
+ + Merchant Partner ID non disponible +
+ } +
+
@@ -107,7 +141,13 @@ name="lastName" required [disabled]="creatingUser" + #lastName="ngModel" > + @if (lastName.invalid && lastName.touched) { +
+ Le nom est requis +
+ }
@@ -122,8 +162,14 @@ name="username" required [disabled]="creatingUser" + #username="ngModel" >
Doit être unique dans le système
+ @if (username.invalid && username.touched) { +
+ Le nom d'utilisateur est requis +
+ }
@@ -137,8 +183,20 @@ [(ngModel)]="newMerchantUser.email" name="email" required + email [disabled]="creatingUser" + #email="ngModel" > + @if (email.invalid && email.touched) { +
+ @if (email.errors?.['required']) { + L'email est requis + } + @if (email.errors?.['email']) { + Format d'email invalide + } +
+ }
@@ -154,10 +212,21 @@ required minlength="8" [disabled]="creatingUser" + #password="ngModel" >
Le mot de passe doit contenir au moins 8 caractères.
+ @if (password.invalid && password.touched) { +
+ @if (password.errors?.['required']) { + Le mot de passe est requis + } + @if (password.errors?.['minlength']) { + Le mot de passe doit contenir au moins 8 caractères + } +
+ }
@@ -170,17 +239,18 @@ [(ngModel)]="newMerchantUser.role" name="role" required - [disabled]="creatingUser" + [disabled]="creatingUser || !canManageAllRoles" + #roleSelect="ngModel" > - - @if (availableRoles) { - @for (role of availableRoles.roles; track role.value) { + + @for (role of getAvailableRoles(); track role.value) { + @if (isMerchantRole(role.value) && isRoleAllowedForCreation(role.value)) { @@ -188,10 +258,43 @@ }
- Sélectionnez le rôle à assigner à cet utilisateur marchand + @if (canManageAllRoles) { + + + Vous pouvez attribuer tous les rôles + + } @else { + + + Permissions de rôle limitées + + }
+ @if (roleSelect.invalid && roleSelect.touched) { +
+ Le rôle est requis +
+ }
+ + @if (!canManageAllRoles) { +
+
+
+ +
+ + Permissions limitées : + Vous ne pouvez créer que des utilisateurs avec des rôles spécifiques. + Seul un DCB Partner peut attribuer tous les rôles. + +
+
+
+
+ } + @if (newMerchantUser.role) {
@@ -259,7 +362,8 @@ Informations système :
• Merchant Partner ID : {{ currentMerchantPartnerId || 'Chargement...' }}
• Type d'utilisateur : MERCHANT
- • Créé par : Utilisateur courant + • Créé par : Utilisateur courant
+ • Votre rôle : {{ currentUserRole || 'Non défini' }}
@@ -272,12 +376,13 @@ (click)="modal.dismiss()" [disabled]="creatingUser" > + Annuler @@ -363,10 +469,21 @@ required minlength="8" [disabled]="resettingPassword" + #newPasswordInput="ngModel" >
Le mot de passe doit contenir au moins 8 caractères.
+ @if (newPasswordInput.invalid && newPasswordInput.touched) { +
+ @if (newPasswordInput.errors?.['required']) { + Le mot de passe est requis + } + @if (newPasswordInput.errors?.['minlength']) { + Le mot de passe doit contenir au moins 8 caractères + } +
+ }
@@ -389,6 +506,11 @@
+ } @else if (!selectedUserForReset) { +
+ + Aucun utilisateur sélectionné pour la réinitialisation +
} @@ -415,7 +537,7 @@ type="button" class="btn btn-primary" (click)="confirmResetPassword()" - [disabled]="!newPassword || newPassword.length < 8 || resettingPassword" + [disabled]="!newPassword || newPassword.length < 8 || resettingPassword || !selectedUserForReset" > @if (resettingPassword) { @@ -478,6 +601,11 @@ + } @else { +
+ + Aucun utilisateur sélectionné pour la suppression +
} @@ -503,7 +631,7 @@ type="button" class="btn btn-danger" (click)="confirmDeleteUser()" - [disabled]="deletingUser" + [disabled]="deletingUser || !selectedUserForDelete" > @if (deletingUser) {