From 1620ccac53cb4ccabbcd101cefb54052819ede62 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 2 May 2019 23:55:40 -0600 Subject: [PATCH 1/2] Always default to the registration form Fixes https://github.com/vector-im/riot-web/issues/8886 --- .../structures/auth/Registration.js | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js index df87c1b9ca..78346170be 100644 --- a/src/components/structures/auth/Registration.js +++ b/src/components/structures/auth/Registration.js @@ -69,26 +69,6 @@ module.exports = React.createClass({ getInitialState: function() { const serverType = ServerType.getTypeFromHsUrl(this.props.customHsUrl); - const customURLsAllowed = !SdkConfig.get()['disable_custom_urls']; - let initialPhase = this.getDefaultPhaseForServerType(serverType); - if ( - // if we have these two, skip to the good bit - // (they could come in from the URL params in a - // registration email link) - (this.props.clientSecret && this.props.sessionId) || - // if custom URLs aren't allowed, skip to form - !customURLsAllowed || - // if other logic says to, skip to form - this.props.skipServerDetails - ) { - // TODO: It would seem we've now added enough conditions here that the initial - // phase will _always_ be the form. It's tempting to remove the complexity and - // just do that, but we keep tweaking and changing auth, so let's wait until - // things settle a bit. - // Filed https://github.com/vector-im/riot-web/issues/8886 to track this. - initialPhase = PHASE_REGISTRATION; - } - return { busy: false, errorText: null, @@ -111,7 +91,7 @@ module.exports = React.createClass({ hsUrl: this.props.customHsUrl, isUrl: this.props.customIsUrl, // Phase of the overall registration dialog. - phase: initialPhase, + phase: PHASE_REGISTRATION, flows: null, }; }, From 35ad68751b34bc5e2b5f2c179a4c459dbb0401df Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 3 May 2019 11:13:36 -0600 Subject: [PATCH 2/2] Remove unused skipServerDetails prop from registration --- src/components/structures/MatrixChat.js | 12 ------------ src/components/structures/auth/Registration.js | 1 - 2 files changed, 13 deletions(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index bf2e7beb16..277985ba1d 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -249,17 +249,6 @@ export default React.createClass({ return this.state.defaultIsUrl || "https://vector.im"; }, - /** - * Whether to skip the server details phase of registration and start at the - * actual form. - * @return {boolean} - * If there was a configured default HS or default server name, skip the - * the server details. - */ - skipServerDetailsForRegistration() { - return !!this.state.defaultHsUrl; - }, - componentWillMount: function() { SdkConfig.put(this.props.config); @@ -1973,7 +1962,6 @@ export default React.createClass({ defaultServerDiscoveryError={this.state.defaultServerDiscoveryError} defaultHsUrl={this.getDefaultHsUrl()} defaultIsUrl={this.getDefaultIsUrl()} - skipServerDetails={this.skipServerDetailsForRegistration()} brand={this.props.config.brand} customHsUrl={this.getCurrentHsUrl()} customIsUrl={this.getCurrentIsUrl()} diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js index 78346170be..708118bb22 100644 --- a/src/components/structures/auth/Registration.js +++ b/src/components/structures/auth/Registration.js @@ -58,7 +58,6 @@ module.exports = React.createClass({ customIsUrl: PropTypes.string, defaultHsUrl: PropTypes.string, defaultIsUrl: PropTypes.string, - skipServerDetails: PropTypes.bool, brand: PropTypes.string, email: PropTypes.string, // registration shouldn't know or care how login is done.