From 68e7787719ba89974f43b27b3300ecd1e9a2142c Mon Sep 17 00:00:00 2001
From: Benjamin Arias <bjlaa@proton.me>
Date: Thu, 30 May 2024 11:44:50 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20R=C3=A9initialise=20le=20state=20local?=
 =?UTF-8?q?=20de=20l'orga=20=C3=A0=20chaque=20essai=20de=20connexion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organisations/_components/HeroSection.tsx      |  4 ++--
 .../_components/emailSection/EmailForm.tsx         | 14 ++++++++++++++
 .../hooks/useUser/useUserDetails.ts                |  6 +++---
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/app/(layout-with-navigation)/(simulation)/organisations/_components/HeroSection.tsx b/src/app/(layout-with-navigation)/(simulation)/organisations/_components/HeroSection.tsx
index 9675fa6a6..604cc9c6a 100644
--- a/src/app/(layout-with-navigation)/(simulation)/organisations/_components/HeroSection.tsx
+++ b/src/app/(layout-with-navigation)/(simulation)/organisations/_components/HeroSection.tsx
@@ -19,9 +19,9 @@ export default function HeroSection() {
           <Trans>Nos Gestes Climat pour les organisations</Trans>
         </h1>
 
-        <p className="mb-12 text-sm md:text-lg">
+        <div className="mb-12 text-sm md:text-lg">
           <Baseline />
-        </p>
+        </div>
 
         <div className="flex flex-col flex-wrap items-center gap-4 sm:flex-row sm:justify-start md:items-baseline md:gap-8 lg:justify-start">
           <ButtonLink
diff --git a/src/app/(layout-with-navigation)/(simulation)/organisations/connexion/_components/emailSection/EmailForm.tsx b/src/app/(layout-with-navigation)/(simulation)/organisations/connexion/_components/emailSection/EmailForm.tsx
index e43fda088..f48589a9d 100644
--- a/src/app/(layout-with-navigation)/(simulation)/organisations/connexion/_components/emailSection/EmailForm.tsx
+++ b/src/app/(layout-with-navigation)/(simulation)/organisations/connexion/_components/emailSection/EmailForm.tsx
@@ -54,6 +54,13 @@ export default function EmailForm() {
         email,
       })
 
+      // Reset the organisation local state
+      updateUserOrganisation({
+        administratorEmail: email,
+        slug: '',
+        name: '',
+      })
+
       // We update the expiration date of the code
       updateLoginExpirationDate(expirationDate)
     } catch (error: any) {
@@ -64,6 +71,13 @@ export default function EmailForm() {
           userId: user.userId,
         })
 
+        // Always reset the organisation local state
+        updateUserOrganisation({
+          administratorEmail: email,
+          slug: '',
+          name: '',
+        })
+
         updateLoginExpirationDate(expirationDate)
       } catch (error: any) {
         setInputError(error.response.data.message)
diff --git a/src/publicodes-state/hooks/useUser/useUserDetails.ts b/src/publicodes-state/hooks/useUser/useUserDetails.ts
index 7ef222bef..9694e2ef3 100644
--- a/src/publicodes-state/hooks/useUser/useUserDetails.ts
+++ b/src/publicodes-state/hooks/useUser/useUserDetails.ts
@@ -32,16 +32,16 @@ export default function useUserDetails({ setUser }: Props) {
     (organisation: UserOrganisationInfo) => {
       const organisationModifications: UserOrganisationInfo = {}
 
-      if (organisation.administratorEmail) {
+      if (organisation.administratorEmail !== undefined) {
         organisationModifications.administratorEmail =
           organisation.administratorEmail
       }
 
-      if (organisation.slug) {
+      if (organisation.slug !== undefined) {
         organisationModifications.slug = organisation.slug
       }
 
-      if (organisation.name) {
+      if (organisation.name !== undefined) {
         organisationModifications.name = organisation.name
       }