diff --git a/synapse/replication/http/device.py b/synapse/replication/http/device.py
new file mode 100644
index 0000000000..605de028a0
--- /dev/null
+++ b/synapse/replication/http/device.py
@@ -0,0 +1,64 @@
+# -*- 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)
|