PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1116 from matrix-org/rav/no_more_guestcreds

Browse source 
Get rid of guestCreds
This commit is contained in:
Richard van der Hoff 2017-06-19 14:34:12 +01:00 committed by GitHub
commit 3a6dabdc08
1 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/components/structures/MatrixChat.js
View file

@ -133,11 +133,6 @@ module.exports = React.createClass({
// a thing to call showScreen with once login completes. // a thing to call showScreen with once login completes.
screenAfterLogin: this.props.initialScreenAfterLogin, screenAfterLogin: this.props.initialScreenAfterLogin,
// Stashed guest credentials if the user logs out
// whilst logged in as a guest user (so they can change
// their mind & log back in)
guestCreds: null,
// What the LoggedInView would be showing if visible // What the LoggedInView would be showing if visible
page_type: null, page_type: null,
@ -385,13 +380,6 @@ module.exports = React.createClass({
this._startRegistration(payload.params || {}); this._startRegistration(payload.params || {});
break; break;
case 'start_login': case 'start_login':
if (MatrixClientPeg.get() &&
MatrixClientPeg.get().isGuest()
) {
this.setState({
guestCreds: MatrixClientPeg.getCredentials(),
});
}
this.setStateForNewView({ this.setStateForNewView({
view: VIEWS.LOGIN, view: VIEWS.LOGIN,
}); });
@ -947,7 +935,6 @@ module.exports = React.createClass({
_onLoggedIn: function(teamToken) { _onLoggedIn: function(teamToken) {
this.setState({ this.setState({
view: VIEWS.LOGGED_IN, view: VIEWS.LOGGED_IN,
guestCreds: null,
}); });
if (teamToken) { if (teamToken) {
@ -1270,14 +1257,9 @@ module.exports = React.createClass({
this.showScreen("forgot_password"); this.showScreen("forgot_password");
}, },
onReturnToGuestClick: function() { onReturnToAppClick: function() {
// reanimate our guest login // treat it the same as if the user had completed the login
if (this.state.guestCreds) { this._onLoggedIn(null);
// TODO: this is probably a bit broken - we don't want to be
// clearing storage when we reanimate the guest creds.
Lifecycle.setLoggedIn(this.state.guestCreds);
this.setState({guestCreds: null});
}
}, },
// returns a promise which resolves to the new MatrixClient // returns a promise which resolves to the new MatrixClient
@ -1457,7 +1439,7 @@ module.exports = React.createClass({
onLoggedIn={this.onRegistered} onLoggedIn={this.onRegistered}
onLoginClick={this.onLoginClick} onLoginClick={this.onLoginClick}
onRegisterClick={this.onRegisterClick} onRegisterClick={this.onRegisterClick}
onCancelClick={this.state.guestCreds ? this.onReturnToGuestClick : null} onCancelClick={MatrixClientPeg.get() ? this.onReturnToAppClick : null}
/> />
); );
} }
@ -1491,7 +1473,7 @@ module.exports = React.createClass({
defaultDeviceDisplayName={this.props.defaultDeviceDisplayName} defaultDeviceDisplayName={this.props.defaultDeviceDisplayName}
onForgotPasswordClick={this.onForgotPasswordClick} onForgotPasswordClick={this.onForgotPasswordClick}
enableGuest={this.props.enableGuest} enableGuest={this.props.enableGuest}
onCancelClick={this.state.guestCreds ? this.onReturnToGuestClick : null} onCancelClick={MatrixClientPeg.get() ? this.onReturnToAppClick : null}
/> />
); );
} }