Test for self-keyshare

Make sure that we share keys with our own devices.
matrix-org · Dec 7, 2016 · ec12484 · ec12484
1 parent 89ced19
commit ec12484
Show file tree

Hide file tree

Showing 2 changed files with 365 additions and 231 deletions.
diff --git a/lib/crypto/olmlib.js b/lib/crypto/olmlib.js
@@ -159,9 +159,10 @@ module.exports.ensureOlmSessionsForDevices = function(
     return baseApis.claimOneTimeKeys(
         devicesWithoutSession, oneTimeKeyAlgorithm
     ).then(function(res) {
+        var otk_res = res.one_time_keys || {};
         for (var userId in devicesByUser) {
             if (!devicesByUser.hasOwnProperty(userId)) { continue; }
-            var userRes = res.one_time_keys[userId] || {};
+            var userRes = otk_res[userId] || {};
             var devices = devicesByUser[userId];
             for (var j = 0; j < devices.length; j++) {
                 var deviceInfo = devices[j];