Merge pull request #63 from WildCodeSchool/dev

merge staging

Author: clement4444

.github/workflows/CI-cheack-buid.yml

@@ -7,7 +7,7 @@ on:
       - main
 
 jobs:
-  build-and-push-projects:
+  build-services-teste:
     runs-on: ubuntu-latest
     strategy:
       # pouvoir voir tout les builds qui échouent pas juste le premier
@@ -22,7 +22,7 @@ jobs:
     steps:
       - name: Récupérer le code source
         uses: actions/checkout@v4
-      
+
       - name: setup Docker Buildx (pour du cache)
         uses: docker/setup-buildx-action@v3
 
@@ -35,4 +35,3 @@ jobs:
           load: false
           cache-from: type=gha
           cache-to: type=gha,mode=max
-        

backend/src/entities/User.ts

@@ -63,9 +63,9 @@ class User extends BaseEntity {
   @Field()
   updatedAt: Date;
 
-  @Column({ default: null, nullable: true })
-  @Field({ nullable: true })
-  image_url: string;
+  @Column({ type: "text", default: null, nullable: true })
+  @Field(() => String, { nullable: true })
+  image_url: string | null;
 
   @Column({ default: false })
   @Field()

backend/src/resolvers/UserResolver.ts

@@ -1,5 +1,6 @@
 import argon2 from "argon2";
 import axios from "axios";
+import jwt from "jsonwebtoken";
 import {
   Arg,
   Ctx,
@@ -15,6 +16,7 @@ import { IsNull } from "typeorm";
 import { PendingInvitation } from "../entities/PendingInvitation";
 import User from "../entities/User";
 import cookieManager from "../lib/cookieManager/cookieManager";
+import { getVariableEnv } from "../lib/envManager/envManager";
 import { RoleMiddleware } from "../middleware/RoleMiddleware";
 import { addMembersToGroup } from "../services/groupMemberService";
 import type { ContextType } from "../types/context";
@@ -163,6 +165,9 @@ export default class UserResolver {
       try {
         urlImage = await axios.post("http://picture-service:3410/service/picture/uploads", {
           imageBase64: data.pictureBase64,
+          tokenService: jwt.sign({ service: "API-graphQL" }, getVariableEnv("INTERNAL_SECRET_KEY"), {
+            expiresIn: "2m",
+          }),
         });
       } catch (_error) {
         throw new Error("Erreur lors de l'upload de l'image");
@@ -262,11 +267,18 @@ export default class UserResolver {
   async UpdateMyProfile(@Arg("data") data: UpdateMyProfileInput, @Ctx() ctx: ContextType) {
     if (!ctx.user) throw new Error("Utilisateur non connecté update impossible");
 
+    // récupère l'utilisateur avant la modification
+    const userBeforeUpdate = await User.findOne({ where: { id: ctx.user.id } });
+
     let urlImage = null;
     if (data.pictureBase64) {
       try {
         urlImage = await axios.post("http://picture-service:3410/service/picture/uploads", {
           imageBase64: data.pictureBase64,
+          tokenService: jwt.sign({ service: "API-graphQL" }, getVariableEnv("INTERNAL_SECRET_KEY"), {
+            expiresIn: "2m",
+          }),
+          urlExistant: userBeforeUpdate?.image_url, // donne a notre service d'image son potentielle url actuelle
         });
       } catch (_error) {
         throw new Error("Erreur lors de l'upload de l'image");
@@ -328,6 +340,12 @@ export default class UserResolver {
       {
         deletedAt: new Date(),
         email: deletedEmail,
+        firstName: "deleted",
+        lastName: "user",
+        phone_number: "0000000000",
+        image_url: null,
+        password_hashed: "",
+        date_of_birth: "1970-01-01",
       },
     );
 
@@ -468,13 +486,37 @@ export default class UserResolver {
       };
     }
 
+    // si il existe on fait appel a notres service d'image pour qu'il supprime l'image de profil de l'utilisateur
+    if (user.image_url) {
+      try {
+        await axios.post("http://picture-service:3410/service/picture/delete", {
+          url: user.image_url,
+          tokenService: jwt.sign({ service: "API-graphQL" }, getVariableEnv("INTERNAL_SECRET_KEY"), {
+            expiresIn: "2m",
+          }),
+        });
+      } catch (error) {
+        // on ne bloque pas la suppression du compte si la suppression de l'image échoue
+        console.error(
+          `Erreur lors de la suppression de l'image de profil de l'utilisateur id=${user.id} :`,
+          error,
+        );
+      }
+    }
+
     // Soft delete : mettre à jour le champ deletedAt et modifier l'email pour permettre la réutilisation
     const deletedEmail = `${user.email}_deleted_${Date.now()}`;
     await User.update(
       { id: ctx.user.id },
       {
         deletedAt: new Date(),
         email: deletedEmail,
+        firstName: "deleted",
+        lastName: "user",
+        phone_number: "0000000000",
+        image_url: null,
+        password_hashed: "",
+        date_of_birth: "1970-01-01",
       },
     );
 

compose.dev.yaml

@@ -62,6 +62,7 @@ services:
     environment:
       BACKEND_URL: ${SERVEUR_URL}
       CLIENT_URL: ${FRONTEND_URL}
+      INTERNAL_SECRET_KEY: ${INTERNAL_SECRET_KEY}
       APP_PORT: ${PICTURE_SERVICE_PORT}
 
   message-service:

frontend/src/App.tsx

@@ -25,16 +25,16 @@ const App = () => {
       setUserProfile(data.getMyProfile);
       // si on était sur une page que on est pas censé étre une foie connecté on redirige vers la page principale
       if (["/", "/connexion", "/inscription"].includes(window.location.pathname)) {
-        navigate("/dashboard");
+        navigate("/dashboard/conversations", { replace: true });
       }
     } else if (!loading) {
       setUserProfile(null);
       // si on est pas connecté on redirige forcement vers la page de connexion ou d'inscription
       if (!["/connexion", "/inscription", "/", "/contact"].includes(window.location.pathname)) {
-        navigate("/");
+        navigate("/", { replace: true });
       }
     }
-  }, [data, loading]);
+  }, [loading]);
 
   if (loading) return <LoadingHomePage />;
 

frontend/src/components/forms/auth/LoginForm.tsx

@@ -62,13 +62,15 @@ const LoginForm = () => {
         theme="dark"
         type="text"
         name="email"
+        label="Email"
         placeholder="Entrez votre adresse email"
         value={form.email}
         onChange={(e) => setForm({ ...form, email: e.target.value })}
       />
       <Input
         theme="dark"
         type="password"
+        label="Password"
         name="password"
         placeholder="Entrez votre mot de passe"
         value={form.password}

frontend/src/components/forms/auth/RegisterForm.tsx

@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useId, useState } from "react";
 import { useNavigate } from "react-router";
 import { useSignupMutation } from "../../../graphql/generated/graphql-types";
 import consoleErrorDev from "../../../hooks/erreurMod";
@@ -24,6 +24,7 @@ const RegisterForm = () => {
   const navigate = useNavigate();
   const [messageError, setMessageError] = useState("");
   const { setUserProfile } = useMyProfileStore();
+  const idInputFile = useId();
 
   const [signup] = useSignupMutation();
 
@@ -120,6 +121,7 @@ const RegisterForm = () => {
         theme="dark"
         type="text"
         placeholder="Nom"
+        label="Nom"
         name="lastname"
         value={form.lastName}
         onChange={(e) => setForm({ ...form, lastName: e.target.value })}
@@ -128,6 +130,7 @@ const RegisterForm = () => {
         theme="dark"
         type="text"
         placeholder="Prénom"
+        label="Prénom"
         name="firstname"
         value={form.firstName}
         onChange={(e) => setForm({ ...form, firstName: e.target.value })}
@@ -136,6 +139,7 @@ const RegisterForm = () => {
         theme="dark"
         type="text"
         placeholder="Adresse email"
+        label="Adresse email"
         name="email"
         value={form.email}
         onChange={(e) => setForm({ ...form, email: e.target.value })}
@@ -144,6 +148,7 @@ const RegisterForm = () => {
         theme="dark"
         type="date"
         placeholder="Date de naissance"
+        label="Date de naissance"
         name="date_of_birth"
         value={form.date_of_birth}
         onChange={(e) => setForm({ ...form, date_of_birth: e.target.value })}
@@ -152,6 +157,7 @@ const RegisterForm = () => {
         theme="dark"
         type="password"
         placeholder="Mot de passe"
+        label="Mot de passe"
         name="password"
         value={form.password}
         onChange={(e) => setForm({ ...form, password: e.target.value })}
@@ -160,6 +166,7 @@ const RegisterForm = () => {
         theme="dark"
         type="password"
         placeholder="Confirmation du mot de passe"
+        label="Confirmation du mot de passe"
         name="passwordConfirmation"
         value={form.passwordConfirmation}
         onChange={(e) => setForm({ ...form, passwordConfirmation: e.target.value })}
@@ -169,9 +176,16 @@ const RegisterForm = () => {
         {/* md:w-auto */}
         <label
           className={`inline-block w-full bg-dark text-white text-center border-none px-5 py-3 rounded-lg cursor-pointer text-sm md:text-lg font-inter font-bold transition-colors duration-300 overflow-hidden whitespace-nowrap w-[400px] px-4 py-2 text-xl ${file ? "bg-[#292e96]" : ""}`}
+          htmlFor={idInputFile}
         >
           <span className="block overflow-hidden text-lg text-ellipsis font-bold">{fileName}</span>
-          <input type="file" accept="image/*" className="hidden" onChange={handleFileChange} />
+          <input
+            id={idInputFile}
+            type="file"
+            accept="image/*"
+            className="sr-only"
+            onChange={handleFileChange}
+          />
         </label>
       </div>
 

frontend/src/components/forms/groups/GroupForm.tsx

@@ -34,6 +34,7 @@ export default function GroupForm({
         <Input
           disabled={disabled}
           name="name"
+          label="Nom"
           type="text"
           value={formData.name}
           onChange={handleChange}
@@ -51,6 +52,7 @@ export default function GroupForm({
             } as React.ChangeEvent<HTMLInputElement>)
           }
           placeholder="Quel est l'événement ?"
+          label="Type événement"
           error={errors.event_type}
           options={options}
           theme="light"
@@ -60,6 +62,7 @@ export default function GroupForm({
           disabled={disabled}
           name="piggy_bank"
           type="number"
+          label="Piggy bank"
           value={String(formData.piggy_bank)}
           onChange={handleChange}
           placeholder={String(0)}
@@ -84,6 +87,7 @@ export default function GroupForm({
           disabled={disabled}
           name="deadline"
           type="date"
+          label="Deadline"
           value={formData.deadline}
           onChange={handleChange}
           error={errors.deadline}

frontend/src/components/forms/groups/UsersForm.tsx

@@ -64,6 +64,7 @@ export default function UsersForm({
         <SearchInput
           disabled={isEdit && !isAdmin}
           placeholder="Ajouter des participants..."
+          label="Ajouter des participants"
           theme="light"
           name="users"
           value={query}

frontend/src/components/forms/groups/index.tsx

@@ -23,6 +23,7 @@ type GroupFormIndex = {
   onCancel: () => void;
   groupId?: number;
   isOpen?: boolean;
+  onDelete?: () => void;
 };
 
 const EMPTY_FORM_STATE: CreateGroupInput = {
@@ -34,7 +35,7 @@ const EMPTY_FORM_STATE: CreateGroupInput = {
   user_beneficiary: "",
 };
 
-export default function GroupFormindex({ onSuccess, groupId }: GroupFormIndex) {
+export default function GroupFormindex({ onSuccess, groupId, onDelete }: GroupFormIndex) {
   const [submitError, setSubmitError] = useState<string>("");
   const [checked, setChecked] = useState(false);
   const [query, setQuery] = useState("");
@@ -221,12 +222,10 @@ export default function GroupFormindex({ onSuccess, groupId }: GroupFormIndex) {
         // Reset removal tracking after successful update
         setUsersToRemove([]);
       } else {
-        const response = await createGroup({
+        await createGroup({
           variables: commonVariables,
         });
 
-        console.info("Group created successfully:", response.data);
-
         setFormData(EMPTY_FORM_STATE);
         setChecked(false);
         setUsersToRemove([]);
@@ -277,7 +276,7 @@ export default function GroupFormindex({ onSuccess, groupId }: GroupFormIndex) {
   async function deleteMyGroup() {
     try {
       await deleteGroup({ variables: { deleteGroupId: groupId! } });
-      onSuccess();
+      onDelete?.();
     } catch (error) {
       console.error("Error deleting group:", error);
     }