matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-09 10:22:46 +03:00
Code Activity
10,444 Commits 249 Branches 493 Tags
toger5/use-logspan-instead-of-child-logger
Commit Graph

1879 Commits

Author SHA1 Message Date
Michael Telatynski
87a8e4c216 Apply uhoreg's patch (with jesty stuff changed out) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-04 23:37:49 +00:00
Michael Telatynski
30cc7d4f0f Fix one of the crypto.spec.js failures 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-04 23:31:20 +00:00
Michael Telatynski
4a47867e49 Down to two test failures 2019-12-04 19:17:58 +00:00
J. Ryan Stinnett
eeffe208ec Clarify client-level method for adding secret storage keys 2019-12-04 13:45:56 +00:00
J. Ryan Stinnett
9dc61faa6f Add bootstrap option to specify storage key 2019-12-04 11:36:25 +00:00
J. Ryan Stinnett
2173ab3437 Add test for bootstrapping from scratch 2019-12-04 10:59:28 +00:00
Travis Ralston
5da936d96a Fix tests 2019-12-03 13:38:40 -07:00
Michael Telatynski
1632ee3537 fix order 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-02 23:18:26 +00:00
Michael Telatynski
a16cdb948c Fix cross-signing.spec by waiting for right emit 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-02 23:12:45 +00:00
Michael Telatynski
c4ae27dae6 Merge branches 'develop' and 't3chguy/remove_bluebird_13' of github.com:matrix-org/matrix-js-sdk into t3chguy/remove_bluebird_13 2019-12-02 22:56:13 +00:00
Michael Telatynski
0170cb066d add another clean-up to sas.spec.js 2019-12-02 22:34:46 +00:00
Michael Telatynski
6bba5ca25a Rip out some more bluebird 2019-12-02 22:34:46 +00:00
Michael Telatynski
edcdeb31ea Rip out bluebird of a bunch more places, not as much to go :| 2019-12-02 22:34:46 +00:00
Michael Telatynski
1286007b2e Rip out bluebird of a bunch of places, lots to go :( 2019-12-02 22:34:46 +00:00
Michael Telatynski
64bf145e4b Replace rest of defers 2019-12-02 22:34:46 +00:00
Michael Telatynski
733008cfc4 delint and replace more defers 2019-12-02 22:34:46 +00:00
Michael Telatynski
bab4582139 Replace more Bluebirdy stuffs 2019-12-02 22:34:46 +00:00
Hubert Chathi
59b25d6837 increase timeout on flush to fix failing unit test 
also remove unused requests
 2019-11-28 16:53:21 -05:00
Travis Ralston
7392b4de17 xit instead of comment 2019-11-27 19:23:59 -07:00
Travis Ralston
79b0a5fada Add issue to comment 2019-11-27 19:21:57 -07:00
Travis Ralston
aee9442e52 Disable broken cross-signing test 
I don't know why it's broken, but the two errors I can get out of it are "unknown device for verification" and "user_signing key does not match". Someone who knows a bit more about cross-signing will probably need to take a look at this one.

Fixes https://github.com/vector-im/riot-web/issues/11520 (technically)
Opened https://github.com/vector-im/riot-web/issues/11545 to fix this correctly.
 2019-11-27 19:20:09 -07:00
Travis Ralston
e0c90ec9e3 Fix test flakes in SAS verification with old MAC 
This has similar fixes to 7ad5021147

Part of https://github.com/vector-im/riot-web/issues/11520
 2019-11-26 23:29:06 -07:00
Travis Ralston
7ad5021147 Fix SAS verification test 
There's 3 things going on in this commit:
1. `this` is maintained in the tests. Some binds are added instead of the `.call(this, ...)` syntax.
2. We use the right `origSendToDevice`
3. We ensure `downloadKeys` is actually on the client

The combination of these 3 fixes makes the test pass.

Part of https://github.com/vector-im/riot-web/issues/11520
 2019-11-26 23:24:37 -07:00
Travis Ralston
18749c580e Fix Olm unwedging test 
Deep within the crypto layers we call `getId()`, and when we don't have that function the async call on the emitter fails but doesn't fail the test. This manifests as a timeout because the code path that would call the thing blew up.
 2019-11-26 15:06:56 -07:00
Michael Telatynski
32234ee7fc Merge pull request #1087 from matrix-org/t3chguy/remove_bluebird_11 
Remove Bluebird: phase 2
 2019-11-26 00:03:22 +00:00
Michael Telatynski
057303d57c s/beforeEach/beforeAll/ for Olm.init() and cleanup sas.spec.js 2019-11-25 13:26:10 +00:00
Michael Telatynski
7fb807919c Stop using bluebird .returns and .spread 2019-11-25 12:31:46 +00:00
J. Ryan Stinnett
12f6e51ef6 Merge pull request #1062 from matrix-org/jryans/identity-disco-opt 
Relax identity server discovery checks to FAIL_PROMPT
 2019-11-25 10:48:53 +00:00
Michael Telatynski
5e0ba9971c nothing works anymore :(( 2019-11-23 12:18:39 +00:00
Michael Telatynski
4d950fec66 fixxy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-21 10:59:18 +00:00
Michael Telatynski
b4f68f4fc6 Stop using Bluebird promise::nodeify 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-21 10:43:58 +00:00
Michael Telatynski
53d225a1d1 fix stub timelineSet for timeline-window.spec 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-21 10:09:36 +00:00
Michael Telatynski
2ce106382a Stop using Bluebird promise::isFulfilled() 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-21 10:01:16 +00:00
Michael Telatynski
c57109c2f3 tidy up 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-20 21:16:11 +00:00
Michael Telatynski
522640edd9 rip out lolex also 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-20 21:05:21 +00:00
Michael Telatynski
5fc0629201 fix expect calls 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-20 20:19:54 +00:00
Michael Telatynski
fd58957b06 migrate to jest from mocha+expect+istanbul 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-20 19:52:50 +00:00
J. Ryan Stinnett
d2ebc58c3c Use secret storage alg const in tests 2019-11-19 11:46:08 +00:00
J. Ryan Stinnett
5f02c4b5ad Namespace default secret storage key methods 2019-11-18 15:19:18 +00:00
David Baker
d37ed9ff6f lint 2019-11-15 12:39:14 +00:00
David Baker
e541b96a71 Change check{User|Device}Trust interfaces 
...to return objects with functions rather than a bitmask
 2019-11-15 12:15:13 +00:00
David Baker
d9d65309b3 More s/cross-signing/crossSigning/ 2019-11-14 11:29:08 +00:00
David Baker
7218e31a9c Sign & verify SSSS keys 2019-11-13 17:52:24 +00:00
David Baker
1798f3921f Make setDeafultKeyId wait for event 2019-11-13 14:42:08 +00:00
David Baker
26aa3d3ce7 Support default keys 2019-11-13 14:09:40 +00:00
David Baker
c97a87d1f6 Throw if an unknown key is specified 
It's probably important that the app knows if a secret isn't going
to be stored under one or more of the keys it thought it was going
to be stored under.

Also add a test to assert it.
 2019-11-12 14:07:05 +00:00
David Baker
4c651c15ea Convert secrets events to callbacks too 2019-11-11 20:01:11 +00:00
David Baker
a98e6964ef Missed bits of callback renaming 2019-11-11 16:51:49 +00:00
David Baker
03fe4afe32 lint 2019-11-07 15:20:07 +00:00
David Baker
12627022d1 Convert sas verification test to callbacks 2019-11-07 15:18:16 +00:00