diff options
| author | Richard van der Hoff <richard@matrix.org> | 2021-02-01 18:46:12 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2021-02-01 18:46:12 +0000 |
| commit | 5963426b957d9f312817e0f3e4f44b753f8e2398 (patch) | |
| tree | 217afd1d90cc7c0cb217158e5849dc011fbea5c4 /synapse/handlers/register.py | |
| parent | Refactor email summary generation. (#9260) (diff) | |
| parent | make primary button not wider than viewport (diff) | |
| download | synapse-5963426b957d9f312817e0f3e4f44b753f8e2398.tar.xz | |
Merge branch 'social_login' into develop
Diffstat (limited to 'synapse/handlers/register.py')
| -rw-r--r-- | synapse/handlers/register.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index a2cf0f6f3e..49b085269b 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -14,8 +14,9 @@ # limitations under the License. """Contains functions for registering clients.""" + import logging -from typing import TYPE_CHECKING, List, Optional, Tuple +from typing import TYPE_CHECKING, Iterable, List, Optional, Tuple from synapse import types from synapse.api.constants import MAX_USERID_LENGTH, EventTypes, JoinRules, LoginType @@ -152,7 +153,7 @@ class RegistrationHandler(BaseHandler): user_type: Optional[str] = None, default_display_name: Optional[str] = None, address: Optional[str] = None, - bind_emails: List[str] = [], + bind_emails: Iterable[str] = [], by_admin: bool = False, user_agent_ips: Optional[List[Tuple[str, str]]] = None, ) -> str: @@ -693,6 +694,8 @@ class RegistrationHandler(BaseHandler): access_token: The access token of the newly logged in device, or None if `inhibit_login` enabled. """ + # TODO: 3pid registration can actually happen on the workers. Consider + # refactoring it. if self.hs.config.worker_app: await self._post_registration_client( user_id=user_id, auth_result=auth_result, access_token=access_token |