Merge branch 'clokep/login-fallback-changes'

turt2live · turt2live · commit 8eb1c5314420 · 2020-07-30T15:28:15.000-06:00
diff --git a/changelogs/client_server/newsfragments/2709.feature b/changelogs/client_server/newsfragments/2709.feature
@@ -0,0 +1 @@
+Add a ``device_id`` parameter to login fallback per `MSC2604 <https://github.com/matrix-org/matrix-doc/pull/2604>`_.
diff --git a/specification/client_server_api.rst b/specification/client_server_api.rst
@@ -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

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