Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

specify auth method #124

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions oauth2/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ def set_signature_method(self, method):
self.method = method

def request(self, uri, method="GET", body='', headers=None,
redirections=httplib2.DEFAULT_MAX_REDIRECTS, connection_type=None):
redirections=httplib2.DEFAULT_MAX_REDIRECTS, connection_type=None,auth_method=None):
DEFAULT_POST_CONTENT_TYPE = 'application/x-www-form-urlencoded'

if not isinstance(headers, dict):
Expand Down Expand Up @@ -670,11 +670,19 @@ def request(self, uri, method="GET", body='', headers=None,

realm = schema + ':' + hierpart + host

if is_form_encoded:
if auth_method is None:
if is_form_encoded:
auth_method="body"
elif method == "GET":
auth_method="query_string"
else:
auth_method="authorization"

if auth_method == "body":
body = req.to_postdata()
elif method == "GET":
elif auth_method == "query_string":
uri = req.to_url()
else:
elif auth_method == "authorization":
headers.update(req.to_header(realm=realm))

return httplib2.Http.request(self, uri, method=method, body=body,
Expand Down