Merge pull request #206 from lepture/expires

The ability to vary expires_in per request.
oauthlib · Sep 16, 2013 · 4234b53 · 4234b53
2 parents 25c82a2 + 27b480b
commit 4234b53
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/oauthlib/oauth2/rfc6749/tokens.py b/oauthlib/oauth2/rfc6749/tokens.py
@@ -180,11 +180,18 @@ def __init__(self, request_validator=None, token_generator=None,
 
     def create_token(self, request, refresh_token=False):
         """Create a BearerToken, by default without refresh token."""
+
+        if callable(self.expires_in):
+            expires_in = self.expires_in(request)
+        else:
+            expires_in = self.expires_in
+
         token = {
             'access_token': self.token_generator(request),
-            'expires_in': self.expires_in,
+            'expires_in': expires_in,
             'token_type': 'Bearer',
         }
+
         if request.scopes is not None:
             token['scope'] = ' '.join(request.scopes)