PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #2551 from jryans/auth-reg-optional-fields

Browse source 
Hide registration fields that aren't used by any flow
This commit is contained in:
J. Ryan Stinnett 2019-02-01 08:59:31 -06:00 committed by GitHub
commit 5841f0520f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/components/views/auth/RegistrationForm.js
View file

@ -270,11 +270,27 @@ module.exports = React.createClass({
this.validateField(FIELD_USERNAME, ev.type); this.validateField(FIELD_USERNAME, ev.type);
}, },
/**
* A step is required if all flows include that step.
*
* @param {string} step A stage name to check
* @returns {boolean} Whether it is required
*/
_authStepIsRequired(step) { _authStepIsRequired(step) {
// A step is required if no flow exists which does not include that step return this.props.flows.every((flow) => {
// (Notwithstanding setups like either email or msisdn being required) return flow.stages.includes(step);
return !this.props.flows.some((flow) => { });
return !flow.stages.includes(step); },
/**
* A step is used if any flows include that step.
*
* @param {string} step A stage name to check
* @returns {boolean} Whether it is used
*/
_authStepIsUsed(step) {
return this.props.flows.some((flow) => {
return flow.stages.includes(step);
}); });
}, },
@ -298,24 +314,28 @@ module.exports = React.createClass({
</a>; </a>;
} }
const emailPlaceholder = this._authStepIsRequired('m.login.email.identity') ? let emailSection;
_t("Email") : if (this._authStepIsUsed('m.login.email.identity')) {
_t("Email (optional)"); const emailPlaceholder = this._authStepIsRequired('m.login.email.identity') ?
_t("Email") :
_t("Email (optional)");
const emailSection = ( emailSection = (
<div> <div>
<input type="text" ref="email" <input type="text" ref="email"
placeholder={emailPlaceholder} placeholder={emailPlaceholder}
defaultValue={this.props.defaultEmail} defaultValue={this.props.defaultEmail}
className={this._classForField(FIELD_EMAIL, 'mx_Login_field')} className={this._classForField(FIELD_EMAIL, 'mx_Login_field')}
onBlur={this.onEmailBlur} onBlur={this.onEmailBlur}
value={this.state.email} /> value={this.state.email} />
</div> </div>
); );
}
const threePidLogin = !SdkConfig.get().disable_3pid_login;
const CountryDropdown = sdk.getComponent('views.auth.CountryDropdown'); const CountryDropdown = sdk.getComponent('views.auth.CountryDropdown');
let phoneSection; let phoneSection;
if (!SdkConfig.get().disable_3pid_login) { if (threePidLogin && this._authStepIsUsed('m.login.msisdn')) {
const phonePlaceholder = this._authStepIsRequired('m.login.msisdn') ? const phonePlaceholder = this._authStepIsRequired('m.login.msisdn') ?
_t("Phone") : _t("Phone") :
_t("Phone (optional)"); _t("Phone (optional)");