Merge pull request #21 from ungdev/dev

Fix : routing and permission check

Author: T1gr0uu

backend/src/routes/faction.routes.ts

@@ -11,5 +11,8 @@ factionRouter.get("/admin/faction",checkRole("Admin") ,factionController.getFact
 factionRouter.post("/admin/createfaction",checkRole("Admin") ,factionController.createFaction);
 factionRouter.delete("/admin/deletefaction",checkRole("Admin") ,factionController.deleteFaction);
 
+//Student Routes
+factionRouter.get("/user/factions",factionController.getFactions);
+
 
 export default factionRouter;

backend/src/routes/permanences.routes.ts

@@ -16,7 +16,7 @@ permanenceRouter.get("/admin/permanences", checkRole("Admin"), permanenceControl
 permanenceRouter.get("/admin/users", checkRole("Admin"), permanenceController.getUsersInPermanence);
 permanenceRouter.post("/admin/add", checkRole("Admin"), permanenceController.addUserToPermanence);
 permanenceRouter.post("/admin/remove", checkRole("Admin"), permanenceController.removeUserToPermanence);
-permanenceRouter.post("/admin/importpermanences", upload.single("file"), permanenceController.uploadPermanencesCSV);
+permanenceRouter.post("/admin/importpermanences",checkRole("Admin"), upload.single("file"), permanenceController.uploadPermanencesCSV);
 
 
 // Student routes

frontend/src/components/Admin/adminChallenge.tsx

@@ -15,7 +15,7 @@ import {
 import { Challenge } from "../../interfaces/challenge.interface";
 import Select from "react-select";
 import { getAllTeams } from "../../services/requests/team.service";
-import { getAllFactions } from "../../services/requests/faction.service";
+import { getAllFactionsAdmin } from "../../services/requests/faction.service";
 import { getUsers } from "../../services/requests/user.service";
 import { Team } from "../../interfaces/team.interface";
 import { Faction } from "../../interfaces/faction.interface";
@@ -69,7 +69,7 @@ export const AdminChallengeForm = () => {
     try {
       const [teamRes, factionRes, userRes] = await Promise.all([
         getAllTeams(),
-        getAllFactions(),
+        getAllFactionsAdmin(),
         getUsers(),
       ]);
       setTeams(teamRes);
@@ -310,7 +310,7 @@ export const AdminChallengeAddPointsForm = () => {
     useEffect(() => {
       const fetchFactions = async () => {
         try {
-          const response = await getAllFactions();
+          const response = await getAllFactionsAdmin();
           setFactions(response);
         } catch (error) {
           console.error("Erreur lors de la récupération des factions", error);

frontend/src/components/Admin/adminFaction.tsx

@@ -2,7 +2,7 @@ import { useEffect, useState } from "react";
 import { Button } from "../ui/button";
 import { Input } from "../ui/input";
 import { Card } from "../ui/card";
-import { getAllFactions, createFaction, deleteFaction } from "../../services/requests/faction.service";
+import { getAllFactionsAdmin, createFaction, deleteFaction } from "../../services/requests/faction.service";
 import { Faction } from "../../interfaces/faction.interface";
 
 export const AdminFactionManagement = () => {
@@ -15,7 +15,7 @@ export const AdminFactionManagement = () => {
 
   const fetchFactions = async () => {
     try {
-      const factionList = await getAllFactions();
+      const factionList = await getAllFactionsAdmin();
       setFactions(factionList);
     } catch (err) {
       console.error("Erreur lors du chargement des factions", err);

frontend/src/components/Admin/adminTeam.tsx

@@ -13,7 +13,7 @@ import {
   teamDistribution,
   getTeamFaction,
 } from "../../services/requests/team.service";
-import { getAllFactions } from "../../services/requests/faction.service";
+import { getAllFactionsAdmin } from "../../services/requests/faction.service";
 import { getUsers } from "../../services/requests/user.service";
 import { Team } from "../../interfaces/team.interface";
 import { Faction } from "../../interfaces/faction.interface";
@@ -66,7 +66,7 @@ export const AdminTeamManagement = () => {
     try {
       const [teamRes, factionRes, usersRes] = await Promise.all([
         getAllTeams(),
-        getAllFactions(),
+        getAllFactionsAdmin(),
         getUsers(),
       ]);
       setTeams(teamRes);

frontend/src/components/challenge/challengeList.tsx

@@ -2,7 +2,7 @@ import { useEffect, useState, useMemo } from "react";
 import { Card } from "../ui/card";
 import { getAllChallenges, getFactionsPoints } from "../../services/requests/challenge.service";
 import { Challenge } from "../../interfaces/challenge.interface";
-import { getAllFactions } from "../../services/requests/faction.service";
+import { getAllFactionsUser } from "../../services/requests/faction.service";
 import { Faction } from "../../interfaces/faction.interface";
 
 export const ChallengeList = () => {
@@ -32,7 +32,7 @@ export const ChallengeList = () => {
 
   const fetchFactions = async () => {
     try {
-      const data = await getAllFactions();
+      const data = await getAllFactionsUser();
       setFactions(data);
     } catch (err) {
       console.error("Erreur lors du chargement des factions", err);
@@ -42,7 +42,7 @@ export const ChallengeList = () => {
   const fetchFactionPoints = async () => {
     try {
       const points: { [key: number]: number } = {};
-      const fetchedFactions = await getAllFactions();
+      const fetchedFactions = await getAllFactionsUser();
       await Promise.all(
         fetchedFactions.map(async (faction : Faction) => {
           const res = await getFactionsPoints(faction.factionId);

frontend/src/components/utils/privateroute.tsx

@@ -16,7 +16,7 @@ const PrivateRoute: React.FC<PrivateRouteProps> = ({ permissionRequired, childre
     return <Navigate to="/" />;
   }
 
-  if (permissionRequired && !isAdmin()) {
+  if (!permissionRequired && !isAdmin()) {
     return <Navigate to="/" />;
   }
 

frontend/src/services/requests/faction.service.ts

@@ -1,11 +1,17 @@
 import api from '../api';
 
-export const getAllFactions = async () => {
+export const getAllFactionsAdmin = async () => {
   const res = await api.get("faction/admin/factions");
 
   return res.data.data;
 };
 
+export const getAllFactionsUser = async () => {
+  const res = await api.get("faction/user/factions");
+
+  return res.data.data;
+};
+
 export const createFaction = async (factionName : string) => {
   const res = await api.post("faction/admin/createfaction", {factionName});