diff options
author | Erik Johnston <erik@matrix.org> | 2017-02-02 16:50:28 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-02-02 16:50:28 +0000 |
commit | f8c407a13b04f906dc761bcf33992e05af219098 (patch) | |
tree | 0479c242f3d7df94437755296616e657a0a15858 /synapse/push | |
parent | Update changelog (diff) | |
parent | Merge pull request #1877 from matrix-org/erikj/device_list_fixes (diff) | |
download | synapse-f8c407a13b04f906dc761bcf33992e05af219098.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.0
Diffstat (limited to 'synapse/push')
-rw-r--r-- | synapse/push/mailer.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py index ce2d31fb98..62d794f22b 100644 --- a/synapse/push/mailer.py +++ b/synapse/push/mailer.py @@ -81,7 +81,7 @@ class Mailer(object): def __init__(self, hs, app_name): self.hs = hs self.store = self.hs.get_datastore() - self.auth_handler = self.hs.get_auth_handler() + self.macaroon_gen = self.hs.get_macaroon_generator() self.state_handler = self.hs.get_state_handler() loader = jinja2.FileSystemLoader(self.hs.config.email_template_dir) self.app_name = app_name @@ -466,7 +466,7 @@ class Mailer(object): def make_unsubscribe_link(self, user_id, app_id, email_address): params = { - "access_token": self.auth_handler.generate_delete_pusher_token(user_id), + "access_token": self.macaroon_gen.generate_delete_pusher_token(user_id), "app_id": app_id, "pushkey": email_address, } |