Merge pull request #44 from WildCodeSchool/US18-dette_technique-autorisation-codegen

Us18 dette technique autorisation codegen

Author: clement4444

backend/src/resolvers/GroupResolver.ts

@@ -95,6 +95,7 @@ export default class GroupResolver {
     return messages || [];
   }
 
+  @UseMiddleware(RoleMiddleware())
   @Mutation(() => Group)
   async createGroup(@Arg("data") data: CreateGroupInput, @Ctx() ctx: ContextType) {
     //TO DO: vérifier les inputs et les nettoyer

backend/src/resolvers/GroupWishlistResolver.ts

@@ -1,10 +1,11 @@
-import { Arg, Ctx, Field, Int, Mutation, ObjectType, Query, Resolver } from "type-graphql";
+import { Arg, Ctx, Field, Int, Mutation, ObjectType, Query, Resolver, UseMiddleware } from "type-graphql";
 import { Gift } from "../entities/Gift";
 import Group from "../entities/Group";
 import { GroupMember } from "../entities/GroupMember";
 
 // biome-ignore lint/style/useImportType: bypass biome linting
 import { AddGiftInput } from "../inputs/AddGiftInput";
+import { RoleMiddleware } from "../middleware/RoleMiddleware";
 import type { ContextType } from "../types/context";
 import { getOrCreateUserWishlist } from "../utils/getOrCreateUserWishlist";
 
@@ -18,6 +19,7 @@ class GroupWishlistItems {
 }
 
 @Resolver()
+@UseMiddleware(RoleMiddleware())
 export default class GroupWishlistResolver {
   @Query(() => GroupWishlistItems)
   async groupWishlistItems(
@@ -105,6 +107,7 @@ export default class GroupWishlistResolver {
   }
 
   @Mutation(() => Gift)
+  @UseMiddleware(RoleMiddleware())
   async addGiftToGroupList(
     @Arg("groupId", () => Int) groupId: number,
     @Arg("data") data: AddGiftInput,

backend/src/resolvers/MyWishlistResolver.ts

@@ -1,17 +1,19 @@
-import { Arg, Ctx, Int, Mutation, Query, Resolver } from "type-graphql";
+import { Arg, Ctx, Int, Mutation, Query, Resolver, UseMiddleware } from "type-graphql";
 import { Gift } from "../entities/Gift";
 import List from "../entities/List";
 import User from "../entities/User";
 // biome-ignore lint/style/useImportType: bypass biome linting
 import { AddGiftInput } from "../inputs/AddGiftInput";
 // biome-ignore lint/style/useImportType: bypass biome linting
 import { UpdateGiftInput } from "../inputs/UpdateGiftInput";
+import { RoleMiddleware } from "../middleware/RoleMiddleware";
 import type { ContextType } from "../types/context";
 import { getOrCreateUserWishlist } from "../utils/getOrCreateUserWishlist";
 
 @Resolver()
 export default class MyWishlistResolver {
   @Query(() => [Gift])
+  @UseMiddleware(RoleMiddleware())
   async myWishlistItems(@Ctx() ctx: ContextType): Promise<Gift[]> {
     if (!ctx.user) throw new Error("Utilisateur non connecté");
 
@@ -25,6 +27,7 @@ export default class MyWishlistResolver {
   }
 
   @Mutation(() => Gift)
+  @UseMiddleware(RoleMiddleware())
   async addGift(@Arg("data") data: AddGiftInput, @Ctx() ctx: ContextType): Promise<Gift> {
     if (!ctx.user) throw new Error("Utilisateur non connecté");
 
@@ -60,6 +63,7 @@ export default class MyWishlistResolver {
   }
 
   @Mutation(() => Gift)
+  @UseMiddleware(RoleMiddleware())
   async updateGift(
     @Arg("id", () => Int) id: number,
     @Arg("data") data: UpdateGiftInput,
@@ -81,6 +85,7 @@ export default class MyWishlistResolver {
     return gift;
   }
 
+  @UseMiddleware(RoleMiddleware())
   @Mutation(() => Int)
   async deleteGift(@Arg("id", () => Int) id: number, @Ctx() ctx: ContextType): Promise<number> {
     if (!ctx.user) throw new Error("Utilisateur non connecté");

backend/src/resolvers/UserResolver.ts

@@ -98,6 +98,7 @@ export default class UserResolver {
   }
 
   @Query(() => User)
+  @UseMiddleware(RoleMiddleware())
   async getMyProfile(@Ctx() ctx: ContextType) {
     if (!ctx.user) throw new Error("Utilisateur non connecté");
     const user = await User.findOne({
@@ -121,7 +122,7 @@ export default class UserResolver {
 
   @Query(() => [User])
   @UseMiddleware(RoleMiddleware(true))
-  async getAllUsersForAdmin(@Ctx() _ctx: ContextType) {
+  async getAllUsersForAdmin() {
     // Récupérer tous les utilisateurs (y compris les bannis, mais pas les supprimés)
     const allUsers = await User.find({
       where: { deletedAt: IsNull() },
@@ -227,6 +228,7 @@ export default class UserResolver {
   }
 
   @Mutation(() => Boolean)
+  @UseMiddleware(RoleMiddleware())
   async logout(@Ctx() ctx: ContextType) {
     // set le cookie vide pour déconnecter l'utilisateur
     cookieManager.delCookie(ctx, "token", { secure: false });
@@ -236,6 +238,7 @@ export default class UserResolver {
   }
 
   @Mutation(() => User)
+  @UseMiddleware(RoleMiddleware())
   async UpdateMyProfile(@Arg("data") data: UpdateMyProfileInput, @Ctx() ctx: ContextType) {
     if (!ctx.user) throw new Error("Utilisateur non connecté update impossible");
 
@@ -251,7 +254,7 @@ export default class UserResolver {
     }
 
     // hash le mot de passe
-    const password_hashed = await argon2.hash(data.password);
+    const password_hashed = data.password ? await argon2.hash(data.password) : undefined;
     const newData = {
       ...data,
       password_hashed,
@@ -419,6 +422,7 @@ export default class UserResolver {
   }
 
   @Mutation(() => DeleteUserResponse)
+  @UseMiddleware(RoleMiddleware())
   async deleteMyProfile(@Ctx() ctx: ContextType): Promise<DeleteUserResponse> {
     // Vérifier que l'utilisateur est connecté
     if (!ctx.user) {

compose.dev.yaml

@@ -5,6 +5,7 @@ services:
     build: ./frontend
     volumes:
       - ./frontend/src/:/app/src/
+      - ./frontend/public/:/app/public/
     healthcheck:
       test: [ "CMD-SHELL", "curl --fail --request GET --url 'http://localhost:${FRONTEND_PORT}' || exit 1" ]
       interval: 10s

frontend/codegen.ts

@@ -2,10 +2,10 @@ import type { CodegenConfig } from "@graphql-codegen/cli";
 
 const config: CodegenConfig = {
   schema: "http://backend:3310/graphql",
-  documents: ["src/graphql/operations.ts"],
+  documents: ["src/graphql/operations/**/*.ts"],
   overwrite: true,
   generates: {
-    "src/generated/graphql-types.ts": {
+    "src/graphql/generated/graphql-types.ts": {
       plugins: [
         "typescript",
         "typescript-operations",

frontend/public/images/gift-not-find.png

@@ -1,7 +1,7 @@
 import { useEffect } from "react";
 import { Navigate, Outlet, Route, Routes, useNavigate } from "react-router";
 import AdminRoute from "./components/AdminRoute";
-import { useGetMyProfileQuery } from "./generated/graphql-types";
+import { useGetMyProfileQuery } from "./graphql/generated/graphql-types";
 import AdminPage from "./pages/AdminPage";
 import ContactPage from "./pages/ContactPage";
 import Conversations from "./pages/Conversations";

frontend/src/App.tsx

@@ -1,7 +1,12 @@
 // src/components/Wishlist.tsx
 import { useMutation, useQuery } from "@apollo/client";
 import { useState } from "react";
-import { ADD_GIFT, DELETE_GIFT, MY_WISHLIST_ITEMS, UPDATE_GIFT } from "../graphql/operations";
+import {
+  ADD_GIFT,
+  DELETE_GIFT,
+  MY_WISHLIST_ITEMS,
+  UPDATE_GIFT,
+} from "../graphql/operations/wishlistOperations";
 import type { Gift } from "../types/Gift";
 import { useMyProfileStore } from "../zustand/myProfileStore";
 import Button from "./utils/Button";

frontend/src/components/Wishlist.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import { useNavigate } from "react-router";
-import { useLoginMutation } from "../../generated/graphql-types";
+import { useLoginMutation } from "../../graphql/generated/graphql-types";
 import consoleErrorDev from "../../hooks/erreurMod";
 import { useMyProfileStore } from "../../zustand/myProfileStore";
 import Button from "../utils/Button";