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

1429 Commits

Author SHA1 Message Date
Travis Ralston
f3efac059c Merge branch 'develop' into travis/sourcemaps 2020-01-15 09:03:21 -07:00
Hubert Chathi
b3a16cb852 lint (and add a comment) 2020-01-10 13:36:11 -05:00
Hubert Chathi
63c57e8e02 record, report, and notify about olm errors 2020-01-09 22:19:35 -05:00
Travis Ralston
cea3831c20 Fix merge conflicts 
This is done outside of the merge to highlight the changes, hopefully.
 2020-01-07 14:43:36 -07:00
Travis Ralston
18ccceca2d [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-dev 2020-01-07 14:37:17 -07:00
Hubert Chathi
01f6b3dfc6 notify devices when we don't send them keys (#1135) 
and handle incoming notifications
 2020-01-06 17:47:22 -05:00
Travis Ralston
f4d1c5c006 Switch back to plain export functions instead of class 2020-01-03 12:16:54 -07:00
Travis Ralston
50791e3aa7 Make ContentRepo a class for easier importing 
Exporting it the way we were was causing problems for webpack way down
the line, so we export it differently here to get around that. We also
have to fix all the import references so we import the right thing.
 2019-12-22 20:51:30 -07:00
Travis Ralston
95c2c1643e Remove "source-map-support" from tests because it makes sourcemaps worse 
Now that we're pointing at `src/` for tests, we can stop trying to load source maps from random places. With this dependency used, source maps are off by a few lines.
 2019-12-17 15:45:15 -07:00
Travis Ralston
f952f6742f Remove ancient "use strict" annotations 
We don't need these anymore. Theoretically this commit could go to develop, but for safety it's going to `travis/sourcemaps` first.
 2019-12-17 15:43:02 -07:00
Travis Ralston
034b8db070 Convert tests to ES6 
The earlier commit, d3ce0cb82f, has most of the juicy details on this. In addition to d3ce's changes, we also:
* Use `TestClient` in many integration tests due to subtle behaviour changes in imports when switching to ES6. Namely the behaviour where setting the request function is less reliable in the way we did it, but `TestClient` is very reliable.
* We now use the Olm loader more often to avoid having to maintain so much duplicate code. This makes the imports slightly easier to read.
 2019-12-17 15:16:37 -07:00
J. Ryan Stinnett
1fc2ab7f7d Fix backup tests 2019-12-12 16:06:46 +00:00
J. Ryan Stinnett
1b63cb1406 Merge remote-tracking branch 'origin/develop' into jryans/4s-new-key-backup 2019-12-11 10:09:29 +00:00
Travis Ralston
ca6a52727c Fix logger imports in tests 2019-12-10 11:39:56 -07:00
J. Ryan Stinnett
780394b051 Merge remote-tracking branch 'origin/develop' into jryans/4s-new-key-backup 2019-12-10 17:54:02 +00:00
J. Ryan Stinnett
6942e3467b Rework to hold cross-signing keys in JS SDK as needed 2019-12-10 17:36:35 +00:00
Michael Telatynski
70eb8a7300 Merge pull request #1100 from matrix-org/t3chguy/remove_bluebird_13 
Remove Bluebird: phase 2.5
 2019-12-10 16:58:22 +00:00
Bruno Windels
df6ebf83b4 fix tests 2019-12-09 17:45:01 +01:00
J. Ryan Stinnett
9b05d1d68e Merge remote-tracking branch 'origin/develop' into jryans/4s-new-key-backup 2019-12-06 12:08:33 +00:00
J. Ryan Stinnett
33f5894547 Adjust secret key adding to consume instead of create 
This changes `addKey` for secret storage to consume info about a pre-generated
key, rather than creating the key in middle of the method. This eases UI work
that want to have the public and private keys earlier on in the flow.
 2019-12-05 16:30:10 +00:00
Michael Telatynski
ebe174fbef lets *not* get rid of pointless waits :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-04 23:47:53 +00:00
Michael Telatynski
eaaeedbb37 Merge branches 'develop' and 't3chguy/remove_bluebird_12' of github.com:matrix-org/matrix-js-sdk into t3chguy/remove_bluebird_12 2019-12-04 23:44:04 +00:00
Michael Telatynski
bf45c176a7 get rid of bunch of seemingly pointless waits 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-04 23:42:16 +00:00
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
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
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
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