matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-01 04:43:29 +03:00
Code Activity

Merge pull request #1248 from matrix-org/bwindels/removecryptoverifstartevent

Browse Source 
Cleanup: remove crypto.verification.start event
This commit is contained in:
Bruno Windels
2020-03-06 16:47:34 +00:00
committed by GitHub
parent 936ef4116b 4b9bc67cb6
commit 074e02ccf2
3 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spec/unit/crypto/verification/sas.spec.js
View File

@@ -122,8 +122,8 @@ describe("SAS verification", function() {
bobSasEvent = null; bobSasEvent = null;
bobPromise = new Promise((resolve, reject) => { bobPromise = new Promise((resolve, reject) => {
bob.client.on("crypto.verification.start", (verifier) => { bob.client.on("crypto.verification.request", request => {
verifier.on("show_sas", (e) => { request.verifier.on("show_sas", (e) => {
if (!e.sas.emoji || !e.sas.decimal) { if (!e.sas.emoji || !e.sas.decimal) {
e.cancel(); e.cancel();
} else if (!aliceSasEvent) { } else if (!aliceSasEvent) {
@@ -139,7 +139,7 @@ describe("SAS verification", function() {
} }
} }
}); });
resolve(verifier); resolve(request.verifier);
}); });
}); });
@@ -339,11 +339,11 @@ describe("SAS verification", function() {
}; };
const bobPromise = new Promise((resolve, reject) => { const bobPromise = new Promise((resolve, reject) => {
bob.client.on("crypto.verification.start", (verifier) => { bob.client.on("crypto.verification.request", request => {
verifier.on("show_sas", (e) => { request.verifier.on("show_sas", (e) => {
e.mismatch(); e.mismatch();
}); });
resolve(verifier); resolve(request.verifier);
}); });
}); });

7
src/client.js
View File

@@ -5506,13 +5506,6 @@ MatrixClient.prototype.generateClientSecret = function() {
* reject the key verification. * reject the key verification.
*/ */
/**
* Fires when a key verification started message is received.
* @event module:client~MatrixClient#"crypto.verification.start"
* @param {module:crypto/verification/Base} verifier a verifier object to
* perform the key verification
*/
/** /**
* Fires when a secret request has been cancelled. If the client is prompting * Fires when a secret request has been cancelled. If the client is prompting
* the user to ask whether they want to share a secret, the prompt can be * the user to ask whether they want to share a secret, the prompt can be

5
src/crypto/index.js
View File

@@ -2680,12 +2680,7 @@ Crypto.prototype._handleVerificationEvent = async function(
} }
event.setVerificationRequest(request); event.setVerificationRequest(request);
try { try {
const hadVerifier = !!request.verifier;
await request.channel.handleEvent(event, request, isLiveEvent); await request.channel.handleEvent(event, request, isLiveEvent);
// emit start event when verifier got set
if (!hadVerifier && request.verifier) {
this._baseApis.emit("crypto.verification.start", request.verifier);
}
} catch (err) { } catch (err) {
logger.error("error while handling verification event: " + err.message); logger.error("error while handling verification event: " + err.message);
} }