matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-05 23:10:41 +03:00
Code Activity

Support accounts with cross signing but no SSSS

Browse Source 
At least at the login stage.

Fixes https://github.com/vector-im/riot-web/issues/13894
This commit is contained in:
David Baker
2020-06-05 16:40:20 +01:00
parent b82a893a79
commit 68e555a0c6
4 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/structures/MatrixChat.tsx
View File

@@ -1900,10 +1900,12 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
return setLoggedInPromise;
}
// Test for the master cross-signing key in SSSS as a quick proxy for
// whether cross-signing has been set up on the account.
const masterKeyInStorage = !!cli.getAccountData("m.cross_signing.master");
if (masterKeyInStorage) {
// wait for the client to finish downloading cross-signing keys for us so we
// know whether or not we have keys set up on this account
await cli.downloadKeys([cli.getUserId()]);
const crossSigningIsSetUp = cli.getStoredCrossSigningForUser(cli.getUserId());
if (crossSigningIsSetUp) {
this.setStateForNewView({ view: Views.COMPLETE_SECURITY });
} else if (await cli.doesServerSupportUnstableFeature("org.matrix.e2e_cross_signing")) {
this.setStateForNewView({ view: Views.E2E_SETUP });