feat(admin): ajout d'un toast pour confirmer le bon déroulement de l'elevation de droit

Author: hbalty

packages/backend/src/_common/mocks/USER_STRUCTURE_AUTHENTIFICATED.mock.ts

@@ -7,7 +7,7 @@ export const USER_STRUCTURE_AUTH: UserStructureAuthenticated = {
   nom: "Admin",
   prenom: "Test",
   email: "admin@test.com",
-  role: "admin",
+  role: "simple",
   structureId: 1,
   verified: true,
   createdAt: new Date(),

packages/backend/src/modules/portail-admin/controllers/admin-users/admin-users.controller.ts

@@ -79,6 +79,8 @@ export class AdminUsersController {
         uuid,
       });
 
+      if (user.role === "admin") throw new Error("User is already and admin");
+
       await userStructureRepository.update(
         {
           uuid: userToElevate.uuid,

packages/portail-admins/src/app/modules/structure/components/users/users.component.html

@@ -138,14 +138,16 @@ <h2>Utilisateurs enregistrés: {{ users.length }} utilisateurs</h2>
           >
           <button
             class="btn btn-outline-primary m-1"
-            (click)="openConfirmationModdal(user)"
+            (click)="
+              openConfirmationModal(user, MODAL_ACTION.REINIT_USER_PASSWORD)
+            "
             type="button"
           >
             Réinitialiser mot de passe
           </button>
           <button
             *ngIf="user.role !== 'admin'"
-            (click)="doElevateRole(user)"
+            (click)="openConfirmationModal(user, MODAL_ACTION.PROMOTE_USER)"
             class="btn btn-outline-primary mr-2"
             type="button"
           >
@@ -173,9 +175,9 @@ <h4 class="modal-title">Confirmation</h4>
     </div>
     <div class="modal-body">
       <p>
-        Êtes-vous sûr de vouloir réinitialiser le mot de passe de l'utilisateur:
+        Êtes-vous sûr de vouloir {{ confirmModalContext.actionText }}:
         <span class="fw-bold">
-          {{ userForPasswordReinit.email }}
+          {{ userForConfirmModal.email }}
         </span>
         ?
       </p>
@@ -184,14 +186,14 @@ <h4 class="modal-title">Confirmation</h4>
       <button
         type="button"
         class="btn btn-lg btn-outline-dark"
-        (click)="modal.dismiss()"
+        (click)="confirmModalContext = null; modal.dismiss()"
       >
         Annuler
       </button>
       <button
         type="button"
         class="btn btn-primary"
-        (click)="doResetPassword(userForPasswordReinit.email)"
+        (click)="confirmModalContext.action(userForConfirmModal)"
       >
         Confirmer
       </button>

packages/portail-admins/src/app/modules/structure/components/users/users.component.spec.ts

@@ -8,6 +8,7 @@ import { TableHeadSortComponent } from "../../../shared/components/table-head-so
 import { SortArrayPipe } from "../../../shared/pipes/sort-array.pipe";
 import { StructureService } from "../../services/structure.service";
 import { STRUCTURE_MOCK } from "../../../../mocks/STRUCTURE_MOCK.mock";
+import { CustomToastService } from "../../../shared/services";
 
 describe("UsersComponent", () => {
   let component: UsersComponent;
@@ -23,7 +24,7 @@ describe("UsersComponent", () => {
         HttpClientTestingModule,
         RouterModule.forRoot([]),
       ],
-      providers: [StructureService],
+      providers: [StructureService, CustomToastService],
     }).compileComponents();
 
     fixture = TestBed.createComponent(UsersComponent);

packages/portail-admins/src/app/modules/structure/components/users/users.component.ts

@@ -22,6 +22,17 @@ import { environment } from "../../../../../environments/environment";
 import { subMonths } from "date-fns";
 import { NgbModal, NgbModalRef } from "@ng-bootstrap/ng-bootstrap";
 import { faPersonArrowUpFromLine } from "@fortawesome/free-solid-svg-icons";
+import { CustomToastService } from "../../../shared/services";
+
+export enum MODAL_ACTION {
+  PROMOTE_USER = "PROMOTE_USER",
+  REINIT_USER_PASSWORD = "REINIT_USER_PASSWORD",
+}
+
+export interface ConfirmModalContext {
+  actionText: string;
+  action: (user: UserStructureWithSecurity) => void;
+}
 
 @Component({
   selector: "app-users",
@@ -37,6 +48,7 @@ export class UsersComponent implements OnInit, OnDestroy {
   public readonly frontendUrl = environment.frontendUrl;
   public readonly USER_FONCTION = UserFonction;
   public readonly _USER_FONCTION_LABELS = USER_FONCTION_LABELS;
+  public readonly MODAL_ACTION = MODAL_ACTION;
   public readonly personArrowUp = faPersonArrowUpFromLine;
   public readonly USER_ROLES_LABELS: { [key in UserStructureRole]: string } = {
     admin: "Administrateur",
@@ -48,12 +60,14 @@ export class UsersComponent implements OnInit, OnDestroy {
   private subscription = new Subscription();
   public searching = true;
   @ViewChild("confirmPasswordReinit", { static: true })
-  public confirmPasswordReinit!: TemplateRef<NgbModalRef>;
+  public confirmModal!: TemplateRef<NgbModalRef>;
+  public confirmModalContext?: ConfirmModalContext;
 
-  public userForPasswordReinit?: UserStructureWithSecurity;
+  public userForConfirmModal?: UserStructureWithSecurity;
   constructor(
     private readonly structureService: StructureService,
-    private readonly modalService: NgbModal
+    private readonly modalService: NgbModal,
+    private readonly toastService: CustomToastService
   ) {}
 
   ngOnInit(): void {
@@ -80,20 +94,44 @@ export class UsersComponent implements OnInit, OnDestroy {
     );
   }
 
-  public openConfirmationModdal(user: UserStructureWithSecurity): void {
-    this.userForPasswordReinit = user;
-    this.modalService.open(this.confirmPasswordReinit, {
+  public openConfirmationModal(
+    user: UserStructureWithSecurity,
+    modalAction: MODAL_ACTION
+  ): void {
+    this.setConfirmModalContext(user, modalAction);
+    this.userForConfirmModal = user;
+    this.modalService.open(this.confirmModal, {
       size: "s",
       centered: true,
     });
   }
 
-  public doResetPassword(email: string): void {
-    if (!email) return;
+  public setConfirmModalContext(
+    user: UserStructureWithSecurity,
+    modalAction: MODAL_ACTION
+  ) {
+    const isPromoteUser = modalAction === MODAL_ACTION.PROMOTE_USER;
+    this.confirmModalContext = {
+      actionText: isPromoteUser
+        ? "transmettre les droits administrateur à"
+        : `réinitialiser le mot de passe de l'utilisateur`,
+      action: isPromoteUser
+        ? () => this.doElevateRole(user)
+        : () => this.doResetPassword(user),
+    };
+  }
+
+  public doResetPassword(user: UserStructureWithSecurity): void {
+    if (!user) return;
     this.subscription.add(
-      this.structureService
-        .resetStructureAdminPassword(email)
-        .subscribe(() => this.reloadUsersSubject$.next())
+      this.structureService.resetStructureAdminPassword(user.email).subscribe({
+        next: () => {
+          this.reloadUsersSubject$.next();
+          this.toastService.success(
+            "Le lien de réinitialisation de mot de passe admin a été généré avec succès "
+          );
+        },
+      })
     );
 
     this.modalService.dismissAll();
@@ -104,9 +142,16 @@ export class UsersComponent implements OnInit, OnDestroy {
       this.structureService.elevateUserRole(user.uuid).subscribe({
         next: () => {
           this.reloadUsersSubject$.next();
+          this.toastService.success(
+            "L'utilisateur a été promu au rôle admin avec succès"
+          );
+        },
+        error: () => {
+          this.toastService.error("Une erreur serveur est survenue");
         },
       })
     );
+    this.modalService.dismissAll();
   }
 
   ngOnDestroy(): void {

packages/portail-admins/src/app/modules/structure/services/structure.service.ts

@@ -38,13 +38,13 @@ export class StructureService {
 
   public resetStructureAdminPassword(email: string): Observable<void> {
     return this.http.post<void>(`${RESET_PASSWORD_URL}`, {
-      email
+      email,
     });
   }
 
-    public elevateUserRole(uuid: string): Observable<void> {
+  public elevateUserRole(uuid: string): Observable<void> {
     return this.http.patch<void>(`${USER_ADMIN_BASE_URL}/elevate-user-role`, {
-      uuid
+      uuid,
     });
   }