rename auth.auth to auth.process

This fixes some ambiguity around imports.

endpoints/api/__init__.py

@@ -19,7 +19,7 @@ from auth.permissions import (ReadRepositoryPermission, ModifyRepositoryPermissi
                               UserAdminPermission)
 from auth import scopes
 from auth.auth_context import get_authenticated_user, get_validated_oauth_token
-from auth.auth import process_oauth
+from auth.process import process_oauth
 from endpoints.csrf import csrf_protect
 from endpoints.exception import (ApiException, Unauthorized, InvalidRequest, InvalidResponse,
                                  FreshLoginRequired)

endpoints/bitbuckettrigger.py

@@ -4,7 +4,7 @@ from flask import request, redirect, url_for, Blueprint
 from flask_login import current_user
 
 from app import app
-from auth.auth import require_session_login
+from auth.process import require_session_login
 from buildtrigger.basehandler import BuildTriggerHandler
 from buildtrigger.bitbuckethandler import BitbucketBuildTrigger
 from data import model

endpoints/githubtrigger.py

@@ -6,8 +6,8 @@ from flask_login import current_user
 import features
 
 from app import app, github_trigger
-from auth.auth import require_session_login
 from auth.permissions import AdministerRepositoryPermission
+from auth.process import require_session_login
 from data import model
 from endpoints.common import route_show_if, parse_repository_name
 from util.http import abort

endpoints/gitlabtrigger.py

@@ -6,8 +6,8 @@ from flask_login import current_user
 import features
 
 from app import app, gitlab_trigger
-from auth.auth import require_session_login
 from auth.permissions import AdministerRepositoryPermission
+from auth.process import require_session_login
 from data import model
 from endpoints.common import route_show_if
 from util.http import abort

endpoints/oauthlogin.py

@@ -9,7 +9,7 @@ from peewee import IntegrityError
 import features
 
 from app import app, analytics, get_app_url, github_login, google_login, dex_login
-from auth.auth import require_session_login
+from auth.process import require_session_login
 from data import model
 from endpoints.common import common_login, route_show_if
 from endpoints.web import render_page_template_with_routedata

endpoints/realtime.py

@@ -5,7 +5,7 @@ from flask import request, Blueprint, abort, Response
 from flask_login import current_user
 
 from app import userevents
-from auth.auth import require_session_login
+from auth.process import require_session_login
 from data.userevent import CannotReadUserEventsException
 
 

endpoints/v1/index.py

@@ -8,11 +8,11 @@ from flask import request, make_response, jsonify, session
 
 from data.interfaces.v1 import pre_oci_model as model
 from app import authentication, userevents, metric_queue
-from auth.auth import process_auth, generate_signed_token
 from auth.auth_context import get_authenticated_user, get_validated_token, get_validated_oauth_token
 from auth.permissions import (ModifyRepositoryPermission, UserAdminPermission,
                               ReadRepositoryPermission, CreateRepositoryPermission,
                               repository_read_grant, repository_write_grant)
+from auth.process import process_auth, generate_signed_token
 from util.http import abort
 from util.names import REPOSITORY_NAME_REGEX
 from endpoints.common import parse_repository_name

endpoints/v1/registry.py

@@ -8,10 +8,10 @@ from time import time
 from flask import make_response, request, session, Response, redirect, abort as flask_abort
 
 from app import storage as store, app
-from auth.auth import process_auth, extract_namespace_repo_from_session
 from auth.auth_context import get_authenticated_user
 from auth.permissions import (ReadRepositoryPermission,
                               ModifyRepositoryPermission)
+from auth.process import process_auth, extract_namespace_repo_from_session
 from auth.registry_jwt_auth import get_granted_username
 from data import model, database
 from data.interfaces.v1 import pre_oci_model as model

endpoints/v1/tag.py

@@ -5,9 +5,9 @@ from flask import abort, request, jsonify, make_response, session
 
 
 from util.names import TAG_ERROR, TAG_REGEX
-from auth.auth import process_auth
 from auth.permissions import (ReadRepositoryPermission,
                               ModifyRepositoryPermission)
+from auth.process import process_auth
 from data import model
 from data.interfaces.v1 import pre_oci_model as model
 from endpoints.common import parse_repository_name

endpoints/v2/v2auth.py

@@ -5,10 +5,10 @@ from cachetools import lru_cache
 from flask import request, jsonify, abort
 
 from app import app, userevents, instance_keys
-from auth.auth import process_auth
 from auth.auth_context import get_authenticated_user, get_validated_token, get_validated_oauth_token
 from auth.permissions import (ModifyRepositoryPermission, ReadRepositoryPermission,
                               CreateRepositoryPermission)
+from auth.process import process_auth
 from endpoints.v2 import v2_bp
 from endpoints.decorators import anon_protect
 from data.interfaces.v2 import pre_oci_model as model

endpoints/verbs/__init__.py

@@ -6,9 +6,9 @@ from flask import redirect, Blueprint, abort, send_file, make_response, request
 import features
 
 from app import app, signer, storage, metric_queue
-from auth.auth import process_auth
 from auth.auth_context import get_authenticated_user
 from auth.permissions import ReadRepositoryPermission
+from auth.process import process_auth
 from data import database
 from data.interfaces.verbs import pre_oci_model as model
 from endpoints.common import route_show_if, parse_repository_name

endpoints/web.py

@@ -13,11 +13,11 @@ import features
 from app import (app, billing as stripe, build_logs, avatar, signer, log_archive, config_provider,
                  get_app_url, instance_keys)
 from auth import scopes
-from auth.auth import require_session_login, process_oauth, has_basic_auth, process_auth_or_cookie
+from auth.auth_context import get_authenticated_user
 from auth.permissions import (AdministerOrganizationPermission, ReadRepositoryPermission,
                               SuperUserPermission, AdministerRepositoryPermission,
                               ModifyRepositoryPermission, OrganizationMemberPermission)
-from auth.auth_context import get_authenticated_user
+from auth.process import require_session_login, process_oauth, has_basic_auth, process_auth_or_cookie
 from buildtrigger.basehandler import BuildTriggerHandler
 from buildtrigger.bitbuckethandler import BitbucketBuildTrigger
 from buildtrigger.customhandler import CustomBuildTrigger

endpoints/webhooks.py

@@ -4,8 +4,8 @@ from flask import request, make_response, Blueprint
 
 from app import billing as stripe
 from data import model
-from auth.auth import process_auth
 from auth.permissions import ModifyRepositoryPermission
+from auth.process import process_auth
 from util.invoice import renderInvoiceToHtml
 from util.useremails import send_invoice_email, send_subscription_change, send_payment_failed
 from util.http import abort

test/test_auth.py

@@ -7,10 +7,10 @@ from flask import g
 from flask_principal import identity_loaded
 
 from app import app
-from auth.auth import _process_basic_auth
 from auth.scopes import (scopes_from_scope_string, is_subset_string, DIRECT_LOGIN, ADMIN_REPO,
                          ALL_SCOPES)
 from auth.permissions import QuayDeferredPermissionUser
+from auth.process import _process_basic_auth
 from data import model
 from data.database import OAuthApplication, OAuthAccessToken
 from endpoints.api import api