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

Merge pull request #4537 from matrix-org/dbkr/wait_for_user_verified 

Wait for user to be verified in e2e setup
pull/21833/head
David Baker 2020-05-01 10:41:22 +01:00 committed by GitHub
parent c19338b1d3 064d90c4b5
commit bff2130b2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DeviceListener.js
View File

@ -78,6 +78,8 @@ export default class DeviceListener {
this._dismissedThisDeviceToast = false; this._dismissedThisDeviceToast = false;
this._keyBackupInfo = null; this._keyBackupInfo = null;
this._keyBackupFetchedAt = null; this._keyBackupFetchedAt = null;
this._ourDeviceIdsAtStart = null;
this._displayingToastsForDeviceIds = new Set();
} }
/** /**

20
src/stores/SetupEncryptionStore.js
View File

@ -17,6 +17,7 @@ limitations under the License.
import EventEmitter from 'events'; import EventEmitter from 'events';
import { MatrixClientPeg } from '../MatrixClientPeg'; import { MatrixClientPeg } from '../MatrixClientPeg';
import { accessSecretStorage, AccessCancelledError } from '../CrossSigningManager'; import { accessSecretStorage, AccessCancelledError } from '../CrossSigningManager';
import { PHASE_DONE as VERIF_PHASE_DONE } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
export const PHASE_INTRO = 0; export const PHASE_INTRO = 0;
export const PHASE_BUSY = 1; export const PHASE_BUSY = 1;
@ -39,6 +40,7 @@ export class SetupEncryptionStore extends EventEmitter {
this.verificationRequest = null; this.verificationRequest = null;
this.backupInfo = null; this.backupInfo = null;
MatrixClientPeg.get().on("crypto.verification.request", this.onVerificationRequest); MatrixClientPeg.get().on("crypto.verification.request", this.onVerificationRequest);
MatrixClientPeg.get().on('userTrustStatusChanged', this._onUserTrustStatusChanged);
} }
stop() { stop() {
@ -51,6 +53,7 @@ export class SetupEncryptionStore extends EventEmitter {
} }
if (MatrixClientPeg.get()) { if (MatrixClientPeg.get()) {
MatrixClientPeg.get().removeListener("crypto.verification.request", this.onVerificationRequest); MatrixClientPeg.get().removeListener("crypto.verification.request", this.onVerificationRequest);
MatrixClientPeg.get().removeListener('userTrustStatusChanged', this._onUserTrustStatusChanged);
} }
} }
@ -102,6 +105,15 @@ export class SetupEncryptionStore extends EventEmitter {
} }
} }
_onUserTrustStatusChanged = async (userId) => {
if (userId !== MatrixClientPeg.get().getUserId()) return;
const crossSigningReady = await MatrixClientPeg.get().isCrossSigningReady();
if (crossSigningReady) {
this.phase = PHASE_DONE;
this.emit("update");
}
}
onVerificationRequest = async (request) => { onVerificationRequest = async (request) => {
if (request.otherUserId !== MatrixClientPeg.get().getUserId()) return; if (request.otherUserId !== MatrixClientPeg.get().getUserId()) return;
@ -119,6 +131,14 @@ export class SetupEncryptionStore extends EventEmitter {
this.verificationRequest.off("change", this.onVerificationRequestChange); this.verificationRequest.off("change", this.onVerificationRequestChange);
this.verificationRequest = null; this.verificationRequest = null;
this.emit("update"); this.emit("update");
} else if (this.verificationRequest.phase === VERIF_PHASE_DONE) {
this.verificationRequest.off("change", this.onVerificationRequestChange);
this.verificationRequest = null;
// At this point, the verification has finished, we just need to wait for
// cross signing to be ready to use, so wait for the user trust status to
// change.
this.phase = PHASE_BUSY;
this.emit("update");
} }
} }