From 88c459d5490e3c74118d5cfd34038869418d3d98 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 26 Oct 2015 13:40:24 +0000 Subject: [PATCH 1/4] Add back in login v1 fallback API --- specification/client_server_api.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/specification/client_server_api.rst b/specification/client_server_api.rst index 9e230334..9266002f 100644 --- a/specification/client_server_api.rst +++ b/specification/client_server_api.rst @@ -362,6 +362,18 @@ Old V1 API docs: |register|_ {{login_http_api}} +Fallback +++++++++ + +Clients cannot be expected to be able to know how to process every single login +type. If a client determines it does not know how to handle a given login type, +it should request a login fallback page: + + GET /_matrix/client/api/v1/login/fallback + +This returns an HTML and JavaScript page which can perform the entire login +process. + Changing Password +++++++++++++++++ Request:: From 0529b4a9a2018feb509459403d2c0f2a26029b40 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 26 Oct 2015 13:45:36 +0000 Subject: [PATCH 2/4] Reword --- specification/client_server_api.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/client_server_api.rst b/specification/client_server_api.rst index 9266002f..da6f13a7 100644 --- a/specification/client_server_api.rst +++ b/specification/client_server_api.rst @@ -365,14 +365,14 @@ Old V1 API docs: |register|_ Fallback ++++++++ -Clients cannot be expected to be able to know how to process every single login -type. If a client determines it does not know how to handle a given login type, -it should request a login fallback page: +If a client does not recognize all or any login flows, it can use the fallback +login API:: GET /_matrix/client/api/v1/login/fallback This returns an HTML and JavaScript page which can perform the entire login -process. +process. The page will attempt to call the JavaScript function +``window.onLogin`` when login has been successfully completed. Changing Password +++++++++++++++++ From 98dbf4d60b7e79d7b29fb0aa17e7aaa9bf7d0273 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 26 Oct 2015 13:46:41 +0000 Subject: [PATCH 3/4] Better flow --- specification/client_server_api.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/client_server_api.rst b/specification/client_server_api.rst index da6f13a7..fac2e8ff 100644 --- a/specification/client_server_api.rst +++ b/specification/client_server_api.rst @@ -365,7 +365,7 @@ Old V1 API docs: |register|_ Fallback ++++++++ -If a client does not recognize all or any login flows, it can use the fallback +If a client does not recognize any or all login flows it can use the fallback login API:: GET /_matrix/client/api/v1/login/fallback From 9a5bd6d21f9306ff1673155a41cc055de6024665 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 26 Oct 2015 13:56:07 +0000 Subject: [PATCH 4/4] Use static --- specification/client_server_api.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/client_server_api.rst b/specification/client_server_api.rst index fac2e8ff..9f942c94 100644 --- a/specification/client_server_api.rst +++ b/specification/client_server_api.rst @@ -368,7 +368,7 @@ Fallback If a client does not recognize any or all login flows it can use the fallback login API:: - GET /_matrix/client/api/v1/login/fallback + GET /_matrix/static/client/login/ This returns an HTML and JavaScript page which can perform the entire login process. The page will attempt to call the JavaScript function