Merge branch 'main' into agent-rights-page

app/(header-connexion)/connexion/au-revoir/page.tsx

@@ -0,0 +1,24 @@
+import { ConnexionSubLayout } from '#components-ui/connexion-layout';
+import logoutPicture from '#components-ui/illustrations/logout';
+import { Metadata } from 'next';
+import { NextPageWithLayout } from 'pages/_app';
+
+export const metadata: Metadata = {
+  title: 'Vous êtes bien deconnecté',
+  alternates: {
+    canonical: 'https://annuaire-entreprises.data.gouv.fr/connexion/au-revoir',
+  },
+  robots: 'noindex, nofollow',
+};
+
+const ConnexionGoodbye: NextPageWithLayout = () => {
+  return (
+    <ConnexionSubLayout img={logoutPicture}>
+      <h1>Vous êtes bien déconnecté(e)</h1>
+      <p>Merci de votre visite</p>
+      <a href="/">← Revenir au moteur de recherche</a>
+    </ConnexionSubLayout>
+  );
+};
+
+export default ConnexionGoodbye;

app/(header-connexion)/connexion/echec-authorisation-requise/page.tsx

@@ -0,0 +1,30 @@
+import { ConnexionSubLayout } from '#components-ui/connexion-layout';
+import connexionRefusedPicture from '#components-ui/illustrations/connexion-refused';
+import constants from '#models/constants';
+import { Metadata } from 'next';
+
+export const metadata: Metadata = {
+  title: 'Vous n’êtes pas autorisé(e) à accéder à cette partie du site',
+  alternates: {
+    canonical:
+      'https://annuaire-entreprises.data.gouv.fr/connexion/echec-authorisation-requise',
+  },
+  robots: 'noindex, nofollow',
+};
+
+const ConnexionRefused = () => {
+  return (
+    <ConnexionSubLayout img={connexionRefusedPicture}>
+      <h1>Vous n’êtes pas autorisé(e) à accéder à cette partie du site</h1>
+      <p>Cet espace est réservé aux agents publics habilités.</p>
+      <p>
+        Vous êtes agent(e) du service public et vous souhaiter accéder au
+        service&nbsp;:{' '}
+        <a href={constants.links.parcours.contact}>contactez-nous.</a>
+      </p>
+      <a href="/">← Retourner au moteur de recherche</a>
+    </ConnexionSubLayout>
+  );
+};
+
+export default ConnexionRefused;

app/(header-connexion)/connexion/echec-connexion/page.tsx

@@ -0,0 +1,28 @@
+import { ConnexionSubLayout } from '#components-ui/connexion-layout';
+import connexionFailedPicture from '#components-ui/illustrations/connexion-failed';
+import constants from '#models/constants';
+import { Metadata } from 'next';
+
+export const metadata: Metadata = {
+  title: 'Votre tentative de connexion a échouée',
+  alternates: {
+    canonical:
+      'https://annuaire-entreprises.data.gouv.fr/connexion/echec-connexion',
+  },
+  robots: 'noindex, nofollow',
+};
+
+const ConnexionFailure = () => {
+  return (
+    <ConnexionSubLayout img={connexionFailedPicture}>
+      <h1>Votre tentative de connexion a échouée</h1>
+      <p>
+        Merci de réessayer plus tard. Si le problème se reproduit, merci de{' '}
+        <a href={constants.links.parcours.contact}>nous contacter.</a>
+      </p>
+      <a href="/">← Retourner au moteur de recherche</a>
+    </ConnexionSubLayout>
+  );
+};
+
+export default ConnexionFailure;

app/(header-connexion)/error.tsx

@@ -0,0 +1,30 @@
+'use client';
+
+import { ConnexionSubLayout } from '#components-ui/connexion-layout';
+import connexionFailedPicture from '#components-ui/illustrations/connexion-failed';
+import constants from '#models/constants';
+import { NextAppError, useLogFatalErrorAppClient } from 'hooks';
+import { Metadata } from 'next';
+
+export const metadata: Metadata = {
+  title: 'Votre tentative de connexion a échouée',
+  alternates: {
+    canonical:
+      'https://annuaire-entreprises.data.gouv.fr/connexion/echec-connexion',
+  },
+  robots: 'noindex, nofollow',
+};
+
+export default function ErrorPage({ error }: { error: NextAppError }) {
+  useLogFatalErrorAppClient(error);
+  return (
+    <ConnexionSubLayout img={connexionFailedPicture}>
+      <h1>Votre tentative de connexion a échouée</h1>
+      <p>
+        Merci de réessayer plus tard. Si le problème se reproduit, merci de{' '}
+        <a href={constants.links.parcours.contact}>nous contacter.</a>
+      </p>
+      <a href="/">← Retourner au moteur de recherche</a>
+    </ConnexionSubLayout>
+  );
+}

app/(header-connexion)/layout.tsx

@@ -0,0 +1,23 @@
+import { HeaderAppRouter } from '#components/header/header-app-router';
+import { meta } from '#components/meta/meta-server';
+import { Metadata } from 'next';
+
+export const metadata: Metadata = meta({});
+
+export default async function ConnexionLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <>
+      <HeaderAppRouter
+        useSearchBar={false}
+        useLogo={true}
+        useMap={false}
+        useAgentCTA={false}
+      />
+      <div>{children}</div>
+    </>
+  );
+}

app/(header-default)/annonces/[slug]/_components/bodacc.tsx

@@ -1,6 +1,5 @@
 'use client';
 
-import React from 'react';
 import routes from '#clients/routes';
 import { Info } from '#components-ui/alerts';
 import ButtonLink from '#components-ui/button';
@@ -12,6 +11,7 @@ import { EAdministration } from '#models/administrations/EAdministration';
 import { IUniteLegale } from '#models/core/types';
 import { formatDate } from '#utils/helpers';
 import { useFetchBODACC } from 'hooks';
+import React from 'react';
 
 const AnnoncesBodacc: React.FC<{
   uniteLegale: IUniteLegale;
@@ -98,11 +98,6 @@ const AnnoncesBodacc: React.FC<{
               />
             </>
           )}
-          <style jsx>{`
-            .annonce {
-              margin: 5px 0;
-            }
-          `}</style>
         </>
       )}
     </AsyncDataSectionClient>

app/(header-default)/dirigeants/[slug]/_component/sections/entreprise/beneficiaires/agent-section.tsx

@@ -1,4 +1,3 @@
-import { useMemo } from 'react';
 import routes from '#clients/routes';
 import FAQLink from '#components-ui/faq-link';
 import { Tag } from '#components-ui/tag';
@@ -13,6 +12,7 @@ import { UseCase } from '#models/user/agent';
 import { ISession } from '#models/user/session';
 import { formatDatePartial } from '#utils/helpers';
 import { useAPIRouteData } from 'hooks/fetch/use-API-route-data';
+import { useMemo } from 'react';
 
 /**
  * Dirigeants section
@@ -295,11 +295,6 @@ function BénéficiairesContent({
           />
         </>
       )}
-      <style global jsx>{`
-        table > tbody > tr > td:first-of-type {
-          width: 30%;
-        }
-      `}</style>
     </>
   );
 }

app/(header-default)/documents/[slug]/_components/justificatifs/insee.tsx

@@ -64,7 +64,7 @@ const AvisSituationNonDiffusible = () => (
 
 const AvisSituationSection: React.FC<IProps> = ({ uniteLegale, session }) => (
   <Section
-    id="insee"
+    id="justificatifs-insee"
     title="Justificatif d’inscription à l’Insee"
     sources={[EAdministration.INSEE]}
   >

app/(header-default)/documents/[slug]/_components/justificatifs/joafe.tsx

@@ -1,6 +1,5 @@
 'use client';
 
-import React from 'react';
 import AssociationCreationNotFoundAlert from '#components-ui/alerts-with-explanations/association-creation-not-found-alert';
 import ButtonLink from '#components-ui/button';
 import { Icon } from '#components-ui/icon/wrapper';
@@ -10,6 +9,7 @@ import { EAdministration } from '#models/administrations/EAdministration';
 import { IAssociation } from '#models/core/types';
 import { formatDate, formatIntFr } from '#utils/helpers';
 import { useFetchJOAFE } from 'hooks';
+import React from 'react';
 import { TwoColumnTable } from '../../../../../../components/table/simple';
 
 type IProps = {
@@ -23,7 +23,7 @@ export const JustificatifImmatriculationJOAFE: React.FC<IProps> = ({
 
   return (
     <AsyncDataSectionClient
-      id="joafe"
+      id="justificatifs"
       title="Enregistrement au JOAFE"
       sources={[EAdministration.DILA]}
       data={annoncesJOAFE}

app/(header-default)/documents/[slug]/_components/justificatifs/rne.tsx

@@ -13,7 +13,7 @@ export const JustificatifImmatriculationRNE = ({
 }) => (
   <Section
     title="Justificatif d’immatriculation au RNE"
-    id="justificatif-immatriculation-rne"
+    id="justificatifs"
     sources={[EAdministration.INPI]}
   >
     <DataInpiLinkWithExplanations uniteLegale={uniteLegale} session={session} />

app/api/auth/agent-connect/callback/route.ts

@@ -2,9 +2,10 @@ import { agentConnectAuthenticate } from '#clients/authentication/agent-connect/
 import { HttpForbiddenError } from '#clients/exceptions';
 import { getAgent } from '#models/user/agent';
 import { logFatalErrorInSentry } from '#utils/sentry';
-import { redirectTo } from '#utils/server-side-helper/app/redirect-to';
+import { getAbsoluteSiteUrl } from '#utils/server-side-helper/app/get-absolute-site-url';
 import { cleanPathFrom, getPathFrom, setAgentSession } from '#utils/session';
 import withSession from '#utils/session/with-session';
+import { NextResponse } from 'next/server';
 import { AgentConnectFailedException } from '../agent-connect-types';
 
 export const GET = withSession(async function callbackRoute(req) {
@@ -18,16 +19,20 @@ export const GET = withSession(async function callbackRoute(req) {
 
     if (pathFrom) {
       await cleanPathFrom(session);
-      return redirectTo(req, pathFrom);
+      return NextResponse.redirect(getAbsoluteSiteUrl(pathFrom));
     } else {
-      return redirectTo(req, '/');
+      return NextResponse.redirect(getAbsoluteSiteUrl('/'));
     }
   } catch (e: any) {
     logFatalErrorInSentry(new AgentConnectFailedException({ cause: e }));
     if (e instanceof HttpForbiddenError) {
-      return redirectTo(req, '/connexion/echec-authorisation-requise');
+      return NextResponse.redirect(
+        getAbsoluteSiteUrl('/connexion/echec-authorisation-requise')
+      );
     } else {
-      return redirectTo(req, '/connexion/echec-connexion');
+      return NextResponse.redirect(
+        getAbsoluteSiteUrl('/connexion/echec-connexion')
+      );
     }
   }
 });

app/api/auth/agent-connect/login/route.ts

@@ -1,6 +1,6 @@
 import { agentConnectAuthorizeUrl } from '#clients/authentication/agent-connect/strategy';
 import { logFatalErrorInSentry } from '#utils/sentry';
-import { redirectTo } from '#utils/server-side-helper/app/redirect-to';
+import { getAbsoluteSiteUrl } from '#utils/server-side-helper/app/get-absolute-site-url';
 import { setPathFrom } from '#utils/session';
 import withSession from '#utils/session/with-session';
 import { NextResponse } from 'next/server';
@@ -18,6 +18,8 @@ export const GET = withSession(async function loginRoute(req) {
     return NextResponse.redirect(url);
   } catch (e: any) {
     logFatalErrorInSentry(new AgentConnectFailedException({ cause: e }));
-    return redirectTo(req, '/connexion/echec-connexion');
+    return NextResponse.redirect(
+      getAbsoluteSiteUrl('/connexion/echec-connexion')
+    );
   }
 });

app/api/auth/agent-connect/logout-callback/route.ts

@@ -1,7 +1,8 @@
 import logErrorInSentry from '#utils/sentry';
-import { redirectTo } from '#utils/server-side-helper/app/redirect-to';
+import { getAbsoluteSiteUrl } from '#utils/server-side-helper/app/get-absolute-site-url';
 import { cleanAgentSession, cleanPathFrom, getPathFrom } from '#utils/session';
 import withSession from '#utils/session/with-session';
+import { NextResponse } from 'next/server';
 import { AgentConnectLogoutFailedException } from '../agent-connect-types';
 
 export const GET = withSession(async function logoutCallbackRoute(req) {
@@ -11,12 +12,12 @@ export const GET = withSession(async function logoutCallbackRoute(req) {
     const pathFrom = getPathFrom(session);
     if (pathFrom) {
       await cleanPathFrom(session);
-      return redirectTo(req, pathFrom);
+      return NextResponse.redirect(getAbsoluteSiteUrl(pathFrom));
     } else {
-      return redirectTo(req, '/connexion/au-revoir');
+      return NextResponse.redirect(getAbsoluteSiteUrl('/connexion/au-revoir'));
     }
   } catch (e: any) {
     logErrorInSentry(new AgentConnectLogoutFailedException({ cause: e }));
-    return redirectTo(req, '/connexion/au-revoir');
+    return NextResponse.redirect(getAbsoluteSiteUrl('/connexion/au-revoir'));
   }
 });

app/api/auth/agent-connect/logout/route.ts

@@ -1,6 +1,6 @@
 import { agentConnectLogoutUrl } from '#clients/authentication/agent-connect/strategy';
 import logErrorInSentry from '#utils/sentry';
-import { redirectTo } from '#utils/server-side-helper/app/redirect-to';
+import { getAbsoluteSiteUrl } from '#utils/server-side-helper/app/get-absolute-site-url';
 import { setPathFrom } from '#utils/session';
 import withSession from '#utils/session/with-session';
 import { NextResponse } from 'next/server';
@@ -13,6 +13,6 @@ export const GET = withSession(async function logoutRoute(req) {
     return NextResponse.redirect(url);
   } catch (e: any) {
     logErrorInSentry(new AgentConnectLogoutFailedException({ cause: e }));
-    return redirectTo(req, '/connexion/au-revoir');
+    return NextResponse.redirect(getAbsoluteSiteUrl('/connexion/au-revoir'));
   }
 });

app/api/auth/france-connect/callback/route.ts

@@ -1,8 +1,9 @@
 import { franceConnectAuthenticate } from '#clients/authentication/france-connect/strategy';
 import logErrorInSentry from '#utils/sentry';
-import { redirectTo } from '#utils/server-side-helper/app/redirect-to';
+import { getAbsoluteSiteUrl } from '#utils/server-side-helper/app/get-absolute-site-url';
 import { setHidePersonalDataRequestFCSession } from '#utils/session';
 import withSession from '#utils/session/with-session';
+import { NextResponse } from 'next/server';
 import { FranceConnectFailedException } from '../france-connect-types';
 
 export const GET = withSession(async function callbackRoute(req) {
@@ -16,12 +17,15 @@ export const GET = withSession(async function callbackRoute(req) {
       userInfo.sub,
       req.session
     );
-    return redirectTo(
-      req,
-      '/formulaire/supprimer-donnees-personnelles-entreprise'
+    return NextResponse.redirect(
+      getAbsoluteSiteUrl(
+        '/formulaire/supprimer-donnees-personnelles-entreprise'
+      )
     );
   } catch (e: any) {
     logErrorInSentry(new FranceConnectFailedException({ cause: e }));
-    return redirectTo(req, '/connexion/echec-connexion');
+    return NextResponse.redirect(
+      getAbsoluteSiteUrl('/connexion/echec-connexion')
+    );
   }
 });

app/api/auth/france-connect/login/route.ts

@@ -1,6 +1,6 @@
 import { FranceConnectAuthorizeUrl } from '#clients/authentication/france-connect/strategy';
 import { logFatalErrorInSentry } from '#utils/sentry';
-import { redirectTo } from '#utils/server-side-helper/app/redirect-to';
+import { getAbsoluteSiteUrl } from '#utils/server-side-helper/app/get-absolute-site-url';
 import withSession from '#utils/session/with-session';
 import { NextResponse } from 'next/server';
 import { FranceConnectFailedException } from '../france-connect-types';
@@ -11,6 +11,8 @@ export const GET = withSession(async function loginRoute(req) {
     return NextResponse.redirect(url);
   } catch (e: any) {
     logFatalErrorInSentry(new FranceConnectFailedException({ cause: e }));
-    return redirectTo(req, '/connexion/echec-connexion');
+    return NextResponse.redirect(
+      getAbsoluteSiteUrl('/connexion/echec-connexion')
+    );
   }
 });