Fix registration after clicking email link

We weren't correctly jumping into the appropriate bit of the registration
flow when coming in from an email link.

 * If we have client secret / sessionId, go straight to registration phase
 * Don't reset server URLs when the server type component tells us its
   initial value
 * Confusingly, pass the custom server URL as 'default server URL' to
   the custom server type, as this is what we want the inital section
   to be based on.

Fixes https://github.com/vector-im/riot-web/issues/8490
This commit is contained in:
David Baker 2019-02-13 18:12:34 +00:00
parent 737b85c8f0
commit 0f4092dcbc
2 changed files with 29 additions and 7 deletions

View file

@ -64,6 +64,15 @@ module.exports = React.createClass({
getInitialState: function() { getInitialState: function() {
const customURLsAllowed = !SdkConfig.get()['disable_custom_urls']; const customURLsAllowed = !SdkConfig.get()['disable_custom_urls'];
let initialPhase = PHASE_SERVER_DETAILS;
if (
// if we have these two, skip to the good bit
(this.props.clientSecret && this.props.sessionId) ||
// or if custom URLs aren't allowed, skip them
!customURLsAllowed
) {
initialPhase = PHASE_REGISTRATION;
}
return { return {
busy: false, busy: false,
@ -87,7 +96,7 @@ module.exports = React.createClass({
hsUrl: this.props.customHsUrl, hsUrl: this.props.customHsUrl,
isUrl: this.props.customIsUrl, isUrl: this.props.customIsUrl,
// Phase of the overall registration dialog. // Phase of the overall registration dialog.
phase: customURLsAllowed ? PHASE_SERVER_DETAILS : PHASE_REGISTRATION, phase: initialPhase,
flows: null, flows: null,
}; };
}, },
@ -111,7 +120,7 @@ module.exports = React.createClass({
}); });
}, },
onServerTypeChange(type) { onServerTypeChange(type, initial) {
this.setState({ this.setState({
serverType: type, serverType: type,
}); });
@ -137,9 +146,15 @@ module.exports = React.createClass({
hsUrl: this.props.defaultHsUrl, hsUrl: this.props.defaultHsUrl,
isUrl: this.props.defaultIsUrl, isUrl: this.props.defaultIsUrl,
}); });
this.setState({ // if this is the initial value from the control and we're
phase: PHASE_SERVER_DETAILS, // already in the registration phase, don't go back to the
}); // server details phase (but do if it's actually a change resulting
// from user interaction).
if (!initial || !this.state.phase === PHASE_REGISTRATION) {
this.setState({
phase: PHASE_SERVER_DETAILS,
});
}
break; break;
} }
}, },
@ -372,9 +387,12 @@ 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 (PHASES_ENABLED && this.state.phase !== PHASE_SERVER_DETAILS) { if (PHASES_ENABLED && this.state.phase !== PHASE_SERVER_DETAILS) {
// if we've been given a custom HS URL we should actually pass that, so
// that the appropriate section is selected at the start to match the
// homeserver URL we're using
return <div> return <div>
<ServerTypeSelector <ServerTypeSelector
defaultHsUrl={this.props.defaultHsUrl} defaultHsUrl={this.props.customHsUrl || this.props.defaultHsUrl}
onChange={this.onServerTypeChange} onChange={this.onServerTypeChange}
/> />
</div>; </div>;

View file

@ -90,7 +90,11 @@ export default class ServerTypeSelector extends React.PureComponent {
selected: type, selected: type,
}; };
if (onChange) { if (onChange) {
onChange(type); // FIXME: Supply a second 'initial' param here to flag that this is
// initialising the value rather than from user interaction
// (which sometuimes we'll want to ignore). Must be a better way
// to do this.
onChange(type, true);
} }
} }