diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-01-19 15:33:55 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-01-19 15:33:55 +0000 |
| commit | 447f4f0d5f136dcadd5fdc286ded2d6e24a3f686 (patch) | |
| tree | db585cee8d6f0414d353aa7b503d0855b5fdbb92 /synapse/rest/client/v2_alpha/account.py | |
| parent | fix up v1, and improve errors (diff) | |
| download | synapse-447f4f0d5f136dcadd5fdc286ded2d6e24a3f686.tar.xz | |
rewrite based on PR feedback:
* [ ] split config options into allowed_local_3pids and registrations_require_3pid * [ ] simplify and comment logic for picking registration flows * [ ] fix docstring and move check_3pid_allowed into a new util module * [ ] use check_3pid_allowed everywhere @erikjohnston PTAL
Diffstat (limited to 'synapse/rest/client/v2_alpha/account.py')
| -rw-r--r-- | synapse/rest/client/v2_alpha/account.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index 2977ad439f..514bb37da1 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -26,7 +26,8 @@ from synapse.http.servlet import ( ) from synapse.util.async import run_on_reactor from synapse.util.msisdn import phone_number_to_msisdn -from ._base import client_v2_patterns, interactive_auth_handler, check_3pid_allowed +from synapse.util.threepids import check_3pid_allowed +from ._base import client_v2_patterns, interactive_auth_handler logger = logging.getLogger(__name__) |