diff options
| author | Erik Johnston <erikj@jki.re> | 2017-02-02 11:24:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-02 11:24:11 +0000 |
| commit | 5ae38b65c1720176dfdae6f654be06c6f88e2084 (patch) | |
| tree | 2c303e7eda397feec27f93fe6a5e678c03e0b0e5 /synapse/rest/client/v1 | |
| parent | Merge pull request #1872 from matrix-org/erikj/key_changes (diff) | |
| parent | Fix email push in pusher worker (diff) | |
| download | synapse-5ae38b65c1720176dfdae6f654be06c6f88e2084.tar.xz | |
Merge pull request #1875 from matrix-org/erikj/fix_email_push
Fix email push in pusher worker
Diffstat (limited to 'synapse/rest/client/v1')
| -rw-r--r-- | synapse/rest/client/v1/login.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py index 0c9cdff3b8..72057f1b0c 100644 --- a/synapse/rest/client/v1/login.py +++ b/synapse/rest/client/v1/login.py @@ -330,6 +330,7 @@ class CasTicketServlet(ClientV1RestServlet): self.cas_required_attributes = hs.config.cas_required_attributes self.auth_handler = hs.get_auth_handler() self.handlers = hs.get_handlers() + self.macaroon_gen = hs.get_macaroon_generator() @defer.inlineCallbacks def on_GET(self, request): @@ -368,7 +369,9 @@ class CasTicketServlet(ClientV1RestServlet): yield self.handlers.registration_handler.register(localpart=user) ) - login_token = auth_handler.generate_short_term_login_token(registered_user_id) + login_token = self.macaroon_gen.generate_short_term_login_token( + registered_user_id + ) redirect_url = self.add_login_token_to_redirect_url(client_redirect_url, login_token) request.redirect(redirect_url) |