diff options
author | Erik Johnston <erik@matrix.org> | 2020-12-18 09:51:56 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2020-12-18 09:51:56 +0000 |
commit | a7a913918cf04c6d900223b19e719fafbbe94efa (patch) | |
tree | eada22da26f93fe8807a45ebb70d14bb15c80f1a /synapse/handlers/register.py | |
parent | Try and drop stale extremities. (#8929) (diff) | |
parent | Update tests/test_mau.py (diff) | |
download | synapse-a7a913918cf04c6d900223b19e719fafbbe94efa.tar.xz |
Merge remote-tracking branch 'origin/erikj/as_mau_block' into develop
Diffstat (limited to 'synapse/handlers/register.py')
-rw-r--r-- | synapse/handlers/register.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index 94b5610acd..a2cf0f6f3e 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -630,6 +630,7 @@ class RegistrationHandler(BaseHandler): device_id: Optional[str], initial_display_name: Optional[str], is_guest: bool = False, + is_appservice_ghost: bool = False, ) -> Tuple[str, str]: """Register a device for a user and generate an access token. @@ -651,6 +652,7 @@ class RegistrationHandler(BaseHandler): device_id=device_id, initial_display_name=initial_display_name, is_guest=is_guest, + is_appservice_ghost=is_appservice_ghost, ) return r["device_id"], r["access_token"] @@ -672,7 +674,10 @@ class RegistrationHandler(BaseHandler): ) else: access_token = await self._auth_handler.get_access_token_for_user_id( - user_id, device_id=registered_device_id, valid_until_ms=valid_until_ms + user_id, + device_id=registered_device_id, + valid_until_ms=valid_until_ms, + is_appservice_ghost=is_appservice_ghost, ) return (registered_device_id, access_token) |