summaryrefslogtreecommitdiff
path: root/oauthlib/oauth2/rfc6749/endpoints
diff options
context:
space:
mode:
authorIb Lundgren <ib.lundgren@gmail.com>2013-07-09 16:59:39 +0100
committerIb Lundgren <ib.lundgren@gmail.com>2013-07-09 16:59:39 +0100
commit03735492b33b1ce8ac8a7fb05fcd017d26d443d7 (patch)
treeeca97b5b4973672aefca05d12445c5c7ad55e4b6 /oauthlib/oauth2/rfc6749/endpoints
parent8949286bf9ba266830d20de913019fa158491617 (diff)
downloadoauthlib-03735492b33b1ce8ac8a7fb05fcd017d26d443d7.tar.gz
Add token_generator param to pre-configured Server. #192.
Diffstat (limited to 'oauthlib/oauth2/rfc6749/endpoints')
-rw-r--r--oauthlib/oauth2/rfc6749/endpoints/pre_configured.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/oauthlib/oauth2/rfc6749/endpoints/pre_configured.py b/oauthlib/oauth2/rfc6749/endpoints/pre_configured.py
index 539879d..e970771 100644
--- a/oauthlib/oauth2/rfc6749/endpoints/pre_configured.py
+++ b/oauthlib/oauth2/rfc6749/endpoints/pre_configured.py
@@ -24,13 +24,13 @@ class Server(AuthorizationEndpoint, TokenEndpoint, ResourceEndpoint):
"""An all-in-one endpoint featuring all four major grant types."""
def __init__(self, request_validator, token_expires_in=None,
- *args, **kwargs):
+ token_generator=None, *args, **kwargs):
auth_grant = AuthorizationCodeGrant(request_validator)
implicit_grant = ImplicitGrant(request_validator)
password_grant = ResourceOwnerPasswordCredentialsGrant(request_validator)
credentials_grant = ClientCredentialsGrant(request_validator)
refresh_grant = RefreshTokenGrant(request_validator)
- bearer = BearerToken(request_validator,
+ bearer = BearerToken(request_validator, token_generator,
expires_in=token_expires_in)
AuthorizationEndpoint.__init__(self, default_response_type='code',
response_types={