Travis Ralston
4b1d78e04d
Merge branch 'develop' into travis/soft-logout-design
2019-07-09 11:35:49 -06:00
Travis Ralston
a33e5f1918
Merge pull request #3188 from matrix-org/travis/soft-logout-non-default-hs
...
Fix React crash when using a non-default homeserver on soft logout
2019-07-09 11:32:31 -06:00
Travis Ralston
d2ab0a5ca7
Move key backup init to componentDidMount
2019-07-08 11:53:26 -06:00
Travis Ralston
3e0be640fd
Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-keys
2019-07-08 11:52:58 -06:00
Travis Ralston
c3383e9315
Move _initLogin to componentDidMount
2019-07-08 11:51:22 -06:00
Travis Ralston
ae79ce97f3
Dress up the soft logout page to look like the design
...
Fixes https://github.com/vector-im/riot-web/issues/10262
Also fixes showing the user ID twice. We might have a User object which helpfully sets the display name to the user ID, so check for that.
2019-07-05 15:05:31 -06:00
Travis Ralston
1f1a5b2aac
Fix React crash when using a non-default homeserver on soft logout
...
The function used exists on the peg, not the client. This commit also fixes the name of the function in a backwards compatible way.
2019-07-05 14:35:21 -06:00
Travis Ralston
55b4ef2169
Change soft logout rehydrate text if there's pending key backups
...
Fixes https://github.com/vector-im/riot-web/issues/10263
Requires https://github.com/matrix-org/matrix-js-sdk/pull/982
2019-07-05 13:52:14 -06:00
Travis Ralston
00973a1ee8
Appease the linter
2019-07-04 17:00:09 -06:00
Travis Ralston
93872e6fa5
Ask for the user's password to rehydrate their soft logged out session
...
Fixes https://github.com/vector-im/riot-web/issues/10236
The changes to the MatrixClientPeg (assign/start) are to permit the SoftLogout page to access the MatrixClientPeg reliably. This is why assign() is called by Lifecycle as an alternative to start().
Minimal design work has been done here. The majority is deferred to https://github.com/vector-im/riot-web/issues/10262
2019-07-04 16:51:16 -06:00
Travis Ralston
521bc90b5f
Appease the linter
2019-07-03 16:51:09 -06:00
Travis Ralston
42e6287bdb
Implement basic soft logout handling
...
Fixes https://github.com/vector-im/riot-web/issues/10235
CSS and copy are left as an exercise for a later iteration.
Login page handling is left for https://github.com/vector-im/riot-web/issues/10236
This implementation reuses as much of the Lifecycle flow as it can without causing problems. Most importantly, it requires https://github.com/matrix-org/matrix-js-sdk/pull/975 to be able to detect a soft logout and react to it. When it comes time to starting/stopping the Lifecycle, additional parameters are provided so that the auxiliary services can (re)start themselves without the client starting to sync.
2019-07-03 16:46:37 -06:00
