diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 17:13:33 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 17:13:33 +0100 |
| commit | d5a825edee07cc0e66904283ea86a923b50beb69 (patch) | |
| tree | 8b06dbdbac6d79c6a23b3fb8037b579ccf223a8e /synapse/handlers | |
| parent | Merge branch 'develop' into refresh (diff) | |
| parent | Remove incorrect whitespace (diff) | |
| download | synapse-d5a825edee07cc0e66904283ea86a923b50beb69.tar.xz | |
Merge branch 'auth' into refresh
Conflicts: synapse/handlers/register.py
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/auth.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py index af602bee44..17465d2af6 100644 --- a/synapse/handlers/auth.py +++ b/synapse/handlers/auth.py @@ -319,9 +319,9 @@ class AuthHandler(BaseHandler): def generate_access_token(self, user_id): macaroon = pymacaroons.Macaroon( - location = self.hs.config.server_name, - identifier = "key", - key = self.hs.config.macaroon_secret_key) + location=self.hs.config.server_name, + identifier="key", + key=self.hs.config.macaroon_secret_key) macaroon.add_first_party_caveat("gen = 1") macaroon.add_first_party_caveat("user_id = %s" % (user_id,)) macaroon.add_first_party_caveat("type = access") |