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
Cédric Van Rompay
ec597bea93 fix new way of calling OlmDevice.init 2020-02-03 10:27:10 +01:00
Cédric Van Rompay
a4e74fea94 fix linting errors 2020-01-31 11:51:17 +01:00
Travis Ralston
1b80c83676 Merge branch 'develop' into travis/update-qr-code 2020-01-29 15:11:06 +00:00
Travis Ralston
ec4dc582b6 Remove tests for old QR code stuff 2020-01-29 15:10:35 +00:00
Bruno Windels
470bdf8741 fix tests 2020-01-29 15:19:18 +01:00
J. Ryan Stinnett
4dbeee8cb3 Ignore downloading for tests 2020-01-27 15:28:36 +00:00
Cédric Van Rompay
e1f832bfa7 fix linting errors 2020-01-24 09:20:43 +01:00
Travis Ralston
b8092cd00b Make the tests pass 2020-01-23 20:41:52 -07:00
Cédric Van Rompay
ed01b3b8cf stop checking structure of exported data 
it should suffice that the exported data
allows to recreate a device that can do crypto
 2020-01-23 16:55:16 +01:00
Cédric Van Rompay
7880a30e57 add importing in OlmDevice.init() 2020-01-23 16:55:16 +01:00
Cédric Van Rompay
3a1cdd37a3 move export test with other Olm tests to have active sessions 2020-01-23 16:55:16 +01:00
Cédric Van Rompay
ff24ef4ee5 add OlmDevice.prototype.export 
- only exporting account and P2P sessions
- test is halfway done:
  - it only prints the export result instead of running assertions on it
  - there are no sessions to export

Note: to run only the added test:

    node_modules/.bin/jest spec/unit/crypto/algorithms/olm.spec.js --testEnvironment node --testNamePattern OlmDevice
 2020-01-23 16:55:16 +01:00
Bruno Windels
3faeec4add fix lint 2020-01-23 15:59:47 +01:00
Bruno Windels
b2afaabb8c add unit tests for verifying your own device over to_device messages 2020-01-23 15:52:07 +01:00
Bruno Windels
3efaf90bc8 Merge pull request #1163 from matrix-org/bwindels/verificationaccceptedbyotherdevice 
For dm-verification, also consider events sent by other devices of same user as "our" events
 2020-01-23 13:27:15 +00:00
Bruno Windels
0c52887688 copyright year 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-23 10:51:19 +00:00
Bruno Windels
dc38f78da2 add unit tests for verification request 2020-01-22 17:39:21 +01:00
Michael Telatynski
1b6a74fd93 Remove :deviceId from /keys/upload/:deviceId as not spec-compliant 2020-01-22 15:20:13 +00:00
Bruno Windels
22e6cfaebb Merge pull request #1140 from matrix-org/bwindels/verification-right-panel 
Support for .ready verification event (MSC2366) & other things
 2020-01-20 17:17:51 +00:00
Bruno Windels
bd9a2c13eb implement API change in sas test for requestVerificationDM 2020-01-20 17:55:48 +01:00
Bruno Windels
e5c65d53f8 set transaction_id for remote echos in TestClient 
as InRoomChannel looks at this to decide whether an event is
a remote echo (and to pass it to the verifier or not)
 2020-01-20 17:54:26 +01:00
Bruno Windels
c12a3b6610 more fixup: make sure remote echo doesn't arrive earlier for TestClient 2020-01-20 17:35:44 +01:00
Bruno Windels
77d0a76186 fixup: another timeout 2020-01-20 14:52:34 +01:00
Bruno Windels
e89528315d enable fake timers for consistency 
although it doesn't make or break the test
 2020-01-20 14:04:32 +01:00
Bruno Windels
c34ccc9d53 adjust test: requestVerification returns the request instead of verifier 2020-01-20 14:03:43 +01:00
Bruno Windels
e51ba795f3 to make this work while using fake timers, don't use setTimeout 
but instead use Promise.resolved() as then always runs in the next tick.
 2020-01-20 13:56:39 +01:00
J. Ryan Stinnett
ceb4581f91 Convert secret storage to new account data API 
This converts all secret storage to use a newer account data API which uses
cached data in stored when available, but also knows how to ask the homeserver
in case it's invoked during early client startup before the initial sync.

As a consequence, it means most secret storage APIs are now async.

Part of https://github.com/vector-im/riot-web/issues/11901
 2020-01-17 17:56:05 +00:00
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