diff options
Diffstat (limited to 'oauthlib/oauth2')
7 files changed, 19 insertions, 19 deletions
diff --git a/oauthlib/oauth2/rfc6749/__init__.py b/oauthlib/oauth2/rfc6749/__init__.py index c82c06a..6903955 100644 --- a/oauthlib/oauth2/rfc6749/__init__.py +++ b/oauthlib/oauth2/rfc6749/__init__.py @@ -43,7 +43,7 @@ def catch_errors_and_unavailability(f): if not endpoint.available: e = TemporarilyUnavailableError() log.info('Endpoint unavailable, ignoring request %s.' % uri) - return None, {}, e.json, 503 + return {}, e.json, 503 if endpoint.catch_errors: try: @@ -55,7 +55,7 @@ def catch_errors_and_unavailability(f): except Exception as e: error = ServerError() log.warning('Exception caught while processing request, %s.' % e) - return None, {}, error.json, 500 + return {}, error.json, 500 else: return f(endpoint, uri, *args, **kwargs) return wrapper diff --git a/oauthlib/oauth2/rfc6749/endpoints/base.py b/oauthlib/oauth2/rfc6749/endpoints/base.py index 41b3aef..984de2f 100644 --- a/oauthlib/oauth2/rfc6749/endpoints/base.py +++ b/oauthlib/oauth2/rfc6749/endpoints/base.py @@ -44,7 +44,7 @@ def catch_errors_and_unavailability(f): if not endpoint.available: e = TemporarilyUnavailableError() log.info('Endpoint unavailable, ignoring request %s.' % uri) - return None, {}, e.json, 503 + return {}, e.json, 503 if endpoint.catch_errors: try: @@ -56,7 +56,7 @@ def catch_errors_and_unavailability(f): except Exception as e: error = ServerError() log.warning('Exception caught while processing request, %s.' % e) - return None, {}, error.json, 500 + return {}, error.json, 500 else: return f(endpoint, uri, *args, **kwargs) return wrapper diff --git a/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py b/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py index 55f70f3..71d018b 100644 --- a/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py +++ b/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py @@ -131,7 +131,7 @@ class AuthorizationCodeGrant(GrantTypeBase): :param request: oauthlib.commong.Request :param token_handler: A token handler instace, for example of type oauthlib.oauth2.BearerToken. - :returns: uri, headers, body, status + :returns: headers, body, status :raises: FatalClientError on invalid redirect URI or client id. ValueError if scopes are not set on the request object. @@ -203,12 +203,12 @@ class AuthorizationCodeGrant(GrantTypeBase): except errors.OAuth2Error as e: log.debug('Client error during validation of %r. %r.', request, e) request.redirect_uri = request.redirect_uri or self.error_uri - return common.add_params_to_uri(request.redirect_uri, e.twotuples), None, None, e.status_code + return {'Location': common.add_params_to_uri(request.redirect_uri, e.twotuples)}, None, 302 grant = self.create_authorization_code(request) log.debug('Saving grant %r for %r.', grant, request) self.request_validator.save_authorization_code(request.client_id, grant, request) - return common.add_params_to_uri(request.redirect_uri, grant.items()), None, None, 302 + return {'Location': common.add_params_to_uri(request.redirect_uri, grant.items())}, None, 302 def create_token_response(self, request, token_handler): """Validate the authorization code. @@ -229,12 +229,12 @@ class AuthorizationCodeGrant(GrantTypeBase): log.debug('Token request validation ok for %r.', request) except errors.OAuth2Error as e: log.debug('Client error during validation of %r. %r.', request, e) - return None, headers, e.json, e.status_code + return headers, e.json, e.status_code token = token_handler.create_token(request, refresh_token=True) self.request_validator.invalidate_authorization_code( request.client_id, request.code, request) - return None, headers, json.dumps(token), 200 + return headers, json.dumps(token), 200 def validate_authorization_request(self, request): """Check the authorization request for normal and fatal errors. diff --git a/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py b/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py index b2bfff3..6641f1f 100644 --- a/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py +++ b/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py @@ -66,12 +66,12 @@ class ClientCredentialsGrant(GrantTypeBase): self.validate_token_request(request) except errors.OAuth2Error as e: log.debug('Client error in token request. %s.', e) - return None, {}, e.json, e.status_code + return {}, e.json, e.status_code token = token_handler.create_token(request, refresh_token=False) log.debug('Issuing token to client id %r (%r), %r.', request.client_id, request.client, token) - return None, {}, json.dumps(token), 200 + return {}, json.dumps(token), 200 def validate_token_request(self, request): if not getattr(request, 'grant_type'): diff --git a/oauthlib/oauth2/rfc6749/grant_types/implicit.py b/oauthlib/oauth2/rfc6749/grant_types/implicit.py index 7e2cc54..0761287 100644 --- a/oauthlib/oauth2/rfc6749/grant_types/implicit.py +++ b/oauthlib/oauth2/rfc6749/grant_types/implicit.py @@ -220,12 +220,12 @@ class ImplicitGrant(GrantTypeBase): # http://tools.ietf.org/html/rfc6749#appendix-B except errors.OAuth2Error as e: log.debug('Client error during validation of %r. %r.', request, e) - return common.add_params_to_uri(request.redirect_uri, e.twotuples, - fragment=True), {}, None, e.status_code + return {'Location': common.add_params_to_uri(request.redirect_uri, e.twotuples, + fragment=True)}, None, 302 token = token_handler.create_token(request, refresh_token=False) - return common.add_params_to_uri(request.redirect_uri, token.items(), - fragment=True), {}, None, 302 + return {'Location': common.add_params_to_uri(request.redirect_uri, token.items(), + fragment=True)}, None, 302 def validate_authorization_request(self, request): return self.validate_token_request(request) diff --git a/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py b/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py index 8ea176e..644f7eb 100644 --- a/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py +++ b/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py @@ -54,13 +54,13 @@ class RefreshTokenGrant(GrantTypeBase): log.debug('Validating refresh token request, %r.', request) self.validate_token_request(request) except errors.OAuth2Error as e: - return None, headers, e.json, e.status_code + return headers, e.json, e.status_code token = token_handler.create_token(request, refresh_token=self.issue_new_refresh_tokens) log.debug('Issuing new token to client id %r (%r), %r.', request.client_id, request.client, token) - return None, headers, json.dumps(token), 200 + return headers, json.dumps(token), 200 def validate_token_request(self, request): # REQUIRED. Value MUST be set to "refresh_token". diff --git a/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py b/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py index 5b991c6..8629518 100644 --- a/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py +++ b/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py @@ -105,12 +105,12 @@ class ResourceOwnerPasswordCredentialsGrant(GrantTypeBase): self.validate_token_request(request) except errors.OAuth2Error as e: log.debug('Client error in token request, %s.', e) - return None, headers, e.json, e.status_code + return headers, e.json, e.status_code token = token_handler.create_token(request, refresh_token=True) log.debug('Issuing token %r to client id %r (%r) and username %s.', token, request.client_id, request.client, request.username) - return None, headers, json.dumps(token), 200 + return headers, json.dumps(token), 200 def validate_token_request(self, request): """ |