OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Disable phases for now

pull/21833/head
J. Ryan Stinnett 2019-01-28 17:49:24 -06:00
parent 34e2979f98
commit c84198afd1
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/components/structures/auth/Login.js
View File

@ -37,6 +37,9 @@ const PHASE_SERVER_DETAILS = 0;
// Show the appropriate login flow(s) for the server // Show the appropriate login flow(s) for the server
const PHASE_LOGIN = 1; const PHASE_LOGIN = 1;
// Disable phases for now, pending UX discussion on WK discovery
const PHASES_ENABLED = false;
// These are used in several places, and come from the js-sdk's autodiscovery // These are used in several places, and come from the js-sdk's autodiscovery
// stuff. We define them here so that they'll be picked up by i18n. // stuff. We define them here so that they'll be picked up by i18n.
_td("Invalid homeserver discovery response"); _td("Invalid homeserver discovery response");
@ -549,7 +552,7 @@ module.exports = React.createClass({
// If we're on a different phase, we only show the server type selector, // If we're on a different phase, we only show the server type selector,
// which is always shown if we allow custom URLs at all. // which is always shown if we allow custom URLs at all.
if (this.state.phase !== PHASE_SERVER_DETAILS) { if (PHASES_ENABLED && this.state.phase !== PHASE_SERVER_DETAILS) {
return <div> return <div>
<ServerTypeSelector <ServerTypeSelector
defaultHsUrl={this.props.defaultHsUrl} defaultHsUrl={this.props.defaultHsUrl}
@ -583,22 +586,27 @@ module.exports = React.createClass({
break; break;
} }
let nextButton = null;
if (PHASES_ENABLED) {
nextButton = <AccessibleButton className="mx_Login_submit"
onClick={this.onServerDetailsNextPhaseClick}
>
{_t("Next")}
</AccessibleButton>;
}
return <div> return <div>
<ServerTypeSelector <ServerTypeSelector
defaultHsUrl={this.props.defaultHsUrl} defaultHsUrl={this.props.defaultHsUrl}
onChange={this.onServerTypeChange} onChange={this.onServerTypeChange}
/> />
{serverDetails} {serverDetails}
<AccessibleButton className="mx_Login_submit" {nextButton}
onClick={this.onServerDetailsNextPhaseClick}
>
{_t("Next")}
</AccessibleButton>
</div>; </div>;
}, },
loginComponentForStep() { loginComponentForStep() {
if (this.state.phase !== PHASE_LOGIN) { if (PHASES_ENABLED && this.state.phase !== PHASE_LOGIN) {
return null; return null;
} }
@ -623,6 +631,7 @@ module.exports = React.createClass({
// If custom URLs are allowed and we haven't selected the Free server type, wire // If custom URLs are allowed and we haven't selected the Free server type, wire
// up the server details edit link. // up the server details edit link.
if ( if (
PHASES_ENABLED &&
!SdkConfig.get()['disable_custom_urls'] && !SdkConfig.get()['disable_custom_urls'] &&
this.state.serverType !== ServerType.FREE this.state.serverType !== ServerType.FREE
) { ) {