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/v2_alpha | |
| 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/v2_alpha')
| -rw-r--r-- | synapse/rest/client/v2_alpha/register.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py index 3e7a285e10..ccca5a12d5 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py @@ -96,6 +96,7 @@ class RegisterRestServlet(RestServlet): self.registration_handler = hs.get_handlers().registration_handler self.identity_handler = hs.get_handlers().identity_handler self.device_handler = hs.get_device_handler() + self.macaroon_gen = hs.get_macaroon_generator() @defer.inlineCallbacks def on_POST(self, request): @@ -436,7 +437,7 @@ class RegisterRestServlet(RestServlet): user_id, device_id, initial_display_name ) - access_token = self.auth_handler.generate_access_token( + access_token = self.macaroon_gen.generate_access_token( user_id, ["guest = true"] ) defer.returnValue((200, { |