summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Fokau <andrei@5monkeys.se>2013-02-06 13:42:28 +0100
committerAndrei Fokau <andrei@5monkeys.se>2013-02-06 13:42:28 +0100
commitd46e37f1de5b716a2f12c23635cd60b383ac20ac (patch)
tree041550c55395206d59dbbb83bed868e4ea067bfc
parentc287c87a102b95d4636b5ea3ebac2d1332513dfd (diff)
downloadoauthlib-d46e37f1de5b716a2f12c23635cd60b383ac20ac.tar.gz
Added missing argument for auth endpoint. Fixed typo in docstring.
-rw-r--r--oauthlib/oauth2/draft25/__init__.py3
-rw-r--r--oauthlib/oauth2/draft25/tokens.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/oauthlib/oauth2/draft25/__init__.py b/oauthlib/oauth2/draft25/__init__.py
index b440c2a..ae927de 100644
--- a/oauthlib/oauth2/draft25/__init__.py
+++ b/oauthlib/oauth2/draft25/__init__.py
@@ -737,7 +737,8 @@ class WebApplicationServer(AuthorizationEndpoint, TokenEndpoint, ResourceEndpoin
refresh_grant = grant_types.RefreshTokenGrant(request_validator)
bearer = tokens.BearerToken(request_validator)
AuthorizationEndpoint.__init__(self, default_response_type='code',
- response_types={'code': auth_grant})
+ response_types={'code': auth_grant},
+ default_token_type=bearer)
TokenEndpoint.__init__(self, default_grant_type='authorization_code',
grant_types={
'authorization_code': auth_grant,
diff --git a/oauthlib/oauth2/draft25/tokens.py b/oauthlib/oauth2/draft25/tokens.py
index 1d8af33..eaa53f3 100644
--- a/oauthlib/oauth2/draft25/tokens.py
+++ b/oauthlib/oauth2/draft25/tokens.py
@@ -47,7 +47,7 @@ def prepare_mac_header(token, uri, key, http_method, nonce=None, headers=None,
:param headers: Request headers as a dictionary.
:param http_method: HTTP Request method.
:param key: MAC given provided by token endpoint.
- :param algorithm: HMAC algorithm provided by token endpoint.
+ :param hash_algorithm: HMAC algorithm provided by token endpoint.
:param issue_time: Time when the MAC credentials were issues as a datetime object.
:param draft: MAC authentication specification version.
:return: headers dictionary with the authorization field added.