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

Return user ID in use error straight away

Browse source
This commit is contained in:
David Baker 2015-04-16 19:56:44 +01:00
parent 766bd8e880
commit ea1776f556
4 changed files with 88 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

25
synapse/handlers/identity.py
View file

@ -63,4 +63,27 @@ class IdentityHandler(BaseHandler):
if 'medium' in data:
defer.returnValue(data)
defer.returnValue(None)
defer.returnValue(None)
@defer.inlineCallbacks
def bind_threepid(self, creds, mxid):
yield run_on_reactor()
logger.debug("binding threepid %r to %s", creds, mxid)
http_client = SimpleHttpClient(self.hs)
data = None
try:
data = yield http_client.post_urlencoded_get_json(
# XXX: Change when ID servers are all HTTPS
"http://%s%s" % (
creds['idServer'], "/_matrix/identity/api/v1/3pid/bind"
),
{
'sid': creds['sid'],
'clientSecret': creds['clientSecret'],
'mxid': mxid,
}
)
logger.debug("bound threepid %r to %s", creds, mxid)
except CodeMessageException as e:
data = json.loads(e.msg)
defer.returnValue(data)