.vscode/settings.json

@@ -159,6 +159,7 @@
     "usageevent",
     "Usain",
     "userchallenge",
+    "WEBAUTH",
     "weektype"
   ],
   "typescript.tsdk": "node_modules/typescript/lib",

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,

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: '',
 })

src/components/Konnector/KonnectorViewerCard.tsx

@@ -92,6 +92,9 @@ const KonnectorViewerCard = ({
   const isWaitingForConsent =
     fluidType === FluidType.GAS &&
     currentFluidStatus.status === FluidState.CHALLENGE_ASKED
+  const emailHasBeenIgnored =
+    fluidType === FluidType.GAS &&
+    currentFluidStatus.status === FluidState.EMAIL_IGNORED
 
   const fluidService = useMemo(() => new FluidService(client), [client])
   const accountService = useMemo(() => new AccountService(client), [client])
@@ -465,7 +468,7 @@ const KonnectorViewerCard = ({
   return (
     <div className="konnector-section-root">
       {isWaitingForConsent && <GrdfWaitConsent />}
-      {!isWaitingForConsent && !showOfflineData && (
+      {(!isWaitingForConsent || emailHasBeenIgnored) && !showOfflineData && (
         <Connection fluidType={fluidType} />
       )}
       {!isWaitingForConsent && showOfflineData && (

src/enums/fluid.enum.ts

@@ -13,4 +13,5 @@ export enum FluidState {
   ERROR = 'ERROR',
   LOGIN_FAILED = 'LOGIN_FAILED',
   CHALLENGE_ASKED = 'CHALLENGE_ASKED',
+  EMAIL_IGNORED = 'EMAIL_IGNORED',
 }

src/enums/konnectorStatus.enum.ts

@@ -4,6 +4,7 @@ export enum KonnectorError {
   USER_ACTION_NEEDED = 'USER_ACTION_NEEDED',
   TERMS_VERSION_MISMATCH = 'TERMS_VERSION_MISMATCH',
   CHALLENGE_ASKED = 'CHALLENGE_ASKED',
+  EMAIL_IGNORED = 'USER_ACTION_NEEDED.WEBAUTH_REQUIRED',
   UNKNOWN_ERROR = 'UNKNOWN_ERROR',
   CRITICAL = 'exit status 1',
   MISSING_SECRET = "Cannot read property 'secret' of null",

src/services/fluid.service.ts

@@ -31,6 +31,9 @@ export default class FluidService {
         if (state?.last_error === 'CHALLENGE_ASKED') {
           return FluidState.CHALLENGE_ASKED
         }
+        if (state?.last_error === 'EMAIL_IGNORED') {
+          return FluidState.EMAIL_IGNORED
+        }
         return FluidState.ERROR
 
       default: