allow registration and login from guest to be cancellable #220
Conversation
| @@ -1042,7 +1071,9 @@ module.exports = React.createClass({ | |||
| registrationUrl={this.props.registrationUrl} | |||
| onLoggedIn={this.onRegistered} | |||
| onLoginClick={this.onLoginClick} | |||
| onRegisterClick={this.onRegisterClick} /> | |||
| onRegisterClick={this.onRegisterClick} | |||
| onCancelClick={ MatrixClientPeg.get() && MatrixClientPeg.get().isGuest() ? this.onReturnToGuestClick : null } | |||
There was a problem hiding this comment.
How does this work? Will this not hide the back-to-app div if the user does anything to cause the matrix client to be replaced, like changing home servers?
|
Possibly a better way of doing this in the future might be to just make login / register use a separate matrixclient which only replaces the one in MatrixClientPeg on success, then we wouldn't have to worry about restoring the old login if the user cancelled (eg. presumably if the user clicks 'login', then refreshes the page, they will no longer be able to return to their guest session). This would probably be a more invasive change though, so appreciate we might not want to do this now. |
| @@ -275,11 +279,31 @@ module.exports = React.createClass({ | |||
| screen: 'post_registration' | |||
| }); | |||
| break; | |||
| case 'start_login_from_guest': | |||
There was a problem hiding this comment.
Does this need to be a separate thing? ie. could start_login just do if (MatrixClientPeg.get().isGuest()) {... and if something explicitly wants to log out first, it can just post the logout action first?
There was a problem hiding this comment.
yup, it could be combined together. i guess it was a choice of separating the two flows with an isGuest() or adding a different dispatch target. keeping it separate gives us the option of logging in without preserving the guest details if desired (e.g. if you explicitly wanted to replace your current session with a new login). i'm not sure that one is a huge win over the other, but yell if you feel strongly.
There was a problem hiding this comment.
Fair enough, I don't really feel strongly.
|
@dbkr: PTAL |
|
lgtm, modulo conflicts. |
allow registration and login from guest to be cancellable
fixes element-hq/element-web#1097