Merge branch 'clokep/login-fallback-changes'

This commit is contained in:
Travis Ralston 2020-07-30 15:28:15 -06:00
commit 8eb1c53144
2 changed files with 7 additions and 0 deletions

View file

@ -0,0 +1 @@
Add a ``device_id`` parameter to login fallback per `MSC2604 <https://github.com/matrix-org/matrix-doc/pull/2604>`_.

View file

@ -1096,6 +1096,12 @@ This returns an HTML and JavaScript page which can perform the entire login
process. The page will attempt to call the JavaScript function
``window.onLogin`` when login has been successfully completed.
Non-credential parameters valid for the ``/login`` endpoint can be provided as query
string parameters here. These are to be forwarded to the login endpoint during the login
process. For example::
GET /_matrix/static/client/login/?device_id=GHTYAJCE
.. _Registration:
Account registration and management