OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Avoid logged in event race

pull/21833/head
J. Ryan Stinnett 2020-01-16 11:52:02 +00:00
parent 71fa3222fe
commit 5926e277c4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/structures/MatrixChat.js
View File

@ -1820,12 +1820,9 @@ export default createReactClass({
}, },
async onUserCompletedLoginFlow(credentials) { async onUserCompletedLoginFlow(credentials) {
// Create and start the client in the background
Lifecycle.setLoggedIn(credentials);
// Wait for the client to be logged in (but not started) // Wait for the client to be logged in (but not started)
// which is enough to ask the server about account data. // which is enough to ask the server about account data.
await new Promise(resolve => { const loggedIn = new Promise(resolve => {
const actionHandlerRef = dis.register(payload => { const actionHandlerRef = dis.register(payload => {
if (payload.action !== "on_logged_in") { if (payload.action !== "on_logged_in") {
return; return;
@ -1835,6 +1832,10 @@ export default createReactClass({
}); });
}); });
// Create and start the client in the background
Lifecycle.setLoggedIn(credentials);
await loggedIn;
const cli = MatrixClientPeg.get(); const cli = MatrixClientPeg.get();
// We're checking `isCryptoAvailable` here instead of `isCryptoEnabled` // We're checking `isCryptoAvailable` here instead of `isCryptoEnabled`
// because the client hasn't been started yet. // because the client hasn't been started yet.