Merge pull request #573 from Police-Data-Accessibility-Project/mc_update_permissions

Update permissions

Author: maxachis

src/api/endpoints/agencies/routes.py

@@ -16,6 +16,8 @@
 from src.api.endpoints.agencies.root.post.response import AgencyPostResponse
 from src.api.shared.models.message_response import MessageResponse
 from src.core.core import AsyncCore
+from src.security.dtos.access_info import AccessInfo
+from src.security.manager import get_admin_access_info
 
 agencies_router = APIRouter(prefix="/agencies", tags=["Agencies"])
 
@@ -34,7 +36,9 @@ async def get_agencies(
 @agencies_router.post("")
 async def create_agency(
     request: AgencyPostRequest,
+    access_info: AccessInfo = Depends(get_admin_access_info),
     async_core: AsyncCore = Depends(get_async_core),
+
 ) -> AgencyPostResponse:
     return await async_core.adb_client.run_query_builder(
         AddAgencyQueryBuilder(request=request)
@@ -45,6 +49,7 @@ async def delete_agency(
     agency_id: int = Path(
         description="Agency ID to delete"
     ),
+    access_info: AccessInfo = Depends(get_admin_access_info),
     async_core: AsyncCore = Depends(get_async_core),
 ) -> MessageResponse:
     await async_core.adb_client.run_query_builder(
@@ -58,6 +63,7 @@ async def update_agency(
     agency_id: int = Path(
         description="Agency ID to update"
     ),
+    access_info: AccessInfo = Depends(get_admin_access_info),
     async_core: AsyncCore = Depends(get_async_core),
 ) -> MessageResponse:
     await async_core.adb_client.run_query_builder(
@@ -84,6 +90,7 @@ async def add_location_to_agency(
     location_id: int = Path(
         description="Location ID to add"
     ),
+    access_info: AccessInfo = Depends(get_admin_access_info),
     async_core: AsyncCore = Depends(get_async_core),
 ) -> MessageResponse:
     await async_core.adb_client.run_query_builder(
@@ -99,6 +106,7 @@ async def remove_location_from_agency(
     location_id: int = Path(
         description="Location ID to remove"
     ),
+    access_info: AccessInfo = Depends(get_admin_access_info),
     async_core: AsyncCore = Depends(get_async_core),
 ) -> MessageResponse:
     await async_core.adb_client.run_query_builder(

src/api/endpoints/annotate/routes.py

@@ -17,7 +17,7 @@
 from src.core.core import AsyncCore
 from src.db.queries.implementations.anonymous_session import MakeAnonymousSessionQueryBuilder
 from src.security.dtos.access_info import AccessInfo
-from src.security.manager import get_access_info, get_standard_user_access_info
+from src.security.manager import get_admin_access_info, get_standard_user_access_info
 
 annotate_router = APIRouter(
     prefix="/annotate",
@@ -136,7 +136,7 @@ async def migrate_annotations_to_user(
 async def get_agency_suggestions(
     url_id: int,
     async_core: AsyncCore = Depends(get_async_core),
-    access_info: AccessInfo = Depends(get_access_info),
+    access_info: AccessInfo = Depends(get_admin_access_info),
     location_id: int | None = Query(default=None)
 ) -> AgencyAnnotationResponseOuterInfo:
     return await async_core.adb_client.run_query_builder(

src/api/endpoints/batch/routes.py

@@ -12,7 +12,7 @@
 from src.core.core import AsyncCore
 from src.db.models.materialized_views.batch_url_status.enums import BatchURLStatusViewEnum
 from src.security.dtos.access_info import AccessInfo
-from src.security.manager import get_access_info
+from src.security.manager import get_admin_access_info
 
 batch_router = APIRouter(
     prefix="/batch",
@@ -36,7 +36,7 @@ async def get_batch_status(
             default=1
         ),
         core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info),
+        access_info: AccessInfo = Depends(get_admin_access_info),
 ) -> GetBatchSummariesResponse:
     """
     Get the status of recent batches
@@ -52,7 +52,7 @@ async def get_batch_status(
 async def get_batch_info(
         batch_id: int = Path(description="The batch id"),
         core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info),
+        access_info: AccessInfo = Depends(get_admin_access_info),
 ) -> BatchSummary:
     return await core.get_batch_info(batch_id)
 
@@ -64,7 +64,7 @@ async def get_urls_by_batch(
             default=1
         ),
         core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info),
+        access_info: AccessInfo = Depends(get_admin_access_info),
 ) -> GetURLsByBatchResponse:
     return await core.get_urls_by_batch(batch_id, page=page)
 
@@ -76,15 +76,15 @@ async def get_duplicates_by_batch(
             default=1
         ),
         core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info),
+        access_info: AccessInfo = Depends(get_admin_access_info),
 ) -> GetDuplicatesByBatchResponse:
     return await core.get_duplicate_urls_by_batch(batch_id, page=page)
 
 @batch_router.get("/{batch_id}/logs")
 async def get_batch_logs(
         batch_id: int = Path(description="The batch id"),
         async_core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info),
+        access_info: AccessInfo = Depends(get_admin_access_info),
 ) -> GetBatchLogsResponse:
     """
     Retrieve the logs for a recent batch.
@@ -96,6 +96,6 @@ async def get_batch_logs(
 async def abort_batch(
         batch_id: int = Path(description="The batch id"),
         async_core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info),
+        access_info: AccessInfo = Depends(get_admin_access_info),
 ) -> MessageResponse:
     return await async_core.abort_batch(batch_id)

src/api/endpoints/collector/routes.py

@@ -10,7 +10,7 @@
 from src.collectors.impl.example.dtos.input import ExampleInputDTO
 from src.collectors.enums import CollectorType
 from src.core.core import AsyncCore
-from src.security.manager import get_access_info
+from src.security.manager import get_admin_access_info
 from src.security.dtos.access_info import AccessInfo
 from src.collectors.impl.ckan.dtos.input import CKANInputDTO
 from src.collectors.impl.muckrock.collectors.all_foia.dto import MuckrockAllFOIARequestsCollectorInputDTO
@@ -27,7 +27,7 @@
 async def start_example_collector(
         dto: ExampleInputDTO,
         core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info),
+        access_info: AccessInfo = Depends(get_admin_access_info),
 ) -> CollectorStartInfo:
     """
     Start the example collector
@@ -42,7 +42,7 @@ async def start_example_collector(
 async def start_ckan_collector(
         dto: CKANInputDTO,
         core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info),
+        access_info: AccessInfo = Depends(get_admin_access_info),
 ) -> CollectorStartInfo:
     """
     Start the ckan collector
@@ -57,7 +57,7 @@ async def start_ckan_collector(
 async def start_common_crawler_collector(
         dto: CommonCrawlerInputDTO,
         core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info),
+        access_info: AccessInfo = Depends(get_admin_access_info),
 ) -> CollectorStartInfo:
     """
     Start the common crawler collector
@@ -72,7 +72,7 @@ async def start_common_crawler_collector(
 async def start_auto_googler_collector(
         dto: AutoGooglerInputDTO,
         core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info),
+        access_info: AccessInfo = Depends(get_admin_access_info),
 ) -> CollectorStartInfo:
     """
     Start the auto googler collector
@@ -87,7 +87,7 @@ async def start_auto_googler_collector(
 async def start_muckrock_collector(
         dto: MuckrockSimpleSearchCollectorInputDTO,
         core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info),
+        access_info: AccessInfo = Depends(get_admin_access_info),
 ) -> CollectorStartInfo:
     """
     Start the muckrock collector
@@ -102,7 +102,7 @@ async def start_muckrock_collector(
 async def start_muckrock_county_collector(
         dto: MuckrockCountySearchCollectorInputDTO,
         core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info),
+        access_info: AccessInfo = Depends(get_admin_access_info),
 ) -> CollectorStartInfo:
     """
     Start the muckrock county level collector
@@ -117,7 +117,7 @@ async def start_muckrock_county_collector(
 async def start_muckrock_all_foia_collector(
         dto: MuckrockAllFOIARequestsCollectorInputDTO,
         core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info),
+        access_info: AccessInfo = Depends(get_admin_access_info),
 ) -> CollectorStartInfo:
     """
     Start the muckrock collector for all FOIA requests
@@ -132,7 +132,7 @@ async def start_muckrock_all_foia_collector(
 async def upload_manual_collector(
         dto: ManualBatchInputDTO,
         core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info),
+        access_info: AccessInfo = Depends(get_admin_access_info),
 ) -> ManualBatchResponseDTO:
     """
     Uploads a manual "collector" with existing data

src/api/endpoints/data_source/routes.py

@@ -13,6 +13,8 @@
 from src.api.endpoints.data_source.by_id.put.request import DataSourcePutRequest
 from src.api.shared.models.message_response import MessageResponse
 from src.core.core import AsyncCore
+from src.security.dtos.access_info import AccessInfo
+from src.security.manager import get_admin_access_info
 
 data_sources_router = APIRouter(
     prefix="/data-sources",
@@ -45,6 +47,7 @@ async def get_data_source_by_id(
 async def update_data_source(
     url_id: int ,
     request: DataSourcePutRequest,
+    access_info: AccessInfo = Depends(get_admin_access_info),
     async_core: AsyncCore = Depends(get_async_core),
 ) -> MessageResponse:
     await check_is_data_source_url(url_id=url_id, adb_client=async_core.adb_client)
@@ -70,6 +73,7 @@ async def get_data_source_agencies(
 async def add_agency_to_data_source(
     url_id: int,
     agency_id: int,
+    access_info: AccessInfo = Depends(get_admin_access_info),
     async_core: AsyncCore = Depends(get_async_core),
 ) -> MessageResponse:
     await add_data_source_agency_link(
@@ -83,6 +87,7 @@ async def add_agency_to_data_source(
 async def remove_agency_from_data_source(
     url_id: int,
     agency_id: int,
+    access_info: AccessInfo = Depends(get_admin_access_info),
     async_core: AsyncCore = Depends(get_async_core),
 ) -> MessageResponse:
     await delete_data_source_agency_link(

src/api/endpoints/locations/routes.py

@@ -5,6 +5,8 @@
 from src.api.endpoints.locations.post.request import AddLocationRequestModel
 from src.api.endpoints.locations.post.response import AddLocationResponseModel
 from src.core.core import AsyncCore
+from src.security.dtos.access_info import AccessInfo
+from src.security.manager import get_admin_access_info
 
 location_url_router = APIRouter(
     prefix="/locations",
@@ -15,6 +17,7 @@
 @location_url_router.post("")
 async def create_location(
     request: AddLocationRequestModel,
+    access_info: AccessInfo = Depends(get_admin_access_info),
     async_core: AsyncCore = Depends(get_async_core),
 ) -> AddLocationResponseModel:
     return await async_core.adb_client.run_query_builder(

src/api/endpoints/meta_url/routes.py

@@ -12,6 +12,8 @@
 from src.api.endpoints.meta_url.by_id.put.request import UpdateMetaURLRequest
 from src.api.shared.models.message_response import MessageResponse
 from src.core.core import AsyncCore
+from src.security.dtos.access_info import AccessInfo
+from src.security.manager import get_admin_access_info
 
 meta_urls_router = APIRouter(
     prefix="/meta-urls",
@@ -35,6 +37,7 @@ async def get_meta_urls(
 async def update_meta_url(
     url_id: int,
     request: UpdateMetaURLRequest,
+    access_info: AccessInfo = Depends(get_admin_access_info),
     async_core: AsyncCore = Depends(get_async_core),
 ) -> MessageResponse:
     await check_is_meta_url(url_id=url_id, adb_client=async_core.adb_client)
@@ -61,6 +64,7 @@ async def get_meta_url_agencies(
 async def add_agency_to_meta_url(
     url_id: int,
     agency_id: int,
+    access_info: AccessInfo = Depends(get_admin_access_info),
     async_core: AsyncCore = Depends(get_async_core),
 ) -> MessageResponse:
     await add_meta_url_agency_link(
@@ -74,6 +78,7 @@ async def add_agency_to_meta_url(
 async def remove_agency_from_meta_url(
     url_id: int,
     agency_id: int,
+    access_info: AccessInfo = Depends(get_admin_access_info),
     async_core: AsyncCore = Depends(get_async_core),
 ) -> MessageResponse:
     await delete_meta_url_agency_link(

src/api/endpoints/metrics/routes.py

@@ -10,7 +10,7 @@
 from src.api.endpoints.metrics.dtos.get.urls.breakdown.pending import GetMetricsURLsBreakdownPendingResponseDTO
 from src.api.endpoints.metrics.dtos.get.urls.breakdown.submitted import GetMetricsURLsBreakdownSubmittedResponseDTO
 from src.core.core import AsyncCore
-from src.security.manager import get_access_info
+from src.security.manager import get_admin_access_info
 from src.security.dtos.access_info import AccessInfo
 
 metrics_router = APIRouter(
@@ -22,14 +22,14 @@
 @metrics_router.get("/batches/aggregated")
 async def get_batches_aggregated_metrics(
         core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info)
+        access_info: AccessInfo = Depends(get_admin_access_info)
 ) -> GetMetricsBatchesAggregatedResponseDTO:
     return await core.get_batches_aggregated_metrics()
 
 @metrics_router.get("/batches/breakdown")
 async def get_batches_breakdown_metrics(
         core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info),
+        access_info: AccessInfo = Depends(get_admin_access_info),
         page: int = Query(
             description="The page number",
             default=1
@@ -40,34 +40,34 @@ async def get_batches_breakdown_metrics(
 @metrics_router.get("/urls/aggregate")
 async def get_urls_aggregated_metrics(
         core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info)
+        access_info: AccessInfo = Depends(get_admin_access_info)
 ) -> GetMetricsURLsAggregatedResponseDTO:
     return await core.get_urls_aggregated_metrics()
 
 @metrics_router.get("/urls/aggregate/pending")
 async def get_urls_aggregated_pending_metrics(
         core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info)
+        access_info: AccessInfo = Depends(get_admin_access_info)
 ) -> GetMetricsURLsAggregatedPendingResponseDTO:
     return await core.get_urls_aggregated_pending_metrics()
 
 @metrics_router.get("/urls/breakdown/submitted")
 async def get_urls_breakdown_submitted_metrics(
         core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info)
+        access_info: AccessInfo = Depends(get_admin_access_info)
 ) -> GetMetricsURLsBreakdownSubmittedResponseDTO:
     return await core.get_urls_breakdown_submitted_metrics()
 
 @metrics_router.get("/urls/breakdown/pending")
 async def get_urls_breakdown_pending_metrics(
         core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info)
+        access_info: AccessInfo = Depends(get_admin_access_info)
 ) -> GetMetricsURLsBreakdownPendingResponseDTO:
     return await core.get_urls_breakdown_pending_metrics()
 
 @metrics_router.get("/backlog")
 async def get_backlog_metrics(
         core: AsyncCore = Depends(get_async_core),
-        access_info: AccessInfo = Depends(get_access_info)
+        access_info: AccessInfo = Depends(get_admin_access_info)
 ) -> GetMetricsBacklogResponseDTO:
     return await core.get_backlog_metrics()

src/api/endpoints/proposals/routes.py

@@ -18,14 +18,14 @@
 from src.api.shared.models.message_response import MessageResponse
 from src.core.core import AsyncCore
 from src.security.dtos.access_info import AccessInfo
-from src.security.manager import get_access_info
+from src.security.manager import get_admin_access_info
 
 proposal_router = APIRouter(prefix="/proposal", tags=["Pending"])
 
 @proposal_router.get("/agencies")
 async def get_pending_agencies(
     async_core: AsyncCore = Depends(get_async_core),
-    access_info: AccessInfo = Depends(get_access_info),
+    access_info: AccessInfo = Depends(get_admin_access_info),
 ) -> ProposalAgencyGetOuterResponse:
     return await async_core.adb_client.run_query_builder(
         ProposalAgencyGetQueryBuilder(),
@@ -37,7 +37,7 @@ async def approve_proposed_agency(
     proposed_agency_id: int = Path(
         description="Proposed agency ID to approve"
     ),
-    access_info: AccessInfo = Depends(get_access_info),
+    access_info: AccessInfo = Depends(get_admin_access_info),
 ) -> ProposalAgencyApproveResponse:
     return await async_core.adb_client.run_query_builder(
         ProposalAgencyApproveQueryBuilder(
@@ -53,7 +53,7 @@ async def reject_proposed_agency(
     proposed_agency_id: int = Path(
         description="Proposed agency ID to reject"
     ),
-    access_info: AccessInfo = Depends(get_access_info),
+    access_info: AccessInfo = Depends(get_admin_access_info),
 ) -> ProposalAgencyRejectResponse:
     return await async_core.adb_client.run_query_builder(
         ProposalAgencyRejectQueryBuilder(