Merge branch 'wichert-master'

CONTRIBUTORS.txt

@@ -124,3 +124,5 @@ Contributors
 - Marcin Lulek, 2011/01/02
 
 - John Shipman, 2011/01/15
+
+- Wichert Akkerman, 2011/01/19

pyramid/authentication.py

@@ -413,7 +413,7 @@ def identify(self, request):
 
         if not hasattr(request, '_authtkt_reissued'):
             if reissue and ( (now - timestamp) > self.reissue_time):
-                headers = self.remember(request, userid, max_age=self.max_age)
+                headers = self.remember(request, userid, max_age=self.max_age, tokens=tokens)
                 add_global_response_headers(request, headers)
                 request._authtkt_reissued = True
 

pyramid/tests/test_authentication.py

@@ -455,6 +455,23 @@ def test_identify_cookie_reissue(self):
         self.assertEqual(len(response.headerlist), 3)
         self.assertEqual(response.headerlist[0][0], 'Set-Cookie')
 
+    def test_identify_cookie_reissue_with_token(self):
+        import time
+        plugin = self._makeOne('secret', timeout=10, reissue_time=0)
+        plugin.auth_tkt = DummyAuthTktModule(tokens=('my-token',))
+        now = time.time()
+        plugin.auth_tkt.timestamp = now
+        plugin.now = now + 1
+        request = self._makeRequest({'HTTP_COOKIE':'auth_tkt=bogus'})
+        result = plugin.identify(request)
+        self.failUnless(result)
+        self.assertEqual(len(request.callbacks), 1)
+        response = DummyResponse()
+        request.callbacks[0](None, response)
+        self.assertEqual(len(response.headerlist), 3)
+        self.assertEqual(response.headerlist[0][0], 'Set-Cookie')
+        self.assertTrue('my-token' in response.headerlist[0][1])
+
     def test_remember(self):
         plugin = self._makeOne('secret')
         request = self._makeRequest()