merged dev, resolved conflicts

Author: wktatschl

.env.sample

@@ -18,7 +18,7 @@ INTERNAL_SECRET_KEY=cle_code_secret_interne
 FRONTEND_PORT=NUMERO_DE_PORT_DU_FRONTEND
 SERVEUR_URL=http://localhost:GATEWAY_PORT/api || https://URL_DU_SERVEUR/api
 SERVEUR_URL_DOCKER=http://backend:SERVEUR_PORT_DOCKER/graphql || https://URL_DU_SERVEUR/graphql
-SERVICE_MESSAGE_URL=http://localhost:3000/service/message
+SERVICE_MESSAGE_URL=http://localhost:3000
 
 # variable gateway
 GATEWAY_PORT=NUMERO_DE_PORT_DU_GATEWAY

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
@@ -15,7 +16,7 @@ services:
         condition: service_healthy
     environment:
       VITE_API_URL: ${SERVEUR_URL}
-      VITE_API_MESSAGE: ${SERVICE_MESSAGE_URL}
+      VITE_MESSAGE_SOCKET_URL: ${SERVICE_MESSAGE_URL}
       VITE_API_URL_DOCKER: ${SERVEUR_URL_DOCKER}
       VITE_MODE: ${MODE}
       CHOKIDAR_USEPOLLING: true

frontend/Dockerfile.production

@@ -9,6 +9,8 @@ COPY index.html .
 COPY src src    
 
 RUN echo "VITE_MODE=prod" >> .env
+RUN echo "VITE_MESSAGE_SOCKET_URL=https://giftchat.032025-bleu-2.wns.wilders.dev" >> .env
+RUN echo "VITE_API_URL=https://giftchat.032025-bleu-2.wns.wilders.dev/api" >> .env
 RUN npm run build
 
 FROM httpd:2.4-alpine

frontend/Dockerfile.staging

@@ -6,9 +6,12 @@ RUN npm i
 COPY *.ts .
 COPY public public
 COPY index.html .
-COPY src src    
+COPY src src
 
 RUN echo "VITE_MODE=prod" >> .env
+RUN echo "VITE_MESSAGE_SOCKET_URL=https://staging.giftchat.032025-bleu-2.wns.wilders.dev" >> .env
+RUN echo "VITE_API_URL=https://staging.giftchat.032025-bleu-2.wns.wilders.dev/api" >> .env
+
 RUN npm run build
 
 FROM httpd:2.4-alpine

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",