Skip to content

Commit e4bddc2

Browse files
fix: remove password field duplicate validation (#1181)
1 parent 8aeacaa commit e4bddc2

File tree

1 file changed

+9
-27
lines changed

1 file changed

+9
-27
lines changed

src/register/RegistrationPage.jsx

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import RegistrationFailure from './components/RegistrationFailure';
1717
import {
1818
backupRegistrationFormBegin,
1919
clearRegistrationBackendError,
20-
fetchRealtimeValidations,
2120
registerNewUser,
2221
setSimplifyRegExperimentData,
2322
setUserPipelineDataLoaded,
@@ -31,11 +30,9 @@ import {
3130
FIRST_STEP,
3231
getRegisterButtonLabelInExperiment,
3332
NOT_INITIALIZED,
34-
prepareSimplifiedRegistrationFirstStepPayload,
3533
SECOND_STEP,
3634
shouldDisplayFieldInExperiment,
3735
SIMPLIFIED_REGISTRATION_VARIATION,
38-
validateSimplifiedRegistrationFirstStepPayload,
3936
} from './data/optimizelyExperiment/helper';
4037
import {
4138
trackSimplifyRegistrationContinueBtnClicked,
@@ -96,7 +93,6 @@ const RegistrationPage = (props) => {
9693
usernameSuggestionsBackup,
9794
submitState,
9895
validations,
99-
isValidatingSimplifiedRegisterFirstPage,
10096
simplifyRegExpVariation,
10197
simplifiedRegisterPageStep,
10298
} = useSelector(state => state.register);
@@ -143,22 +139,6 @@ const RegistrationPage = (props) => {
143139
simplifyRegExpVariation, registrationEmbedded, tpaHint, currentProvider, thirdPartyAuthApiStatus,
144140
);
145141

146-
useEffect(() => {
147-
if (isValidatingSimplifiedRegisterFirstPage && backendValidations) {
148-
if (Object.values(backendValidations).every(value => value === '')) {
149-
setErrorCode({ type: '', count: 0 });
150-
trackSimplifyRegistrationValidatedSubmitBtnClicked(simplifyRegistrationExpVariation);
151-
trackSimplifyRegistrationSecondStepViewed();
152-
dispatch(setSimplifyRegExperimentData(simplifyRegistrationExpVariation, SECOND_STEP));
153-
} else {
154-
setErrorCode(prevState => ({ type: FORM_SUBMISSION_ERROR, count: prevState.count + 1 }));
155-
}
156-
}
157-
}, [ // eslint-disable-line react-hooks/exhaustive-deps
158-
isValidatingSimplifiedRegisterFirstPage,
159-
backendValidations,
160-
]);
161-
162142
/**
163143
* Set the userPipelineDetails data in formFields for only first time
164144
*/
@@ -324,8 +304,11 @@ const RegistrationPage = (props) => {
324304

325305
if (simplifyRegistrationExpVariation === SIMPLIFIED_REGISTRATION_VARIATION
326306
&& simplifiedRegisterPageStep === FIRST_STEP) {
327-
const { isValid, fieldErrors } = validateSimplifiedRegistrationFirstStepPayload(
328-
formFields, errors, configurableFormFields, fieldDescriptions, formatMessage,
307+
const payload = { ...formFields };
308+
// We dont want to validate username since it is in second step of registration
309+
delete payload.username;
310+
const { isValid, fieldErrors } = isFormValid(
311+
payload, errors, configurableFormFields, fieldDescriptions, formatMessage,
329312
);
330313
setErrors(prevErrors => ({
331314
...prevErrors,
@@ -335,11 +318,10 @@ const RegistrationPage = (props) => {
335318
if (!isValid) {
336319
setErrorCode(prevState => ({ type: FORM_SUBMISSION_ERROR, count: prevState.count + 1 }));
337320
} else {
338-
const payload = prepareSimplifiedRegistrationFirstStepPayload(
339-
formFields,
340-
configurableFormFields,
341-
);
342-
dispatch(fetchRealtimeValidations(payload, true));
321+
setErrorCode({ type: '', count: 0 });
322+
trackSimplifyRegistrationValidatedSubmitBtnClicked(simplifyRegistrationExpVariation);
323+
trackSimplifyRegistrationSecondStepViewed();
324+
dispatch(setSimplifyRegExperimentData(simplifyRegistrationExpVariation, SECOND_STEP));
343325
}
344326
} else {
345327
registerUser();

0 commit comments

Comments
 (0)