fix(back): add currentSupervisor decorator

Author: hbalty

packages/backend/src/auth/decorators/current-supervisor.decorator.ts

@@ -0,0 +1,9 @@
+import { createParamDecorator, ExecutionContext } from "@nestjs/common";
+import { UserSupervisorAuthenticated } from "../../_common/model/users/user-supervisor";
+
+export const CurrentSupervisor = createParamDecorator(
+  (_data: unknown, ctx: ExecutionContext) => {
+    const request = ctx.switchToHttp().getRequest();
+    return request.user as UserSupervisorAuthenticated;
+  }
+);

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

@@ -15,7 +15,6 @@ import { ApiBearerAuth, ApiTags } from "@nestjs/swagger";
 import {
   AllowUserProfiles,
   AllowUserSupervisorRoles,
-  CurrentUser,
 } from "../../../../auth/decorators";
 import { AppUserGuard } from "../../../../auth/guards";
 import { structureRepository } from "../../../../database";
@@ -30,6 +29,7 @@ import { cleanPath } from "../../../../util";
 import { STRUCTURE_LIGHT_ATTRIBUTES } from "../../constants/STRUCTURE_LIGHT_ATTRIBUTES.const";
 import { deleteStructureEmailSender } from "../../../mails/services/templates-renderers";
 import { UserAdminAuthenticated } from "../../../../_common/model";
+import { CurrentSupervisor } from "../../../../auth/decorators/current-supervisor.decorator";
 
 @UseGuards(AuthGuard("jwt"), AppUserGuard)
 @Controller("admin/structures-delete")
@@ -52,7 +52,7 @@ export class AdminStructuresDeleteController {
 
     if (structure) {
       return deleteStructureEmailSender.sendMail({ structure }).then(
-        async () => {
+        () => {
           return res.status(HttpStatus.OK).json({ message: "OK" });
         },
         () => {
@@ -99,7 +99,7 @@ export class AdminStructuresDeleteController {
   @AllowUserSupervisorRoles("super-admin-domifa")
   @Delete("confirm-delete-structure")
   public async deleteStructureConfirm(
-    @CurrentUser() user: UserAdminAuthenticated,
+    @CurrentSupervisor() user: UserAdminAuthenticated,
     @Res() res: ExpressResponse,
     @Body() structureConfirmationDto: StructureConfirmationDto
   ) {

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

@@ -11,12 +11,8 @@ import { SmsModule } from "../../../sms/sms.module";
 
 describe("Dashboard AdminStructuresController", () => {
   let controller: AdminStructuresController;
-  let appLogService: AppLogsService;
   let context: AppTestContext;
   beforeAll(async () => {
-    appLogService = {
-      create: jest.fn(),
-    };
     context = await AppTestHelper.bootstrapTestApp({
       controllers: [AdminStructuresController],
       imports: [
@@ -26,13 +22,7 @@ describe("Dashboard AdminStructuresController", () => {
         forwardRef(() => InteractionsModule),
         forwardRef(() => SmsModule),
       ],
-      providers: [
-        AdminStructuresService,
-        {
-          provide: AppLogsService,
-          useValue: appLogService,
-        },
-      ],
+      providers: [AdminStructuresService, AppLogsService],
     });
     controller = context.module.get<AdminStructuresController>(
       AdminStructuresController

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

@@ -16,7 +16,6 @@ import {
   AllowUserProfiles,
   AllowUserSupervisorRoles,
   CurrentStructure,
-  CurrentUser,
 } from "../../../../auth/decorators";
 import { AppUserGuard, StructureAccessGuard } from "../../../../auth/guards";
 import {
@@ -39,6 +38,7 @@ import { userAccountActivatedEmailSender } from "../../../mails/services/templat
 import { structureCreatorService } from "../../../structures/services";
 import { format } from "date-fns";
 import { getBackoffTime } from "../../../users/services";
+import { CurrentSupervisor } from "../../../../auth/decorators/current-supervisor.decorator";
 
 @UseGuards(AuthGuard("jwt"), AppUserGuard)
 @Controller("admin/structures")
@@ -54,7 +54,7 @@ export class AdminStructuresController {
 
   @Get("export")
   public async export(
-    @CurrentUser() user: UserAdminAuthenticated,
+    @CurrentSupervisor() user: UserAdminAuthenticated,
     @Res() response: ExpressResponse
   ) {
     await this.appLogsService.create({
@@ -90,7 +90,7 @@ export class AdminStructuresController {
   @Get("structure/:structureId")
   @UseGuards(StructureAccessGuard)
   public async getStructure(
-    @CurrentUser() _user: UserAdminAuthenticated,
+    @CurrentSupervisor() _user: UserAdminAuthenticated,
     @CurrentStructure() structure: Structure,
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     @Param("structureId") _structureId: number
@@ -103,7 +103,7 @@ export class AdminStructuresController {
   @Get("structure/:structureId/users")
   @UseGuards(StructureAccessGuard)
   public async getUsers(
-    @CurrentUser() _user: UserAdminAuthenticated,
+    @CurrentSupervisor() _user: UserAdminAuthenticated,
     @CurrentStructure() structure: Structure,
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     @Param("structureId", new ParseIntPipe()) _structureId: number
@@ -141,7 +141,7 @@ export class AdminStructuresController {
 
   @Post("confirm-structure-creation")
   public async confirmStructureCreation(
-    @CurrentUser() _user: UserAdminAuthenticated,
+    @CurrentSupervisor() _user: UserAdminAuthenticated,
     @Body() structureConfirmationDto: StructureConfirmationDto,
     @Res() res: ExpressResponse
   ): Promise<ExpressResponse> {

packages/backend/src/modules/users/controllers/users-supervisor.controller.ts

@@ -104,7 +104,6 @@ export class UsersSupervisorController {
         });
     } catch (err) {
       appLogger.error("Cannot reset password");
-      throw err;
     }
 
     return res.status(HttpStatus.OK).json({ message: "OK" });

packages/backend/src/modules/users/services/userSecurityResetPasswordInitiator.service.ts

@@ -1,6 +1,6 @@
 import { addDays } from "date-fns";
 
-import { CommonUser, UserStructure } from "@domifa/common";
+import { CommonUser } from "@domifa/common";
 import {
   UserProfile,
   UserSecurity,
@@ -50,7 +50,7 @@ async function generateResetPasswordToken({
   const repository = getUserRepository(userProfile);
   const securityRepository = getUserSecurityRepository(userProfile);
 
-  const user: Pick<UserStructure, "id" | "nom" | "prenom" | "email"> =
+  const user: Pick<CommonUser, "id" | "nom" | "prenom" | "email"> =
     await repository.findOneByOrFail({
       email,
     });