diff options
| author | David Baker <dave@matrix.org> | 2016-06-30 17:51:28 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-06-30 17:51:28 +0100 |
| commit | be8be535f73e51a29cfa30f1eac266a7a08b695b (patch) | |
| tree | 9090f4e64abf172a7c781533b6105bcff79c124d /synapse/api | |
| parent | Merge pull request #903 from matrix-org/erikj/deactivate_user (diff) | |
| download | synapse-be8be535f73e51a29cfa30f1eac266a7a08b695b.tar.xz | |
requestToken update
Don't send requestToken request to untrusted ID servers Also correct the THREEPID_IN_USE error to add the M_ prefix. This is a backwards incomaptible change, but the only thing using this is the angular client which is now unmaintained, so it's probably better to just do this now.
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/errors.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py index b106fbed6d..b219b46a4b 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py @@ -42,8 +42,9 @@ class Codes(object): TOO_LARGE = "M_TOO_LARGE" EXCLUSIVE = "M_EXCLUSIVE" THREEPID_AUTH_FAILED = "M_THREEPID_AUTH_FAILED" - THREEPID_IN_USE = "THREEPID_IN_USE" + THREEPID_IN_USE = "M_THREEPID_IN_USE" INVALID_USERNAME = "M_INVALID_USERNAME" + SERVER_NOT_TRUSTED = "M_SERVER_NOT_TRUSTED" class CodeMessageException(RuntimeError): |