From aa4bcdda9fadd249bbcce7c5cf8e194e170e91d2 Mon Sep 17 00:00:00 2001
From: Pierre Ecarlat <pecarlat@grandlyon.com>
Date: Mon, 25 Nov 2024 08:07:50 +0000
Subject: [PATCH] fix: wrong email for grdf consent request
---
.../Connection/GRDFConnect/GrdfConnectView.tsx | 12 ++++++++++--
src/components/Connection/useForm.tsx | 3 ++-
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/components/Connection/GRDFConnect/GrdfConnectView.tsx b/src/components/Connection/GRDFConnect/GrdfConnectView.tsx
index 814ca9007..6ab30c622 100644
--- a/src/components/Connection/GRDFConnect/GrdfConnectView.tsx
+++ b/src/components/Connection/GRDFConnect/GrdfConnectView.tsx
@@ -57,9 +57,15 @@ export const GrdfConnectView = () => {
setGrdfState(prev => ({
...prev,
...createInitialGrdfState(formData),
- email: instanceSettings.email ?? '',
}))
- }, [instanceSettings, formData])
+ }, [formData])
+
+ useEffect(() => {
+ setGrdfState(prev => ({
+ ...prev,
+ email: instanceSettings.email ?? prev.email,
+ }))
+ }, [instanceSettings])
useEffect(() => {
async function launchConnect() {
@@ -110,6 +116,7 @@ export const GrdfConnectView = () => {
_type: FORM_DOCTYPE,
firstName: grdfState.firstname,
lastName: grdfState.lastname,
+ email: grdfState.email,
pce: grdfState.pce,
zipCode: grdfState.postalCode,
})
@@ -124,6 +131,7 @@ export const GrdfConnectView = () => {
formData,
grdfState.firstname,
grdfState.lastname,
+ grdfState.email,
grdfState.pce,
grdfState.postalCode,
isNextValid,
diff --git a/src/components/Connection/useForm.tsx b/src/components/Connection/useForm.tsx
index 1bf3be720..90d7c2d39 100644
--- a/src/components/Connection/useForm.tsx
+++ b/src/components/Connection/useForm.tsx
@@ -12,6 +12,7 @@ export type QueryParams = (arg?: any) => {
interface FormData {
firstName: string
lastName: string
+ email: string
pdl: string
pce: string
zipCode: string
@@ -61,7 +62,7 @@ export const createInitialGrdfState = (
): AccountGRDFData => ({
lastname: formData?.lastName ?? '',
firstname: formData?.firstName ?? '',
+ email: formData?.email ?? '',
pce: formData?.pce ?? '',
postalCode: formData?.zipCode ?? '',
- email: '',
})
--
GitLab