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

Merge pull request #4225 from matrix-org/jryans/comp-sec-restore-slow

Browse source 
Restore key backup in background after complete security
This commit is contained in:
J. Ryan Stinnett 2020-03-17 16:47:18 +00:00 committed by GitHub
commit fac4561ac8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/components/structures/auth/CompleteSecurity.js
View file

@ -63,9 +63,30 @@ export default class CompleteSecurity extends React.Component {
const backupInfo = await cli.getKeyBackupVersion(); const backupInfo = await cli.getKeyBackupVersion();
this.setState({backupInfo}); this.setState({backupInfo});
await accessSecretStorage(async () => { // The control flow is fairly twisted here...
await cli.checkOwnCrossSigningTrust(); // For the purposes of completing security, we only wait on getting
if (backupInfo) await cli.restoreKeyBackupWithSecretStorage(backupInfo); // as far as the trust check and then show a green shield.
// We also begin the key backup restore as well, which we're
// awaiting inside `accessSecretStorage` only so that it keeps your
// passphase cached for that work. This dialog itself will only wait
// on the first trust check, and the key backup restore will happen
// in the background.
await new Promise((resolve, reject) => {
try {
accessSecretStorage(async () => {
await cli.checkOwnCrossSigningTrust();
resolve();
if (backupInfo) {
// A complete restore can take many minutes for large
// accounts / slow servers, so we allow the dialog
// to advance before this.
await cli.restoreKeyBackupWithSecretStorage(backupInfo);
}
});
} catch (e) {
console.error(e);
reject(e);
}
}); });
if (cli.getCrossSigningId()) { if (cli.getCrossSigningId()) {