[Hotfix] Réinitialise le state local de l'orga à chaque essai de conn…

…exion [NGC-901] (#571)
incubateur-ademe · May 30, 2024 · 6ce5fbf · 6ce5fbf
2 parents 849116f + 68e7787
commit 6ce5fbf
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 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
@@ -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/...h-navigation)/(simulation)/organisations/connexion/_components/emailSection/EmailForm.tsx b/...h-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
@@ -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
       }