vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix the problem with login on new triggers.

Browse source
This commit is contained in:
jakedt 2014-03-26 15:52:24 -04:00
parent fa3af789b2
commit 4d2e090bea
3 changed files with 64 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

10
endpoints/callbacks.py
View file

@ -1,7 +1,7 @@
import logging
from flask import request, redirect, url_for, Blueprint
from flask.ext.login import login_required, current_user
from flask.ext.login import current_user
from endpoints.common import render_page_template, common_login
from app import app, mixpanel
@ -9,6 +9,7 @@ from data import model
from util.names import parse_repository_name
from util.http import abort
from auth.permissions import AdministerRepositoryPermission
from auth.auth import require_session_login
logger = logging.getLogger(__name__)
@ -100,7 +101,7 @@ def github_oauth_callback():
@callback.route('/github/callback/attach', methods=['GET'])
@login_required
@require_session_login
def github_oauth_attach():
token = exchange_github_code_for_token(request.args.get('code'))
user_data = get_github_user(token)
@ -111,7 +112,7 @@ def github_oauth_attach():
@callback.route('/github/callback/trigger/<path:repository>', methods=['GET'])
@login_required
@require_session_login
@parse_repository_name
def attach_github_build_trigger(namespace, repository):
permission = AdministerRepositoryPermission(namespace, repository)
@ -124,7 +125,8 @@ def attach_github_build_trigger(namespace, repository):
trigger = model.create_build_trigger(repo, 'github', token, current_user.db_user())
admin_path = '%s/%s/%s' % (namespace, repository, 'admin')
full_url = url_for('web.repository', path=admin_path) + '?tab=trigger&new_trigger=' + trigger.uuid
full_url = '%s%s%s' % (url_for('web.repository', path=admin_path), '?tab=trigger&new_trigger=',
trigger.uuid)
logger.debug('Redirecting to full url: %s' % full_url)
return redirect(full_url)