Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-24 08:59:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use the same reg paths as register v1 for ASes.

Browse Source 
Namely this means using registration_handler.appservice_register.
This commit is contained in:
Kegan Dougal 2015-07-29 10:00:54 +01:00
parent a4d62ba36a
commit 11b0a34074
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
synapse/rest/client/v2_alpha/register.py
View File

@ -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))

4
tests/rest/client/v2_alpha/test_register.py
View File

@ -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,