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

Merge pull request #4464 from matrix-org/jryans/signing-upload-assume-password

Browse source 
Skip auth flow test for signing upload when password present
This commit is contained in:
J. Ryan Stinnett 2020-04-22 15:08:32 +01:00 committed by GitHub
commit 355539feb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/async-components/views/dialogs/secretstorage/CreateSecretStorageDialog.js
View file

@ -83,7 +83,15 @@ export default class CreateSecretStorageDialog extends React.PureComponent {
}; };
this._fetchBackupInfo(); this._fetchBackupInfo();
this._queryKeyUploadAuth(); if (this.state.accountPassword) {
// If we have an account password in memory, let's simplify and
// assume it means password auth is also supported for device
// signing key upload as well. This avoids hitting the server to
// test auth flows, which may be slow under high load.
this.state.canUploadKeysWithPasswordOnly = true;
} else {
this._queryKeyUploadAuth();
}
MatrixClientPeg.get().on('crypto.keyBackupStatus', this._onKeyBackupStatusChange); MatrixClientPeg.get().on('crypto.keyBackupStatus', this._onKeyBackupStatusChange);
} }