J. Ryan Stinnett
3829362754
Fix up merge to develop
2020-06-23 15:24:02 +01:00
RiotRobot
6161f95434
Merge branch 'master' into develop
2020-06-23 15:18:35 +01:00
David Baker
d1caadec9f
Add null check
2020-06-19 20:07:20 +01:00
David Baker
a82253ec96
Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss
2020-06-19 17:18:48 +01:00
David Baker
3f936a1fe4
Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss
2020-06-19 16:50:29 +01:00
David Baker
9b9e6e04e3
Merge remote-tracking branch 'origin/develop' into dbkr/fix_verification_race
2020-06-18 15:12:06 +01:00
David Baker
e4d824839a
Revert "Use recovery keys over passphrases"
2020-06-18 15:02:03 +01:00
David Baker
e0a34d9dea
Revert "Use recovery keys over passphrases"
2020-06-18 09:35:11 +01:00
David Baker
89a72b7685
Take the last request (ie. the most recent)
2020-06-16 14:53:13 +01:00
David Baker
d90645f0ea
add comment
2020-06-15 17:46:22 +01:00
David Baker
0618d82ccb
Look for existing verification requests after login
...
Fixes https://github.com/vector-im/riot-web/issues/13462
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1405
2020-06-15 17:41:22 +01:00
David Baker
68e555a0c6
Support accounts with cross signing but no SSSS
...
At least at the login stage.
Fixes https://github.com/vector-im/riot-web/issues/13894
2020-06-05 16:40:20 +01:00
David Baker
5624cf5ceb
Add option to reset keys to the encryption setup screen
2020-06-02 17:55:27 +01:00
David Baker
e06ba2003b
Prompt for recovery key on login rather than passphrase
...
Only show passphrase options at all if the user has a passphrase on
their SSSS key.
2020-06-02 16:32:15 +01:00
David Baker
bc6aeef824
Guard against race when waiting for cross-signing to be ready
...
Check to see if cross-signing is already set up after a verification
is done to make sure it doesn't race and we end up waiting forever.
2020-05-01 10:58:00 +01:00
David Baker
124740a63c
Wait for user to be verified in e2e setup
...
Wait for our user to become verified and cross-signing to be ready
before declaring that we're finsihed, otherwise we could end up
prompting the user to verify again if we just wait for the verification
itself to complete.
Fixes part of https://github.com/vector-im/riot-web/issues/13464
2020-04-30 22:08:00 +01:00
Zoe
0102876e40
Re-request room keys after auth
2020-04-03 11:49:08 +01:00
Bruno Windels
7d4e498257
fix lint
2020-03-24 17:03:40 +01:00
Bruno Windels
4ff847c8a3
put CompleteSecurity state management in store
...
and split off a child component (SetupCrossSigningBody) that can
be reused from the "Verify this session" toast.
2020-03-24 16:10:15 +01:00
