From a0ecd89c94a4269d81ff2b163a82b9f767e94769 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 14 May 2019 11:44:00 +0100 Subject: [PATCH] Fix email registration: pt. 1 We look to see if there's already a user logged in and if there is, restore that session instead of logging the user in as their new account. We still set this 'is_registered' flag though, even though in that case it's not a newly registered account that's being restored, so don't set in that case. --- src/components/structures/MatrixChat.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index 277985ba1d..49ee1ca872 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -1710,9 +1710,6 @@ export default React.createClass({ // returns a promise which resolves to the new MatrixClient onRegistered: function(credentials) { - // XXX: This should be in state or ideally store(s) because we risk not - // rendering the most up-to-date view of state otherwise. - this._is_registered = true; if (this.state.register_session_id) { // The user came in through an email validation link. To avoid overwriting // their session, check to make sure the session isn't someone else. @@ -1748,6 +1745,9 @@ export default React.createClass({ return MatrixClientPeg.get(); } } + // XXX: This should be in state or ideally store(s) because we risk not + // rendering the most up-to-date view of state otherwise. + this._is_registered = true; return Lifecycle.setLoggedIn(credentials); },