From c7788685b061dc1fbbecc07e472570f99f36dca3 Mon Sep 17 00:00:00 2001
From: Daniel Wagner-Hall <daniel@matrix.org>
Date: Thu, 20 Aug 2015 17:43:12 +0100
Subject: [PATCH] Fix bad merge

---
 synapse/handlers/auth.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/synapse/handlers/auth.py b/synapse/handlers/auth.py
index e04336317..c983d444e 100644
--- a/synapse/handlers/auth.py
+++ b/synapse/handlers/auth.py
@@ -318,18 +318,11 @@ class AuthHandler(BaseHandler):
         defer.returnValue(refresh_token)
 
     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
-        )
-        macaroon.add_first_party_caveat("gen = 1")
-        macaroon.add_first_party_caveat("user_id = %s" % (user_id,))
+        macaroon = self._generate_base_macaroon(user_id)
         macaroon.add_first_party_caveat("type = access")
         now = self.hs.get_clock().time_msec()
         expiry = now + (60 * 60 * 1000)
         macaroon.add_first_party_caveat("time < %d" % (expiry,))
-
         return macaroon.serialize()
 
     def generate_refresh_token(self, user_id):