diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2021-02-01 15:54:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-01 15:54:39 +0000 |
| commit | a800603561c0cb58727474035b6b27ed9e5fc277 (patch) | |
| tree | 83d3ed47f039e07d4ceab4a02f61e009f7089b0f /synapse/handlers | |
| parent | Fixes for PyPy compatibility (#9270) (diff) | |
| download | synapse-a800603561c0cb58727474035b6b27ed9e5fc277.tar.xz | |
Prevent email UIA failures from raising a LoginError (#9265)
Context, Fixes: https://github.com/matrix-org/synapse/issues/9263 In the past to fix an issue with old Riots re-requesting threepid validation tokens, we raised a `LoginError` during UIA instead of `InteractiveAuthIncompleteError`. This is now breaking the way Tchap logs in - which isn't standard, but also isn't disallowed by the spec. An easy fix is just to remove the 4 year old workaround.
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/auth.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index 0e98db22b3..3127357964 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -567,16 +567,6 @@ class AuthHandler(BaseHandler): session.session_id, login_type, result ) except LoginError as e: - if login_type == LoginType.EMAIL_IDENTITY: - # riot used to have a bug where it would request a new - # validation token (thus sending a new email) each time it - # got a 401 with a 'flows' field. - # (https://github.com/vector-im/vector-web/issues/2447). - # - # Grandfather in the old behaviour for now to avoid - # breaking old riot deployments. - raise - # this step failed. Merge the error dict into the response # so that the client can have another go. errordict = e.error_dict() |