scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-02-17 08:31:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Return early if local check on password fails

Browse source
This commit is contained in:
Colby Gutierrez-Kraybill 2022-09-27 21:02:14 -04:00
parent 22ed62400c
commit bea73415c1
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/components/join-flow/username-step.jsx
View file

@ -114,11 +114,12 @@ class UsernameStep extends React.Component {
if (!password) return null; // skip validation if password is blank; null indicates valid
// if password is not blank, run both local and remote validations
const localResult = validate.validatePasswordLocally(password, username);
if (localResult.valid === false) { // defer to local check first
return this.props.intl.formatMessage({id: localResult.errMsgId});
}
return this.validatePasswordRemotelyWithCache(password).then(
remoteResult => {
if (localResult.valid === false) { // defer to local check first
return this.props.intl.formatMessage({id: localResult.errMsgId});
} else if (remoteResult.valid === false) {
if (remoteResult.valid === false) {
return this.props.intl.formatMessage({id: remoteResult.errMsgId});
}
return null;