Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support sign in + E2EE set up using QR code implementing MSC3886, MSC3903 and MSC3906 #2747

Merged
merged 79 commits into from
Oct 19, 2022
Merged

Support sign in + E2EE set up using QR code implementing MSC3886, MSC3903 and MSC3906 #2747

merged 79 commits into from
Oct 19, 2022

Conversation

hughns
Copy link
Member

@hughns hughns commented Oct 12, 2022 •
edited
Loading

Implements MSC3886, MSC3903 and MSC3906

Checklist

  • Tests written for new code (and old code if feasible)
  • Linter and other CI checks pass
  • Sign-off given on the changes (see CONTRIBUTING.md)

Here's what your changelog entry will look like:

✨ Features

@hughns hughns mentioned this pull request Oct 12, 2022
Closed
3 tasks
@hughns hughns force-pushed the hughns/login-with-qr branch from d8b3ada to 5e27b8c Compare October 12, 2022 21:42
@hughns hughns mentioned this pull request Oct 13, 2022
Closed
6 tasks
hughns added 16 commits October 13, 2022 12:41
@hughns hughns requested a review from turt2live October 18, 2022 07:11
t3chguy
t3chguy requested changes Oct 18, 2022
View reviewed changes
src/rendezvous/MSC3906Rendezvous.ts Show resolved Hide resolved
src/rendezvous/MSC3906Rendezvous.ts Outdated Show resolved Hide resolved
src/rendezvous/MSC3906Rendezvous.ts Outdated Show resolved Hide resolved
src/rendezvous/MSC3906Rendezvous.ts Outdated Show resolved Hide resolved
src/rendezvous/RendezvousChannelAlgorithm.ts Outdated Show resolved Hide resolved
src/rendezvous/channels/MSC3903ECDHv1RendezvousChannel.ts Outdated Show resolved Hide resolved
src/rendezvous/transports/MSC3886SimpleHttpRendezvousTransport.ts Outdated Show resolved Hide resolved
src/rendezvous/transports/MSC3886SimpleHttpRendezvousTransport.ts Outdated Show resolved Hide resolved
src/rendezvous/transports/MSC3886SimpleHttpRendezvousTransport.ts Outdated Show resolved Hide resolved
src/rendezvous/transports/MSC3886SimpleHttpRendezvousTransport.ts Outdated Show resolved Hide resolved
@hughns hughns requested a review from t3chguy October 18, 2022 16:11
@hughns hughns changed the base branch from develop to v21.0.0-resilience-rc.1 October 19, 2022 08:45
@hughns hughns changed the base branch from v21.0.0-resilience-rc.1 to develop October 19, 2022 09:10
t3chguy
t3chguy approved these changes Oct 19, 2022
View reviewed changes
Copy link
Member

@t3chguy t3chguy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@kerryarchibald kerryarchibald enabled auto-merge (squash) October 19, 2022 09:22
@kerryarchibald kerryarchibald merged commit 2464a69 into develop Oct 19, 2022
@kerryarchibald kerryarchibald deleted the hughns/login-with-qr branch October 19, 2022 09:30
su-ex added a commit to SchildiChat/matrix-js-sdk that referenced this pull request Nov 12, 2022
@su-ex
Merge tag 'v21.1.0' into sc
1474204 
* Loading threads with server-side assistance ([\matrix-org#2735](matrix-org#2735)). Contributed by @justjanne.
* Support sign in + E2EE set up using QR code implementing MSC3886, MSC3903 and MSC3906 ([\matrix-org#2747](matrix-org#2747)). Contributed by @hughns.
* Replace `instanceof Array` with `Array.isArray` ([\matrix-org#2812](matrix-org#2812)). Fixes matrix-org#2811.
* Emit UnreadNotification event on notifications reset ([\matrix-org#2804](matrix-org#2804)). Fixes element-hq/element-web#23590.
* Fix incorrect prevEv being sent in ClientEvent.AccountData events ([\matrix-org#2794](matrix-org#2794)).
* Fix build error caused by wrong ts-strict improvements ([\matrix-org#2783](matrix-org#2783)). Contributed by @justjanne.
* Encryption should not hinder verification ([\matrix-org#2734](matrix-org#2734)).
@MadLittleMods MadLittleMods mentioned this pull request Dec 14, 2022
Merged
4 tasks
@hughns hughns mentioned this pull request Feb 13, 2023
Closed
3 tasks
@hughns hughns mentioned this pull request Feb 23, 2023
Closed
9 tasks
@richvdh richvdh mentioned this pull request Mar 13, 2023
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@uhoreg uhoreg uhoreg left review comments

@t3chguy t3chguy t3chguy approved these changes

@turt2live turt2live turt2live approved these changes

@germain-gg germain-gg germain-gg approved these changes

@weeman1337 weeman1337 Awaiting requested review from weeman1337 weeman1337 is a code owner automatically assigned from matrix-org/element-web-reviewers

@BillCarsonFr BillCarsonFr Awaiting requested review from BillCarsonFr

Assignees
No one assigned
Labels
T-Enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@hughns @turt2live @germain-gg @uhoreg @t3chguy @kerryarchibald