Removed proxy and added api calls, has gov gateway auth

components/account/personaldetails.js

@@ -82,10 +82,11 @@ let PersonalDetails = (props) => {
     let errorsobj = {};
 
     const required = (value) => (value ? undefined : "Is required");
+    const emailRegex =
+        /(?:[a-z0-9!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+\/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/gi;
+
     const email = (value) =>
-        value && !/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i.test(value)
-            ? "Invalid email address"
-            : undefined;
+        value && !emailRegex.test(value) ? "Invalid email address" : undefined;
     const phoneNumber = (value) =>
         value &&
         !/^(?:(?:\(?(?:0(?:0|11)\)?[\s-]?\(?|\+)44\)?[\s-]?(?:\(?0\)?[\s-]?)?)|(?:\(?0))(?:(?:\d{5}\)?[\s-]?\d{4,5})|(?:\d{4}\)?[\s-]?(?:\d{5}|\d{3}[\s-]?\d{3}))|(?:\d{3}\)?[\s-]?\d{3}[\s-]?\d{3,4})|(?:\d{2}\)?[\s-]?\d{4}[\s-]?\d{4}))(?:[\s-]?(?:x|ext\.?|\#)\d{3,4})?$/i.test(

components/account/registerform.js

@@ -23,6 +23,7 @@ const RenderTextfield = ({
     input,
     type,
     errorMsg,
+    disabled,
     meta: { touched, error },
     ...custom
 }) => {
@@ -39,6 +40,7 @@ const RenderTextfield = ({
                         name={name}
                         id={id}
                         type={type}
+                        disabled={disabled}
                     />
                     {touched && error && (
                         <span
@@ -69,6 +71,8 @@ const RegisterForm = (props) => {
         value,
         setRegisterFormComplete,
         setAccountCreatedComplete,
+        loggedInUserEmail,
+        emailaddress1,
     } = props;
     let { t, lang } = useTranslation();
 
@@ -135,7 +139,8 @@ const RegisterForm = (props) => {
                                 <h2 className="govuk-fieldset__heading">
                                     {t(
                                         "account:register-new-account-sub-heading-1"
-                                    )}
+                                    )}{" "}
+                                    {loggedInUserEmail}
                                 </h2>
                             </legend>
                             <Field
@@ -176,6 +181,7 @@ const RegisterForm = (props) => {
                                 label={t(
                                     "account:register-new-account-email-address-label"
                                 )}
+                                disabled
                             />
                             <Field
                                 name="telephone1"
@@ -327,13 +333,16 @@ const RegisterForm = (props) => {
     );
 };
 
-const mapStateToProps = (state) => {
+const mapStateToProps = (state, props) => {
     return {
         search: state.search,
         searchResultsObj: state.searchResultsObj,
         formData: state.formData,
         appealType: state.appealType,
         //form: state.form,
+        initialValues: {
+            emailaddress1: props.loggedInUserEmail,
+        },
     };
 };
 
@@ -353,6 +362,7 @@ export default connect(
 )(
     reduxForm({
         form: "accountRegisterForm",
+        enableReinitialize: true,
         destroyOnUnmount: false,
     })(RegisterForm)
 );