diff options
author | Erik Johnston <erik@matrix.org> | 2014-09-03 11:59:57 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-09-03 12:01:14 +0100 |
commit | b50ea730b15706d0e2099f94cf8b3cf24b5c5433 (patch) | |
tree | 05fb4bb1190f0f2223de49bf17060481a8bfad70 /docs/client-server | |
parent | Add option to change content repo location (diff) | |
parent | Edited /presence REST servlet to raise SynapseErrors to return a standard err... (diff) | |
download | synapse-b50ea730b15706d0e2099f94cf8b3cf24b5c5433.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Conflicts: synapse/http/server.py synapse/http/content_repository.py
Diffstat (limited to 'docs/client-server')
-rw-r--r-- | docs/client-server/swagger_matrix/api-docs-login | 22 | ||||
-rw-r--r-- | docs/client-server/swagger_matrix/api-docs-presence | 2 | ||||
-rw-r--r-- | docs/client-server/swagger_matrix/api-docs-registration | 4 |
3 files changed, 25 insertions, 3 deletions
diff --git a/docs/client-server/swagger_matrix/api-docs-login b/docs/client-server/swagger_matrix/api-docs-login index 77a588a68e..d6f8d84f29 100644 --- a/docs/client-server/swagger_matrix/api-docs-login +++ b/docs/client-server/swagger_matrix/api-docs-login @@ -8,7 +8,7 @@ "nickname": "get_login_info", "notes": "All login stages MUST be mentioned if there is >1 login type.", "summary": "Get the login mechanism to use when logging in.", - "type": "LoginInfo" + "type": "LoginFlows" }, { "method": "POST", @@ -45,12 +45,26 @@ "application/json" ], "models": { + "LoginFlows": { + "id": "LoginFlows", + "properties": { + "flows": { + "description": "A list of valid login flows.", + "type": "array", + "items": { + "$ref": "LoginInfo" + } + } + } + }, "LoginInfo": { "id": "LoginInfo", "properties": { "stages": { "description": "Multi-stage login only: An array of all the login types required to login.", - "format": "string", + "items": { + "$ref": "string" + }, "type": "array" }, "type": { @@ -65,6 +79,10 @@ "access_token": { "description": "The access token for this user's login if this is the final stage of the login process.", "type": "string" + }, + "user_id": { + "description": "The user's fully-qualified user ID.", + "type": "string" }, "next": { "description": "Multi-stage login only: The next login type to submit.", diff --git a/docs/client-server/swagger_matrix/api-docs-presence b/docs/client-server/swagger_matrix/api-docs-presence index 99630d2056..5c9f160508 100644 --- a/docs/client-server/swagger_matrix/api-docs-presence +++ b/docs/client-server/swagger_matrix/api-docs-presence @@ -106,7 +106,7 @@ "PresenceUpdate": { "id": "PresenceUpdate", "properties": { - "state": { + "presence": { "type": "string", "description": "Enum: The presence state.", "enum": [ diff --git a/docs/client-server/swagger_matrix/api-docs-registration b/docs/client-server/swagger_matrix/api-docs-registration index a3dbc01b36..f4669ea2f0 100644 --- a/docs/client-server/swagger_matrix/api-docs-registration +++ b/docs/client-server/swagger_matrix/api-docs-registration @@ -52,6 +52,10 @@ "user_id": { "description": "The fully-qualified user ID.", "type": "string" + }, + "home_server": { + "description": "The name of the home server.", + "type": "string" } } }, |