From 35e62588b198bdfbf975be08ab1dd885dc538731 Mon Sep 17 00:00:00 2001
From: Robin Monnier <monnier.robin@gmail.com>
Date: Thu, 3 Oct 2024 17:40:45 +0200
Subject: [PATCH] fix: use referrer from client

---
 components-ui/button-pro-connect/index.tsx | 22 +++++-----
 middleware.ts                              | 26 ++---------
 pages/connexion/agent-public.tsx           | 50 ----------------------
 3 files changed, 15 insertions(+), 83 deletions(-)
 delete mode 100644 pages/connexion/agent-public.tsx

diff --git a/components-ui/button-pro-connect/index.tsx b/components-ui/button-pro-connect/index.tsx
index 55d0778ca..cf3e180a9 100644
--- a/components-ui/button-pro-connect/index.tsx
+++ b/components-ui/button-pro-connect/index.tsx
@@ -1,27 +1,29 @@
 'use client';
 
 import { logConversionEvent } from '#utils/matomo';
+import { usePathname } from 'next/navigation';
 import React from 'react';
 
 type IProps = {
+  shouldRedirectToReferer: boolean;
   event: string;
-  pathForRedirection?: string;
 };
 
 const ButtonProConnect: React.FC<IProps> = ({
+  shouldRedirectToReferer = false,
   event = 'BTN_DEFAULT',
-  pathForRedirection,
 }) => {
+  const currentPath = usePathname();
+  const referrer = document?.referrer;
+  const isFromSite = referrer.indexOf('https://annuaire-entreprises') === 0;
+
+  const pathFrom =
+    shouldRedirectToReferer && isFromSite ? referrer : currentPath;
+
   return (
     <form action="/api/auth/agent-connect/login" method="get">
-      {pathForRedirection && (
-        <input
-          readOnly
-          hidden
-          aria-hidden
-          name="pathFrom"
-          value={pathForRedirection}
-        />
+      {pathFrom && (
+        <input readOnly hidden aria-hidden name="pathFrom" value={pathFrom} />
       )}
       <div className="fr-connect-group">
         <button
diff --git a/middleware.ts b/middleware.ts
index 63ac5eb7d..97bd3ba0f 100644
--- a/middleware.ts
+++ b/middleware.ts
@@ -11,12 +11,7 @@ import { getIronSession } from 'iron-session';
 import type { NextRequest } from 'next/server';
 import { NextResponse } from 'next/server';
 
-const shouldRedirect = (
-  path: string,
-  search: string,
-  url: string,
-  referer: string
-) => {
+const shouldRedirect = (path: string, search: string, url: string) => {
   try {
     if (path.startsWith('/entreprise/')) {
       const sirenOrSiretSlug = extractSirenOrSiretSlugFromUrl(path);
@@ -49,19 +44,6 @@ const shouldRedirect = (
         return new URL(`/entreprise/${sirenOrSiretParam}?redirected=1`, url);
       }
     }
-
-    if (path.startsWith('/lp/agent-public')) {
-      const isFromSite = referer.indexOf('https://annuaire-entreprises') === 0;
-
-      const searchParams = new URLSearchParams(search);
-      const hasNoPathFrom = !searchParams.has('pathFrom');
-
-      if (isFromSite && hasNoPathFrom) {
-        const refererUrl = new URL(referer);
-        const pathFrom = refererUrl.pathname;
-        return new URL(`/lp/agent-public?pathFrom=${pathFrom}`, url);
-      }
-    }
   } catch (e) {
     logErrorInSentry(
       new Exception({
@@ -78,13 +60,10 @@ const shouldRedirect = (
 
 // This function can be marked `async` if using `await` inside
 export async function middleware(request: NextRequest) {
-  const requestHeaders = new Headers(request.headers);
-
   const redirection = shouldRedirect(
     request.nextUrl.pathname,
     request.nextUrl.search,
-    request.url,
-    requestHeaders.get('referer') || ''
+    request.url
   );
 
   if (redirection) {
@@ -94,6 +73,7 @@ export async function middleware(request: NextRequest) {
   /**
    * siren redirection logging
    */
+  const requestHeaders = new Headers(request.headers);
   const nextUrl = request.nextUrl;
   const paramIsPresent = nextUrl.search.indexOf('redirected=1') > -1;
 
diff --git a/pages/connexion/agent-public.tsx b/pages/connexion/agent-public.tsx
deleted file mode 100644
index 7514c9d5c..000000000
--- a/pages/connexion/agent-public.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import ButtonProConnect from '#components-ui/button-pro-connect';
-import connexionPicture from '#components-ui/illustrations/connexion';
-import { Tag } from '#components-ui/tag';
-import { LayoutConnexion } from '#components/layouts/layout-connexion';
-import Meta from '#components/meta/meta-client';
-import { ReactElement } from 'react';
-
-const Login = () => {
-  return (
-    <>
-      <Meta
-        title="Accédez à votre espace agent public sur l’Annuaire des Entreprises"
-        noIndex={true}
-      />
-      <h1>Espace agent public</h1>
-      <p>
-        Ce service est en <Tag color="new">beta test</Tag>.
-      </p>
-      <p>
-        Accédez aux entreprises non-diffusibles, aux actes, aux statuts et aux
-        bilans des entreprises, en continuant avec le bouton{' '}
-        <a
-          href="https://www.proconnect.gouv.fr/"
-          target="_blank"
-          rel="noopener noreferrer"
-          title="Qu’est-ce que ProConnect ? - nouvelle fenêtre"
-        >
-          ProConnect
-        </a>
-        .
-        <p>
-          Disponible pour toutes les administrations, sans création de compte.
-        </p>
-      </p>
-      <ButtonProConnect event="LOGIN_PAGE" />
-      <style jsx>{`
-        h1,
-        p {
-          text-align: left;
-        }
-      `}</style>
-    </>
-  );
-};
-
-Login.getLayout = function getLayout(page: ReactElement) {
-  return <LayoutConnexion img={connexionPicture}>{page}</LayoutConnexion>;
-};
-
-export default Login;