Skip to content

Commit

Permalink
Merge pull request #1967 from aqtusia/master
Browse files Browse the repository at this point in the history
Replace /bind with /3pid/bind
  • Loading branch information
anoadragon453 authored Apr 25, 2019
2 parents 5c62d62 + 2eb9708 commit c230c2f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion api/identity/associations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ paths:
}
schema:
$ref: "../client-server/definitions/errors/error.yaml"
"/bind":
"/3pid/bind":
post:
summary: Publish an association between a session and a Matrix user ID.
description: |-
Expand Down
6 changes: 3 additions & 3 deletions proposals/1915-unbind-identity-server-param.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ from the given identity server.

### Identity Server 3PID Unbind API

Add `POST /_matrix/identity/api/v1/unbind` with `mxid` and `threepid` fields.
Add `POST /_matrix/identity/api/v1/3pid/unbind` with `mxid` and `threepid` fields.
The `mxid` is the user's `user_id` and `threepid` is a dict with the usual
`medium` and `address` fields.

If the server returns a 400, 404 or 501 HTTP error code then the homeserver
should assume that the identity server doesn't support the `/unbind` API, unless
should assume that the identity server doesn't support the `/3pid/unbind` API, unless
it returns a specific matrix error response (i.e. the body is a JSON object with
`error` and `errcode` fields).

Expand All @@ -73,7 +73,7 @@ The identity server should authenticate the request in one of two ways:
Example:

```
POST /_matrix/identity/api/v1/unbind HTTP/1.1
POST /_matrix/identity/api/v1/3pid/unbind HTTP/1.1
{
"mxid": "@foobar:example.com",
Expand Down

0 comments on commit c230c2f

Please sign in to comment.