Properly connect the github push webhook with the build worker. Still need to resolve the archive format.

This commit is contained in:
jakedt 2014-02-18 18:09:14 -05:00
parent ed38bcdafc
commit f60f9eb62a
8 changed files with 57 additions and 34 deletions

View file

@ -1,4 +1,3 @@
import requests
import logging
from flask import request, redirect, url_for, Blueprint
@ -12,9 +11,13 @@ from util.names import parse_repository_name
logger = logging.getLogger(__name__)
client = app.config['HTTPCLIENT']
callback = Blueprint('callback', __name__)
def exchange_github_code_for_token(code):
code = request.args.get('code')
payload = {
@ -26,8 +29,8 @@ def exchange_github_code_for_token(code):
'Accept': 'application/json'
}
get_access_token = requests.post(app.config['GITHUB_TOKEN_URL'],
params=payload, headers=headers)
get_access_token = client.post(app.config['GITHUB_TOKEN_URL'],
params=payload, headers=headers)
token = get_access_token.json()['access_token']
return token
@ -37,7 +40,7 @@ def get_github_user(token):
token_param = {
'access_token': token,
}
get_user = requests.get(app.config['GITHUB_USER_URL'], params=token_param)
get_user = client.get(app.config['GITHUB_USER_URL'], params=token_param)
return get_user.json()
@ -61,8 +64,8 @@ def github_oauth_callback():
token_param = {
'access_token': token,
}
get_email = requests.get(app.config['GITHUB_USER_EMAILS'],
params=token_param, headers=v3_media_type)
get_email = client.get(app.config['GITHUB_USER_EMAILS'], params=token_param,
headers=v3_media_type)
# We will accept any email, but we prefer the primary
found_email = None