Merge branch 'refac/fetchWrapper' into 'dev'

Refac/fetchwrapper

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!73

src/components/Task/Task.jsx

@@ -9,7 +9,7 @@ const Task = ({ task }) => {
     useEffect(() => {
         (async () => {
             const e = await getEventById(task.id);
-            setEvent(e);
+            setEvent(e.data);
         }) ()
     }, [])
 

src/contexts/auth/authProvider.jsx

@@ -12,7 +12,7 @@ export function AuthProvider({ children }) {
     useEffect(() => {
         (async () => {
             const u = await getUser();
-            setUser(u);
+            setUser(u.data);
             setLoading(false);
         })();
     }, []);
@@ -20,7 +20,7 @@ export function AuthProvider({ children }) {
     const login = async (email, password) => {
         const res = await loginFunction(email, password);
         const u = res.status === 200 ? await getUser() : null;
-        if (u) setUser(u);
+        if (u) setUser(u.data);
         return res;
     };
 
@@ -32,7 +32,7 @@ export function AuthProvider({ children }) {
 
     const update = async () => {
         const u = await getUser();
-        setUser(u);
+        setUser(u.data);
     }
 
     return (

src/contexts/eventDetail/eventDetailProvider.jsx

@@ -11,8 +11,8 @@ export function EventDetailProvider({ children }) {
 
     const updateEventInfo = async (id) => {
         const e = await getEventById(id);
-        setEventInfo(e);
+        setEventInfo(e.data);
-        setTasks(e.tasks)
+        setTasks(e.data.tasks)
     }
 
     const deleteTask = async (id, eventId) => {

src/contexts/events/EventProvider.jsx

@@ -10,8 +10,8 @@ export function EventProvider({ children }) {
     const [events, setEvents] = useState([]);
 
     const updateEvent = async () => {
-        const data = await getAllEvents();
+        const result = await getAllEvents();
-        setEvents(data.data);
+        setEvents(result.data.data);
     }
 
     const addEvent = async (name, description, start, end) => {

src/pages/Admin/components/pendingMembers/PendingMembers.jsx

@@ -16,7 +16,8 @@ function PendingMembers() {
   useEffect(() => {
     const fetchPendingMembers = async () => {
       setLoading(true);
-      const userIds = await getUserToValidate();
+      const result = await getUserToValidate();
+      const userIds = result.data
       if (userIds && userIds.length > 0) {
         const users = await Promise.all(userIds.map((id) => getUserById(id)));
         setPendingMembers(users.filter(Boolean));

src/pages/VolunteerProfile/VolunteerProfilePage.jsx

@@ -1,74 +1,84 @@
-import styles from "./VolunteerProfilePage.module.css"
+import styles from "./VolunteerProfilePage.module.css";
-import { useParams } from "react-router";
+import { useParams, useNavigate } from "react-router";
 import { useEffect, useState, useContext } from "react";
 import getUserById from "../../utils/users/getUserById.js";
 import formatDate from "../../utils/date/formatDate.js";
 import Task from "../../components/Task/Task.jsx";
-import { useNavigate } from "react-router";
 import ManageMember from "./components/manageMember/ManageMember.jsx";
 import { AuthContext } from "../../contexts/auth/AuthContext.js";
 
 export default function VolunteerProfilePage() {
-
+    const { id } = useParams();
-    const params = useParams();
-    const id = params.id;
-
     const navigate = useNavigate();
-
     const { user: currentUser } = useContext(AuthContext);
 
-    const [user, setUser] = useState({});
+    const [user, setUser] = useState(null);
 
     useEffect(() => {
         (async () => {
-            const result = await getUserById(id);
+            const res = await getUserById(id);
-            if (result?.error === 'not_found') {
+
+            if (res.status === 404) {
                 navigate("/404");
-            } else {
+                return;
-                setUser(result);
             }
+
+            if (res.status !== 200) {
+                console.error("Erreur lors du chargement du profil", res);
+                return;
+            }
+
+            setUser(res.data);
         })();
-    }, [id]);
+    }, [id, navigate]);
 
+    if (!user) return null;
 
-
+    return (
-    return <div className={styles.container}>
+        <div className={styles.container}>
-        <div className={`${styles.profileboard} glassCard`}>
+            <div className={`${styles.profileboard} glassCard`}>
-            <div className={styles.contentWrapper}>
+                <div className={styles.contentWrapper}>
-                <div className={styles.profilePictureContainer}>
+                    <div className={styles.profilePictureContainer}>
-                    <img
+                        <img
-                        src="/react.svg"
+                            src="/react.svg"
-                        alt="Photo de profil"
+                            alt="Photo de profil"
-                        className={styles.profilePicture}
+                            className={styles.profilePicture}
-                    />
+                        />
-                </div>
-                <div className={styles.description}>
-                    <div className={styles.headerProfile}>
-                        <h2> {user.name} {user.lastname} </h2>
-                        {currentUser?.isAdmin && <ManageMember userToManage={user} />}
-                    </div>
-                    <div className={styles.topDescription}>
-                        <div className={`${styles.infoBlock} glassBorder`}>
-                            <p><strong>Role :</strong> {user.role}</p>
-                            <p><strong>Membre depuis :</strong> {formatDate(user.created_at)}</p>
-                        </div>
-                        <div className={`${styles.infoBlock} glassBorder`}>
-                            <p><strong>Mail :</strong> {user.email} </p>
-                            <p><strong>Téléphone :</strong> {user.phone === null ? "Pas de numéro enregistré" : user.phone}</p>
-                        </div>
                     </div>
 
-                    <h2>Tâches :</h2>
+                    <div className={styles.description}>
-                    {user.tasks && user.tasks.length > 0 ? (
+                        <div className={styles.headerProfile}>
-                        user.tasks.map((task, index) => (
+                            <h2>{user.name} {user.lastname}</h2>
-                            <Task key={index} task={task} />
+                            {currentUser?.isAdmin && (
-                        ))
+                                <ManageMember userToManage={user} />
-                    ) : (
+                            )}
-                        <p>Aucune tâche pour le moment.</p>
+                        </div>
-                    )}
 
+                        <div className={styles.topDescription}>
+                            <div className={`${styles.infoBlock} glassBorder`}>
+                                <p><strong>Role :</strong> {user.role}</p>
+                                <p><strong>Membre depuis :</strong> {formatDate(user.created_at)}</p>
+                            </div>
+                            <div className={`${styles.infoBlock} glassBorder`}>
+                                <p><strong>Mail :</strong> {user.email}</p>
+                                <p>
+                                    <strong>Téléphone :</strong>{" "}
+                                    {user.phone ?? "Pas de numéro enregistré"}
+                                </p>
+                            </div>
+                        </div>
+
+                        <h2>Tâches :</h2>
+                        {user.tasks?.length > 0 ? (
+                            user.tasks.map((task, index) => (
+                                <Task key={index} task={task} />
+                            ))
+                        ) : (
+                            <p>Aucune tâche pour le moment.</p>
+                        )}
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
+    );
 }

src/pages/VolunteerProfile/components/manageMember/modifyrole/ModifyRole.jsx

@@ -15,7 +15,8 @@ export default function ModifyRole({ user }) {
 
     useEffect(() => {
         getRoles().then(data => {
-            if (data) setRoles(data);
+            if (data) setRoles(data.data);
+            //TODO: Fermer les modal + actualiser les infos lors du changement de role
         });
     }, [])
 
@@ -23,7 +24,7 @@ export default function ModifyRole({ user }) {
     const handleRoleUpdate = async () => {
         const res = await modifyRole(selectedRole, user.id);
 
-        if (res.success) {
+        if (res.status === 200) {
             setDescription("Rôle modifié avec succès");
             setTitle("Modification")
             setOpen(true);

src/pages/Volunteers/VolunteersPage.jsx

@@ -6,7 +6,6 @@ import ToolBar from "../../components/ToolBar/ToolBar.jsx";
 import filter from "../../utils/filter.js";
 import getUserById from "../../utils/users/getUserById.js";
 
-
 function VolunteerPage() {
     const [filters, setFilters] = useState({
         alphabetical: "asc",
@@ -16,22 +15,39 @@ function VolunteerPage() {
 
     useEffect(() => {
         (async () => {
-            const ids = await getAllUser();
+            const result = await getAllUser();
-            const usersData = await Promise.all(ids.map(id => getUserById(id)));
-            setUsers(usersData);
-        })()
-    }, [])
 
-  return (
+            if (result.status !== 200 || !Array.isArray(result.data)) {
-    <div className={styles.container}>
+                console.error("Erreur lors du chargement des utilisateurs", result);
-        <ToolBar setFilters={setFilters} filters={filters} showCreate={false}/>
+                return;
-        <div className={styles.usersList}>
+            }
-            {filter(users, filters, "user").map((user, index) => (
+
-                <VolunteerCard key={index} user={user} />
+            const usersData = await Promise.all(
-            ))}
+                result.data.map(async (id) => {
+                    const res = await getUserById(id);
+
+                    if (res.status === 200) {
+                        return res.data;
+                    }
+                    console.warn(`Utilisateur ${id} non récupéré`, res.status);
+                    return null;
+                })
+            );
+
+            setUsers(usersData.filter(Boolean));
+        })();
+    }, []);
+
+    return (
+        <div className={styles.container}>
+            <ToolBar setFilters={setFilters} filters={filters} showCreate={false} />
+            <div className={styles.usersList}>
+                {filter(users, filters, "user").map((user, index) => (
+                    <VolunteerCard key={user.id ?? index} user={user} />
+                ))}
+            </div>
         </div>
-    </div>
+    );
-  );
 }
 
 export default VolunteerPage;

src/pages/eventDetail/components/EventTask/EventTask.jsx

@@ -20,7 +20,7 @@ export default function EventTask({ task, index, eventId }) {
 
     async function checkAssign() {
         const data = await isAssigned(task.id);
-        setAssigned(data?.assigned);
+        setAssigned(data?.data.assigned);
     }
 
     useEffect(() => {

src/pages/eventDetail/components/createTaskBtn/createTaskBtn.jsx

@@ -20,7 +20,7 @@ export default function CreateTaskBtn({ id }) {
     const { updateEventInfo } = useContext(EventDetailContext)
 
     const createTask = async () => {
-        const success = await createTaskApi({
+        const data = await createTaskApi({
             eventId: id,
             name: taskName,
             description: taskDescription,
@@ -30,7 +30,7 @@ export default function CreateTaskBtn({ id }) {
             maxParticipants,
         });
 
-        if (success) {
+        if (data?.status === 200) {
             setOpenTaskModal(false);
             setTaskName("");
             setTaskDescription("");

src/pages/eventDetail/components/deleteTaskBtn/deleteTaskBtn.jsx

@@ -21,7 +21,7 @@ export default function DeleteTaskBtn({ taskId, eventId, taskName }) {
         <Modal open={openModal} onClose={setOpenModal} title={"Suppression"}>
             <div className={styles.modalContent}>
                 <p className={styles.modalContent}>Etes-vous sur de vouloir supprimer la tâche {taskName} ? </p>
-                <Button variant={"danger"} onClick={() => deleteTask(taskId, eventId)}> Confirmer </Button>
+                <Button variant={"danger"} onClick={() => { deleteTask(taskId, eventId); setOpenModal(false) }}> Confirmer </Button>
             </div>
         </Modal>
     </>

src/utils/auth/login.js

@@ -1,32 +1,13 @@
+import fetchWrapper from "../fetchWrapper.js";
 import getXSRFToken from "../getXSRF.js";
 
 export default async function login(email, password) {
     const csrfToken = await getXSRFToken();
 
-    try {
+    return fetchWrapper(
-        const response = await fetch(`${import.meta.env.VITE_API_URL}/api/users/login`, {
+        "/api/users/login",
-            method: 'POST',
+        { email, password },
-            credentials: 'include',
+        "POST",
-            headers: {
+        { "X-XSRF-TOKEN": csrfToken }
-                'Content-Type': 'application/json',
+    );
-                'X-XSRF-TOKEN': csrfToken,
-                'Accept': 'application/json'
-            },
-            body: JSON.stringify({ email, password })
-        });
-
-        const data = await response.json();
-
-        if (!response.ok) {
-            return {
-                status: response.status,
-                errors: data.errors || data.message
-            };
-        }
-
-        return { status: response.status, data };
-
-    } catch (error) {
-        return { status: 500, error };
-    }
 }

src/utils/auth/logout.js

@@ -1,28 +1,13 @@
+import fetchWrapper from "../fetchWrapper.js";
 import getXSRFToken from "../getXSRF.js";
 
 export default async function logout() {
-
     const csrfToken = await getXSRFToken();
 
-    try {
+    return fetchWrapper(
-        const response = await fetch(`${import.meta.env.VITE_API_URL}/api/users/logout`, {
+        "/api/users/logout",
-            method: 'POST',
+        null,
-            credentials: 'include',
+        "POST",
-            headers: {
+        { "X-XSRF-TOKEN": csrfToken }
-                'Content-Type': 'application/json',
+    );
-                'Accept': 'application/json',
-                'X-XSRF-TOKEN': csrfToken
-            },
-        });
-
-        console.log('Code HTTP :', response.status);
-
-        if (!response.ok) {
-            throw new Error(`Erreur HTTP ${response.status}`);
-        }
-
-        return { status: response.status };
-    } catch (error) {
-        return error;
-    }
 }

src/utils/events/createEvent.js

@@ -1,36 +1,13 @@
+import fetchWrapper from "../fetchWrapper.js";
 import getXSRFToken from "../getXSRF.js";
 
 export default async function createEvent(name, description, start, end) {
     const csrfToken = await getXSRFToken();
 
-    try {
+    return fetchWrapper(
-        const response = await fetch(`${import.meta.env.VITE_API_URL}/api/events/create`, {
+        "/api/events/create",
-            method: 'POST',
+        {name, description, start, end},
-            credentials: 'include',
+        "POST",
-            headers: {
+        {"X-XSRF-TOKEN": csrfToken}
-                'Content-Type': 'application/json',
+    );
-                'X-XSRF-TOKEN': csrfToken,
-                'Accept': 'application/json'
-            },
-            body: JSON.stringify({ name, description, start, end }),
-        });
-
-        const data = await response.json();
-
-        if (!response.ok) {
-            if (response.status === 422) {
-                return {
-                    status: 422,
-                    errors: data.errors
-                };
-            }
-
-            throw new Error(`Erreur HTTP ${response.status}`);
-        }
-
-        return { status: response.status, data };
-
-    } catch (error) {
-        return { status: "error", error };
-    }
 }

src/utils/events/deleteEvent.js

@@ -1,38 +1,13 @@
+import fetchWrapper from "../fetchWrapper.js";
 import getXSRFToken from "../getXSRF.js";
 
 export default async function deleteEvent(eventId) {
     const csrfToken = await getXSRFToken();
 
-    try {
+    return fetchWrapper(
-        const response = await fetch(`${import.meta.env.VITE_API_URL}/api/events/${eventId}`, {
+        `/api/events/${eventId}`,
-            method: 'DELETE',
+        {id: eventId},
-            credentials: 'include',
+        "DELETE",
-            headers: {
+        {"X-XSRF-TOKEN": csrfToken}
-                'Content-Type': 'application/json',
+    );
-                'X-XSRF-TOKEN': csrfToken,
-                'Accept': 'application/json'
-            },
-            body: JSON.stringify({
-                id: eventId,
-            }),
-        });
-
-        const data = await response.json();
-
-        if (!response.ok) {
-            if (response.status === 422) {
-                return {
-                    status: 422,
-                    errors: data.errors
-                };
-            }
-
-            throw new Error(`Erreur HTTP ${response.status}`);
-        }
-
-        return { status: response.status, data };
-
-    } catch (error) {
-        return { status: "error", error };
-    }
 }

src/utils/events/getAllEvents.js

@@ -1,23 +1,5 @@
+import fetchWrapper from "../fetchWrapper.js";
+
 export default async function getAllEvents() {
-
+    return fetchWrapper("/api/events/", null, "GET");
-    try {
-        const res = await fetch(`${import.meta.env.VITE_API_URL}/api/events/`, {
-            method: 'GET',
-            credentials: 'include',
-            headers: {
-                'Accept': 'application/json'
-            }
-        });
-
-        if (!res.ok) {
-            throw new Error(`Erreur serveur : ${res.status}`);
-        }
-
-        const data = await res.json();
-        return data;
-    } catch (err) {
-        console.error('Erreur :', err);
-        return null;
-    }
-
 }

src/utils/events/getEventById.js

@@ -1,23 +1,5 @@
+import fetchWrapper from "../fetchWrapper.js";
+
 export default async function GetEventById(id) {
-
+    return fetchWrapper(`/api/events/${id}`, null, "GET");
-    try {
-        const res = await fetch(`${import.meta.env.VITE_API_URL}/api/events/${id}`, {
-            method: 'GET',
-            credentials: 'include',
-            headers: {
-                'Accept': 'application/json'
-            }
-        });
-
-        if (!res.ok) {
-            throw new Error(`Erreur serveur : ${res.status}`);
-        }
-
-        const data = await res.json();
-        return data;
-    } catch (err) {
-        console.error('Erreur :', err);
-        return null;
-    }
-
 }

src/utils/fetchWrapper.js

@@ -0,0 +1,45 @@
+export default async function fetchWrapper(
+    path,
+    data = null,
+    method = "GET",
+    headers = {}
+) {
+    try {
+        const res = await fetch(
+            `${import.meta.env.VITE_API_URL}${path}`,
+            {
+                method,
+                credentials: "include",
+                headers: {
+                    "Accept": "application/json",
+                    "Content-Type": "application/json",
+                    ...headers,
+                },
+                body: data ? JSON.stringify(data) : null,
+            }
+        );
+
+        let responseData = null;
+
+        try {
+            responseData = await res.json();
+        } catch (_) {
+            responseData = null;
+        }
+
+        return {
+            status: res.status,
+            data: responseData,
+        };
+
+    } catch (err) {
+        console.error("❌ Erreur réseau :", err);
+
+        return {
+            status: 0,
+            data: {
+                message: "Network error",
+            },
+        };
+    }
+}

src/utils/getRoles.js

@@ -1,21 +1,5 @@
+import fetchWrapper from "./fetchWrapper.js";
+
 export default async function getRoles() {
-    try {
+    return fetchWrapper("/api/roles", null, "GET");
-        const res = await fetch(`${import.meta.env.VITE_API_URL}/api/roles`, {
-            method: 'GET',
-            credentials: 'include',
-            headers: {
-                'Accept': 'application/json'
-            }
-        });
-
-        if (!res.ok) {
-            throw new Error(`Erreur serveur : ${res.status}`);
-        }
-
-        const data = await res.json();
-        return data;
-    } catch (err) {
-        console.error('Erreur :', err);
-        return null;
-    }
 }

src/utils/getUser.js

@@ -1,21 +1,5 @@
+import fetchWrapper from "./fetchWrapper.js";
+
 export default async function getUser() {
-    try {
+    return fetchWrapper("/api/users/me", null, "GET");
-        const res = await fetch(`${import.meta.env.VITE_API_URL}/api/users/me`, {
-            method: 'GET',
-            credentials: 'include',
-            headers: {
-                'Accept': 'application/json'
-            }
-        });
-
-        if (!res.ok) {
-            throw new Error(`Erreur serveur : ${res.status}`);
-        }
-
-        const data = await res.json();
-        return data;
-    } catch (err) {
-        console.error('Erreur :', err);
-        return null;
-    }
 }

src/utils/register.js

@@ -1,36 +1,13 @@
+import fetchWrapper from "./fetchWrapper.js";
 import getXSRFToken from "./getXSRF.js";
 
 export default async function register(email, password, name, lastname, phone) {
     const csrfToken = await getXSRFToken();
 
-    try {
+    return fetchWrapper(
-        const response = await fetch(`${import.meta.env.VITE_API_URL}/api/users/register`, {
+        "/api/users/register",
-            method: 'POST',
+        { email, password, name, lastname, phone },
-            credentials: 'include',
+        "POST",
-            headers: {
+        { "X-XSRF-TOKEN": csrfToken }
-                'Content-Type': 'application/json',
+    );
-                'X-XSRF-TOKEN': csrfToken,
-                'Accept': 'application/json'
-            },
-            body: JSON.stringify({ email, password, name, lastname, phone }),
-        });
-
-        const data = await response.json();
-
-        if (!response.ok) {
-            if (response.status === 422) {
-                return {
-                    status: 422,
-                    errors: data.errors
-                };
-            }
-
-            throw new Error(`Erreur HTTP ${response.status}`);
-        }
-
-        return { status: response.status, data };
-
-    } catch (error) {
-        return { status: "error", error };
-    }
 }

src/utils/tasks/assign.js

@@ -1,37 +1,13 @@
+import fetchWrapper from "../fetchWrapper.js";
 import getXSRFToken from "../getXSRF.js";
 
 export default async function assign(taskId) {
     const csrfToken = await getXSRFToken();
 
-    try {
+    return fetchWrapper(
-        const res = await fetch(
+        "/api/events/task/assign",
-            `${import.meta.env.VITE_API_URL}/api/events/task/assign`,
+        {task_id: taskId},
-            {
+        "POST",
-                method: 'POST',
+        {"X-XSRF-TOKEN": csrfToken}
-                credentials: 'include',
+    );
-                headers: {
-                    'Accept': 'application/json',
-                    'Content-Type': 'application/json',
-                    'X-XSRF-TOKEN': csrfToken,
-                },
-                body: JSON.stringify({
-                    task_id: taskId
-                }),
-            }
-        );
-
-        const data = await res.json();
-
-        return {
-            status: res.status,
-            message: data?.message ?? null,
-        };
-
-    } catch (err) {
-        console.error("❌ Erreur réseau :", err);
-        return {
-            status: 0,
-            message: "Network error",
-        };
-    }
 }

src/utils/tasks/createTask.js

@@ -1,3 +1,4 @@
+import fetchWrapper from "../fetchWrapper.js";
 import getXSRFToken from "../getXSRF.js";
 
 export default async function createTask({
@@ -11,39 +12,18 @@ export default async function createTask({
                                          }) {
     const csrfToken = await getXSRFToken();
 
-    try {
+    return fetchWrapper(
-        const res = await fetch(
+        "/api/events/task",
-            `${import.meta.env.VITE_API_URL}/api/events/task`,
+        {
-            {
+            event_id: eventId,
-                method: "POST",
+            name,
-                credentials: "include",
+            description,
-                headers: {
+            start,
-                    Accept: "application/json",
+            end,
-                    "Content-Type": "application/json",
+            location,
-                    "X-XSRF-TOKEN": csrfToken,
+            max_participants: maxParticipants,
-                },
+        },
-                body: JSON.stringify({
+        "POST",
-                    event_id: eventId,
+        {"X-XSRF-TOKEN": csrfToken}
-                    name,
+    );
-                    description,
-                    start,
-                    end,
-                    location,
-                    max_participants: maxParticipants,
-                }),
-            }
-        );
-
-        if (!res.ok) {
-            const errorData = await res.json();
-            return false;
-        }
-
-        const data = await res.json();
-        return true;
-
-    } catch (err) {
-        console.log("❌ Erreur réseau :", err);
-        return false;
-    }
 }

src/utils/tasks/deleteTask.js

@@ -1,37 +1,13 @@
+import fetchWrapper from "../fetchWrapper.js";
 import getXSRFToken from "../getXSRF.js";
 
 export default async function deleteTask(taskId) {
     const csrfToken = await getXSRFToken();
 
-    try {
+    return fetchWrapper(
-        const res = await fetch(
+        `/api/events/tasks/${taskId}`,
-            `${import.meta.env.VITE_API_URL}/api/events/tasks/${taskId}`,
+        { task_id: taskId },
-            {
+        "DELETE",
-                method: 'DELETE',
+        { "X-XSRF-TOKEN": csrfToken }
-                credentials: 'include',
+    );
-                headers: {
-                    'Accept': 'application/json',
-                    'Content-Type': 'application/json',
-                    'X-XSRF-TOKEN': csrfToken,
-                },
-                body: JSON.stringify({
-                    task_id: taskId
-                }),
-            }
-        );
-
-        const data = await res.json();
-
-        return {
-            status: res.status,
-            message: data?.message ?? null,
-        };
-
-    } catch (err) {
-        console.error("❌ Erreur réseau :", err);
-        return {
-            status: 0,
-            message: "Network error",
-        };
-    }
 }

src/utils/tasks/isAssigned.js

@@ -1,24 +1,9 @@
+import fetchWrapper from "../fetchWrapper.js";
+
 export default async function isAssigned(taskId) {
-    try {
+    return fetchWrapper(
-        const res = await fetch(
+        `/api/events/tasks/${taskId}/assigned`,
-            `${import.meta.env.VITE_API_URL}/api/events/tasks/${taskId}/assigned`,
+        null,
-            {
+        "GET"
-                method: 'GET',
+    );
-                credentials: 'include',
-                headers: {
-                    'Accept': 'application/json',
-                },
-            }
-        );
-
-        if (!res.ok) {
-            throw new Error(`Erreur serveur : ${res.status}`);
-        }
-
-        return await res.json();
-
-    } catch (err) {
-        console.error('Erreur :', err);
-        return null;
-    }
 }

src/utils/tasks/unAssign.js

@@ -1,37 +1,13 @@
+import fetchWrapper from "../fetchWrapper.js";
 import getXSRFToken from "../getXSRF.js";
 
 export default async function unAssign(taskId) {
     const csrfToken = await getXSRFToken();
 
-    try {
+    return fetchWrapper(
-        const res = await fetch(
+        "/api/events/task/unassign",
-            `${import.meta.env.VITE_API_URL}/api/events/task/unassign`,
+        {task_id: taskId},
-            {
+        "POST",
-                method: 'POST',
+        {"X-XSRF-TOKEN": csrfToken}
-                credentials: 'include',
+    );
-                headers: {
-                    'Accept': 'application/json',
-                    'Content-Type': 'application/json',
-                    'X-XSRF-TOKEN': csrfToken,
-                },
-                body: JSON.stringify({
-                    task_id: taskId
-                }),
-            }
-        );
-
-        const data = await res.json();
-
-        return {
-            status: res.status,
-            message: data?.message ?? null,
-        };
-
-    } catch (err) {
-        console.error("❌ Erreur réseau :", err);
-        return {
-            status: 0,
-            message: "Network error",
-        };
-    }
 }

src/utils/users/deactivateUser.js

@@ -1,34 +1,13 @@
+import fetchWrapper from "../fetchWrapper.js";
 import getXSRFToken from "../getXSRF.js";
 
 export default async function deactivateUser(userId) {
     const csrfToken = await getXSRFToken();
 
-    try {
+    return fetchWrapper(
-        const response = await fetch(`${import.meta.env.VITE_API_URL}/api/users/${userId}/deactivate`, {
+        `/api/users/${userId}/deactivate`,
-            method: 'POST',
+        { id: userId },
-            credentials: 'include',
+        "POST",
-            headers: {
+        { "X-XSRF-TOKEN": csrfToken }
-                'Content-Type': 'application/json',
+    );
-                'X-XSRF-TOKEN': csrfToken,
-                'Accept': 'application/json'
-            },
-            body: JSON.stringify({
-                id: userId
-            })
-        });
-
-        const data = await response.json();
-
-        if (!response.ok) {
-            return {
-                status: response.status,
-                errors: data.errors || data.message
-            };
-        }
-
-        return { status: response.status, data };
-
-    } catch (error) {
-        return { status: 500, error };
-    }
 }

src/utils/users/deleteOtherUser.js

@@ -1,34 +1,13 @@
+import fetchWrapper from "../fetchWrapper.js";
 import getXSRFToken from "../getXSRF.js";
 
 export default async function deleteOtherUser(userId) {
     const csrfToken = await getXSRFToken();
 
-    try {
+    return fetchWrapper(
-        const response = await fetch(`${import.meta.env.VITE_API_URL}/api/users/${userId}`, {
+        `/api/users/${userId}`,
-            method: 'DELETE',
+        { id: userId },
-            credentials: 'include',
+        "DELETE",
-            headers: {
+        { "X-XSRF-TOKEN": csrfToken }
-                'Content-Type': 'application/json',
+    );
-                'X-XSRF-TOKEN': csrfToken,
-                'Accept': 'application/json'
-            },
-            body: JSON.stringify({
-                id: userId
-            })
-        });
-
-        const data = await response.json();
-
-        if (!response.ok) {
-            return {
-                status: response.status,
-                errors: data.errors || data.message
-            };
-        }
-
-        return { status: response.status, data };
-
-    } catch (error) {
-        return { status: 500, error };
-    }
 }

src/utils/users/deleteUser.js

@@ -1,31 +1,13 @@
+import fetchWrapper from "../fetchWrapper.js";
 import getXSRFToken from "../getXSRF.js";
 
 export default async function deleteUser() {
     const csrfToken = await getXSRFToken();
 
-    try {
+    return fetchWrapper(
-        const response = await fetch(`${import.meta.env.VITE_API_URL}/api/users`, {
+        "/api/users",
-            method: 'DELETE',
+        null,
-            credentials: 'include',
+        "DELETE",
-            headers: {
+        { "X-XSRF-TOKEN": csrfToken }
-                'Content-Type': 'application/json',
+    );
-                'X-XSRF-TOKEN': csrfToken,
-                'Accept': 'application/json'
-            }
-        });
-
-        const data = await response.json();
-
-        if (!response.ok) {
-            return {
-                status: response.status,
-                errors: data.errors || data.message
-            };
-        }
-
-        return { status: response.status, data };
-
-    } catch (error) {
-        return { status: 500, error };
-    }
 }

src/utils/users/getAllUsers.js

@@ -1,21 +1,5 @@
+import fetchWrapper from "../fetchWrapper.js";
+
 export default async function getAllUser() {
-    try {
+    return fetchWrapper("/api/users");
-        const res = await fetch(`${import.meta.env.VITE_API_URL}/api/users`, {
-            method: 'GET',
-            credentials: 'include',
-            headers: {
-                'Accept': 'application/json'
-            }
-        });
-
-        if (!res.ok) {
-            throw new Error(`Erreur serveur : ${res.status}`);
-        }
-
-        const data = await res.json();
-        return data;
-    } catch (err) {
-        console.error('Erreur :', err);
-        return null;
-    }
 }

src/utils/users/getUserById.js

@@ -1,23 +1,5 @@
+import fetchWrapper from "../fetchWrapper.js";
+
 export default async function getUserById(id) {
-    try {
+    return fetchWrapper(`/api/users/${id}`);
-        const res = await fetch(`${import.meta.env.VITE_API_URL}/api/users/${id}`, {
-            method: 'GET',
-            credentials: 'include',
-            headers: {
-                'Accept': 'application/json'
-            }
-        });
-
-        if (!res.ok) {
-            if (res.status === 404) {
-                return { error: 'not_found' };
-            }
-            throw new Error(`Erreur serveur : ${res.status}`);
-        }
-
-        return await res.json();
-    } catch (err) {
-        console.error('Erreur :', err);
-        return { error: 'server_error' };
-    }
 }

src/utils/users/getUserToValidate.js

@@ -1,21 +1,5 @@
+import fetchWrapper from "../fetchWrapper.js";
+
 export default async function getUserToValidate() {
-    try {
+    return fetchWrapper("/api/users/invalid");
-        const res = await fetch(`${import.meta.env.VITE_API_URL}/api/users/invalid`, {
-            method: 'GET',
-            credentials: 'include',
-            headers: {
-                'Accept': 'application/json'
-            }
-        });
-
-        if (!res.ok) {
-            throw new Error(`Erreur serveur : ${res.status}`);
-        }
-
-        const data = await res.json();
-        return data;
-    } catch (err) {
-        console.error('Erreur :', err);
-        return null;
-    }
 }

src/utils/users/modifyRole.js

@@ -1,33 +1,13 @@
+import fetchWrapper from "../fetchWrapper.js";
 import getXSRFToken from "../getXSRF.js";
 
-
 export default async function modifyRole(role, userId) {
-    try {
+    const csrfToken = await getXSRFToken();
-        const csrfToken = await getXSRFToken();
 
-        const res = await fetch(
+    return fetchWrapper(
-            `${import.meta.env.VITE_API_URL}/api/users/${userId}/role`,
+        `/api/users/${userId}/role`,
-            {
+        { role },
-                method: 'POST',
+        "POST",
-                credentials: 'include',
+        { "X-XSRF-TOKEN": csrfToken }
-                headers: {
+    );
-                    'Accept': 'application/json',
-                    'X-XSRF-TOKEN': csrfToken,
-                    'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({ role }),
-            }
-        );
-
-        const data = await res.json();
-
-        if (!res.ok) {
-            return { success: false, error: data.message ?? "Erreur serveur" };
-        }
-
-        return { success: true, data };
-    } catch (err) {
-        console.error(err);
-        return { success: false, error: "Erreur réseau" };
-    }
 }

src/utils/users/updateUser.js

@@ -1,32 +1,13 @@
+import fetchWrapper from "../fetchWrapper.js";
 import getXSRFToken from "../getXSRF.js";
 
 export default async function updateUser(name, lastname, phone) {
-
     const csrfToken = await getXSRFToken();
 
-    try {
+    return fetchWrapper(
-        const res = await fetch(`${import.meta.env.VITE_API_URL}/api/users/update`, {
+        "/api/users/update",
-            method: 'POST',
+        { name, lastname, phone },
-            credentials: 'include',
+        "POST",
-            headers: {
+        { "X-XSRF-TOKEN": csrfToken }
-                'Accept': 'application/json',
+    );
-                'X-XSRF-TOKEN': csrfToken,
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-                name: name,
-                phone: phone,
-                lastname: lastname,
-            })
-        });
-
-        if (!res.ok) {
-            throw new Error(`Erreur serveur : ${res.status}`);
-        }
-
-        return await res.json();
-    } catch (err) {
-        console.error('Erreur :', err);
-        return null;
-    }
 }

src/utils/users/validateUser.js

@@ -1,27 +1,13 @@
+import fetchWrapper from "../fetchWrapper.js";
 import getXSRFToken from "../getXSRF.js";
 
 export default async function validateUser(userId) {
-      const csrfToken = await getXSRFToken();
+    const csrfToken = await getXSRFToken();
-  try {
+
-    const res = await fetch(
+    return fetchWrapper(
-      `${import.meta.env.VITE_API_URL}/api/users/${userId}/validate`,
+        `/api/users/${userId}/validate`,
-      {
+        null,
-        method: "POST",
+        "POST",
-        credentials: "include",
+        { "X-XSRF-TOKEN": csrfToken }
-        headers: {
-          Accept: "application/json",
-          'X-XSRF-TOKEN': csrfToken,
-        },
-      }
     );
-    if (!res.ok) {
-      const errorData = await res.json();
-      console.error("Erreur backend:", errorData);
-      return false;
-    }
-    return true;
-  } catch (err) {
-    console.error("Erreur réseau:", err);
-    return false;
-  }
 }