From f4842688f880c324acdd1819d2fea05f15415b4b Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 28 Jan 2020 11:10:15 +0000 Subject: [PATCH 1/3] Add reciprocate to verification methods --- src/MatrixClientPeg.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js index 450bec8e77..53dd63d805 100644 --- a/src/MatrixClientPeg.js +++ b/src/MatrixClientPeg.js @@ -217,7 +217,7 @@ class _MatrixClientPeg { timelineSupport: true, forceTURN: !SettingsStore.getValue('webRtcAllowPeerToPeer', false), fallbackICEServerAllowed: !!SettingsStore.getValue('fallbackICEServerAllowed'), - verificationMethods: [verificationMethods.SAS, verificationMethods.QR_CODE_SHOW], + verificationMethods: [verificationMethods.SAS, verificationMethods.QR_CODE_SHOW, verificationMethods.RECIPROCATE_QR_CODE], unstableClientRelationAggregation: true, identityServer: new IdentityAuthClient(), }; From 7d1c61fa550c1fda3a601a678ca44742e6786d06 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 29 Jan 2020 09:29:45 +0000 Subject: [PATCH 2/3] Use new constant for QR code verification --- src/MatrixClientPeg.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js index 53dd63d805..db99f38738 100644 --- a/src/MatrixClientPeg.js +++ b/src/MatrixClientPeg.js @@ -32,6 +32,7 @@ import MatrixClientBackedSettingsHandler from "./settings/handlers/MatrixClientB import * as StorageManager from './utils/StorageManager'; import IdentityAuthClient from './IdentityAuthClient'; import { crossSigningCallbacks } from './CrossSigningManager'; +import {SHOW_QR_CODE_METHOD} from "matrix-js-sdk/src/crypto/verification/QRCode"; interface MatrixClientCreds { homeserverUrl: string, @@ -217,7 +218,7 @@ class _MatrixClientPeg { timelineSupport: true, forceTURN: !SettingsStore.getValue('webRtcAllowPeerToPeer', false), fallbackICEServerAllowed: !!SettingsStore.getValue('fallbackICEServerAllowed'), - verificationMethods: [verificationMethods.SAS, verificationMethods.QR_CODE_SHOW, verificationMethods.RECIPROCATE_QR_CODE], + verificationMethods: [verificationMethods.SAS, SHOW_QR_CODE_METHOD, verificationMethods.RECIPROCATE_QR_CODE], unstableClientRelationAggregation: true, identityServer: new IdentityAuthClient(), }; From 00fa7cce57498d0c2ab1963f75029baa4ff5956e Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 29 Jan 2020 15:02:52 +0000 Subject: [PATCH 3/3] Appease the linter --- src/MatrixClientPeg.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js index db99f38738..98fcc85d60 100644 --- a/src/MatrixClientPeg.js +++ b/src/MatrixClientPeg.js @@ -218,7 +218,11 @@ class _MatrixClientPeg { timelineSupport: true, forceTURN: !SettingsStore.getValue('webRtcAllowPeerToPeer', false), fallbackICEServerAllowed: !!SettingsStore.getValue('fallbackICEServerAllowed'), - verificationMethods: [verificationMethods.SAS, SHOW_QR_CODE_METHOD, verificationMethods.RECIPROCATE_QR_CODE], + verificationMethods: [ + verificationMethods.SAS, + SHOW_QR_CODE_METHOD, + verificationMethods.RECIPROCATE_QR_CODE, + ], unstableClientRelationAggregation: true, identityServer: new IdentityAuthClient(), };