maxmustermann/synapse
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix

Browse source
This commit is contained in:
Amber Brown 2019-02-16 05:10:48 +11:00
parent 3175edc5d8
commit 155efa9e36
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
synapse/rest/client/v2_alpha/register.py
View file

@ -672,16 +672,19 @@ class RegisterRestServlet(RestServlet):
})
defer.returnValue(result)
@defer.inlineCallbacks
def _check_device_registered(self, user_id, device_id, initial_display_name):
if self.hs.config.worker_app:
return self._device_check_registered_client(
user_id, device_id, initial_display_name
)["device_id"]
else:
return self.device_handler.check_device_registered(
r = yield self._device_check_registered_client(
user_id, device_id, initial_display_name
)
defer.returnValue(r["device_id"])
else:
r = yield self.device_handler.check_device_registered(
user_id, device_id, initial_display_name
)
defer.returnValue(r)
def _register_device(self, user_id, params):
"""Register a device for a user.