refact: move authz code to common place

bento-platform · Oct 17, 2023 · 2508752 · 2508752
1 parent b2b3b57
commit 2508752
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 7 deletions.
diff --git a/chord_metadata_service/authz/__init__.py b/chord_metadata_service/authz/__init__.py
diff --git a/chord_metadata_service/metadata/authz.py → chord_metadata_service/authz/middleware.py b/chord_metadata_service/metadata/authz.py → 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 → chord_metadata_service/authz/permissions.py b/chord_metadata_service/chord/permissions.py → 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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