feat: add DCB User Service API - Authentication system with KEYCLOAK - Modular architecture with services for each feature
This commit is contained in:
diallolatoile
parent
d2a5ffcebb
commit
8d7fdb27ea
@ -58,7 +58,7 @@ export interface TechnicalContact {
|
||||
}
|
||||
|
||||
export interface MerchantUser {
|
||||
userId: number;
|
||||
userId: string;
|
||||
role: UserRole;
|
||||
username?: string;
|
||||
email?: string;
|
||||
@ -134,8 +134,8 @@ export interface CreateMerchantDto {
|
||||
description?: string;
|
||||
adresse: string;
|
||||
phone: string;
|
||||
configs: Omit<MerchantConfig, 'id' | 'merchantPartnerId' | 'createdAt' | 'updatedAt'>[];
|
||||
technicalContacts: Omit<TechnicalContact, 'id' | 'merchantPartnerId' | 'createdAt' | 'updatedAt'>[];
|
||||
configs?: Omit<MerchantConfig, 'id' | 'merchantPartnerId' | 'createdAt' | 'updatedAt'>[];
|
||||
technicalContacts?: Omit<TechnicalContact, 'id' | 'merchantPartnerId' | 'createdAt' | 'updatedAt'>[];
|
||||
}
|
||||
|
||||
export interface UpdateMerchantDto extends Partial<CreateMerchantDto> {}
|
||||
@ -227,14 +227,6 @@ export class MerchantUtils {
|
||||
errors.push('Le téléphone est requis');
|
||||
}
|
||||
|
||||
if (!merchant.technicalContacts || merchant.technicalContacts.length === 0) {
|
||||
errors.push('Au moins un contact technique est requis');
|
||||
}
|
||||
|
||||
if (!merchant.configs || merchant.configs.length === 0) {
|
||||
errors.push('Au moins une configuration est requise');
|
||||
}
|
||||
|
||||
return errors;
|
||||
}
|
||||
|
||||
|
||||
@ -233,6 +233,7 @@ export class AuthService {
|
||||
emailVerified: apiUser.emailVerified ?? apiUser.email_verified ?? false,
|
||||
userType: userType,
|
||||
merchantPartnerId: apiUser.merchantPartnerId || apiUser.partnerId || apiUser.merchantId || null,
|
||||
merchantConfigId: apiUser.merchantConfigId || apiUser.configId || 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,
|
||||
|
||||
@ -4,6 +4,7 @@ import { MerchantUsersService } from '@modules/hub-users-management/merchant-use
|
||||
import { BehaviorSubject, Observable, map, tap, of, catchError } from 'rxjs';
|
||||
import { UserRole, UserType, AvailableRole } from '@core/models/dcb-bo-hub-user.model';
|
||||
|
||||
// Interfaces
|
||||
export interface RolePermission {
|
||||
canCreateUsers: boolean;
|
||||
canEditUsers: boolean;
|
||||
@ -21,6 +22,196 @@ export interface AvailableRolesWithPermissions {
|
||||
roles: (AvailableRole & { permissions: RolePermission })[];
|
||||
}
|
||||
|
||||
interface RoleConfig {
|
||||
label: string;
|
||||
description: string;
|
||||
badgeClass: string;
|
||||
icon: string;
|
||||
permissions: RolePermission;
|
||||
}
|
||||
|
||||
// Permissions par défaut
|
||||
const DEFAULT_PERMISSIONS: RolePermission = {
|
||||
canCreateUsers: false,
|
||||
canEditUsers: false,
|
||||
canDeleteUsers: false,
|
||||
canManageRoles: false,
|
||||
canViewStats: false,
|
||||
canManageMerchants: false,
|
||||
canAccessAdmin: false,
|
||||
canAccessSupport: false,
|
||||
canAccessPartner: false,
|
||||
assignableRoles: []
|
||||
};
|
||||
|
||||
// Configuration des rôles
|
||||
const ROLE_CONFIG: Record<UserRole, RoleConfig> = {
|
||||
[UserRole.DCB_ADMIN]: {
|
||||
label: 'Administrateur DCB',
|
||||
description: 'Administrateur système avec tous les accès',
|
||||
badgeClass: 'bg-danger',
|
||||
icon: 'lucideShield',
|
||||
permissions: {
|
||||
canCreateUsers: true,
|
||||
canEditUsers: true,
|
||||
canDeleteUsers: true,
|
||||
canManageRoles: true,
|
||||
canViewStats: true,
|
||||
canManageMerchants: true,
|
||||
canAccessAdmin: true,
|
||||
canAccessSupport: true,
|
||||
canAccessPartner: true,
|
||||
assignableRoles: Object.values(UserRole)
|
||||
}
|
||||
},
|
||||
[UserRole.DCB_SUPPORT]: {
|
||||
label: 'Support DCB',
|
||||
description: 'Support technique avec accès étendus',
|
||||
badgeClass: 'bg-info',
|
||||
icon: 'lucideHeadphones',
|
||||
permissions: {
|
||||
canCreateUsers: true,
|
||||
canEditUsers: true,
|
||||
canDeleteUsers: false,
|
||||
canManageRoles: true,
|
||||
canViewStats: true,
|
||||
canManageMerchants: true,
|
||||
canAccessAdmin: false,
|
||||
canAccessSupport: true,
|
||||
canAccessPartner: true,
|
||||
assignableRoles: [
|
||||
UserRole.DCB_SUPPORT,
|
||||
UserRole.DCB_PARTNER,
|
||||
UserRole.DCB_PARTNER_ADMIN,
|
||||
UserRole.DCB_PARTNER_MANAGER,
|
||||
UserRole.DCB_PARTNER_SUPPORT
|
||||
]
|
||||
}
|
||||
},
|
||||
[UserRole.DCB_PARTNER]: {
|
||||
label: 'Partenaire DCB',
|
||||
description: 'Partenaire commercial principal',
|
||||
badgeClass: 'bg-primary',
|
||||
icon: 'lucideBuilding',
|
||||
permissions: {
|
||||
canCreateUsers: true,
|
||||
canEditUsers: true,
|
||||
canDeleteUsers: true,
|
||||
canManageRoles: true,
|
||||
canViewStats: true,
|
||||
canManageMerchants: false,
|
||||
canAccessAdmin: false,
|
||||
canAccessSupport: false,
|
||||
canAccessPartner: false,
|
||||
assignableRoles: [
|
||||
UserRole.DCB_PARTNER_ADMIN,
|
||||
UserRole.DCB_PARTNER_MANAGER,
|
||||
UserRole.DCB_PARTNER_SUPPORT
|
||||
]
|
||||
}
|
||||
},
|
||||
[UserRole.DCB_PARTNER_ADMIN]: {
|
||||
label: 'Admin Partenaire',
|
||||
description: 'Administrateur de partenaire marchand',
|
||||
badgeClass: 'bg-warning',
|
||||
icon: 'lucideShieldCheck',
|
||||
permissions: {
|
||||
canCreateUsers: true,
|
||||
canEditUsers: true,
|
||||
canDeleteUsers: true,
|
||||
canManageRoles: true,
|
||||
canViewStats: true,
|
||||
canManageMerchants: false,
|
||||
canAccessAdmin: false,
|
||||
canAccessSupport: false,
|
||||
canAccessPartner: false,
|
||||
assignableRoles: [UserRole.DCB_PARTNER_MANAGER, UserRole.DCB_PARTNER_SUPPORT]
|
||||
}
|
||||
},
|
||||
[UserRole.DCB_PARTNER_MANAGER]: {
|
||||
label: 'Manager Partenaire',
|
||||
description: 'Manager opérationnel partenaire',
|
||||
badgeClass: 'bg-success',
|
||||
icon: 'lucideUserCog',
|
||||
permissions: {
|
||||
canCreateUsers: false,
|
||||
canEditUsers: false,
|
||||
canDeleteUsers: false,
|
||||
canManageRoles: false,
|
||||
canViewStats: true,
|
||||
canManageMerchants: true,
|
||||
canAccessAdmin: false,
|
||||
canAccessSupport: false,
|
||||
canAccessPartner: true,
|
||||
assignableRoles: []
|
||||
}
|
||||
},
|
||||
[UserRole.DCB_PARTNER_SUPPORT]: {
|
||||
label: 'Support Partenaire',
|
||||
description: 'Support technique partenaire',
|
||||
badgeClass: 'bg-secondary',
|
||||
icon: 'lucideHeadphones',
|
||||
permissions: {
|
||||
canCreateUsers: false,
|
||||
canEditUsers: false,
|
||||
canDeleteUsers: false,
|
||||
canManageRoles: false,
|
||||
canViewStats: true,
|
||||
canManageMerchants: false,
|
||||
canAccessAdmin: false,
|
||||
canAccessSupport: false,
|
||||
canAccessPartner: true,
|
||||
assignableRoles: []
|
||||
}
|
||||
},
|
||||
[UserRole.MERCHANT_CONFIG_ADMIN]: {
|
||||
label: 'Admin Marchand',
|
||||
description: 'Administrateur de configuration marchand',
|
||||
badgeClass: 'bg-warning',
|
||||
icon: 'lucideSettings',
|
||||
permissions: DEFAULT_PERMISSIONS
|
||||
},
|
||||
[UserRole.MERCHANT_CONFIG_MANAGER]: {
|
||||
label: 'Manager Marchand',
|
||||
description: 'Manager de configuration marchand',
|
||||
badgeClass: 'bg-success',
|
||||
icon: 'lucideUserCog',
|
||||
permissions: DEFAULT_PERMISSIONS
|
||||
},
|
||||
[UserRole.MERCHANT_CONFIG_TECHNICAL]: {
|
||||
label: 'Technique Marchand',
|
||||
description: 'Support technique configuration marchand',
|
||||
badgeClass: 'bg-secondary',
|
||||
icon: 'lucideWrench',
|
||||
permissions: DEFAULT_PERMISSIONS
|
||||
},
|
||||
[UserRole.MERCHANT_CONFIG_VIEWER]: {
|
||||
label: 'Visualiseur Marchand',
|
||||
description: 'Visualiseur de configuration marchand',
|
||||
badgeClass: 'bg-light',
|
||||
icon: 'lucideEye',
|
||||
permissions: DEFAULT_PERMISSIONS
|
||||
}
|
||||
} as const;
|
||||
|
||||
// Rôles Hub (pour les filtres)
|
||||
const HUB_ROLES = [
|
||||
UserRole.DCB_ADMIN,
|
||||
UserRole.DCB_SUPPORT,
|
||||
UserRole.DCB_PARTNER
|
||||
] as const;
|
||||
|
||||
// Rôles Marchands (pour les filtres)
|
||||
const MERCHANT_ROLES = [
|
||||
UserRole.DCB_PARTNER_ADMIN,
|
||||
UserRole.DCB_PARTNER_MANAGER,
|
||||
UserRole.DCB_PARTNER_SUPPORT,
|
||||
UserRole.MERCHANT_CONFIG_ADMIN,
|
||||
UserRole.MERCHANT_CONFIG_MANAGER,
|
||||
UserRole.MERCHANT_CONFIG_TECHNICAL,
|
||||
UserRole.MERCHANT_CONFIG_VIEWER
|
||||
] as const;
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
})
|
||||
@ -35,28 +226,30 @@ export class RoleManagementService {
|
||||
* Charge les rôles Hub disponibles
|
||||
*/
|
||||
loadAvailableHubRoles(): Observable<AvailableRolesWithPermissions> {
|
||||
return this.hubUsersService.getAvailableHubRoles().pipe(
|
||||
map(apiResponse => ({
|
||||
roles: apiResponse.roles.map(role => ({
|
||||
...role,
|
||||
permissions: this.getPermissionsForRole(role.value)
|
||||
}))
|
||||
})),
|
||||
tap(roles => this.availableRoles$.next(roles)),
|
||||
catchError(error => {
|
||||
console.error('Error loading hub roles:', error);
|
||||
// On renvoie un observable valide pour éviter le crash
|
||||
return of({ roles: [] } as AvailableRolesWithPermissions);
|
||||
})
|
||||
return this.loadRoles(
|
||||
() => this.hubUsersService.getAvailableHubRoles(),
|
||||
'hub'
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Charge les rôles Marchands disponibles
|
||||
*/
|
||||
loadAvailableMerchantRoles(): Observable<AvailableRolesWithPermissions> {
|
||||
return this.merchantUsersService.getAvailableMerchantRoles().pipe(
|
||||
return this.loadRoles(
|
||||
() => this.merchantUsersService.getAvailableMerchantRoles(),
|
||||
'merchant'
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Méthode générique pour charger les rôles
|
||||
*/
|
||||
private loadRoles(
|
||||
fetchFn: () => Observable<{ roles: AvailableRole[] }>,
|
||||
type: 'hub' | 'merchant'
|
||||
): Observable<AvailableRolesWithPermissions> {
|
||||
return fetchFn().pipe(
|
||||
map(apiResponse => ({
|
||||
roles: apiResponse.roles.map(role => ({
|
||||
...role,
|
||||
@ -65,8 +258,7 @@ export class RoleManagementService {
|
||||
})),
|
||||
tap(roles => this.availableRoles$.next(roles)),
|
||||
catchError(error => {
|
||||
console.error('Error loading merchant roles:', error);
|
||||
// On renvoie un observable valide pour éviter le crash
|
||||
console.error(`Error loading ${type} roles:`, error);
|
||||
return of({ roles: [] } as AvailableRolesWithPermissions);
|
||||
})
|
||||
);
|
||||
@ -98,119 +290,9 @@ export class RoleManagementService {
|
||||
*/
|
||||
getPermissionsForRole(role: UserRole | null): RolePermission {
|
||||
if (!role) {
|
||||
return this.getDefaultPermissions();
|
||||
return DEFAULT_PERMISSIONS;
|
||||
}
|
||||
|
||||
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];
|
||||
|
||||
switch (role) {
|
||||
case UserRole.DCB_ADMIN:
|
||||
return {
|
||||
canCreateUsers: true,
|
||||
canEditUsers: true,
|
||||
canDeleteUsers: true,
|
||||
canManageRoles: true,
|
||||
canViewStats: true,
|
||||
canManageMerchants: true,
|
||||
canAccessAdmin: true,
|
||||
canAccessSupport: 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: false,
|
||||
canAccessAdmin: false,
|
||||
canAccessSupport: false,
|
||||
canAccessPartner: false,
|
||||
assignableRoles: merchantRoles
|
||||
};
|
||||
|
||||
case UserRole.DCB_PARTNER_ADMIN:
|
||||
return {
|
||||
canCreateUsers: true,
|
||||
canEditUsers: true,
|
||||
canDeleteUsers: true,
|
||||
canManageRoles: true,
|
||||
canViewStats: true,
|
||||
canManageMerchants: false,
|
||||
canAccessAdmin: false,
|
||||
canAccessSupport: false,
|
||||
canAccessPartner: false,
|
||||
assignableRoles: [UserRole.DCB_PARTNER_MANAGER, UserRole.DCB_PARTNER_SUPPORT]
|
||||
};
|
||||
|
||||
case UserRole.DCB_PARTNER_MANAGER:
|
||||
return {
|
||||
canCreateUsers: false,
|
||||
canEditUsers: false,
|
||||
canDeleteUsers: false,
|
||||
canManageRoles: false,
|
||||
canViewStats: true,
|
||||
canManageMerchants: true,
|
||||
canAccessAdmin: false,
|
||||
canAccessSupport: false,
|
||||
canAccessPartner: true,
|
||||
assignableRoles: []
|
||||
};
|
||||
|
||||
case UserRole.DCB_PARTNER_SUPPORT:
|
||||
return {
|
||||
canCreateUsers: false,
|
||||
canEditUsers: false,
|
||||
canDeleteUsers: false,
|
||||
canManageRoles: false,
|
||||
canViewStats: true,
|
||||
canManageMerchants: false,
|
||||
canAccessAdmin: false,
|
||||
canAccessSupport: false,
|
||||
canAccessPartner: true,
|
||||
assignableRoles: []
|
||||
};
|
||||
|
||||
default:
|
||||
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: []
|
||||
};
|
||||
return ROLE_CONFIG[role]?.permissions || DEFAULT_PERMISSIONS;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -219,7 +301,6 @@ export class RoleManagementService {
|
||||
canAssignRole(currentUserRole: UserRole | null, targetRole: UserRole): boolean {
|
||||
if (!currentUserRole) return false;
|
||||
|
||||
// Rôles qui peuvent attribuer tous les rôles
|
||||
const fullPermissionRoles = [
|
||||
UserRole.DCB_ADMIN,
|
||||
UserRole.DCB_SUPPORT,
|
||||
@ -230,287 +311,163 @@ export class RoleManagementService {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Pour les autres rôles, utiliser les permissions définies
|
||||
const permissions = this.getPermissionsForRole(currentUserRole);
|
||||
return permissions.assignableRoles.includes(targetRole);
|
||||
}
|
||||
|
||||
/**
|
||||
* Vérifie si l'utilisateur courant peut créer des utilisateurs
|
||||
*/
|
||||
// Méthodes d'utilité pour les permissions
|
||||
canCreateUsers(currentUserRole: UserRole | null): boolean {
|
||||
return currentUserRole ? this.getPermissionsForRole(currentUserRole).canCreateUsers : false;
|
||||
return this.getPermission(currentUserRole, 'canCreateUsers');
|
||||
}
|
||||
|
||||
/**
|
||||
* Vérifie si l'utilisateur courant peut éditer des utilisateurs
|
||||
*/
|
||||
canEditUsers(currentUserRole: UserRole | null): boolean {
|
||||
return currentUserRole ? this.getPermissionsForRole(currentUserRole).canEditUsers : false;
|
||||
return this.getPermission(currentUserRole, 'canEditUsers');
|
||||
}
|
||||
|
||||
/**
|
||||
* Vérifie si l'utilisateur courant peut supprimer des utilisateurs
|
||||
*/
|
||||
canDeleteUsers(currentUserRole: UserRole | null): boolean {
|
||||
return currentUserRole ? this.getPermissionsForRole(currentUserRole).canDeleteUsers : false;
|
||||
return this.getPermission(currentUserRole, 'canDeleteUsers');
|
||||
}
|
||||
|
||||
/**
|
||||
* Vérifie si l'utilisateur courant peut gérer les rôles
|
||||
*/
|
||||
canManageRoles(currentUserRole: UserRole | null): boolean {
|
||||
return currentUserRole ? this.getPermissionsForRole(currentUserRole).canManageRoles : false;
|
||||
return this.getPermission(currentUserRole, 'canManageRoles');
|
||||
}
|
||||
|
||||
/**
|
||||
* Vérifie si l'utilisateur courant peut accéder aux statistiques
|
||||
*/
|
||||
canViewStats(currentUserRole: UserRole | null): boolean {
|
||||
return currentUserRole ? this.getPermissionsForRole(currentUserRole).canViewStats : false;
|
||||
return this.getPermission(currentUserRole, 'canViewStats');
|
||||
}
|
||||
|
||||
/**
|
||||
* Vérifie si l'utilisateur courant peut gérer les merchants
|
||||
*/
|
||||
canManageMerchants(currentUserRole: UserRole | null): boolean {
|
||||
return currentUserRole ? this.getPermissionsForRole(currentUserRole).canManageMerchants : false;
|
||||
return this.getPermission(currentUserRole, 'canManageMerchants');
|
||||
}
|
||||
|
||||
/**
|
||||
* Vérifie si l'utilisateur courant peut accéder à l'admin
|
||||
*/
|
||||
canAccessAdmin(currentUserRole: UserRole | null): boolean {
|
||||
return currentUserRole ? this.getPermissionsForRole(currentUserRole).canAccessAdmin : false;
|
||||
return this.getPermission(currentUserRole, 'canAccessAdmin');
|
||||
}
|
||||
|
||||
/**
|
||||
* Vérifie si l'utilisateur courant peut accéder au support
|
||||
*/
|
||||
canAccessSupport(currentUserRole: UserRole | null): boolean {
|
||||
return currentUserRole ? this.getPermissionsForRole(currentUserRole).canAccessSupport : false;
|
||||
return this.getPermission(currentUserRole, 'canAccessSupport');
|
||||
}
|
||||
|
||||
/**
|
||||
* Vérifie si l'utilisateur courant peut accéder à l'espace partenaire
|
||||
*/
|
||||
canAccessPartner(currentUserRole: UserRole | null): boolean {
|
||||
return currentUserRole ? this.getPermissionsForRole(currentUserRole).canAccessPartner : false;
|
||||
return this.getPermission(currentUserRole, 'canAccessPartner');
|
||||
}
|
||||
|
||||
/**
|
||||
* Récupère le libellé d'un rôle
|
||||
* Méthode helper générique pour les permissions
|
||||
*/
|
||||
private getPermission(
|
||||
role: UserRole | null,
|
||||
permissionKey: keyof RolePermission
|
||||
): boolean {
|
||||
if (!role) return false;
|
||||
const permissions = this.getPermissionsForRole(role);
|
||||
return Boolean(permissions[permissionKey]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Méthodes d'utilité pour les rôles
|
||||
*/
|
||||
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;
|
||||
}
|
||||
return ROLE_CONFIG[userRole]?.label || 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',
|
||||
[UserRole.MERCHANT_CONFIG_ADMIN]: 'Administrateur de partenaire marchand',
|
||||
[UserRole.MERCHANT_CONFIG_MANAGER]: 'Manager opérationnel partenaire',
|
||||
[UserRole.MERCHANT_CONFIG_TECHNICAL]: 'Support technique partenaire',
|
||||
[UserRole.MERCHANT_CONFIG_VIEWER]: 'Support technique partenaire'
|
||||
};
|
||||
return roleDescriptions[userRole] || 'Description non disponible';
|
||||
return ROLE_CONFIG[userRole]?.description || 'Description non disponible';
|
||||
}
|
||||
|
||||
/**
|
||||
* Récupère la classe CSS pour un badge de rôle
|
||||
*/
|
||||
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_SUPPORT:
|
||||
return 'bg-secondary';
|
||||
default:
|
||||
return 'bg-secondary';
|
||||
}
|
||||
return ROLE_CONFIG[userRole]?.badgeClass || 'bg-secondary';
|
||||
}
|
||||
|
||||
/**
|
||||
* Récupère l'icône pour un rôle
|
||||
*/
|
||||
getRoleIcon(role: string): string {
|
||||
const userRole = role as UserRole;
|
||||
switch (userRole) {
|
||||
case UserRole.DCB_ADMIN:
|
||||
return 'lucideShield';
|
||||
case UserRole.DCB_SUPPORT:
|
||||
return 'lucideHeadphones';
|
||||
case UserRole.DCB_PARTNER:
|
||||
return 'lucideBuilding';
|
||||
case UserRole.DCB_PARTNER_ADMIN:
|
||||
return 'lucideShieldCheck';
|
||||
case UserRole.DCB_PARTNER_MANAGER:
|
||||
return 'lucideUserCog';
|
||||
case UserRole.DCB_PARTNER_SUPPORT:
|
||||
return 'lucideHeadphones';
|
||||
default:
|
||||
return 'lucideUser';
|
||||
}
|
||||
return ROLE_CONFIG[userRole]?.icon || 'lucideUser';
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Vérifie si un rôle est un rôle administrateur
|
||||
* Vérifications de type de rôle
|
||||
*/
|
||||
isAdminRole(role: UserRole): boolean {
|
||||
return role === UserRole.DCB_ADMIN;
|
||||
}
|
||||
|
||||
/**
|
||||
* Vérifie si un rôle est un rôle support
|
||||
*/
|
||||
isSupportRole(role: UserRole): boolean {
|
||||
return role === UserRole.DCB_SUPPORT;
|
||||
}
|
||||
|
||||
/**
|
||||
* Vérifie si un rôle est un rôle partenaire
|
||||
*/
|
||||
isPartnerRole(role: UserRole): boolean {
|
||||
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);
|
||||
isMerchantUserRole(role: UserRole): boolean {
|
||||
return role === UserRole.DCB_PARTNER_ADMIN
|
||||
|| role === UserRole.DCB_PARTNER_MANAGER
|
||||
|| role === UserRole.DCB_PARTNER_SUPPORT
|
||||
|| role === UserRole.MERCHANT_CONFIG_ADMIN
|
||||
|| role === UserRole.MERCHANT_CONFIG_MANAGER
|
||||
|| role === UserRole.MERCHANT_CONFIG_TECHNICAL
|
||||
|| role === UserRole.MERCHANT_CONFIG_VIEWER;
|
||||
}
|
||||
|
||||
/**
|
||||
* Récupère tous les rôles disponibles sous forme de tableau
|
||||
* Gestion des listes de rôles
|
||||
*/
|
||||
getAllRoles(): UserRole[] {
|
||||
return Object.values(UserRole);
|
||||
}
|
||||
|
||||
/**
|
||||
* Récupère les rôles que l'utilisateur courant peut attribuer
|
||||
*/
|
||||
getHubRoles(): UserRole[] {
|
||||
return [...HUB_ROLES];
|
||||
}
|
||||
|
||||
getMerchantRoles(): UserRole[] {
|
||||
return [...MERCHANT_ROLES];
|
||||
}
|
||||
|
||||
getAssignableRoles(currentUserRole: UserRole | null): UserRole[] {
|
||||
if (!currentUserRole) return [];
|
||||
return this.getPermissionsForRole(currentUserRole).assignableRoles;
|
||||
}
|
||||
|
||||
/**
|
||||
* 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)
|
||||
);
|
||||
return this.filterAssignableRoles(currentUserRole, HUB_ROLES);
|
||||
}
|
||||
|
||||
/**
|
||||
* Récupère les rôles Marchands assignables (pour le composant unifié)
|
||||
*/
|
||||
getAssignableMerchantRoles(currentUserRole: UserRole | null): UserRole[] {
|
||||
return this.filterAssignableRoles(currentUserRole, MERCHANT_ROLES);
|
||||
}
|
||||
|
||||
private filterAssignableRoles(
|
||||
currentUserRole: UserRole | null,
|
||||
roleList: readonly UserRole[]
|
||||
): UserRole[] {
|
||||
if (!currentUserRole) return [];
|
||||
|
||||
const allMerchantRoles = this.getMerchantRoles();
|
||||
const permissions = this.getPermissionsForRole(currentUserRole);
|
||||
|
||||
return allMerchantRoles.filter(role =>
|
||||
permissions.assignableRoles.includes(role)
|
||||
);
|
||||
return roleList.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
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Récupère uniquement les rôles Marchands
|
||||
*/
|
||||
getMerchantRoles(): UserRole[] {
|
||||
return [
|
||||
UserRole.DCB_PARTNER_ADMIN,
|
||||
UserRole.DCB_PARTNER_MANAGER,
|
||||
UserRole.DCB_PARTNER_SUPPORT
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Vérifie si l'utilisateur a un rôle spécifique
|
||||
* Vérifications de rôles
|
||||
*/
|
||||
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;
|
||||
}
|
||||
|
||||
/**
|
||||
* Réinitialise le cache des rôles
|
||||
* Gestion du cache
|
||||
*/
|
||||
clearCache(): void {
|
||||
this.availableRoles$.next(null);
|
||||
this.currentUserRole$.next(null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Récupère les rôles disponibles (observable)
|
||||
*/
|
||||
getAvailableRoles(): Observable<AvailableRolesWithPermissions | null> {
|
||||
return this.availableRoles$.asObservable();
|
||||
}
|
||||
|
||||
@ -316,6 +316,103 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Informations de base du marchand (seulement pour DCB_PARTNER) -->
|
||||
@if (newUser.role === UserRole.DCB_PARTNER) {
|
||||
<div class="col-12 mt-4">
|
||||
<h6 class="border-bottom pb-2">
|
||||
<ng-icon name="lucideStore" class="me-2"></ng-icon>
|
||||
Informations de base du marchand
|
||||
</h6>
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">
|
||||
Nom du marchand <span class="text-danger">*</span>
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
class="form-control"
|
||||
placeholder="Ex: Boutique ABC"
|
||||
[(ngModel)]="newMerchant.name"
|
||||
name="merchantName"
|
||||
required
|
||||
[disabled]="creatingUser"
|
||||
#merchantName="ngModel"
|
||||
>
|
||||
@if (merchantName.invalid && merchantName.touched) {
|
||||
<div class="text-danger small">
|
||||
Le nom du marchand est requis
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Logo URL</label>
|
||||
<input
|
||||
type="text"
|
||||
class="form-control"
|
||||
placeholder="https://exemple.com/logo.png"
|
||||
[(ngModel)]="newMerchant.logo"
|
||||
name="merchantLogo"
|
||||
[disabled]="creatingUser"
|
||||
>
|
||||
</div>
|
||||
|
||||
<div class="col-12">
|
||||
<label class="form-label">Description</label>
|
||||
<textarea
|
||||
class="form-control"
|
||||
placeholder="Description du marchand"
|
||||
[(ngModel)]="newMerchant.description"
|
||||
name="merchantDescription"
|
||||
[disabled]="creatingUser"
|
||||
rows="2"
|
||||
></textarea>
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">
|
||||
Adresse <span class="text-danger">*</span>
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
class="form-control"
|
||||
placeholder="Adresse complète"
|
||||
[(ngModel)]="newMerchant.adresse"
|
||||
name="merchantAdresse"
|
||||
required
|
||||
[disabled]="creatingUser"
|
||||
#merchantAdresse="ngModel"
|
||||
>
|
||||
@if (merchantAdresse.invalid && merchantAdresse.touched) {
|
||||
<div class="text-danger small">
|
||||
L'adresse est requise
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">
|
||||
Téléphone <span class="text-danger">*</span>
|
||||
</label>
|
||||
<input
|
||||
type="text"
|
||||
class="form-control"
|
||||
placeholder="+XX X XX XX XX XX"
|
||||
[(ngModel)]="newMerchant.phone"
|
||||
name="merchantPhone"
|
||||
required
|
||||
[disabled]="creatingUser"
|
||||
#merchantPhone="ngModel"
|
||||
>
|
||||
@if (merchantPhone.invalid && merchantPhone.touched) {
|
||||
<div class="text-danger small">
|
||||
Le téléphone est requis
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
|
||||
<!-- Avertissement pour les non-DCB_PARTNER -->
|
||||
@if (!canManageRoles) {
|
||||
<div class="col-12">
|
||||
@ -401,6 +498,9 @@
|
||||
• Type d'utilisateur : HUB<br>
|
||||
• Créé par : Utilisateur courant<br>
|
||||
• Votre rôle : {{ currentUserRole || 'Non défini' }}
|
||||
@if (newUser.role === UserRole.DCB_PARTNER) {
|
||||
<br>• Un marchand sera créé avec cet utilisateur
|
||||
}
|
||||
</small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -8,6 +8,7 @@ import { Subject, takeUntil } from 'rxjs';
|
||||
import { HubUsersService } from './hub-users.service';
|
||||
import { RoleManagementService } from '@core/services/hub-users-roles-management.service';
|
||||
import { AuthService } from '@core/services/auth.service';
|
||||
import { MerchantSyncService } from './merchant-sync-orchestrator.service';
|
||||
import { PageTitle } from '@app/components/page-title/page-title';
|
||||
import { HubUsersList } from './hub-users-list/hub-users-list';
|
||||
import { HubUserProfile } from './hub-users-profile/hub-users-profile';
|
||||
@ -17,6 +18,7 @@ import {
|
||||
UserRole,
|
||||
UserType
|
||||
} from '@core/models/dcb-bo-hub-user.model';
|
||||
import { CreateMerchantDto } from '@core/models/merchant-config.model';
|
||||
|
||||
@Component({
|
||||
selector: 'app-hub-users',
|
||||
@ -37,6 +39,7 @@ export class HubUsersManagement implements OnInit, OnDestroy {
|
||||
private modalService = inject(NgbModal);
|
||||
private authService = inject(AuthService);
|
||||
private hubUsersService = inject(HubUsersService);
|
||||
private merchantSyncService = inject(MerchantSyncService);
|
||||
protected roleService = inject(RoleManagementService);
|
||||
private cdRef = inject(ChangeDetectorRef);
|
||||
private destroy$ = new Subject<void>();
|
||||
@ -60,7 +63,7 @@ export class HubUsersManagement implements OnInit, OnDestroy {
|
||||
canDeleteUsers = false;
|
||||
canManageRoles = false;
|
||||
|
||||
// Formulaire de création
|
||||
// Formulaire de création utilisateur
|
||||
newUser: {
|
||||
username: string;
|
||||
email: string;
|
||||
@ -70,12 +73,17 @@ export class HubUsersManagement implements OnInit, OnDestroy {
|
||||
role: UserRole;
|
||||
enabled: boolean;
|
||||
emailVerified: boolean;
|
||||
userType: UserType
|
||||
userType: UserType;
|
||||
} = this.getDefaultUserForm();
|
||||
|
||||
// Formulaire de création marchand (pour DCB_PARTNER)
|
||||
newMerchant: CreateMerchantDto = this.getDefaultMerchantForm();
|
||||
|
||||
// États des opérations
|
||||
creatingUser = false;
|
||||
createUserError = '';
|
||||
creatingMerchant = false;
|
||||
|
||||
resettingPassword = false;
|
||||
resetPasswordError = '';
|
||||
resetPasswordSuccess = '';
|
||||
@ -218,6 +226,18 @@ export class HubUsersManagement implements OnInit, OnDestroy {
|
||||
};
|
||||
}
|
||||
|
||||
private getDefaultMerchantForm(): CreateMerchantDto {
|
||||
return {
|
||||
name: '',
|
||||
logo: '',
|
||||
description: '',
|
||||
adresse: '',
|
||||
phone: '',
|
||||
configs:[],
|
||||
technicalContacts: []
|
||||
};
|
||||
}
|
||||
|
||||
// ==================== MÉTHODES D'INTERFACE ====================
|
||||
|
||||
userProfiles: { [userId: string]: any } = {}; // Stocker les profils par userId
|
||||
@ -313,17 +333,8 @@ export class HubUsersManagement implements OnInit, OnDestroy {
|
||||
}
|
||||
|
||||
private resetUserForm() {
|
||||
this.newUser = {
|
||||
username: '',
|
||||
email: '',
|
||||
firstName: '',
|
||||
lastName: '',
|
||||
password: '',
|
||||
role: UserRole.DCB_SUPPORT,
|
||||
enabled: true,
|
||||
emailVerified: false,
|
||||
userType: UserType.HUB
|
||||
};
|
||||
this.newUser = this.getDefaultUserForm();
|
||||
this.newMerchant = this.getDefaultMerchantForm();
|
||||
console.log('🔄 Hub user form reset');
|
||||
}
|
||||
|
||||
@ -386,10 +397,11 @@ export class HubUsersManagement implements OnInit, OnDestroy {
|
||||
return;
|
||||
}
|
||||
|
||||
const validation = this.validateUserForm();
|
||||
if (!validation.isValid) {
|
||||
this.createUserError = validation.error!;
|
||||
console.error('❌ Form validation failed:', validation.error);
|
||||
// Validation du formulaire utilisateur
|
||||
const userValidation = this.validateUserForm();
|
||||
if (!userValidation.isValid) {
|
||||
this.createUserError = userValidation.error!;
|
||||
console.error('❌ User form validation failed:', userValidation.error);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -402,7 +414,95 @@ export class HubUsersManagement implements OnInit, OnDestroy {
|
||||
this.creatingUser = true;
|
||||
this.createUserError = '';
|
||||
|
||||
console.log('📤 Creating hub user with data:', this.newUser);
|
||||
console.log('📤 Creating hub user:', {
|
||||
username: this.newUser.username,
|
||||
role: this.newUser.role,
|
||||
type: this.newUser.role === UserRole.DCB_PARTNER ? 'DCB Partner (avec marchand)' : 'Utilisateur Hub standard'
|
||||
});
|
||||
|
||||
// Pour DCB_PARTNER: créer d'abord le marchand
|
||||
if (this.newUser.role === UserRole.DCB_PARTNER) {
|
||||
// Validation du formulaire marchand pour DCB_PARTNER
|
||||
const merchantValidation = this.validateMerchantForm();
|
||||
if (!merchantValidation.isValid) {
|
||||
this.createUserError = merchantValidation.error!;
|
||||
console.error('❌ Merchant form validation failed:', merchantValidation.error);
|
||||
this.creatingUser = false;
|
||||
return;
|
||||
}
|
||||
|
||||
this.createMerchantForDcbPartner();
|
||||
} else {
|
||||
// Pour les autres rôles: créer uniquement l'utilisateur Hub
|
||||
this.createHubUserOnly();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Crée un marchand avec un DCB Partner (ordre: merchantConfig -> Keycloak)
|
||||
*/
|
||||
private createMerchantForDcbPartner() {
|
||||
this.creatingMerchant = true;
|
||||
console.log('📤 Creating merchant for DCB_PARTNER:', this.newMerchant);
|
||||
|
||||
// Données du DCB Partner
|
||||
const dcbPartnerData = {
|
||||
username: this.newUser.username,
|
||||
email: this.newUser.email,
|
||||
password: this.newUser.password,
|
||||
firstName: this.newUser.firstName,
|
||||
lastName: this.newUser.lastName,
|
||||
enabled: this.newUser.enabled,
|
||||
emailVerified: this.newUser.emailVerified
|
||||
};
|
||||
|
||||
// Données du marchand
|
||||
const merchantData: CreateMerchantDto = {
|
||||
...this.newMerchant
|
||||
|
||||
};
|
||||
|
||||
console.log('🔧 Données envoyées:');
|
||||
console.log(' Merchant:', merchantData);
|
||||
console.log(' DCB Partner:', { ...dcbPartnerData, password: '***' });
|
||||
|
||||
// Utiliser le MerchantSyncService pour créer d'abord dans merchantConfig puis dans Keycloak
|
||||
this.merchantSyncService.createMerchant(merchantData, dcbPartnerData)
|
||||
.pipe(takeUntil(this.destroy$))
|
||||
.subscribe({
|
||||
next: (createResult) => {
|
||||
console.log('✅ Merchant and DCB Partner created successfully:', createResult);
|
||||
this.creatingUser = false;
|
||||
this.creatingMerchant = false;
|
||||
|
||||
console.log('📊 Résultat création:');
|
||||
console.log(' Merchant Config ID:', createResult.merchantConfig?.id);
|
||||
console.log(' Keycloak Merchant ID:', createResult.keycloakMerchant?.id);
|
||||
console.log(' Merchant name:', createResult.merchantConfig?.name);
|
||||
console.log(' DCB Partner email:', createResult.keycloakMerchant?.email);
|
||||
|
||||
this.modalService.dismissAll();
|
||||
this.refreshUsersList();
|
||||
this.cdRef.detectChanges();
|
||||
},
|
||||
error: (error) => {
|
||||
console.error('❌ Error creating merchant and DCB Partner:', error);
|
||||
this.creatingUser = false;
|
||||
this.creatingMerchant = false;
|
||||
|
||||
this.createUserError = this.getMerchantErrorMessage(error);
|
||||
console.error('❌ Détails de l\'erreur:', error);
|
||||
|
||||
this.cdRef.detectChanges();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Crée uniquement un utilisateur Hub (pas de marchand)
|
||||
*/
|
||||
private createHubUserOnly() {
|
||||
console.log('📤 Creating hub user only (no merchant)');
|
||||
|
||||
this.hubUsersService.createHubUser(this.newUser)
|
||||
.pipe(takeUntil(this.destroy$))
|
||||
@ -556,6 +656,25 @@ export class HubUsersManagement implements OnInit, OnDestroy {
|
||||
return 'Erreur lors de la création de l\'utilisateur. Veuillez réessayer.';
|
||||
}
|
||||
|
||||
private getMerchantErrorMessage(error: any): string {
|
||||
if (error.error?.message) {
|
||||
return error.error.message;
|
||||
}
|
||||
if (error.status === 400) {
|
||||
return 'Données du marchand ou du DCB Partner invalides.';
|
||||
}
|
||||
if (error.status === 409) {
|
||||
return 'Un marchand avec ce nom ou un utilisateur avec ces identifiants existe déjà.';
|
||||
}
|
||||
if (error.status === 403) {
|
||||
return 'Vous n\'avez pas les permissions pour créer un marchand ou un DCB Partner.';
|
||||
}
|
||||
if (error.status === 404) {
|
||||
return 'Service de création de marchand non disponible.';
|
||||
}
|
||||
return 'Erreur lors de la création du marchand et du DCB Partner.';
|
||||
}
|
||||
|
||||
private getResetPasswordErrorMessage(error: any): string {
|
||||
if (error.error?.message) {
|
||||
return error.error.message;
|
||||
@ -588,7 +707,7 @@ export class HubUsersManagement implements OnInit, OnDestroy {
|
||||
return 'Erreur lors de la suppression de l\'utilisateur. Veuillez réessayer.';
|
||||
}
|
||||
|
||||
// ==================== VALIDATION DU FORMULAIRE ====================
|
||||
// ==================== VALIDATION DES FORMULAIRES ====================
|
||||
|
||||
private validateUserForm(): { isValid: boolean; error?: string } {
|
||||
const requiredFields = [
|
||||
@ -625,4 +744,20 @@ export class HubUsersManagement implements OnInit, OnDestroy {
|
||||
|
||||
return { isValid: true };
|
||||
}
|
||||
|
||||
private validateMerchantForm(): { isValid: boolean; error?: string } {
|
||||
const requiredFields = [
|
||||
{ field: this.newMerchant.name?.trim(), name: 'Nom du marchand' },
|
||||
{ field: this.newMerchant.adresse?.trim(), name: 'Adresse' },
|
||||
{ field: this.newMerchant.phone?.trim(), name: 'Téléphone' },
|
||||
];
|
||||
|
||||
for (const { field, name } of requiredFields) {
|
||||
if (!field) {
|
||||
return { isValid: false, error: `${name} est requis pour un DCB Partner` };
|
||||
}
|
||||
}
|
||||
|
||||
return { isValid: true };
|
||||
}
|
||||
}
|
||||
@ -42,7 +42,7 @@ export interface MerchantSyncStatus {
|
||||
}
|
||||
|
||||
@Injectable({ providedIn: 'root' })
|
||||
export class MerchantSyncCrudService {
|
||||
export class MerchantSyncService {
|
||||
private hubUsersService = inject(HubUsersService);
|
||||
private merchantUsersService = inject(MerchantUsersService);
|
||||
private merchantConfigService = inject(MerchantConfigService);
|
||||
@ -302,7 +302,7 @@ export class MerchantSyncCrudService {
|
||||
|
||||
const users = keycloakUsers.map(keycloakUser => {
|
||||
const merchantConfigUser = merchantConfigUsers.find(
|
||||
mcUser => mcUser.email === keycloakUser.email
|
||||
mcUser => mcUser.userId === keycloakUser.id
|
||||
);
|
||||
|
||||
return {
|
||||
@ -382,7 +382,7 @@ export class MerchantSyncCrudService {
|
||||
*/
|
||||
updateMerchantUser(
|
||||
keycloakUserId: string,
|
||||
merchantConfigUserId: number,
|
||||
merchantConfigUserId: string,
|
||||
merchantConfigId: string,
|
||||
updates: {
|
||||
keycloak?: UpdateUserDto;
|
||||
@ -519,7 +519,7 @@ export class MerchantSyncCrudService {
|
||||
*/
|
||||
deleteMerchantUser(
|
||||
keycloakUserId: string,
|
||||
merchantConfigUserId: number,
|
||||
merchantConfigUserId: string,
|
||||
merchantConfigId: string,
|
||||
): Observable<{ success: boolean; message: string }> {
|
||||
console.log('🗑️ DELETE Merchant User...');
|
||||
|
||||
@ -20,7 +20,6 @@ import {
|
||||
UserType
|
||||
} from '@core/models/dcb-bo-hub-user.model';
|
||||
import { HubUsersService } from './hub-users.service';
|
||||
import { MerchantSyncCrudService } from './merchant-sync-orchestrator.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-merchant-users',
|
||||
@ -226,7 +225,7 @@ export class MerchantUsersManagement implements OnInit, OnDestroy {
|
||||
}
|
||||
|
||||
get showMerchantPartnerField(): boolean {
|
||||
if (this.isMerchantRole(this.newUser.role)) {
|
||||
if (this.isMerchantRole(this.newUser.role) && !this.isPartnerUser) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@ -264,7 +263,13 @@ export class MerchantUsersManagement implements OnInit, OnDestroy {
|
||||
.subscribe({
|
||||
next: (user) => {
|
||||
this.currentUserRole = this.extractUserRole(user);
|
||||
this.currentMerchantPartnerId = this.extractMerchantPartnerId(user);
|
||||
|
||||
if(user?.role.includes(UserRole.DCB_PARTNER)){
|
||||
this.currentMerchantPartnerId = user.id;
|
||||
} else {
|
||||
this.currentMerchantPartnerId = this.extractMerchantPartnerId(user);
|
||||
}
|
||||
|
||||
this.currentUserType = this.extractUserType(user);
|
||||
|
||||
console.log(`MERCHANT User ROLE: ${this.currentUserRole}`);
|
||||
|
||||
@ -11,6 +11,7 @@ import {
|
||||
ConfigType,
|
||||
Operator,
|
||||
MerchantUtils,
|
||||
UserRole,
|
||||
} from '@core/models/merchant-config.model';
|
||||
|
||||
import { MerchantConfigService } from '../merchant-config.service';
|
||||
@ -81,6 +82,7 @@ export class MerchantConfigsList implements OnInit, OnDestroy {
|
||||
// Permissions
|
||||
currentUserRole: any = null;
|
||||
canViewAllMerchants = false;
|
||||
currentMerchantConfigId: string | undefined;
|
||||
|
||||
// ==================== CONVERSION IDS ====================
|
||||
|
||||
@ -131,7 +133,7 @@ export class MerchantConfigsList implements OnInit, OnDestroy {
|
||||
}
|
||||
|
||||
getColumnCount(): number {
|
||||
return 8; // Nombre de colonnes dans le tableau
|
||||
return 8;
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
@ -153,7 +155,19 @@ export class MerchantConfigsList implements OnInit, OnDestroy {
|
||||
.subscribe({
|
||||
next: (user) => {
|
||||
this.currentUserRole = this.extractUserRole(user);
|
||||
|
||||
if(user?.role.includes(UserRole.DCB_PARTNER)){
|
||||
this.currentMerchantConfigId = user.merchantConfigId;
|
||||
} else {
|
||||
this.currentMerchantConfigId = this.extractMerchantConfigId(user);
|
||||
}
|
||||
|
||||
this.canViewAllMerchants = this.canViewAllMerchantsCheck(this.currentUserRole);
|
||||
|
||||
console.log(`MERCHANT User ROLE: ${this.currentUserRole}`);
|
||||
console.log(`Merchant Config ID: ${this.currentMerchantConfigId}`);
|
||||
console.log(`canViewAllMerchants: ${this.canViewAllMerchants}`);
|
||||
|
||||
this.loadMerchants();
|
||||
},
|
||||
error: (error) => {
|
||||
@ -163,6 +177,17 @@ export class MerchantConfigsList implements OnInit, OnDestroy {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Extraire le merchantPartnerId
|
||||
*/
|
||||
private extractMerchantConfigId(user: any): string {
|
||||
if (user?.merchantConfigId) {
|
||||
return user.merchantConfigId;
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
|
||||
private extractUserRole(user: any): any {
|
||||
const userRoles = this.authService.getCurrentUserRoles();
|
||||
return userRoles && userRoles.length > 0 ? userRoles[0] : null;
|
||||
@ -172,9 +197,8 @@ export class MerchantConfigsList implements OnInit, OnDestroy {
|
||||
if (!role) return false;
|
||||
|
||||
const canViewAllRoles = [
|
||||
'DCB_ADMIN',
|
||||
'DCB_SUPPORT',
|
||||
'DCB_PARTNER_ADMIN'
|
||||
UserRole.DCB_ADMIN,
|
||||
UserRole.DCB_SUPPORT
|
||||
];
|
||||
|
||||
return canViewAllRoles.includes(role);
|
||||
@ -239,7 +263,17 @@ export class MerchantConfigsList implements OnInit, OnDestroy {
|
||||
}
|
||||
|
||||
private getMyMerchants(): Observable<Merchant[]> {
|
||||
return this.getAllMerchants();
|
||||
const merchantConfigId = Number(this.currentMerchantConfigId);
|
||||
|
||||
return this.merchantConfigService.getMerchantUsers(merchantConfigId).pipe(
|
||||
map(response => {
|
||||
return this.convertMerchantsToFrontend(response);
|
||||
}),
|
||||
catchError(error => {
|
||||
console.error('Error getting all merchants:', error);
|
||||
return of([]);
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -399,91 +399,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Formulaire d'ajout de configuration -->
|
||||
@if (addingConfig) {
|
||||
<div class="section-card mb-4">
|
||||
<div class="section-header">
|
||||
<h6 class="mb-0">
|
||||
<ng-icon name="lucidePlus" class="me-2"></ng-icon>
|
||||
Nouvelle configuration
|
||||
</h6>
|
||||
</div>
|
||||
<div class="section-content">
|
||||
<div class="row g-3">
|
||||
<div class="col-md-4">
|
||||
<label class="form-label">Type</label>
|
||||
<select
|
||||
class="form-select"
|
||||
[(ngModel)]="newConfig.name"
|
||||
>
|
||||
@for (type of getAvailableConfigTypes(); track type.value) {
|
||||
<option [value]="type.value">{{ type.label }}</option>
|
||||
}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
<label class="form-label">Opérateur</label>
|
||||
<select
|
||||
class="form-select"
|
||||
[(ngModel)]="newConfig.operatorId"
|
||||
>
|
||||
<option [value]="null">Aucun opérateur spécifique</option>
|
||||
@for (operator of getAvailableOperators(); track operator.value) {
|
||||
<option [ngValue]="operator.value">{{ operator.label }}</option>
|
||||
}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-12">
|
||||
<label class="form-label">Valeur</label>
|
||||
<textarea
|
||||
class="form-control font-monospace"
|
||||
[(ngModel)]="newConfig.value"
|
||||
placeholder="Valeur de la configuration"
|
||||
rows="3"
|
||||
></textarea>
|
||||
@if (isNewConfigSensitive()) {
|
||||
<div class="alert alert-warning mt-2 mb-0">
|
||||
<small>
|
||||
<ng-icon name="lucideAlertTriangle" class="me-1"></ng-icon>
|
||||
Cette valeur contient des informations sensibles. Soyez prudent.
|
||||
</small>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
|
||||
<div class="col-12">
|
||||
<div class="d-flex gap-2">
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-secondary"
|
||||
(click)="cancelAddingConfig()"
|
||||
[disabled]="saving"
|
||||
>
|
||||
Annuler
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-success"
|
||||
(click)="addConfig()"
|
||||
[disabled]="saving || !validateNewConfig().isValid"
|
||||
>
|
||||
@if (saving) {
|
||||
<div class="spinner-border spinner-border-sm me-1" role="status">
|
||||
<span class="visually-hidden">Chargement...</span>
|
||||
</div>
|
||||
}
|
||||
<ng-icon name="lucideCheck" class="me-1"></ng-icon>
|
||||
Ajouter la configuration
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
<!-- Formulaire d'édition -->
|
||||
@if (isEditingConfig(config.id!)) {
|
||||
<div class="border-top pt-3 mt-3">
|
||||
@ -572,6 +487,7 @@
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
</div>
|
||||
|
||||
<!-- Pagination -->
|
||||
@ -596,6 +512,91 @@
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
<!-- Formulaire d'ajout de configuration -->
|
||||
@if (addingConfig) {
|
||||
<div class="section-card mb-4">
|
||||
<div class="section-header">
|
||||
<h6 class="mb-0">
|
||||
<ng-icon name="lucidePlus" class="me-2"></ng-icon>
|
||||
Nouvelle configuration
|
||||
</h6>
|
||||
</div>
|
||||
<div class="section-content">
|
||||
<div class="row g-3">
|
||||
<div class="col-md-4">
|
||||
<label class="form-label">Type</label>
|
||||
<select
|
||||
class="form-select"
|
||||
[(ngModel)]="newConfig.name"
|
||||
>
|
||||
@for (type of getAvailableConfigTypes(); track type.value) {
|
||||
<option [value]="type.value">{{ type.label }}</option>
|
||||
}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-md-4">
|
||||
<label class="form-label">Opérateur</label>
|
||||
<select
|
||||
class="form-select"
|
||||
[(ngModel)]="newConfig.operatorId"
|
||||
>
|
||||
<option [value]="null">Aucun opérateur spécifique</option>
|
||||
@for (operator of getAvailableOperators(); track operator.value) {
|
||||
<option [ngValue]="operator.value">{{ operator.label }}</option>
|
||||
}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-12">
|
||||
<label class="form-label">Valeur</label>
|
||||
<textarea
|
||||
class="form-control font-monospace"
|
||||
[(ngModel)]="newConfig.value"
|
||||
placeholder="Valeur de la configuration"
|
||||
rows="3"
|
||||
></textarea>
|
||||
@if (isNewConfigSensitive()) {
|
||||
<div class="alert alert-warning mt-2 mb-0">
|
||||
<small>
|
||||
<ng-icon name="lucideAlertTriangle" class="me-1"></ng-icon>
|
||||
Cette valeur contient des informations sensibles. Soyez prudent.
|
||||
</small>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
|
||||
<div class="col-12">
|
||||
<div class="d-flex gap-2">
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-secondary"
|
||||
(click)="cancelAddingConfig()"
|
||||
[disabled]="saving"
|
||||
>
|
||||
Annuler
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-success"
|
||||
(click)="addConfig()"
|
||||
[disabled]="saving || !validateNewConfig().isValid"
|
||||
>
|
||||
@if (saving) {
|
||||
<div class="spinner-border spinner-border-sm me-1" role="status">
|
||||
<span class="visually-hidden">Chargement...</span>
|
||||
</div>
|
||||
}
|
||||
<ng-icon name="lucideCheck" class="me-1"></ng-icon>
|
||||
Ajouter la configuration
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</ng-template>
|
||||
</li>
|
||||
|
||||
@ -198,7 +198,7 @@ export class MerchantConfigView implements OnInit, OnDestroy {
|
||||
success = '';
|
||||
|
||||
// Navigation par onglets
|
||||
activeTab: 'overview' | 'configs' | 'contacts' | 'users' = 'overview';
|
||||
activeTab: 'overview' | 'configs' | 'contacts' = 'overview';
|
||||
|
||||
// Gestion des permissions
|
||||
currentUserRole: UserRole | null = null;
|
||||
@ -314,7 +314,7 @@ export class MerchantConfigView implements OnInit, OnDestroy {
|
||||
|
||||
// ==================== GESTION DES ONGLETS ====================
|
||||
|
||||
setActiveTab(tab: 'overview' | 'configs' | 'contacts' | 'users') {
|
||||
setActiveTab(tab: 'overview' | 'configs' | 'contacts') {
|
||||
this.activeTab = tab;
|
||||
}
|
||||
|
||||
@ -414,7 +414,7 @@ export class MerchantConfigView implements OnInit, OnDestroy {
|
||||
};
|
||||
|
||||
// États pour la modification de rôle
|
||||
editingUserId: number | null = null;
|
||||
editingUserId: string | null = null;
|
||||
newUserRole: UserRole | null = null;
|
||||
|
||||
// ==================== GESTION DES CONFIGURATIONS ====================
|
||||
@ -663,7 +663,7 @@ export class MerchantConfigView implements OnInit, OnDestroy {
|
||||
});
|
||||
}
|
||||
|
||||
isEditingUserRole(userId: number): boolean {
|
||||
isEditingUserRole(userId: string): boolean {
|
||||
return this.editingUserId === userId;
|
||||
}
|
||||
|
||||
@ -950,7 +950,6 @@ export class MerchantConfigView implements OnInit, OnDestroy {
|
||||
switch (this.activeTab) {
|
||||
case 'configs': return this.merchant?.configs || [];
|
||||
case 'contacts': return this.merchant?.technicalContacts || [];
|
||||
case 'users': return this.merchant?.users || [];
|
||||
default: return [];
|
||||
}
|
||||
}
|
||||
@ -1042,7 +1041,8 @@ export class MerchantConfigView implements OnInit, OnDestroy {
|
||||
return contact.id || index;
|
||||
}
|
||||
|
||||
trackByUserId(index: number, user: MerchantUser): number {
|
||||
return user.userId || index;
|
||||
trackByUserId(index: number, user: MerchantUser): string {
|
||||
return user?.userId ?? `user-${index}`;
|
||||
}
|
||||
|
||||
}
|
||||
@ -24,9 +24,9 @@
|
||||
Permissions limitées
|
||||
</span>
|
||||
}
|
||||
@if (selectedMerchantPartnerId) {
|
||||
@if (selectedMerchantConfigId) {
|
||||
<span class="ms-2">
|
||||
<strong>Marchand :</strong> {{ selectedMerchantPartnerId }}
|
||||
<strong>Marchand :</strong> {{ selectedMerchantConfigId }}
|
||||
</span>
|
||||
}
|
||||
</small>
|
||||
@ -65,7 +65,13 @@
|
||||
<li [ngbNavItem]="'list'">
|
||||
<a ngbNavLink (click)="showTab('list')">
|
||||
<ng-icon name="lucideList" class="fs-lg me-md-1 d-inline-flex align-middle" />
|
||||
<span class="d-none d-md-inline-block align-middle">Marchands</span>
|
||||
<span class="d-none d-md-inline-block align-middle">
|
||||
@if (isMerchantUser) {
|
||||
Utilisateurs
|
||||
} @else {
|
||||
Marchands
|
||||
}
|
||||
</span>
|
||||
</a>
|
||||
<ng-template ngbNavContent>
|
||||
<app-merchant-config-list
|
||||
@ -80,20 +86,37 @@
|
||||
</ng-template>
|
||||
</li>
|
||||
|
||||
<li [ngbNavItem]="'profile'" [hidden]="activeTab !== 'profile'">
|
||||
<li [ngbNavItem]="'profile'" [hidden]="!showProfileTab">
|
||||
<a ngbNavLink (click)="showTab('profile')">
|
||||
<ng-icon name="lucideSettings" class="fs-lg me-md-1 d-inline-flex align-middle" />
|
||||
<span class="d-none d-md-inline-block align-middle">Détails Marchand</span>
|
||||
<span class="d-none d-md-inline-block align-middle">
|
||||
@if (isMerchantUser) {
|
||||
Mon Marchand
|
||||
} @else {
|
||||
Détails Marchand
|
||||
}
|
||||
</span>
|
||||
</a>
|
||||
<ng-template ngbNavContent>
|
||||
@if (selectedMerchantId) {
|
||||
<app-merchant-config-view
|
||||
[merchantId]="selectedMerchantId"
|
||||
(openCreateMerchantModal)="openCreateMerchantModal()"
|
||||
(editMerchantRequested)="onEditMerchantRequested($event)"
|
||||
(editConfigRequested)="onEditConfigRequested($event)"
|
||||
(back)="backToList()"
|
||||
/>
|
||||
@if (showProfileTab) {
|
||||
<!-- Pour les merchant users, utiliser userMerchantId, pour les autres selectedMerchantId -->
|
||||
@if (isMerchantUser && userMerchantId) {
|
||||
<app-merchant-config-view
|
||||
[merchantId]="userMerchantId"
|
||||
(openCreateMerchantModal)="openCreateMerchantModal()"
|
||||
(editMerchantRequested)="onEditMerchantRequested($event)"
|
||||
(editConfigRequested)="onEditConfigRequested($event)"
|
||||
(back)="backToList()"
|
||||
/>
|
||||
} @else if (!isMerchantUser && selectedMerchantId) {
|
||||
<app-merchant-config-view
|
||||
[merchantId]="selectedMerchantId"
|
||||
(openCreateMerchantModal)="openCreateMerchantModal()"
|
||||
(editMerchantRequested)="onEditMerchantRequested($event)"
|
||||
(editConfigRequested)="onEditConfigRequested($event)"
|
||||
(back)="backToList()"
|
||||
/>
|
||||
}
|
||||
} @else {
|
||||
<div class="alert alert-warning text-center">
|
||||
<ng-icon name="lucideAlertCircle" class="me-2"></ng-icon>
|
||||
@ -107,7 +130,6 @@
|
||||
<div class="tab-content" [ngbNavOutlet]="configsNav"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Modal de création de marchand -->
|
||||
<ng-template #createMerchantModal let-modal>
|
||||
@ -239,72 +261,75 @@
|
||||
</div>
|
||||
}
|
||||
|
||||
<!-- Liste des contacts -->
|
||||
@for (contact of newMerchant.technicalContacts; track $index; let i = $index) {
|
||||
<div class="card mb-3">
|
||||
<div class="card-header py-2 d-flex justify-content-between align-items-center">
|
||||
<span>Contact {{ i + 1 }}</span>
|
||||
@if (newMerchant.technicalContacts.length > 1) {
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-sm btn-outline-danger"
|
||||
(click)="removeTechnicalContact(i)"
|
||||
[disabled]="creatingMerchant"
|
||||
>
|
||||
<ng-icon name="lucideTrash2" class="me-1"></ng-icon>
|
||||
Supprimer
|
||||
</button>
|
||||
}
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="row g-3">
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Prénom <span class="text-danger">*</span></label>
|
||||
<input
|
||||
type="text"
|
||||
class="form-control"
|
||||
[(ngModel)]="contact.firstName"
|
||||
[name]="'firstName_' + i"
|
||||
required
|
||||
[disabled]="creatingMerchant"
|
||||
>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Nom <span class="text-danger">*</span></label>
|
||||
<input
|
||||
type="text"
|
||||
class="form-control"
|
||||
[(ngModel)]="contact.lastName"
|
||||
[name]="'lastName_' + i"
|
||||
required
|
||||
[disabled]="creatingMerchant"
|
||||
>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Téléphone <span class="text-danger">*</span></label>
|
||||
<input
|
||||
type="text"
|
||||
class="form-control"
|
||||
[(ngModel)]="contact.phone"
|
||||
[name]="'phone_' + i"
|
||||
required
|
||||
[disabled]="creatingMerchant"
|
||||
>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Email <span class="text-danger">*</span></label>
|
||||
<input
|
||||
type="email"
|
||||
class="form-control"
|
||||
[(ngModel)]="contact.email"
|
||||
[name]="'email_' + i"
|
||||
required
|
||||
|
||||
@if(newMerchant.technicalContacts) {
|
||||
<!-- Liste des contacts -->
|
||||
@for (contact of newMerchant.technicalContacts; track $index; let i = $index) {
|
||||
<div class="card mb-3">
|
||||
<div class="card-header py-2 d-flex justify-content-between align-items-center">
|
||||
<span>Contact {{ i + 1 }}</span>
|
||||
@if (newMerchant.technicalContacts.length > 1) {
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-sm btn-outline-danger"
|
||||
(click)="removeTechnicalContact(i)"
|
||||
[disabled]="creatingMerchant"
|
||||
>
|
||||
<ng-icon name="lucideTrash2" class="me-1"></ng-icon>
|
||||
Supprimer
|
||||
</button>
|
||||
}
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="row g-3">
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Prénom <span class="text-danger">*</span></label>
|
||||
<input
|
||||
type="text"
|
||||
class="form-control"
|
||||
[(ngModel)]="contact.firstName"
|
||||
[name]="'firstName_' + i"
|
||||
required
|
||||
[disabled]="creatingMerchant"
|
||||
>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Nom <span class="text-danger">*</span></label>
|
||||
<input
|
||||
type="text"
|
||||
class="form-control"
|
||||
[(ngModel)]="contact.lastName"
|
||||
[name]="'lastName_' + i"
|
||||
required
|
||||
[disabled]="creatingMerchant"
|
||||
>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Téléphone <span class="text-danger">*</span></label>
|
||||
<input
|
||||
type="text"
|
||||
class="form-control"
|
||||
[(ngModel)]="contact.phone"
|
||||
[name]="'phone_' + i"
|
||||
required
|
||||
[disabled]="creatingMerchant"
|
||||
>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Email <span class="text-danger">*</span></label>
|
||||
<input
|
||||
type="email"
|
||||
class="form-control"
|
||||
[(ngModel)]="contact.email"
|
||||
[name]="'email_' + i"
|
||||
required
|
||||
[disabled]="creatingMerchant"
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
|
||||
<button
|
||||
@ -334,70 +359,72 @@
|
||||
</div>
|
||||
}
|
||||
|
||||
<!-- Liste des configurations -->
|
||||
@for (config of newMerchant.configs; track $index; let i = $index) {
|
||||
<div class="card mb-3">
|
||||
<div class="card-header py-2 d-flex justify-content-between align-items-center">
|
||||
<span>Configuration {{ i + 1 }}</span>
|
||||
@if (newMerchant.configs.length > 1) {
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-sm btn-outline-danger"
|
||||
(click)="removeConfig(i)"
|
||||
[disabled]="creatingMerchant"
|
||||
>
|
||||
<ng-icon name="lucideTrash2" class="me-1"></ng-icon>
|
||||
Supprimer
|
||||
</button>
|
||||
}
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="row g-3">
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Type <span class="text-danger">*</span></label>
|
||||
<select
|
||||
class="form-select"
|
||||
[(ngModel)]="config.name"
|
||||
[name]="'configType_' + i"
|
||||
required
|
||||
@if(newMerchant.configs) {
|
||||
<!-- Liste des configurations -->
|
||||
@for (config of newMerchant.configs; track $index; let i = $index) {
|
||||
<div class="card mb-3">
|
||||
<div class="card-header py-2 d-flex justify-content-between align-items-center">
|
||||
<span>Configuration {{ i + 1 }}</span>
|
||||
@if (newMerchant.configs.length > 1) {
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-sm btn-outline-danger"
|
||||
(click)="removeConfig(i)"
|
||||
[disabled]="creatingMerchant"
|
||||
>
|
||||
<option value="" disabled>Sélectionnez un type</option>
|
||||
@for (type of configTypes; track type.name) {
|
||||
<option [value]="type.name">{{ type.label }}</option>
|
||||
}
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Opérateur <span class="text-danger">*</span></label>
|
||||
<select
|
||||
class="form-select"
|
||||
[(ngModel)]="config.operatorId"
|
||||
[name]="'operatorId_' + i"
|
||||
required
|
||||
[disabled]="creatingMerchant"
|
||||
>
|
||||
<option value="" disabled>Sélectionnez un opérateur</option>
|
||||
@for (operator of operators; track operator.id) {
|
||||
<option [value]="operator.id">{{ operator.name }}</option>
|
||||
}
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<label class="form-label">Valeur <span class="text-danger">*</span></label>
|
||||
<textarea
|
||||
class="form-control"
|
||||
[(ngModel)]="config.value"
|
||||
[name]="'value_' + i"
|
||||
required
|
||||
[disabled]="creatingMerchant"
|
||||
rows="2"
|
||||
placeholder="Valeur de configuration"
|
||||
></textarea>
|
||||
<ng-icon name="lucideTrash2" class="me-1"></ng-icon>
|
||||
Supprimer
|
||||
</button>
|
||||
}
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="row g-3">
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Type <span class="text-danger">*</span></label>
|
||||
<select
|
||||
class="form-select"
|
||||
[(ngModel)]="config.name"
|
||||
[name]="'configType_' + i"
|
||||
required
|
||||
[disabled]="creatingMerchant"
|
||||
>
|
||||
<option value="" disabled>Sélectionnez un type</option>
|
||||
@for (type of configTypes; track type.name) {
|
||||
<option [value]="type.name">{{ type.label }}</option>
|
||||
}
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label class="form-label">Opérateur <span class="text-danger">*</span></label>
|
||||
<select
|
||||
class="form-select"
|
||||
[(ngModel)]="config.operatorId"
|
||||
[name]="'operatorId_' + i"
|
||||
required
|
||||
[disabled]="creatingMerchant"
|
||||
>
|
||||
<option value="" disabled>Sélectionnez un opérateur</option>
|
||||
@for (operator of operators; track operator.id) {
|
||||
<option [value]="operator.id">{{ operator.name }}</option>
|
||||
}
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<label class="form-label">Valeur <span class="text-danger">*</span></label>
|
||||
<textarea
|
||||
class="form-control"
|
||||
[(ngModel)]="config.value"
|
||||
[name]="'value_' + i"
|
||||
required
|
||||
[disabled]="creatingMerchant"
|
||||
rows="2"
|
||||
placeholder="Valeur de configuration"
|
||||
></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
|
||||
<button
|
||||
@ -426,9 +453,7 @@
|
||||
<button
|
||||
type="submit"
|
||||
class="btn btn-primary"
|
||||
[disabled]="!merchantForm.form.valid || creatingMerchant ||
|
||||
!newMerchant.technicalContacts.length ||
|
||||
!newMerchant.configs.length"
|
||||
[disabled]="!merchantForm.form.valid || creatingMerchant"
|
||||
>
|
||||
@if (creatingMerchant) {
|
||||
<div class="spinner-border spinner-border-sm me-2" role="status">
|
||||
|
||||
@ -3,9 +3,6 @@ import { HttpClient, HttpParams, HttpErrorResponse } from '@angular/common/http'
|
||||
import { environment } from '@environments/environment';
|
||||
import { Observable, map, catchError, throwError, retry, timeout } from 'rxjs';
|
||||
|
||||
// Import de vos modèles existants
|
||||
import { UserRole } from '@core/models/dcb-bo-hub-user.model';
|
||||
|
||||
import {
|
||||
Merchant,
|
||||
CreateMerchantDto,
|
||||
@ -114,19 +111,19 @@ export class MerchantConfigService {
|
||||
);
|
||||
}
|
||||
|
||||
getMerchantById(id: number): Observable<Merchant> {
|
||||
const numericId = this.convertIdToNumber(id);
|
||||
getMerchantById(userId: number): Observable<Merchant> {
|
||||
//const numericId = this.convertIdToNumber(id);
|
||||
|
||||
console.log(`📥 Loading merchant ${id}`);
|
||||
console.log(`📥 Loading merchant ${userId}`);
|
||||
|
||||
return this.http.get<ApiMerchant>(`${this.baseApiUrl}/${numericId}`).pipe(
|
||||
return this.http.get<ApiMerchant>(`${this.baseApiUrl}/${userId}`).pipe(
|
||||
timeout(this.REQUEST_TIMEOUT),
|
||||
retry(this.MAX_RETRIES),
|
||||
map(apiMerchant => {
|
||||
console.log(`✅ Merchant ${id} loaded successfully`);
|
||||
console.log(`✅ Merchant ${userId} loaded successfully`);
|
||||
return this.dataAdapter.convertApiMerchantToFrontend(apiMerchant);
|
||||
}),
|
||||
catchError(error => this.handleError('getMerchantById', error, { merchantId: id }))
|
||||
catchError(error => this.handleError('getMerchantById', error, { merchantId: userId }))
|
||||
);
|
||||
}
|
||||
|
||||
@ -181,11 +178,10 @@ export class MerchantConfigService {
|
||||
getMerchantUsers(merchantId: number): Observable<MerchantUser[]> {
|
||||
//const merchantId = this.convertIdToNumber(merchantId);
|
||||
|
||||
return this.http.get<ApiMerchant>(`${this.baseApiUrl}/${merchantId}`).pipe(
|
||||
return this.http.get<ApiMerchant>(`${this.baseApiUrl}/${merchantId}/users`).pipe(
|
||||
timeout(this.REQUEST_TIMEOUT),
|
||||
map(apiMerchant => {
|
||||
return (apiMerchant.users || []).map(user =>
|
||||
// ✅ UTILISATION DE L'ADAPTER
|
||||
this.dataAdapter.convertApiUserToFrontend(user)
|
||||
);
|
||||
}),
|
||||
@ -193,7 +189,7 @@ export class MerchantConfigService {
|
||||
);
|
||||
}
|
||||
|
||||
updateUserRole(merchantId: number, userId: number, updateRoleDto: UpdateUserRoleDto): Observable<MerchantUser> {
|
||||
updateUserRole(merchantId: number, userId: string, updateRoleDto: UpdateUserRoleDto): Observable<MerchantUser> {
|
||||
//const merchantId = this.convertIdToNumber(merchantId);
|
||||
|
||||
return this.http.patch<ApiMerchantUser>(
|
||||
@ -210,7 +206,7 @@ export class MerchantConfigService {
|
||||
);
|
||||
}
|
||||
|
||||
removeUserFromMerchant(merchantId: number, userId: number): Observable<void> {
|
||||
removeUserFromMerchant(merchantId: number, userId: string): Observable<void> {
|
||||
//const merchantId = this.convertIdToNumber(merchantId);
|
||||
|
||||
return this.http.delete<void>(`${this.baseApiUrl}/${merchantId}/users/${userId}`).pipe(
|
||||
|
||||
@ -8,6 +8,7 @@ import { catchError, finalize, map, of, Subject, takeUntil } from 'rxjs';
|
||||
import { MerchantConfigService } from './merchant-config.service';
|
||||
import { RoleManagementService } from '@core/services/hub-users-roles-management.service';
|
||||
import { AuthService } from '@core/services/auth.service';
|
||||
import { MerchantSyncService } from '../hub-users-management/merchant-sync-orchestrator.service';
|
||||
import { PageTitle } from '@app/components/page-title/page-title';
|
||||
import { MerchantConfigsList } from './merchant-config-list/merchant-config-list';
|
||||
import { MerchantConfigView } from './merchant-config-view/merchant-config-view';
|
||||
@ -23,7 +24,6 @@ import {
|
||||
TechnicalContact
|
||||
} from '@core/models/merchant-config.model';
|
||||
import { UserRole, UserType, PaginatedUserResponse, User } from '@core/models/dcb-bo-hub-user.model';
|
||||
import { HubUsersService } from '../hub-users-management/hub-users.service';
|
||||
|
||||
import { MerchantDataAdapter } from './merchant-data-adapter.service';
|
||||
|
||||
@ -47,6 +47,7 @@ export class MerchantConfigManagement implements OnInit, OnDestroy {
|
||||
private modalService = inject(NgbModal);
|
||||
private authService = inject(AuthService);
|
||||
private merchantConfigService = inject(MerchantConfigService);
|
||||
private merchantSyncService = inject(MerchantSyncService);
|
||||
private dataAdapter = inject(MerchantDataAdapter);
|
||||
protected roleService = inject(RoleManagementService);
|
||||
private cdRef = inject(ChangeDetectorRef);
|
||||
@ -70,12 +71,16 @@ export class MerchantConfigManagement implements OnInit, OnDestroy {
|
||||
// Gestion des permissions
|
||||
currentUserRole: UserRole | null = null;
|
||||
currentUserType: UserType | null = null;
|
||||
currentMerchantPartnerId: string = '';
|
||||
currentMerchantConfigId: string | undefined;
|
||||
userPermissions: any = null;
|
||||
canCreateMerchants = false;
|
||||
canDeleteMerchants = false;
|
||||
canManageMerchants = false;
|
||||
|
||||
// Déterminer le type d'utilisateur
|
||||
isMerchantUser = false;
|
||||
isHubUser = false;
|
||||
|
||||
// Formulaire de création
|
||||
newMerchant: CreateMerchantDto = this.getDefaultMerchantForm();
|
||||
|
||||
@ -123,16 +128,169 @@ export class MerchantConfigManagement implements OnInit, OnDestroy {
|
||||
merchantPartners: User[] = [];
|
||||
loadingMerchantPartners = false;
|
||||
merchantPartnersError = '';
|
||||
selectedMerchantPartnerId: string = '';
|
||||
selectedMerchantConfigId: string | undefined;
|
||||
|
||||
// Cache des marchands
|
||||
merchantProfiles: { [merchantId: number]: Merchant } = {};
|
||||
loadingMerchants: { [merchantId: number]: boolean } = {};
|
||||
|
||||
// Marchand de l'utilisateur (pour les merchant users)
|
||||
userMerchantId: number | null = null;
|
||||
userMerchant: Merchant | null = null;
|
||||
loadingUserMerchant = false;
|
||||
|
||||
// Gestion des utilisateurs du marchand (pour les merchant users)
|
||||
merchantUsers: User[] = [];
|
||||
loadingMerchantUsers = false;
|
||||
merchantUsersError = '';
|
||||
currentMerchantPartnerId: string = '';
|
||||
|
||||
ngOnInit() {
|
||||
this.activeTab = 'list';
|
||||
this.loadCurrentUserPermissions();
|
||||
this.initializeUserType();
|
||||
this.initializeMerchantPartnerContext();
|
||||
|
||||
// Déterminer l'onglet initial en fonction du type d'utilisateur
|
||||
this.setInitialTab();
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialise le type d'utilisateur
|
||||
*/
|
||||
private initializeUserType(): void {
|
||||
this.currentUserType = this.authService.getCurrentUserType();
|
||||
this.currentUserRole = this.authService.getCurrentUserRole();
|
||||
|
||||
// Déterminer si c'est un utilisateur marchand
|
||||
if (this.currentUserRole === UserRole.DCB_PARTNER ||
|
||||
this.currentUserRole === UserRole.DCB_PARTNER_ADMIN ||
|
||||
this.currentUserRole === UserRole.DCB_PARTNER_MANAGER ||
|
||||
this.currentUserRole === UserRole.DCB_PARTNER_SUPPORT ||
|
||||
this.currentUserRole === UserRole.MERCHANT_CONFIG_MANAGER ||
|
||||
this.currentUserRole === UserRole.MERCHANT_CONFIG_TECHNICAL ||
|
||||
this.currentUserRole === UserRole.MERCHANT_CONFIG_VIEWER) {
|
||||
this.isMerchantUser = true;
|
||||
} else {
|
||||
this.isHubUser = this.currentUserType === UserType.HUB;
|
||||
this.isMerchantUser = this.currentUserType === UserType.MERCHANT_PARTNER;
|
||||
}
|
||||
|
||||
console.log(`User Type: ${this.currentUserType}`);
|
||||
console.log(`User Role: ${this.currentUserRole}`);
|
||||
console.log(`Is Merchant User: ${this.isMerchantUser}`);
|
||||
console.log(`Is Hub User: ${this.isHubUser}`);
|
||||
}
|
||||
|
||||
/**
|
||||
* Définit l'onglet initial en fonction du type d'utilisateur
|
||||
*/
|
||||
private setInitialTab(): void {
|
||||
if (this.isMerchantUser) {
|
||||
// Pour un utilisateur marchand, charger directement son marchand ET les utilisateurs
|
||||
this.activeTab = 'profile'; // On change pour afficher d'abord la liste des utilisateurs
|
||||
this.loadUserMerchantAndUsers();
|
||||
} else {
|
||||
// Pour un utilisateur Hub, afficher la liste des marchands
|
||||
this.activeTab = 'list';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Charge le marchand ET les utilisateurs pour un merchant user
|
||||
*/
|
||||
private loadUserMerchantAndUsers(): void {
|
||||
if (!this.isMerchantUser || !this.currentMerchantConfigId) return;
|
||||
|
||||
// Charger le marchand de l'utilisateur
|
||||
this.loadUserMerchant();
|
||||
|
||||
// Charger les utilisateurs du marchand
|
||||
this.loadMerchantUsers();
|
||||
}
|
||||
|
||||
/**
|
||||
* Charge le marchand de l'utilisateur (pour les merchant users)
|
||||
*/
|
||||
private loadUserMerchant(): void {
|
||||
if (!this.isMerchantUser || !this.currentMerchantConfigId) return;
|
||||
|
||||
this.loadingUserMerchant = true;
|
||||
|
||||
const merchantConfigId = Number(this.currentMerchantConfigId);
|
||||
|
||||
this.merchantConfigService.getMerchantById(merchantConfigId)
|
||||
.pipe(takeUntil(this.destroy$))
|
||||
.subscribe({
|
||||
next: (merchant) => {
|
||||
if (merchant) {
|
||||
const frontendMerchant = this.convertMerchantToFrontend(merchant);
|
||||
this.userMerchantId = frontendMerchant.id!;
|
||||
this.userMerchant = frontendMerchant;
|
||||
|
||||
// Afficher automatiquement le profil du marchand
|
||||
this.showTab('profile', merchantConfigId);
|
||||
|
||||
} else {
|
||||
console.warn('No merchant found for current user');
|
||||
}
|
||||
this.loadingUserMerchant = false;
|
||||
},
|
||||
error: (error) => {
|
||||
console.error('Error loading user merchant:', error);
|
||||
this.loadingUserMerchant = false;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Charge les utilisateurs du marchand (pour les merchant users)
|
||||
*/
|
||||
private loadMerchantUsers(): void {
|
||||
if (!this.isMerchantUser || !this.currentMerchantConfigId) return;
|
||||
|
||||
this.loadingMerchantUsers = true;
|
||||
this.merchantUsersError = '';
|
||||
|
||||
this.merchantSyncService.getMerchantUsers(
|
||||
this.currentMerchantConfigId,
|
||||
this.currentMerchantPartnerId
|
||||
)
|
||||
.pipe(
|
||||
takeUntil(this.destroy$),
|
||||
catchError(error => {
|
||||
console.error('Error loading merchant users:', error);
|
||||
this.merchantUsersError = 'Erreur lors du chargement des utilisateurs';
|
||||
this.loadingMerchantUsers = false;
|
||||
return of({ users: [] });
|
||||
})
|
||||
)
|
||||
.subscribe({
|
||||
next: (response: any) => {
|
||||
// Transformer les données des utilisateurs
|
||||
this.merchantUsers = response.users.map((userData: any) => {
|
||||
const keycloakUser = userData.keycloakUser || {};
|
||||
const merchantConfigUser = userData.merchantConfigUser || {};
|
||||
|
||||
return {
|
||||
id: keycloakUser.id || merchantConfigUser.userId,
|
||||
username: keycloakUser.username,
|
||||
email: keycloakUser.email,
|
||||
firstName: keycloakUser.firstName,
|
||||
lastName: keycloakUser.lastName,
|
||||
role: keycloakUser.role || merchantConfigUser.role,
|
||||
enabled: keycloakUser.enabled,
|
||||
emailVerified: keycloakUser.emailVerified,
|
||||
merchantPartnerId: this.currentMerchantPartnerId,
|
||||
merchantConfigId: this.currentMerchantConfigId,
|
||||
createdDate: keycloakUser.createdDate || merchantConfigUser.createdDate,
|
||||
lastModifiedDate: keycloakUser.lastModifiedDate || merchantConfigUser.lastModifiedDate
|
||||
} as unknown as User;
|
||||
});
|
||||
|
||||
console.log(`Loaded ${this.merchantUsers.length} users for merchant`);
|
||||
this.loadingMerchantUsers = false;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// ==================== MÉTHODES MANQUANTES POUR LE TEMPLATE ====================
|
||||
@ -260,8 +418,15 @@ export class MerchantConfigManagement implements OnInit, OnDestroy {
|
||||
.subscribe({
|
||||
next: (user) => {
|
||||
this.currentUserRole = this.extractUserRole(user);
|
||||
this.currentMerchantPartnerId = this.extractMerchantPartnerId(user);
|
||||
this.currentUserType = this.extractUserType(user);
|
||||
|
||||
if (user?.role.includes(UserRole.DCB_PARTNER)) {
|
||||
this.currentMerchantPartnerId = user.id;
|
||||
this.currentMerchantConfigId = user.merchantConfigId;
|
||||
} else {
|
||||
|
||||
this.currentMerchantPartnerId = user?.merchantPartnerId || '';
|
||||
this.currentMerchantConfigId = this.extractMerchantConfigId(user);
|
||||
}
|
||||
|
||||
if (this.currentUserRole) {
|
||||
this.userPermissions = this.roleService.getPermissionsForRole(this.currentUserRole);
|
||||
@ -271,7 +436,7 @@ export class MerchantConfigManagement implements OnInit, OnDestroy {
|
||||
}
|
||||
|
||||
// Initialiser le contexte marchand
|
||||
this.selectedMerchantPartnerId = this.currentMerchantPartnerId;
|
||||
this.selectedMerchantConfigId = this.currentMerchantConfigId;
|
||||
},
|
||||
error: (error) => {
|
||||
console.error('Error loading user profile:', error);
|
||||
@ -284,12 +449,8 @@ export class MerchantConfigManagement implements OnInit, OnDestroy {
|
||||
return userRoles && userRoles.length > 0 ? userRoles[0] : null;
|
||||
}
|
||||
|
||||
private extractUserType(user: any): UserType | null {
|
||||
return this.authService.getCurrentUserType();
|
||||
}
|
||||
|
||||
private extractMerchantPartnerId(user: any): string {
|
||||
return user?.merchantPartnerId || this.authService.getCurrentMerchantPartnerId() || '';
|
||||
private extractMerchantConfigId(user: any): string {
|
||||
return user?.merchantConfigId || '';
|
||||
}
|
||||
|
||||
// ==================== PERMISSIONS SPÉCIFIQUES MARCHAND ====================
|
||||
@ -304,12 +465,32 @@ export class MerchantConfigManagement implements OnInit, OnDestroy {
|
||||
canModifyMerchant(merchant: Merchant): boolean {
|
||||
if (this.canManageMerchants) return true;
|
||||
|
||||
return true;
|
||||
// Pour les utilisateurs marchands, ils ne peuvent modifier que leur propre marchand
|
||||
if (this.isMerchantUser && this.userMerchantId) {
|
||||
return merchant.id === this.userMerchantId;
|
||||
}
|
||||
|
||||
// PARTNER ne peut modifier que ses propres marchands
|
||||
// Vérifier via les configs ou users
|
||||
//return merchant.configs?.some(config => config.merchantPartnerId === this.currentMerchantPartnerId) ||
|
||||
// merchant.users?.some(user => user.merchantPartnerId === this.currentMerchantPartnerId);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Vérifie si l'utilisateur peut voir la liste des marchands
|
||||
*/
|
||||
get canViewMerchantList(): boolean {
|
||||
// Les utilisateurs marchands ne voient pas la liste des marchands, mais la liste des utilisateurs
|
||||
if (this.isMerchantUser) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Les utilisateurs Hub avec les rôles appropriés peuvent voir la liste
|
||||
return this.isHubUser && (this.canManageMerchants || this.currentUserRole === UserRole.DCB_SUPPORT);
|
||||
}
|
||||
|
||||
/**
|
||||
* Vérifie si l'utilisateur peut voir la liste des utilisateurs du marchand
|
||||
*/
|
||||
get canViewMerchantUsers(): boolean {
|
||||
return this.isMerchantUser && !!this.currentMerchantConfigId;
|
||||
}
|
||||
|
||||
// ==================== GESTION DES MARCHANDS ====================
|
||||
@ -317,14 +498,12 @@ export class MerchantConfigManagement implements OnInit, OnDestroy {
|
||||
private initializeMerchantPartnerContext(): void {
|
||||
if ((this.currentUserRole === UserRole.DCB_PARTNER ||
|
||||
this.currentUserRole === UserRole.DCB_PARTNER_ADMIN) &&
|
||||
this.currentMerchantPartnerId) {
|
||||
this.selectedMerchantPartnerId = this.currentMerchantPartnerId;
|
||||
this.currentMerchantConfigId) {
|
||||
this.selectedMerchantConfigId = this.currentMerchantConfigId;
|
||||
}
|
||||
}
|
||||
|
||||
onMerchantSelectionChange(selectedMerchantId: number): void {
|
||||
//this.selectedMerchantPartnerId = selectedMerchantId;
|
||||
|
||||
// Recharger les marchands pour le partenaire sélectionné
|
||||
if (this.merchantConfigsList) {
|
||||
this.merchantConfigsList.refreshData();
|
||||
@ -335,20 +514,58 @@ export class MerchantConfigManagement implements OnInit, OnDestroy {
|
||||
|
||||
showTab(tab: 'list' | 'profile', merchantId?: number): void {
|
||||
console.log(`Switching to tab: ${tab}`, merchantId ? `for merchant ${merchantId}` : '');
|
||||
|
||||
// Pour tous les utilisateurs, permettre de basculer entre les onglets
|
||||
this.activeTab = tab;
|
||||
|
||||
if (merchantId) {
|
||||
this.selectedMerchantId = merchantId;
|
||||
if (tab === 'profile') {
|
||||
// Déterminer l'ID du marchand à afficher
|
||||
if (this.isMerchantUser) {
|
||||
// Pour les merchant users, toujours utiliser leur propre marchand
|
||||
this.selectedMerchantId = this.userMerchantId || null;
|
||||
} else {
|
||||
// Pour les Hub users, utiliser l'ID fourni ou null
|
||||
this.selectedMerchantId = merchantId || null;
|
||||
}
|
||||
|
||||
// Charger le profil si pas déjà chargé
|
||||
if (!this.merchantProfiles[merchantId]) {
|
||||
this.loadMerchantProfile(merchantId);
|
||||
// Charger le profil si pas déjà chargé et si un ID est disponible
|
||||
if (this.selectedMerchantId && !this.merchantProfiles[this.selectedMerchantId]) {
|
||||
this.loadMerchantProfile(this.selectedMerchantId);
|
||||
}
|
||||
} else {
|
||||
// Pour l'onglet 'list', pas besoin d'ID de marchand sélectionné
|
||||
this.selectedMerchantId = null;
|
||||
|
||||
// Si c'est un merchant user et qu'on va sur l'onglet liste, recharger les utilisateurs
|
||||
if (this.isMerchantUser) {
|
||||
this.refreshMerchantUsers();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Vérifie si l'utilisateur peut créer des utilisateurs dans son marchand
|
||||
*/
|
||||
get canCreateMerchantUsers(): boolean {
|
||||
if (!this.isMerchantUser) return false;
|
||||
|
||||
// Seuls certains rôles marchands peuvent créer des utilisateurs
|
||||
return this.currentUserRole === UserRole.DCB_PARTNER ||
|
||||
this.currentUserRole === UserRole.DCB_PARTNER_ADMIN;
|
||||
}
|
||||
|
||||
/**
|
||||
* Vérifie si l'utilisateur peut éditer son marchand
|
||||
*/
|
||||
get canEditMerchant(): boolean {
|
||||
if (this.isMerchantUser) {
|
||||
// Les merchant users peuvent éditer leur propre marchand
|
||||
return this.canModifyMerchant(this.userMerchant || { id: this.userMerchantId } as Merchant);
|
||||
}
|
||||
return this.canManageMerchants;
|
||||
}
|
||||
|
||||
private loadMerchantProfile(merchantId: number): void {
|
||||
if (this.loadingMerchants[merchantId]) return;
|
||||
|
||||
@ -370,10 +587,11 @@ export class MerchantConfigManagement implements OnInit, OnDestroy {
|
||||
|
||||
backToList(): void {
|
||||
console.log('🔙 Returning to list view');
|
||||
this.activeTab = 'list';
|
||||
this.selectedMerchantId = null;
|
||||
this.showTab('list');
|
||||
}
|
||||
|
||||
|
||||
|
||||
// ==================== ÉVÉNEMENTS DES COMPOSANTS ENFANTS ====================
|
||||
|
||||
onMerchantSelected(merchantId: number): void {
|
||||
@ -556,6 +774,11 @@ export class MerchantConfigManagement implements OnInit, OnDestroy {
|
||||
this.merchantProfiles[this.selectedMerchantId] = frontendMerchant;
|
||||
}
|
||||
|
||||
// Mettre à jour le marchand de l'utilisateur si nécessaire
|
||||
if (this.isMerchantUser && this.userMerchantId === merchantId) {
|
||||
this.userMerchant = frontendMerchant;
|
||||
}
|
||||
|
||||
this.successMessage = 'Marchand modifié avec succès';
|
||||
|
||||
this.cdRef.detectChanges();
|
||||
@ -663,6 +886,12 @@ export class MerchantConfigManagement implements OnInit, OnDestroy {
|
||||
this.backToList();
|
||||
}
|
||||
|
||||
// Si l'utilisateur marchand supprime son propre marchand
|
||||
if (this.isMerchantUser && this.userMerchantId === merchantId) {
|
||||
this.userMerchant = null;
|
||||
this.userMerchantId = null;
|
||||
}
|
||||
|
||||
this.cdRef.detectChanges();
|
||||
},
|
||||
error: (error) => {
|
||||
@ -730,6 +959,15 @@ export class MerchantConfigManagement implements OnInit, OnDestroy {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Rafraîchit la liste des utilisateurs du marchand
|
||||
*/
|
||||
refreshMerchantUsers(): void {
|
||||
if (this.isMerchantUser) {
|
||||
this.loadMerchantUsers();
|
||||
}
|
||||
}
|
||||
|
||||
// ==================== GESTION DES ERREURS ====================
|
||||
|
||||
private getCreateErrorMessage(error: any): string {
|
||||
@ -798,27 +1036,60 @@ export class MerchantConfigManagement implements OnInit, OnDestroy {
|
||||
// Propriété pour le message de succès
|
||||
successMessage: string = '';
|
||||
|
||||
// ==================== GETTERS TEMPLATE ====================
|
||||
// ==================== GETTERS TEMPLATE ====================
|
||||
|
||||
get currentMerchantProfile(): Merchant | null {
|
||||
return this.selectedMerchantId ? this.merchantProfiles[this.selectedMerchantId] : null;
|
||||
get showListTab(): boolean {
|
||||
// Pour les merchant users, toujours montrer l'onglet liste (pour les utilisateurs)
|
||||
// Pour les Hub users, montrer la liste si autorisé
|
||||
if (this.isMerchantUser) {
|
||||
return true;
|
||||
}
|
||||
return this.canViewMerchantList;
|
||||
}
|
||||
|
||||
get isLoadingMerchant(): boolean {
|
||||
return this.selectedMerchantId ? this.loadingMerchants[this.selectedMerchantId] : false;
|
||||
get showProfileTab(): boolean {
|
||||
// Pour les merchant users, toujours montrer l'onglet profile (pour leur marchand)
|
||||
// Pour les Hub users, montrer l'onglet profile si un marchand est sélectionné
|
||||
if (this.isMerchantUser) {
|
||||
return !!this.userMerchantId; // Montrer seulement si le marchand est chargé
|
||||
}
|
||||
return !!this.selectedMerchantId;
|
||||
}
|
||||
|
||||
get showMerchantPartnerField(): boolean {
|
||||
return this.canManageMerchants;
|
||||
get pageTitleForUser(): string {
|
||||
if (this.isMerchantUser) {
|
||||
return this.activeTab === 'list' ? 'Utilisateurs du Marchand' : 'Mon Marchand';
|
||||
}
|
||||
return this.pageTitle;
|
||||
}
|
||||
|
||||
get requireMerchantPartnerSelection(): boolean {
|
||||
return this.canManageMerchants;
|
||||
get pageSubtitleForUser(): string {
|
||||
if (this.isMerchantUser) {
|
||||
return this.activeTab === 'list'
|
||||
? 'Gérez les utilisateurs de votre marchand'
|
||||
: 'Gérez la configuration technique de votre marchand';
|
||||
}
|
||||
return this.pageSubtitle;
|
||||
}
|
||||
|
||||
get isPartnerUser(): boolean {
|
||||
return this.currentUserRole === UserRole.DCB_PARTNER ||
|
||||
this.currentUserRole === UserRole.DCB_PARTNER_ADMIN;
|
||||
get badgeForUser(): any {
|
||||
if (this.isMerchantUser) {
|
||||
return this.activeTab === 'list'
|
||||
? { icon: 'lucideUsers', text: 'Users' }
|
||||
: { icon: 'lucideStore', text: 'My Merchant' };
|
||||
}
|
||||
return this.badge;
|
||||
}
|
||||
|
||||
/**
|
||||
* Détermine ce qui doit être affiché dans la liste
|
||||
*/
|
||||
get shouldDisplayMerchantUsers(): boolean {
|
||||
return this.isMerchantUser && this.activeTab === 'list';
|
||||
}
|
||||
|
||||
get shouldDisplayMerchantList(): boolean {
|
||||
return !this.isMerchantUser && this.activeTab === 'list';
|
||||
}
|
||||
|
||||
ngOnDestroy(): void {
|
||||
|
||||
@ -186,30 +186,33 @@ export class MerchantDataAdapter {
|
||||
errors.push('Le téléphone est requis');
|
||||
}
|
||||
|
||||
if (!dto.technicalContacts || dto.technicalContacts.length === 0) {
|
||||
errors.push('Au moins un contact technique est requis');
|
||||
} else {
|
||||
if (dto.technicalContacts && dto.technicalContacts.length > 0) {
|
||||
|
||||
dto.technicalContacts.forEach((contact, index) => {
|
||||
|
||||
if (!contact.firstName?.trim()) {
|
||||
errors.push(`Le prénom du contact ${index + 1} est requis`);
|
||||
}
|
||||
|
||||
if (!contact.lastName?.trim()) {
|
||||
errors.push(`Le nom du contact ${index + 1} est requis`);
|
||||
}
|
||||
|
||||
if (!contact.phone?.trim()) {
|
||||
errors.push(`Le téléphone du contact ${index + 1} est requis`);
|
||||
}
|
||||
|
||||
if (!contact.email?.trim()) {
|
||||
errors.push(`L'email du contact ${index + 1} est requis`);
|
||||
} else if (!this.isValidEmail(contact.email)) {
|
||||
errors.push(`L'email du contact ${index + 1} est invalide`);
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
if (!dto.configs || dto.configs.length === 0) {
|
||||
errors.push('Au moins une configuration est requise');
|
||||
} else {
|
||||
if (dto.configs && dto.configs.length > 0) {
|
||||
|
||||
dto.configs.forEach((config, index) => {
|
||||
if (!config.name?.trim()) {
|
||||
errors.push(`Le type de configuration ${index + 1} est requis`);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { MerchantSyncCrudService } from '../hub-users-management/merchant-sync-orchestrator.service';
|
||||
import { MerchantSyncService } from '../hub-users-management/merchant-sync-orchestrator.service';
|
||||
import { UserRole } from '@core/models/dcb-bo-hub-user.model';
|
||||
import { firstValueFrom } from 'rxjs';
|
||||
|
||||
@ -16,7 +16,7 @@ export class Support implements OnInit {
|
||||
testMerchantConfigUserId:''
|
||||
};
|
||||
|
||||
constructor(private merchantCrudService: MerchantSyncCrudService) {}
|
||||
constructor(private merchantCrudService: MerchantSyncService) {}
|
||||
|
||||
ngOnInit() {
|
||||
console.log('🚀 Support Component - Tests CRUD Merchants');
|
||||
@ -276,7 +276,7 @@ export class Support implements OnInit {
|
||||
const userUpdateResult = await firstValueFrom(
|
||||
this.merchantCrudService.updateMerchantUser(
|
||||
this.testData.testUserId,
|
||||
Number(this.testData.testMerchantConfigUserId),
|
||||
this.testData.testMerchantConfigUserId,
|
||||
this.testData.merchantConfigId,
|
||||
{
|
||||
keycloak: {
|
||||
@ -393,7 +393,7 @@ export class Support implements OnInit {
|
||||
const deleteUserResult = await firstValueFrom(
|
||||
this.merchantCrudService.deleteMerchantUser(
|
||||
this.testData.testUserId,
|
||||
Number(this.testData.testMerchantConfigUserId),
|
||||
this.testData.testMerchantConfigUserId,
|
||||
this.testData.merchantConfigId
|
||||
)
|
||||
);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user