Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix UTs

This commit is contained in:
Matthew Hodgson 2018-09-28 15:37:28 +01:00
parent 07340cdaca
commit 8f646f2d04
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/config/registration.py
View File

@ -44,7 +44,7 @@ class RegistrationConfig(Config):
) )
self.auto_join_rooms = config.get("auto_join_rooms", []) self.auto_join_rooms = config.get("auto_join_rooms", [])
self.autocreate_auto_join_rooms = config.get("autocreate_auto_join_rooms", true) self.autocreate_auto_join_rooms = config.get("autocreate_auto_join_rooms", True)
def default_config(self, **kwargs): def default_config(self, **kwargs):
registration_shared_secret = random_string_with_symbols(50) registration_shared_secret = random_string_with_symbols(50)

13
synapse/handlers/register.py
View File

@ -50,8 +50,6 @@ class RegistrationHandler(BaseHandler):
self._auth_handler = hs.get_auth_handler() self._auth_handler = hs.get_auth_handler()
self.profile_handler = hs.get_profile_handler() self.profile_handler = hs.get_profile_handler()
self.user_directory_handler = hs.get_user_directory_handler() self.user_directory_handler = hs.get_user_directory_handler()
self._room_creation_handler = hs.get_room_creation_handler()
self._directory_handler = hs.get_handlers().directory_handler
self.captcha_client = CaptchaServerHttpClient(hs) self.captcha_client = CaptchaServerHttpClient(hs)
self._next_generated_user_id = None self._next_generated_user_id = None
@ -520,7 +518,8 @@ class RegistrationHandler(BaseHandler):
if self.config.autocreate_auto_join_rooms: if self.config.autocreate_auto_join_rooms:
count = yield self.store.count_all_users() count = yield self.store.count_all_users()
if count == 1 and RoomAlias.is_valid(room_identifier): if count == 1 and RoomAlias.is_valid(room_identifier):
info = yield self._room_creation_handler.create_room( room_creation_handler = hs.get_room_creation_handler()
info = yield room_creation_handler.create_room(
requester, requester,
config={ config={
"preset": "public_chat", "preset": "public_chat",
@ -529,7 +528,13 @@ class RegistrationHandler(BaseHandler):
) )
room_id = info["room_id"] room_id = info["room_id"]
yield create_association(self, requester.user, room_identifier, room_id) directory_handler = hs.get_handlers().directory_handler
yield directory_handler.create_association(
self,
requester.user,
room_identifier,
room_id
)
room_id = None room_id = None
room_member_handler = self.hs.get_room_member_handler() room_member_handler = self.hs.get_room_member_handler()