diff options
| author | Patrik Oldsberg <patrik.oldsberg@ericsson.com> | 2016-10-06 10:43:32 +0200 |
|---|---|---|
| committer | Patrik Oldsberg <patrik.oldsberg@ericsson.com> | 2016-10-06 15:24:59 +0200 |
| commit | 9bfc61779111624e972939491a0b5c02190d3463 (patch) | |
| tree | 303e11feba4c129b17b65bcb7384ee44296d0fc2 /synapse/handlers/register.py | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-9bfc61779111624e972939491a0b5c02190d3463.tar.xz | |
storage/appservice: make appservice methods only relying on the cache synchronous
Diffstat (limited to 'synapse/handlers/register.py')
| -rw-r--r-- | synapse/handlers/register.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index dd75c4fecf..19329057d5 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -194,7 +194,7 @@ class RegistrationHandler(BaseHandler): def appservice_register(self, user_localpart, as_token): user = UserID(user_localpart, self.hs.hostname) user_id = user.to_string() - service = yield self.store.get_app_service_by_token(as_token) + service = self.store.get_app_service_by_token(as_token) if not service: raise AuthError(403, "Invalid application service token.") if not service.is_interested_in_user(user_id): @@ -305,11 +305,10 @@ class RegistrationHandler(BaseHandler): # XXX: This should be a deferred list, shouldn't it? yield identity_handler.bind_threepid(c, user_id) - @defer.inlineCallbacks def check_user_id_not_appservice_exclusive(self, user_id, allowed_appservice=None): # valid user IDs must not clash with any user ID namespaces claimed by # application services. - services = yield self.store.get_app_services() + services = self.store.get_app_services() interested_services = [ s for s in services if s.is_interested_in_user(user_id) |