modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-13 18:19:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #322 Use requests instead of httplib2 in auth.py

Browse Source
This commit is contained in:
Matt Prahl
2017-02-17 00:27:42 +00:00
parent 30daab024e 47924a2688
commit b30a6a8e05
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
module_build_service/auth.py
View File

@@ -26,7 +26,7 @@
from module_build_service.errors import Unauthorized
from module_build_service import app, log
import httplib2
import requests
import json
from six.moves.urllib.parse import urlencode
@@ -64,11 +64,8 @@ def _get_token_info(token):
'client_secret': client_secrets['client_secret']}
headers = {'Content-type': 'application/x-www-form-urlencoded'}
resp, content = httplib2.Http().request(
client_secrets['token_introspection_uri'], 'POST',
urlencode(request), headers=headers)
return _json_loads(content)
resp = requests.post(client_secrets['token_introspection_uri'], data=request, headers=headers)
return resp.json()
def _get_user_info(token):
@@ -79,12 +76,8 @@ def _get_user_info(token):
return None
headers = {'authorization': 'Bearer ' + token}
resp, content = httplib2.Http().request(
client_secrets['userinfo_uri'], 'GET',
headers=headers)
return _json_loads(content)
resp = requests.get(client_secrets['userinfo_uri'], headers=headers)
return resp.json()
def get_user(request):