fix: accès au formulaire hors expé pour les utilisateurs de l'expé

mission-apprentissage · Jan 24, 2025 · 46ec9ac · 46ec9ac
1 parent 22b22b2
commit 46ec9ac
Show file tree

Hide file tree

Showing 22 changed files with 144 additions and 75 deletions.
diff --git a/server/src/db/db.ts b/server/src/db/db.ts
@@ -74,8 +74,10 @@ export const connectToPgDb = async (uri: string) => {
   pool.on("error", (error) => {
     try {
       logger.error({ error }, "[PSQL] pg pool lost connexion with database");
-      // eslint-disable-next-line no-empty
-    } catch (_e) {}
+      // eslint-disable-next-line unused-imports/no-unused-vars
+    } catch (_e) {
+      // error
+    }
   });
 
   kdb = new Kysely<DB>({

diff --git a/server/src/modules/core/usecases/redirectDne/redirectDne.usecase.ts b/server/src/modules/core/usecases/redirectDne/redirectDne.usecase.ts
@@ -89,6 +89,7 @@ const decodeCodeVerifierJwt = (token: string, secret: string) => {
     if (decoded.code_verifier) {
       return decoded.code_verifier;
     }
+    // eslint-disable-next-line unused-imports/no-unused-vars
   } catch (_e) {
     throw new Error("wrong codeVerifierJwt");
   }

diff --git a/server/src/modules/core/utils/extractUserInRequest/extractUserInRequest.ts b/server/src/modules/core/utils/extractUserInRequest/extractUserInRequest.ts
@@ -27,6 +27,7 @@ export const [extractUserInRequest, extractUserInRequestFactory] = inject(
 
       if (!user?.enabled) return;
       request.user = cleanNull(user) as RequestUser;
+      // eslint-disable-next-line unused-imports/no-unused-vars
     } catch (_e) {
       return;
     }

diff --git a/server/src/modules/import/usecases/importIJData/steps/fetchIJ/fetchIJ.step.ts b/server/src/modules/import/usecases/importIJData/steps/fetchIJ/fetchIJ.step.ts
@@ -21,6 +21,7 @@ export const [fetchIJ] = inject({ getUaiData, cacheIj, clearIjCache }, (deps) =>
       millesimesOK.push(MILLESIMES_IJ[i]);
       await deps.cacheIj({ data, uai, millesime });
       d.push(data);
+      // eslint-disable-next-line unused-imports/no-unused-vars
     } catch (_err) {
       millesimesNOK.push(MILLESIMES_IJ[i]);
     }

diff --git a/server/src/modules/import/usecases/importIJData/steps/fetchIjReg/fetchIjReg.step.ts b/server/src/modules/import/usecases/importIJData/steps/fetchIjReg/fetchIjReg.step.ts
@@ -21,6 +21,7 @@ export const [fetchIjReg] = inject({ getRegionData, cacheIjReg, clearIjRegCache
         millesimesOK.push(millesime);
         await deps.cacheIjReg({ data, codeRegion, millesime });
         d.push(data);
+        // eslint-disable-next-line unused-imports/no-unused-vars
       } catch (_err) {
         millesimesNOK.push(millesime);
       }

diff --git a/...rc/modules/import/usecases/importLienEmploiFormation/importLienEmploiFormation.usecase.ts b/...rc/modules/import/usecases/importLienEmploiFormation/importLienEmploiFormation.usecase.ts
@@ -138,6 +138,7 @@ export const importLienEmploiFormationFactory =
 
                 try {
                   await createFormationRome(data);
+                  // eslint-disable-next-line unused-imports/no-unused-vars
                 } catch (_err) {
                   console.log(
                     `\nProblème en ajoutant le couple CFD ${data.cfd} / ROME ${data.codeRome}. Il est probable que le CFD ou le code ROME n'existe pas dans notre base.`

diff --git a/...es/import/usecases/importTensionFranceTravail/importTensionFranceTravailRegion.usecase.ts b/...es/import/usecases/importTensionFranceTravail/importTensionFranceTravailRegion.usecase.ts
@@ -23,7 +23,9 @@ export const [importTensionFranceTravailRegion] = inject(
   },
   (deps) => async () => {
     // Create new file
-    await deps.createFranceTravailTensionFile(deps.filePathManager.getFranceTravailIndicateurTensionRegionStatsFilePath());
+    await deps.createFranceTravailTensionFile(
+      deps.filePathManager.getFranceTravailIndicateurTensionRegionStatsFilePath()
+    );
 
     // Lister tous les ROMES pour lesquels il faut importer les données de tension
     const romes = (await deps.findAllRomeCodes()).map((r) => r.codeRome);

diff --git a/...dules/intentions/usecases/deleteChangementStatut/__tests__/deleteChangementStatut.spec.ts b/...dules/intentions/usecases/deleteChangementStatut/__tests__/deleteChangementStatut.spec.ts
@@ -142,7 +142,10 @@ describe("[DELETE]/intention/changement-statut/:id", () => {
         },
         changementStatutExistant: async (input: Partial<ChangementStatut> = {}) => {
           if (user && intention) {
-            changementStatut = (await buildChangementStatut(user, { intentionNumero: intention.numero, ...input }).injectInDB()).build();
+            changementStatut = (await buildChangementStatut(
+              user,
+              { intentionNumero: intention.numero, ...input }
+            ).injectInDB()).build();
           }
         },
         changementStatutInexistant: () => {

diff --git a/server/src/utils/pgtools.utils.ts b/server/src/utils/pgtools.utils.ts
@@ -93,6 +93,7 @@ function createFunction(action: "CREATE" | "DROP") {
       if (action === "CREATE") {
         try {
           await pgClient.query(`DROP DATABASE "${escapedDatabaseName}"`); // ensure drop
+          // eslint-disable-next-line unused-imports/no-unused-vars
         } catch (_error) {
           // silent db does not exist
         }

diff --git a/ui/app/(wrapped)/auth/activer-compte/page.tsx b/ui/app/(wrapped)/auth/activer-compte/page.tsx
@@ -3,7 +3,7 @@ import { serverClient } from "@/api.client";
 import { ActivateAccountError } from "./ActivateAccountError";
 import { ActivateAccountForm } from "./ActivateAccountForm";
 
-export default async function ({ searchParams: { activationToken } }: { searchParams: { activationToken: string } }) {
+const Page = async ({ searchParams: { activationToken } }: { searchParams: { activationToken: string } }) => {
   try {
     await serverClient.ref("[GET]/auth/check-activation-token").query({
       query: { activationToken },
@@ -18,4 +18,6 @@ export default async function ({ searchParams: { activationToken } }: { searchPa
   } catch (e: any) {
     return <ActivateAccountError message={e.response.data.message} />;
   }
-}
+};
+
+export default Page;
diff --git a/ui/app/(wrapped)/auth/login/page.tsx b/ui/app/(wrapped)/auth/login/page.tsx
@@ -7,14 +7,14 @@ import { LoginForm } from "./LoginForm";
 
 const ERROR_TYPE = "echec_dne_redirect";
 
-function LoginPage({ searchParams }: { params: object; searchParams: { error?: string } }) {
+const LoginPage = ({ searchParams }: { params: object; searchParams: { error?: string } }) => {
   return (
     <VStack spacing="16px" py="16px">
       {searchParams.error === ERROR_TYPE && <ErrorSSO />}
       <LoginForm />
       {searchParams.error !== ERROR_TYPE && <AlertPerdir />}
     </VStack>
   );
-}
+};
 
 export default LoginPage;
diff --git a/ui/app/(wrapped)/auth/reset-password/page.tsx b/ui/app/(wrapped)/auth/reset-password/page.tsx
@@ -1,14 +1,11 @@
 import { ResetPasswordForm } from "./ResetPasswordForm";
 
-// eslint-disable-next-line import/no-anonymous-default-export, react/display-name
-export default async function ({
+const Page = ({
   searchParams: { resetPasswordToken },
 }: {
   searchParams: { resetPasswordToken: string };
-}) {
-  return (
-    <div>
-      <ResetPasswordForm resetPasswordToken={resetPasswordToken} />
-    </div>
-  );
-}
+}) => (
+  <ResetPasswordForm resetPasswordToken={resetPasswordToken} />
+);
+
+export default Page;
diff --git a/ui/app/(wrapped)/intentions/page.tsx b/ui/app/(wrapped)/intentions/page.tsx
@@ -1,22 +1,15 @@
 "use client";
 
 import { redirect } from "next/navigation";
-import { hasRole } from "shared";
 import { CODES_REGIONS_EXPE } from "shared/security/securityUtils";
 
 import { useAuth } from "@/utils/security/useAuth";
 
-// eslint-disable-next-line import/no-anonymous-default-export
-export default () => {
+
+const Page = () => {
   const { auth } = useAuth();
-  const isPerdir = hasRole({
-    user: auth?.user,
-    role: "perdir",
-  });
-  // Feature flag pour les perdir de la région Occitanie (76) et AURA (84)
-  // qui font partie du test
-  const FF_isPerdirPartOfExpe = isPerdir && CODES_REGIONS_EXPE.includes(auth?.user.codeRegion ?? "");
+  const isPartOfExpe = CODES_REGIONS_EXPE.includes(auth?.user.codeRegion ?? "");
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-  FF_isPerdirPartOfExpe ? redirect("/intentions/perdir") : redirect("/intentions/saisie");
+  return isPartOfExpe ? redirect("/intentions/perdir/saisie") : redirect("/intentions/saisie");
 };
+export default Page;
diff --git a/ui/app/(wrapped)/intentions/perdir/page.tsx b/ui/app/(wrapped)/intentions/perdir/page.tsx
@@ -1,5 +1,15 @@
-import { redirect } from "next/navigation";
+"use client";
 
-const Page = () => redirect("/intentions/perdir/saisie");
+import {redirect} from 'next/navigation';
+import {CODES_REGIONS_EXPE} from 'shared/security/securityUtils';
 
+import {useAuth} from '@/utils/security/useAuth';
+
+
+const Page = () => {
+  const { auth } = useAuth();
+  const isPartOfExpe = CODES_REGIONS_EXPE.includes(auth?.user.codeRegion ?? "");
+
+  return isPartOfExpe ? redirect("/intentions/perdir/saisie") : redirect("/intentions/saisie");
+};
 export default Page;
diff --git a/ui/app/(wrapped)/intentions/perdir/saisie/[numero]/page.tsx b/ui/app/(wrapped)/intentions/perdir/saisie/[numero]/page.tsx
@@ -1,3 +1,4 @@
+import {GuardExpe} from '@/utils/security/GuardExpe';
 import { GuardPermission } from "@/utils/security/GuardPermission";
 
 import PageClient from "./client";
@@ -11,6 +12,8 @@ export default ({
   };
 }) => (
   <GuardPermission permission="intentions-perdir/lecture">
-    <PageClient params={params}></PageClient>
+    <GuardExpe isExpeRoute={true}>
+      <PageClient params={params} />
+    </GuardExpe>
   </GuardPermission>
 );
diff --git a/ui/app/(wrapped)/intentions/perdir/saisie/new/page.tsx b/ui/app/(wrapped)/intentions/perdir/saisie/new/page.tsx
@@ -6,6 +6,7 @@ import { client } from "@/api.client";
 import { IntentionSpinner } from "@/app/(wrapped)/intentions/perdir/saisie/components/IntentionSpinner";
 import { IntentionForm } from "@/app/(wrapped)/intentions/perdir/saisie/intentionForm/IntentionForm";
 import { IntentionFilesProvider } from "@/app/(wrapped)/intentions/perdir/saisie/intentionForm/observationsSection/filesSection/filesContext";
+import { GuardExpe } from '@/utils/security/GuardExpe';
 import { GuardPermission } from "@/utils/security/GuardPermission";
 
 // eslint-disable-next-line import/no-anonymous-default-export, react/display-name
@@ -14,20 +15,22 @@ export default () => {
 
   return (
     <GuardPermission permission="intentions-perdir/ecriture">
-      <IntentionFilesProvider>
-        {isLoading && <IntentionSpinner />}
-        {!isLoading && defaultCampagne && (
-          <IntentionForm
-            disabled={defaultCampagne?.statut !== CampagneStatutEnum["en cours"]}
-            defaultValues={{
-              campagneId: defaultCampagne?.id,
-              rentreeScolaire: defaultCampagne?.annee ? Number.parseInt(defaultCampagne?.annee) + 1 : undefined,
-            }}
-            formMetadata={{}}
-            campagne={defaultCampagne}
-          />
-        )}
-      </IntentionFilesProvider>
+      <GuardExpe isExpeRoute={true}>
+        <IntentionFilesProvider>
+          {isLoading && <IntentionSpinner />}
+          {!isLoading && defaultCampagne && (
+            <IntentionForm
+              disabled={defaultCampagne?.statut !== CampagneStatutEnum["en cours"]}
+              defaultValues={{
+                campagneId: defaultCampagne?.id,
+                rentreeScolaire: defaultCampagne?.annee ? Number.parseInt(defaultCampagne?.annee) + 1 : undefined,
+              }}
+              formMetadata={{}}
+              campagne={defaultCampagne}
+            />
+          )}
+        </IntentionFilesProvider>
+      </GuardExpe>
     </GuardPermission>
   );
 };
diff --git a/ui/app/(wrapped)/intentions/perdir/saisie/page.tsx b/ui/app/(wrapped)/intentions/perdir/saisie/page.tsx
@@ -1,12 +1,15 @@
+import { GuardExpe } from "@/utils/security/GuardExpe";
 import { GuardPermission } from "@/utils/security/GuardPermission";
 
 import { PageClient } from "./page.client";
 
-// eslint-disable-next-line import/no-anonymous-default-export, react/display-name
-export default () => {
+const SaisiePage = () => {
   return (
     <GuardPermission permission="intentions-perdir/lecture">
-      <PageClient />
+      <GuardExpe isExpeRoute={true}>
+        <PageClient />
+      </GuardExpe>
     </GuardPermission>
   );
 };
+export default SaisiePage;
diff --git a/ui/app/(wrapped)/intentions/perdir/synthese/[numero]/page.tsx b/ui/app/(wrapped)/intentions/perdir/synthese/[numero]/page.tsx
@@ -1,3 +1,4 @@
+import { GuardExpe } from "@/utils/security/GuardExpe";
 import { GuardPermission } from "@/utils/security/GuardPermission";
 
 import PageClient from "./client";
@@ -10,7 +11,9 @@ const IntentionsPerDirSynthesePage = ({
   };
 }) => (
   <GuardPermission permission="intentions-perdir/lecture">
-    <PageClient params={params}></PageClient>
+    <GuardExpe isExpeRoute={true}>
+      <PageClient params={params}/>
+    </GuardExpe>
   </GuardPermission>
 );
 

diff --git a/ui/app/(wrapped)/intentions/saisie/[numero]/page.tsx b/ui/app/(wrapped)/intentions/saisie/[numero]/page.tsx
@@ -1,3 +1,4 @@
+import {GuardExpe} from '@/utils/security/GuardExpe';
 import { GuardPermission } from "@/utils/security/GuardPermission";
 
 import PageClient from "./client";
@@ -11,6 +12,8 @@ export default ({
   };
 }) => (
   <GuardPermission permission="intentions/lecture">
-    <PageClient params={params}></PageClient>
+    <GuardExpe isExpeRoute={false}>
+      <PageClient params={params} />
+    </GuardExpe>
   </GuardPermission>
 );
diff --git a/ui/app/(wrapped)/intentions/saisie/new/page.tsx b/ui/app/(wrapped)/intentions/saisie/new/page.tsx
@@ -6,6 +6,7 @@ import { CampagneStatutEnum } from "shared/enum/campagneStatutEnum";
 import { client } from "@/api.client";
 import { IntentionSpinner } from "@/app/(wrapped)/intentions/saisie/components/IntentionSpinner";
 import { IntentionForm } from "@/app/(wrapped)/intentions/saisie/intentionForm/IntentionForm";
+import {GuardExpe} from '@/utils/security/GuardExpe';
 import { GuardPermission } from "@/utils/security/GuardPermission";
 
 // eslint-disable-next-line import/no-anonymous-default-export, react/display-name
@@ -27,35 +28,37 @@ export default () => {
 
   return (
     <GuardPermission permission="intentions/ecriture">
-      {numero ? (
-        data && (
+      <GuardExpe isExpeRoute={false}>
+        {numero ? (
+          data && (
+            <IntentionForm
+              disabled={defaultCampagne?.statut !== CampagneStatutEnum["en cours"]}
+              defaultValues={{
+                cfd: data?.compensationCfd,
+                codeDispositif: data?.compensationCodeDispositif,
+                uai: data?.compensationUai,
+                rentreeScolaire: data?.compensationRentreeScolaire,
+                campagneId: data?.campagneId,
+              }}
+              formMetadata={{
+                etablissement: data?.metadata?.etablissementCompensation,
+                formation: data?.metadata?.formationCompensation,
+              }}
+              campagne={defaultCampagne}
+            />
+          )
+        ) : (
           <IntentionForm
             disabled={defaultCampagne?.statut !== CampagneStatutEnum["en cours"]}
             defaultValues={{
-              cfd: data?.compensationCfd,
-              codeDispositif: data?.compensationCodeDispositif,
-              uai: data?.compensationUai,
-              rentreeScolaire: data?.compensationRentreeScolaire,
-              campagneId: data?.campagneId,
-            }}
-            formMetadata={{
-              etablissement: data?.metadata?.etablissementCompensation,
-              formation: data?.metadata?.formationCompensation,
+              campagneId: defaultCampagne?.id,
+              rentreeScolaire: defaultCampagne?.annee ? Number.parseInt(defaultCampagne?.annee) + 1 : undefined,
             }}
+            formMetadata={{}}
             campagne={defaultCampagne}
           />
-        )
-      ) : (
-        <IntentionForm
-          disabled={defaultCampagne?.statut !== CampagneStatutEnum["en cours"]}
-          defaultValues={{
-            campagneId: defaultCampagne?.id,
-            rentreeScolaire: defaultCampagne?.annee ? Number.parseInt(defaultCampagne?.annee) + 1 : undefined,
-          }}
-          formMetadata={{}}
-          campagne={defaultCampagne}
-        />
-      )}
+        )}
+      </GuardExpe>
     </GuardPermission>
   );
 };
diff --git a/ui/app/(wrapped)/intentions/saisie/page.tsx b/ui/app/(wrapped)/intentions/saisie/page.tsx
@@ -1,11 +1,14 @@
+import { GuardExpe } from "@/utils/security/GuardExpe";
 import { GuardPermission } from "@/utils/security/GuardPermission";
 
 import { PageClient } from "./page.client";
 
 const SaisiePage = () => {
   return (
     <GuardPermission permission="intentions/lecture">
-      <PageClient />
+      <GuardExpe isExpeRoute={false}>
+        <PageClient />
+      </GuardExpe>
     </GuardPermission>
   );
 };