From 1620ccac53cb4ccabbcd101cefb54052819ede62 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Thu, 2 May 2019 23:55:40 -0600 Subject: [PATCH] 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, }; },