Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Matrix
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Operate
Environments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Matrix
Commits
11b0a340
Commit
11b0a340
authored
9 years ago
by
Kegan Dougal
Browse files
Options
Downloads
Patches
Plain Diff
Use the same reg paths as register v1 for ASes.
Namely this means using registration_handler.appservice_register.
parent
a4d62ba3
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
synapse/rest/client/v2_alpha/register.py
+6
-4
6 additions, 4 deletions
synapse/rest/client/v2_alpha/register.py
tests/rest/client/v2_alpha/test_register.py
+3
-1
3 additions, 1 deletion
tests/rest/client/v2_alpha/test_register.py
with
9 additions
and
5 deletions
synapse/rest/client/v2_alpha/register.py
+
6
−
4
View file @
11b0a340
...
...
@@ -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
))
...
...
This diff is collapsed.
Click to expand it.
tests/rest/client/v2_alpha/test_register.py
+
3
−
1
View file @
11b0a340
...
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment