diff options
author | Mark Haines <mjark@negativecurvature.net> | 2015-08-20 10:04:04 +0100 |
---|---|---|
committer | Mark Haines <mjark@negativecurvature.net> | 2015-08-20 10:04:04 +0100 |
commit | a0b8e5f2fec1982af20fdafc454047067058fd51 (patch) | |
tree | e6b02b94d49fc3ddb3c5ee7793bbc729e3fb5027 /synapse/rest/client/v2_alpha | |
parent | Merge pull request #232 from matrix-org/erikj/appservice_joined_rooms (diff) | |
parent | Check absent before trying to access keys (diff) | |
download | synapse-a0b8e5f2fec1982af20fdafc454047067058fd51.tar.xz |
Merge pull request #211 from matrix-org/email_in_use
Changes for unique emails
Diffstat (limited to 'synapse/rest/client/v2_alpha')
-rw-r--r-- | synapse/rest/client/v2_alpha/register.py | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py index 012c447e88..1ba2f29711 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py @@ -54,6 +54,11 @@ class RegisterRestServlet(RestServlet): @defer.inlineCallbacks def on_POST(self, request): yield run_on_reactor() + + if '/register/email/requestToken' in request.path: + ret = yield self.onEmailTokenRequest(request) + defer.returnValue(ret) + body = parse_json_dict_from_request(request) # we do basic sanity checks here because the auth layer will store these @@ -208,6 +213,29 @@ class RegisterRestServlet(RestServlet): "home_server": self.hs.hostname, } + @defer.inlineCallbacks + def onEmailTokenRequest(self, request): + body = parse_json_dict_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 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): RegisterRestServlet(hs).register(http_server) |