diff --git a/synapse/replication/http/__init__.py b/synapse/replication/http/__init__.py
index dec63ae68d..3807d2ac6f 100644
--- a/synapse/replication/http/__init__.py
+++ b/synapse/replication/http/__init__.py
@@ -14,7 +14,7 @@
# limitations under the License.
from synapse.http.server import JsonResource
-from synapse.replication.http import federation, membership, registration, send_event, device
+from synapse.replication.http import federation, membership, registration, send_event
REPLICATION_PREFIX = "/_synapse/replication"
@@ -29,4 +29,3 @@ class ReplicationRestResource(JsonResource):
membership.register_servlets(hs, self)
federation.register_servlets(hs, self)
registration.register_servlets(hs, self)
- device.register_servlets(hs, self)
diff --git a/synapse/replication/http/device.py b/synapse/replication/http/device.py
deleted file mode 100644
index 605de028a0..0000000000
--- a/synapse/replication/http/device.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2019 New Vector Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import logging
-
-from twisted.internet import defer
-
-from synapse.http.servlet import parse_json_object_from_request
-from synapse.replication.http._base import ReplicationEndpoint
-
-logger = logging.getLogger(__name__)
-
-
-class CheckDeviceRegisteredServlet(ReplicationEndpoint):
- """
- Check a device is registered.
-
- """
-
- NAME = "device_check_registered"
- PATH_ARGS = ("user_id")
-
- def __init__(self, hs):
- super(CheckDeviceRegisteredServlet, self).__init__(hs)
- self.device_handler = hs.get_device_handler()
-
- @staticmethod
- def _serialize_payload(user_id, device_id, initial_display_name):
- """
- """
- return {
- "device_id": device_id,
- "initial_display_name": initial_display_name,
- }
-
- @defer.inlineCallbacks
- def _handle_request(self, request, user_id):
- content = parse_json_object_from_request(request)
-
- device_id = content["device_id"]
- initial_display_name = content["initial_display_name"]
-
- try:
- device_id = yield self.device_handler.check_device_registered(user_id, device_id)
- except Exception as e:
- defer.returnValue((400, str(e)))
-
- defer.returnValue((200, {"device_id": device_id}))
-
-
-def register_servlets(hs, http_server):
- CheckDeviceRegisteredServlet(hs).register(http_server)
diff --git a/synapse/replication/http/registration.py b/synapse/replication/http/registration.py
index 0f2f226ae1..513dafab39 100644
--- a/synapse/replication/http/registration.py
+++ b/synapse/replication/http/registration.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Copyright 2019 New Vector Ltd
+# Copyright 2018 New Vector Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py
index 91c0d5e981..da9ebd540d 100644
--- a/synapse/rest/client/v2_alpha/register.py
+++ b/synapse/rest/client/v2_alpha/register.py
@@ -33,7 +33,6 @@ from synapse.http.servlet import (
parse_json_object_from_request,
parse_string,
)
-from synapse.replication.http.device import CheckDeviceRegisteredServlet
from synapse.replication.http.registration import (
RegistrationUserCacheInvalidationServlet,
)
@@ -194,19 +193,12 @@ class RegisterRestServlet(RestServlet):
self.registration_handler = hs.get_handlers().registration_handler
self.identity_handler = hs.get_handlers().identity_handler
self.room_member_handler = hs.get_room_member_handler()
+ self.device_handler = hs.get_device_handler()
self.macaroon_gen = hs.get_macaroon_generator()
- if self.hs.config.worker_app:
-
- self._invalidate_caches_client = (
- RegistrationUserCacheInvalidationServlet.make_client(hs)
- )
- self._device_check_registered_client = (
- CheckDeviceRegisteredServlet.make_client(hs)
- )
- else:
- self.device_handler = hs.get_device_handler()
-
+ self._invalidate_caches_client = (
+ RegistrationUserCacheInvalidationServlet.make_client(hs)
+ )
@interactive_auth_handler
@defer.inlineCallbacks
@@ -672,20 +664,6 @@ 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:
- 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.
@@ -702,7 +680,7 @@ class RegisterRestServlet(RestServlet):
# register the user's device
device_id = params.get("device_id")
initial_display_name = params.get("initial_device_display_name")
- return self._check_device_registered(
+ return self.device_handler.check_device_registered(
user_id, device_id, initial_display_name
)
@@ -719,7 +697,7 @@ class RegisterRestServlet(RestServlet):
# we have nowhere to store it.
device_id = synapse.api.auth.GUEST_DEVICE_ID
initial_display_name = params.get("initial_device_display_name")
- yield self._check_device_registered(
+ yield self.device_handler.check_device_registered(
user_id, device_id, initial_display_name
)
|
