From 25087529014b94c9e88d448f372447a615a9e499 Mon Sep 17 00:00:00 2001 From: David Lougheed Date: Tue, 17 Oct 2023 15:26:54 -0400 Subject: [PATCH] refact: move authz code to common place --- chord_metadata_service/authz/__init__.py | 0 .../{metadata/authz.py => authz/middleware.py} | 1 + chord_metadata_service/{chord => authz}/permissions.py | 2 +- chord_metadata_service/chord/api_views.py | 2 +- chord_metadata_service/chord/views_data_types.py | 4 ++-- chord_metadata_service/chord/views_search.py | 2 +- chord_metadata_service/metadata/settings.py | 2 +- chord_metadata_service/restapi/api_views.py | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 chord_metadata_service/authz/__init__.py rename chord_metadata_service/{metadata/authz.py => authz/middleware.py} (94%) rename chord_metadata_service/{chord => authz}/permissions.py (92%) diff --git a/chord_metadata_service/authz/__init__.py b/chord_metadata_service/authz/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/chord_metadata_service/metadata/authz.py b/chord_metadata_service/authz/middleware.py similarity index 94% rename from chord_metadata_service/metadata/authz.py rename to chord_metadata_service/authz/middleware.py index bb20a6ab9..644b385c6 100644 --- a/chord_metadata_service/metadata/authz.py +++ b/chord_metadata_service/authz/middleware.py @@ -5,6 +5,7 @@ __all__ = [ "authz_middleware", + "AuthzMiddleware", ] authz_middleware = DjangoAuthMiddleware( diff --git a/chord_metadata_service/chord/permissions.py b/chord_metadata_service/authz/permissions.py similarity index 92% rename from chord_metadata_service/chord/permissions.py rename to chord_metadata_service/authz/permissions.py index 3af793d55..331863b54 100644 --- a/chord_metadata_service/chord/permissions.py +++ b/chord_metadata_service/authz/permissions.py @@ -1,6 +1,6 @@ from django.conf import settings from rest_framework.permissions import BasePermission, SAFE_METHODS -from chord_metadata_service.metadata.authz import authz_middleware +from chord_metadata_service.authz.middleware import authz_middleware __all__ = [ diff --git a/chord_metadata_service/chord/api_views.py b/chord_metadata_service/chord/api_views.py index 59e0c9535..2f82d5929 100644 --- a/chord_metadata_service/chord/api_views.py +++ b/chord_metadata_service/chord/api_views.py @@ -17,7 +17,7 @@ from chord_metadata_service.restapi.pagination import LargeResultsSetPagination from .models import Project, Dataset, ProjectJsonSchema -from .permissions import OverrideOrSuperUserOnly +from chord_metadata_service.authz.permissions import OverrideOrSuperUserOnly from .serializers import ( ProjectJsonSchemaSerializer, ProjectSerializer, diff --git a/chord_metadata_service/chord/views_data_types.py b/chord_metadata_service/chord/views_data_types.py index 8edf4ebe8..6d2636d03 100644 --- a/chord_metadata_service/chord/views_data_types.py +++ b/chord_metadata_service/chord/views_data_types.py @@ -11,11 +11,11 @@ from typing import Callable from chord_metadata_service.chord.models import Dataset, Project -from chord_metadata_service.chord.permissions import BentoAllowAny +from chord_metadata_service.authz.permissions import BentoAllowAny from chord_metadata_service.cleanup import run_all_cleanup from chord_metadata_service.experiments.models import Experiment, ExperimentResult from chord_metadata_service.logger import logger -from chord_metadata_service.metadata.authz import authz_middleware +from chord_metadata_service.authz.middleware import authz_middleware from chord_metadata_service.mcode.models import MCodePacket from chord_metadata_service.phenopackets.models import Phenopacket diff --git a/chord_metadata_service/chord/views_search.py b/chord_metadata_service/chord/views_search.py index d56e68899..6ba22fb21 100644 --- a/chord_metadata_service/chord/views_search.py +++ b/chord_metadata_service/chord/views_search.py @@ -20,7 +20,7 @@ from rest_framework import status from typing import Callable, Dict, Optional, Tuple, Union -from chord_metadata_service.chord.permissions import OverrideOrSuperUserOnly, ReadOnly +from chord_metadata_service.authz.permissions import OverrideOrSuperUserOnly, ReadOnly from chord_metadata_service.logger import logger from chord_metadata_service.restapi.utils import queryset_stats_for_field diff --git a/chord_metadata_service/metadata/settings.py b/chord_metadata_service/metadata/settings.py index fe2d9a0e4..9bb855ef4 100644 --- a/chord_metadata_service/metadata/settings.py +++ b/chord_metadata_service/metadata/settings.py @@ -156,7 +156,7 @@ 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'chord_metadata_service.metadata.authz.AuthzMiddleware' + 'chord_metadata_service.authz.middleware.AuthzMiddleware' 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] diff --git a/chord_metadata_service/restapi/api_views.py b/chord_metadata_service/restapi/api_views.py index e6a21f987..ee5a4ff0a 100644 --- a/chord_metadata_service/restapi/api_views.py +++ b/chord_metadata_service/restapi/api_views.py @@ -18,7 +18,7 @@ get_date_stats, get_range_stats ) -from chord_metadata_service.chord.permissions import OverrideOrSuperUserOnly +from chord_metadata_service.authz.permissions import OverrideOrSuperUserOnly from chord_metadata_service.metadata.service_info import SERVICE_INFO from chord_metadata_service.chord import models as chord_models from chord_metadata_service.phenopackets import models as pheno_models