Merge pull request #1003 from parlemonde/feat/VIL-622

feat(VIL-622): adding access rights to archives to admin, s-admin and…
parlemonde · Nov 19, 2024 · 95316ab · 95316ab
2 parents 2f592ac + 26c1bc2
commit 95316ab
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 20 deletions.
diff --git a/server/controllers/archive.ts b/server/controllers/archive.ts
@@ -8,15 +8,18 @@ import { Controller } from './controller';
 const archiveController = new Controller('/archives');
 
 // get file
-archiveController.get({ path: '/*', userType: UserType.ADMIN }, async (req: Request, res: Response, next: NextFunction) => {
-  const url = decodeURI(req.url);
-  const key = `archives${url}${url.split('/').length === 2 ? '/index.html' : url.indexOf('.') === -1 ? '.html' : ''}`;
-  try {
-    streamFile(key, req, res, next);
-  } catch {
-    next();
-  }
-});
+archiveController.get(
+  { path: '/*', userType: [UserType.SUPER_ADMIN, UserType.ADMIN, UserType.MEDIATOR] },
+  async (req: Request, res: Response, next: NextFunction) => {
+    const url = decodeURI(req.url);
+    const key = `archives${url}${url.split('/').length === 2 ? '/index.html' : url.indexOf('.') === -1 ? '.html' : ''}`;
+    try {
+      streamFile(key, req, res, next);
+    } catch {
+      next();
+    }
+  },
+);
 
 /**
  * Liste les dossiers dans un préfixe S3 spécifié.

diff --git a/server/controllers/controller.ts b/server/controllers/controller.ts
@@ -11,7 +11,7 @@ import { diskStorage } from '../middlewares/multer';
 
 type RouteOptions = {
   path: string;
-  userType?: UserType;
+  userType?: UserType | UserType[];
 };
 
 fs.ensureDir(path.join(__dirname, '../fileUpload/videos')).catch();

diff --git a/src/api/archive/archive.get.ts b/src/api/archive/archive.get.ts
@@ -1,12 +1,26 @@
 import axios from 'axios';
+import React from 'react';
 import { useQuery } from 'react-query';
 
+import { UserType } from '../../../types/user.type';
+import { UserContext } from '../../contexts/userContext';
+
 const BASE_URL = '/api/archives';
 
 // Récupérer la liste des années déjà archivées
 export const useListArchives = () => {
-  return useQuery(['archives'], async () => {
-    const { data } = await axios.get(`${BASE_URL}`);
-    return data;
-  });
+  const { user } = React.useContext(UserContext);
+
+  const hasAccess = user !== null && user.type in [UserType.ADMIN, UserType.SUPER_ADMIN, UserType.MEDIATOR];
+
+  return useQuery(
+    ['archives'],
+    async () => {
+      const { data } = await axios.get(`${BASE_URL}`);
+      return data;
+    },
+    {
+      enabled: hasAccess,
+    },
+  );
 };
diff --git a/src/components/admin/NewAdminNavigation.tsx b/src/components/admin/NewAdminNavigation.tsx
@@ -59,7 +59,7 @@ export const NewAdminNavigation = () => {
   const tabs: Tab[] = [
     { path: '/admin/newportal/create', label: 'Créer', Icon: CreerIcon, rights: [UserType.ADMIN, UserType.SUPER_ADMIN, UserType.MEDIATOR] },
     { path: '/admin/newportal/publier', label: 'Publier', Icon: PublierIcon, rights: [UserType.ADMIN, UserType.SUPER_ADMIN] },
-    { path: '/admin/newportal/manage', label: 'Gérer', Icon: GererIcon, rights: [UserType.ADMIN, UserType.SUPER_ADMIN] },
+    { path: '/admin/newportal/manage', label: 'Gérer', Icon: GererIcon, rights: [UserType.ADMIN, UserType.SUPER_ADMIN, UserType.MEDIATOR] },
     {
       path: '/admin/newportal/analyze',
       label: 'Analyser',

diff --git a/src/pages/admin/newportal/manage/index.tsx b/src/pages/admin/newportal/manage/index.tsx
@@ -15,7 +15,7 @@ type Link = {
 
 const Gerer = () => {
   const { user } = React.useContext(UserContext);
-  const hasAccess = user !== null && user.type in [UserType.ADMIN, UserType.SUPER_ADMIN];
+  const hasAccess = user !== null && user.type in [UserType.ADMIN, UserType.SUPER_ADMIN, UserType.MEDIATOR];
 
   if (!hasAccess) {
     return <h1>Vous n&apos;avez pas accès à cette page, vous devez être super admin.</h1>;
@@ -28,7 +28,7 @@ const Gerer = () => {
       link: '/admin/newportal/manage/activities',
       rights: [UserType.SUPER_ADMIN],
     },
-    { name: 'Paramétrer 1Village', link: '/admin/newportal/manage/settings', rights: [UserType.ADMIN, UserType.SUPER_ADMIN] },
+    { name: 'Paramétrer 1Village', link: '/admin/newportal/manage/settings', rights: [UserType.ADMIN, UserType.SUPER_ADMIN, UserType.MEDIATOR] },
     { name: "Les droits d'accès", link: '/admin/newportal/manage/access', rights: [UserType.SUPER_ADMIN] },
   ];
 

diff --git a/src/pages/admin/newportal/manage/settings/archive/index.tsx b/src/pages/admin/newportal/manage/settings/archive/index.tsx
@@ -11,7 +11,7 @@ import { UserType } from 'types/user.type';
 
 const Archive = () => {
   const { user } = React.useContext(UserContext);
-  const hasAccess = user?.type === UserType.SUPER_ADMIN;
+  const hasAccess = user !== null && user.type in [UserType.ADMIN, UserType.SUPER_ADMIN, UserType.MEDIATOR];
   const [archives, setArchives] = useState<string[]>([]);
   const { enqueueSnackbar } = useSnackbar();
 

diff --git a/src/pages/admin/newportal/manage/settings/index.tsx b/src/pages/admin/newportal/manage/settings/index.tsx
@@ -16,14 +16,14 @@ type Link = {
 
 const Gerer = () => {
   const { user } = React.useContext(UserContext);
-  const hasAccess = user !== null && user.type in [UserType.ADMIN, UserType.SUPER_ADMIN];
+  const hasAccess = user !== null && user.type in [UserType.ADMIN, UserType.SUPER_ADMIN, UserType.MEDIATOR];
 
   if (!hasAccess) {
     return <h1>Vous n&apos;avez pas accès à cette page, vous devez être modérateur ou super admin.</h1>;
   }
 
   const links: Link[] = [
-    { name: 'Archiver', link: '/admin/newportal/manage/settings/archive', rights: [UserType.SUPER_ADMIN] },
+    { name: 'Archiver', link: '/admin/newportal/manage/settings/archive', rights: [UserType.SUPER_ADMIN, UserType.ADMIN, UserType.MEDIATOR] },
     { name: 'Présentation de Pélico', link: '/admin/newportal/manage/settings/pelico', rights: [UserType.ADMIN, UserType.SUPER_ADMIN] },
     { name: 'Paramétrer la home', link: '/admin/newportal/manage/settings/home', rights: [UserType.ADMIN, UserType.SUPER_ADMIN] },
     { name: 'Paramétrer les phases', link: '/admin/newportal/manage/settings/phases', rights: [UserType.ADMIN, UserType.SUPER_ADMIN] },