Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-12 05:14:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

switch to setting default displayname in the storage layer

Browse Source 
to avoid clobbering guest user displaynames on registration
This commit is contained in:
Matthew Hodgson 2017-11-01 15:51:25 +00:00
parent f8420d6279
commit 9f7a555b4e
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
synapse/rest/client/v2_alpha/register.py
View File

@ -20,7 +20,7 @@ import synapse
import synapse.types import synapse.types
from synapse.api.auth import get_access_token_from_request, has_access_token from synapse.api.auth import get_access_token_from_request, has_access_token
from synapse.api.constants import LoginType from synapse.api.constants import LoginType
from synapse.types import RoomID, RoomAlias, get_localpart_from_id from synapse.types import RoomID, RoomAlias
from synapse.api.errors import SynapseError, Codes, UnrecognizedRequestError from synapse.api.errors import SynapseError, Codes, UnrecognizedRequestError
from synapse.http.servlet import ( from synapse.http.servlet import (
RestServlet, parse_json_object_from_request, assert_params_in_request, parse_string RestServlet, parse_json_object_from_request, assert_params_in_request, parse_string
@ -343,13 +343,6 @@ class RegisterRestServlet(RestServlet):
generate_token=False, generate_token=False,
) )
# before we auto-join, set a default displayname to avoid ugly race
# between the client joining rooms and trying to set a displayname
localpart = get_localpart_from_id(registered_user_id)
yield self.store.set_profile_displayname(
localpart, localpart
)
# auto-join the user to any rooms we're supposed to dump them into # auto-join the user to any rooms we're supposed to dump them into
fake_requester = synapse.types.create_requester(registered_user_id) fake_requester = synapse.types.create_requester(registered_user_id)
for r in self.hs.config.auto_join_rooms: for r in self.hs.config.auto_join_rooms:

6
synapse/storage/registration.py
View File

@ -177,9 +177,11 @@ class RegistrationStore(background_updates.BackgroundUpdateStore):
) )
if create_profile_with_localpart: if create_profile_with_localpart:
# set a default displayname serverside to avoid ugly race
# between auto-joins and clients trying to set displaynames
txn.execute( txn.execute(
"INSERT INTO profiles(user_id) VALUES (?)", "INSERT INTO profiles(user_id, displayname) VALUES (?,?)",
(create_profile_with_localpart,) (create_profile_with_localpart, create_profile_with_localpart)
) )
self._invalidate_cache_and_stream( self._invalidate_cache_and_stream(