Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-08-05 04:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement https://github.com/matrix-org/matrix-doc/pull/346/files

Browse Source
This commit is contained in:
David Baker 2016-07-08 17:42:48 +01:00
parent 58930da52b
commit 385aec4010
2 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
synapse/api/errors.py
View File

@ -43,6 +43,7 @@ class Codes(object):
EXCLUSIVE = "M_EXCLUSIVE"
THREEPID_AUTH_FAILED = "M_THREEPID_AUTH_FAILED"
THREEPID_IN_USE = "M_THREEPID_IN_USE"
THREEPID_NOT_FOUND = "M_THREEPID_NOT_FOUND"
INVALID_USERNAME = "M_INVALID_USERNAME"
SERVER_NOT_TRUSTED = "M_SERVER_NOT_TRUSTED"

59
synapse/rest/client/v2_alpha/account.py
View File

@ -36,11 +36,16 @@ class PasswordRestServlet(RestServlet):
self.hs = hs
self.auth = hs.get_auth()
self.auth_handler = hs.get_auth_handler()
self.identity_handler = hs.get_handlers().identity_handler
@defer.inlineCallbacks
def on_POST(self, request):
yield run_on_reactor()
if '/account/password/email/requestToken' in request.path:
ret = yield self.onPasswordEmailTokenRequest(request)
defer.returnValue(ret)
body = parse_json_object_from_request(request)
authed, result, params, _ = yield self.auth_handler.check_auth([
@ -85,6 +90,29 @@ class PasswordRestServlet(RestServlet):
defer.returnValue((200, {}))
@defer.inlineCallbacks
def onPasswordEmailTokenRequest(self, request):
body = parse_json_object_from_request(request)
required = ['id_server', 'client_secret', 'email', 'send_attempt']
absent = []
for k in required:
if k not in body:
absent.append(k)
if len(absent) > 0:
raise SynapseError(400, "Missing params: %r" % absent, Codes.MISSING_PARAM)
existingUid = yield self.hs.get_datastore().get_user_id_by_threepid(
'email', body['email']
)
if existingUid is None:
raise SynapseError(400, "Email not found", Codes.THREEPID_NOT_FOUND)
ret = yield self.identity_handler.requestEmailToken(**body)
defer.returnValue((200, ret))
def on_OPTIONS(self, _):
return 200, {}
@ -115,6 +143,10 @@ class ThreepidRestServlet(RestServlet):
def on_POST(self, request):
yield run_on_reactor()
if '/account/3pid/email/requestToken' in request.path:
ret = yield self.onThreepidEmailTokenRequest(request)
defer.returnValue(ret)
body = parse_json_object_from_request(request)
threePidCreds = body.get('threePidCreds')
@ -155,6 +187,33 @@ class ThreepidRestServlet(RestServlet):
defer.returnValue((200, {}))
@defer.inlineCallbacks
def onThreepidEmailTokenRequest(self, request):
body = parse_json_object_from_request(request)
logger.error("hi")
required = ['id_server', 'client_secret', 'email', 'send_attempt']
absent = []
for k in required:
if k not in body:
absent.append(k)
if len(absent) > 0:
raise SynapseError(400, "Missing params: %r" % absent, Codes.MISSING_PARAM)
existingUid = yield self.hs.get_datastore().get_user_id_by_threepid(
'email', body['email']
)
logger.error("existing %r", existingUid)
if existingUid is not None:
raise SynapseError(400, "Email is already in use", Codes.THREEPID_IN_USE)
ret = yield self.identity_handler.requestEmailToken(**body)
defer.returnValue((200, ret))
def register_servlets(hs, http_server):
PasswordRestServlet(hs).register(http_server)