diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-04-29 13:15:14 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-04-29 13:15:14 +0100 |
| commit | 4ad8b451559682645c818f6c1180e5f9d42a7eeb (patch) | |
| tree | 94fe0beaaaa4ed8c1bb9451f1274df819d9ce8d7 /synapse/api/errors.py | |
| parent | Update the query format used by keyring to match current key v2 spec (diff) | |
| parent | Mention that postgres databases must have the correct charset encoding (diff) | |
| download | synapse-4ad8b451559682645c818f6c1180e5f9d42a7eeb.tar.xz | |
Merge branch 'develop' into key_distribution
Conflicts: synapse/config/homeserver.py
Diffstat (limited to 'synapse/api/errors.py')
| -rw-r--r-- | synapse/api/errors.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py index 72d2bd5b4c..0b3320e62c 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py @@ -31,6 +31,7 @@ class Codes(object): BAD_PAGINATION = "M_BAD_PAGINATION" UNKNOWN = "M_UNKNOWN" NOT_FOUND = "M_NOT_FOUND" + MISSING_TOKEN = "M_MISSING_TOKEN" UNKNOWN_TOKEN = "M_UNKNOWN_TOKEN" LIMIT_EXCEEDED = "M_LIMIT_EXCEEDED" CAPTCHA_NEEDED = "M_CAPTCHA_NEEDED" @@ -38,6 +39,7 @@ class Codes(object): MISSING_PARAM = "M_MISSING_PARAM" TOO_LARGE = "M_TOO_LARGE" EXCLUSIVE = "M_EXCLUSIVE" + THREEPID_AUTH_FAILED = "M_THREEPID_AUTH_FAILED" class CodeMessageException(RuntimeError): |