diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py
index 6a53c5eb47..8b407a307c 100644
--- a/synapse/handlers/identity.py
+++ b/synapse/handlers/identity.py
@@ -18,7 +18,7 @@
from twisted.internet import defer
from synapse.api.errors import (
- CodeMessageException
+ MatrixCodeMessageException, CodeMessageException
)
from ._base import BaseHandler
from synapse.util.async import run_on_reactor
@@ -84,12 +84,15 @@ class IdentityHandler(BaseHandler):
data = {}
try:
data = yield self.http_client.get_json(
- "https://%s%s" % (
+ "http://%s%s" % (
id_server,
"/_matrix/identity/api/v1/3pid/getValidated3pid"
),
{'sid': creds['sid'], 'client_secret': client_secret}
)
+ except MatrixCodeMessageException as e:
+ logger.info("getValidated3pid failed with Matrix error: %r", e)
+ raise SynapseError(e.code, e.msg, e.errcode)
except CodeMessageException as e:
data = json.loads(e.msg)
@@ -119,7 +122,7 @@ class IdentityHandler(BaseHandler):
try:
data = yield self.http_client.post_urlencoded_get_json(
- "https://%s%s" % (
+ "http://%s%s" % (
id_server, "/_matrix/identity/api/v1/3pid/bind"
),
{
@@ -152,13 +155,16 @@ class IdentityHandler(BaseHandler):
try:
data = yield self.http_client.post_json_get_json(
- "https://%s%s" % (
+ "http://%s%s" % (
id_server,
"/_matrix/identity/api/v1/validate/email/requestToken"
),
params
)
defer.returnValue(data)
+ except MatrixCodeMessageException as e:
+ logger.info("Proxied requestToken failed with Matrix error: %r", e)
+ raise SynapseError(e.code, e.msg, e.errcode)
except CodeMessageException as e:
logger.info("Proxied requestToken failed: %r", e)
raise e
@@ -186,13 +192,16 @@ class IdentityHandler(BaseHandler):
try:
data = yield self.http_client.post_json_get_json(
- "https://%s%s" % (
+ "http://%s%s" % (
id_server,
"/_matrix/identity/api/v1/validate/msisdn/requestToken"
),
params
)
defer.returnValue(data)
+ except MatrixCodeMessageException as e:
+ logger.info("Proxied requestToken failed with Matrix error: %r", e)
+ raise SynapseError(e.code, e.msg, e.errcode)
except CodeMessageException as e:
logger.info("Proxied requestToken failed: %r", e)
raise e
|
