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

@ -90,7 +90,11 @@ export default class ServerTypeSelector extends React.PureComponent {
selected: type,
};
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);
}
}