tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests 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
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'
"""

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

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