mirrors/synapse
1
0
Fork 0
mirror of https://github.com/matrix-org/synapse.git synced 2025-10-31 00:01:33 +01:00
Code Issues Projects Releases Wiki Activity

Minor fixes from PR feedback

Browse Source
This commit is contained in:
David Baker 2017-03-08 11:48:43 +00:00
parent 0e0aee25c4
commit 65d43f3ca5
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/rest/client/v1/login.py
View File

@ -66,7 +66,7 @@ def login_id_thirdparty_from_phone(identifier):
""" """
Convert a phone login identifier type to a generic threepid identifier Convert a phone login identifier type to a generic threepid identifier
Args: Args:
identifier: Login identifier dict of type 'm.id.phone' identifier(dict): Login identifier dict of type 'm.id.phone'
Returns: Login identifier dict of type 'm.id.threepid' Returns: Login identifier dict of type 'm.id.threepid'
""" """

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

@ -371,7 +371,7 @@ class RegisterRestServlet(RestServlet):
reqd = ('medium', 'address', 'validated_at') reqd = ('medium', 'address', 'validated_at')
if any(x not in threepid for x in reqd): if any(x not in threepid for x in reqd):
logger.info("Can't add incomplete 3pid") logger.info("Can't add incomplete 3pid")
defer.returnValue() return
yield self.auth_handler.add_threepid( yield self.auth_handler.add_threepid(
user_id, user_id,
@ -447,9 +447,7 @@ class RegisterRestServlet(RestServlet):
if bind_msisdn: if bind_msisdn:
logger.info("bind_msisdn specified: binding") logger.info("bind_msisdn specified: binding")
logger.debug("Binding msisdn %s to %s" % ( logger.debug("Binding msisdn %s to %s", threepid, user_id)
threepid, user_id
))
yield self.identity_handler.bind_threepid( yield self.identity_handler.bind_threepid(
threepid['threepid_creds'], user_id threepid['threepid_creds'], user_id
) )