Add requestToken endpoints #915

dbkr · Jul 8, 2016

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

Why aren't these just separate handlers?

Left over debug logs?

Is this a thing?

dbkr · Jul 11, 2016

ptal

Nit: Its more pythonic to just do if absent:

on_OPTIONS should be handled automatically?

Ah, good to know, just copied it from the other handlers.

Does this not explode if there are extra keys in the body?

requestEmailToken takes **kwargs so it shouldn't do (next_link is passed through this way)

erikjohnston · Jul 13, 2016

LGTM

erikjohnston · Jul 13, 2016

(Is this sytest'ed or even sytest'able?)

dbkr · Jul 13, 2016

It would be tricky to sytest: currently we could test if it rejected appropriately, but since we allow the HS to HTTP 200 the request and tell the user by email that the email is already taken / not found, the tests would then fail if an HS did that.

dbkr assigned erikjohnston Jul 8, 2016

erikjohnston changed the title from Implement https://github.com/matrix-org/matrix-doc/pull/346/files to Add requestToken endpoints Jul 8, 2016

dbkr referenced this pull request in matrix-org/matrix-react-sdk Jul 8, 2016
Merged
Use HS proxy API for requestToken on adding email #336

dbkr referenced this pull request in matrix-org/matrix-react-sdk Jul 8, 2016
Merged
Error if email already in use when resetting pw #337

richvdh deleted the dbkr/more_requesttokens branch Dec 1, 2016

          @defer.inlineCallbacks
          def on_POST(self, request):
              yield run_on_reactor()
+    +        if '/account/password/email/requestToken' in request.path:

+    +        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)

+    +    def __init__(self, hs):
+    +        super(PasswordRequestTokenRestServlet, self).__init__()
+    +        self.hs = hs
+    +        self.identity_handler = hs.get_handlers().identity_handler
+    +
+    +    @defer.inlineCallbacks
+    +    def on_POST(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:

+    +
+    +        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, {}

+    +        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)

matrix-org/synapse

Add requestToken endpoints #915

dbkr commented Jul 8, 2016 • edited

dbkr assigned erikjohnston Jul 8, 2016

erikjohnston changed the title from Implement https://github.com/matrix-org/matrix-doc/pull/346/files to Add requestToken endpoints Jul 8, 2016

dbkr referenced this pull request in matrix-org/matrix-react-sdk Jul 8, 2016

Use HS proxy API for requestToken on adding email #336

erikjohnston commented on an outdated diff Jul 8, 2016

erikjohnston commented on an outdated diff Jul 8, 2016

dbkr referenced this pull request in matrix-org/matrix-react-sdk Jul 8, 2016

Error if email already in use when resetting pw #337

dbkr added some commits Jul 11, 2016

dbkr commented Jul 11, 2016

erikjohnston commented on an outdated diff Jul 11, 2016

erikjohnston and 1 other commented on an outdated diff Jul 11, 2016

erikjohnston commented on the diff Jul 11, 2016

dbkr added some commits Jul 12, 2016

erikjohnston commented Jul 13, 2016

erikjohnston commented Jul 13, 2016

dbkr commented Jul 13, 2016

dbkr merged commit `a37ee22` into develop Jul 13, 2016
9 of 10 checks passed

9 of 10 checks passed

richvdh deleted the dbkr/more_requesttokens branch Dec 1, 2016

matrix-org/synapse

Join GitHub today

Add requestToken endpoints #915

Conversation

dbkr commented Jul 8, 2016 • edited

All checks have passed

dbkr assigned erikjohnston Jul 8, 2016

erikjohnston changed the title from Implement https://github.com/matrix-org/matrix-doc/pull/346/files to Add requestToken endpoints Jul 8, 2016

dbkr referenced this pull request in matrix-org/matrix-react-sdk Jul 8, 2016

Show 1 comment Hide comment erikjohnston commented on an outdated diff Jul 8, 2016

Show 2 comments Hide comments erikjohnston commented on an outdated diff Jul 8, 2016

dbkr referenced this pull request in matrix-org/matrix-react-sdk Jul 8, 2016

dbkr added some commits Jul 11, 2016

Some checks were not successful

dbkr commented Jul 11, 2016

Show 1 comment Hide comment erikjohnston commented on an outdated diff Jul 11, 2016

Show 2 comments Hide comments erikjohnston and 1 other commented on an outdated diff Jul 11, 2016

erikjohnston commented on the diff Jul 11, 2016

dbkr added some commits Jul 12, 2016

Some checks were not successful

Some checks were not successful

Some checks were not successful

erikjohnston commented Jul 13, 2016

erikjohnston commented Jul 13, 2016

dbkr commented Jul 13, 2016

Hide details View details dbkr merged commit a37ee22 into develop Jul 13, 2016 9 of 10 checks passed

9 of 10 checks passed

richvdh deleted the dbkr/more_requesttokens branch Dec 1, 2016

erikjohnston commented on an outdated diff Jul 8, 2016

erikjohnston commented on an outdated diff Jul 8, 2016

erikjohnston commented on an outdated diff Jul 11, 2016

erikjohnston and 1 other commented on an outdated diff Jul 11, 2016

dbkr merged commit `a37ee22` into develop Jul 13, 2016
9 of 10 checks passed