mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-09-08 11:12:00 +00:00
Make shared secret registration work again
This commit is contained in:
parent
7c549dd557
commit
c37a6e151f
@ -82,8 +82,10 @@ class RegisterRestServlet(RestServlet):
|
|||||||
[LoginType.EMAIL_IDENTITY]
|
[LoginType.EMAIL_IDENTITY]
|
||||||
]
|
]
|
||||||
|
|
||||||
|
result = None
|
||||||
if service:
|
if service:
|
||||||
is_application_server = True
|
is_application_server = True
|
||||||
|
params = body
|
||||||
elif 'mac' in body:
|
elif 'mac' in body:
|
||||||
# Check registration-specific shared secret auth
|
# Check registration-specific shared secret auth
|
||||||
if 'username' not in body:
|
if 'username' not in body:
|
||||||
@ -92,6 +94,7 @@ class RegisterRestServlet(RestServlet):
|
|||||||
body['username'], body['mac']
|
body['username'], body['mac']
|
||||||
)
|
)
|
||||||
is_using_shared_secret = True
|
is_using_shared_secret = True
|
||||||
|
params = body
|
||||||
else:
|
else:
|
||||||
authed, result, params = yield self.auth_handler.check_auth(
|
authed, result, params = yield self.auth_handler.check_auth(
|
||||||
flows, body, self.hs.get_ip_from_request(request)
|
flows, body, self.hs.get_ip_from_request(request)
|
||||||
@ -118,7 +121,7 @@ class RegisterRestServlet(RestServlet):
|
|||||||
password=new_password
|
password=new_password
|
||||||
)
|
)
|
||||||
|
|
||||||
if LoginType.EMAIL_IDENTITY in result:
|
if result and LoginType.EMAIL_IDENTITY in result:
|
||||||
threepid = result[LoginType.EMAIL_IDENTITY]
|
threepid = result[LoginType.EMAIL_IDENTITY]
|
||||||
|
|
||||||
for reqd in ['medium', 'address', 'validated_at']:
|
for reqd in ['medium', 'address', 'validated_at']:
|
||||||
|
Loading…
Reference in New Issue
Block a user