Decouple oauth methods from app with a namedtuple
This commit is contained in:
parent
d45b925155
commit
e967fde3ae
7 changed files with 20 additions and 7 deletions
|
@ -10,6 +10,7 @@ from auth.decorators import require_session_login
|
|||
from auth.permissions import AdministerRepositoryPermission
|
||||
from data import model
|
||||
from endpoints.decorators import route_show_if, parse_repository_name
|
||||
from util.config import URLSchemeAndHostname
|
||||
from util.http import abort
|
||||
|
||||
|
||||
|
@ -26,6 +27,7 @@ def attach_github_build_trigger(namespace_name, repo_name):
|
|||
permission = AdministerRepositoryPermission(namespace_name, repo_name)
|
||||
if permission.can():
|
||||
code = request.args.get('code')
|
||||
# url_scheme_and_hostname = URLSchemeAndHostname(app.config['PREFERRED_URL_SCHEME'], app.config['SERVER_HOSTNAME'])
|
||||
token = github_trigger.exchange_code_for_token(app.config, client, code)
|
||||
repo = model.repository.get_repository(namespace_name, repo_name)
|
||||
if not repo:
|
||||
|
|
|
@ -10,6 +10,7 @@ from auth.decorators import require_session_login
|
|||
from auth.permissions import AdministerRepositoryPermission
|
||||
from data import model
|
||||
from endpoints.decorators import route_show_if
|
||||
from util.config import URLSchemeAndHostname
|
||||
from util.http import abort
|
||||
|
||||
|
||||
|
@ -34,6 +35,7 @@ def attach_gitlab_build_trigger():
|
|||
permission = AdministerRepositoryPermission(namespace, repository)
|
||||
if permission.can():
|
||||
code = request.args.get('code')
|
||||
# url_scheme_and_hostname = URLSchemeAndHostname(app.config['PREFERRED_URL_SCHEME'], app.config['SERVER_HOSTNAME'])
|
||||
token = gitlab_trigger.exchange_code_for_token(app.config, client, code,
|
||||
redirect_suffix='/trigger')
|
||||
if not token:
|
||||
|
|
Reference in a new issue