Merge branch 'master' into dinsic

1 files changed, 13 insertions, 2 deletions

diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py
index f39803629e..02f78305a9 100644
--- a/synapse/handlers/identity.py
+++ b/synapse/handlers/identity.py
@@ -270,7 +270,14 @@ class IdentityHandler(BaseHandler):
         defer.returnValue(changed)
 
     @defer.inlineCallbacks
-    def requestEmailToken(self, id_server, email, client_secret, send_attempt, **kwargs):
+    def requestEmailToken(
+        self,
+        id_server,
+        email,
+        client_secret,
+        send_attempt,
+        next_link=None,
+    ):
         if not self._should_trust_id_server(id_server):
             raise SynapseError(
                 400, "Untrusted ID server '%s'" % id_server,
@@ -282,11 +289,15 @@ class IdentityHandler(BaseHandler):
             'client_secret': client_secret,
             'send_attempt': send_attempt,
         }
-        params.update(kwargs)
+
         # if we have a rewrite rule set for the identity server,
         # apply it now.
         if id_server in self.rewrite_identity_server_urls:
             id_server = self.rewrite_identity_server_urls[id_server]
+
+        if next_link:
+            params.update({'next_link': next_link})
+
         try:
             data = yield self.http_client.post_json_get_json(
                 "https://%s%s" % (