Add support for specifying the screen after require_registration

Also use it in start chat and join group

Signed-off-by: Stuart Mumford <stuart@cadair.com>
This commit is contained in:
Stuart Mumford 2020-01-12 17:15:19 +00:00
parent 2c6045fe9f
commit 32eb2c13bf
No known key found for this signature in database
GPG key ID: 60BC5C03E6276769
3 changed files with 15 additions and 4 deletions

View file

@ -39,6 +39,8 @@ export const SAFE_LOCALPART_REGEX = /^[a-z0-9=_\-./]+$/;
* If true, goes to the home page if the user cancels the action
* @param {bool} options.go_welcome_on_cancel
* If true, goes to the welcome page if the user cancels the action
* @param {bool} options.screen_after
* If present the screen to redict to after a successful login or register.
*/
export async function startAnyRegistrationFlow(options) {
if (options === undefined) options = {};
@ -72,13 +74,15 @@ export async function startAnyRegistrationFlow(options) {
button: _t("Register"),
extraButtons: [
<button className="mx_Dialog_primary"
onClick={() => {modal.close(); dis.dispatch({action: 'start_login'});}}>
onClick={() => {modal.close(); dis.dispatch({action: 'start_login',
screenAfterLogin: options.screen_after});}}>
{ _t('Login') }
</button>,
],
onFinished: (proceed) => {
if (proceed) {
dis.dispatch({action: 'start_registration'});
dis.dispatch({action: 'start_registration',
screenAfterLogin: options.screen_after});
} else if (options.go_home_on_cancel) {
dis.dispatch({action: 'view_home_page'});
} else if (options.go_welcome_on_cancel) {