Use the same reg paths as register v1 for ASes.

Namely this means using registration_handler.appservice_register.

2 files changed, 9 insertions, 5 deletions

diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py
index e1c42dd51e..cf54e1dacf 100644
--- a/synapse/rest/client/v2_alpha/register.py
+++ b/synapse/rest/client/v2_alpha/register.py
@@ -82,7 +82,9 @@ class RegisterRestServlet(RestServlet):
 
         # == Application Service Registration ==
         if appservice:
-            result = yield self._do_appservice_registration(desired_username)
+            result = yield self._do_appservice_registration(
+                desired_username, request.args["access_token"][0]
+            )
             defer.returnValue((200, result))  # we throw for non 200 responses
             return
 
@@ -166,9 +168,9 @@ class RegisterRestServlet(RestServlet):
         return 200, {}
 
     @defer.inlineCallbacks
-    def _do_appservice_registration(self, username):
-        (user_id, token) = yield self.registration_handler.register(
-            localpart=username
+    def _do_appservice_registration(self, username, as_token):
+        (user_id, token) = yield self.registration_handler.appservice_register(
+            username, as_token
         )
         defer.returnValue(self._create_registration_details(user_id, token))
 
diff --git a/tests/rest/client/v2_alpha/test_register.py b/tests/rest/client/v2_alpha/test_register.py
index 3edc2ec2e9..66fd25964d 100644
--- a/tests/rest/client/v2_alpha/test_register.py
+++ b/tests/rest/client/v2_alpha/test_register.py
@@ -58,7 +58,9 @@ class RegisterRestServletTestCase(unittest.TestCase):
         self.appservice = {
             "id": "1234"
         }
-        self.registration_handler.register = Mock(return_value=(user_id, token))
+        self.registration_handler.appservice_register = Mock(
+            return_value=(user_id, token)
+        )
         result = yield self.servlet.on_POST(self.request)
         self.assertEquals(result, (200, {
             "user_id": user_id,