|
49 | 49 | from synapse.replication.http.login import RegisterDeviceReplicationServlet
|
50 | 50 | from synapse.replication.http.register import (
|
51 | 51 | ReplicationPostRegisterActionsServlet,
|
52 |
| - ReplicationRegisterServlet, |
53 | 52 | )
|
54 | 53 | from synapse.spam_checker_api import RegistrationBehaviour
|
55 | 54 | from synapse.types import GUEST_USER_ID_PATTERN, RoomAlias, UserID, create_requester
|
@@ -120,7 +119,6 @@ def __init__(self, hs: "HomeServer"):
|
120 | 119 | self._spam_checker_module_callbacks = hs.get_module_api_callbacks().spam_checker
|
121 | 120 |
|
122 | 121 | if hs.config.worker.worker_app:
|
123 |
| - self._register_client = ReplicationRegisterServlet.make_client(hs) |
124 | 122 | self._register_device_client = RegisterDeviceReplicationServlet.make_client(
|
125 | 123 | hs
|
126 | 124 | )
|
@@ -738,37 +736,20 @@ async def register_with_store(
|
738 | 736 | shadow_banned: Whether to shadow-ban the user
|
739 | 737 | approved: Whether to mark the user as approved by an administrator
|
740 | 738 | """
|
741 |
| - if self.hs.config.worker.worker_app: |
742 |
| - await self._register_client( |
743 |
| - user_id=user_id, |
744 |
| - password_hash=password_hash, |
745 |
| - was_guest=was_guest, |
746 |
| - make_guest=make_guest, |
747 |
| - appservice_id=appservice_id, |
748 |
| - create_profile_with_displayname=create_profile_with_displayname, |
749 |
| - admin=admin, |
750 |
| - user_type=user_type, |
751 |
| - address=address, |
752 |
| - shadow_banned=shadow_banned, |
753 |
| - approved=approved, |
754 |
| - ) |
755 |
| - else: |
756 |
| - await self.store.register_user( |
757 |
| - user_id=user_id, |
758 |
| - password_hash=password_hash, |
759 |
| - was_guest=was_guest, |
760 |
| - make_guest=make_guest, |
761 |
| - appservice_id=appservice_id, |
762 |
| - create_profile_with_displayname=create_profile_with_displayname, |
763 |
| - admin=admin, |
764 |
| - user_type=user_type, |
765 |
| - shadow_banned=shadow_banned, |
766 |
| - approved=approved, |
767 |
| - ) |
| 739 | + await self.store.register_user( |
| 740 | + user_id=user_id, |
| 741 | + password_hash=password_hash, |
| 742 | + was_guest=was_guest, |
| 743 | + make_guest=make_guest, |
| 744 | + appservice_id=appservice_id, |
| 745 | + create_profile_with_displayname=create_profile_with_displayname, |
| 746 | + admin=admin, |
| 747 | + user_type=user_type, |
| 748 | + shadow_banned=shadow_banned, |
| 749 | + approved=approved, |
| 750 | + ) |
768 | 751 |
|
769 |
| - # Only call the account validity module(s) on the main process, to avoid |
770 |
| - # repeating e.g. database writes on all of the workers. |
771 |
| - await self._account_validity_handler.on_user_registration(user_id) |
| 752 | + await self._account_validity_handler.on_user_registration(user_id) |
772 | 753 |
|
773 | 754 | async def register_device(
|
774 | 755 | self,
|
|
0 commit comments