Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-07 22:54:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

make add3pid servlet work

Browse source
This commit is contained in:
David Baker 2015-04-17 16:44:49 +01:00
parent 0b1a8500a2
commit f96ab9d18d
4 changed files with 81 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

36
synapse/rest/client/v2_alpha/register.py
View file

@ -50,6 +50,7 @@ class RegisterRestServlet(RestServlet):
self.auth_handler = hs.get_handlers().auth_handler
self.registration_handler = hs.get_handlers().registration_handler
self.identity_handler = hs.get_handlers().identity_handler
self.login_handler = hs.get_handlers().login_handler
@defer.inlineCallbacks
def on_POST(self, request):
@ -61,7 +62,6 @@ class RegisterRestServlet(RestServlet):
if 'username' in body:
desired_username = body['username']
print "username in body"
yield self.registration_handler.check_username(desired_username)
is_using_shared_secret = False
@ -118,17 +118,31 @@ class RegisterRestServlet(RestServlet):
password=new_password
)
if 'bind_email' in params and params['bind_email']:
logger.info("bind_email specified: binding")
if LoginType.EMAIL_IDENTITY in result:
threepid = result[LoginType.EMAIL_IDENTITY]
emailThreepid = result[LoginType.EMAIL_IDENTITY]
threepidCreds = emailThreepid['threepidCreds']
logger.debug("Binding emails %s to %s" % (
emailThreepid, user_id
))
yield self.identity_handler.bind_threepid(threepidCreds, user_id)
else:
logger.info("bind_email not specified: not binding email")
for reqd in ['medium', 'address', 'validatedAt']:
if reqd not in threepid:
logger.info("Can't add incomplete 3pid")
else:
yield self.login_handler.add_threepid(
user_id,
threepid['medium'],
threepid['address'],
threepid['validatedAt'],
)
if 'bind_email' in params and params['bind_email']:
logger.info("bind_email specified: binding")
emailThreepid = result[LoginType.EMAIL_IDENTITY]
threepidCreds = emailThreepid['threepidCreds']
logger.debug("Binding emails %s to %s" % (
emailThreepid, user_id
))
yield self.identity_handler.bind_threepid(threepidCreds, user_id)
else:
logger.info("bind_email not specified: not binding email")
result = {
"user_id": user_id,