diff --git a/src/organisation/router.py b/src/organisation/router.py index 3fda26e..5695889 100644 --- a/src/organisation/router.py +++ b/src/organisation/router.py @@ -27,7 +27,7 @@ from src.user.exceptions import UserNotFoundException from src.auth.service import claims_dependency from src.auth.dependencies import super_admin_dependency, org_model_root_claim_query_dependency, org_model_root_claim_body_dependency -from src.organisation.dependencies import org_model_query_dependency, org_model_body_dependency +from src.organisation.dependencies import org_model_body_dependency from src.organisation.constants import ContactType from src.organisation.models import Organisation as Org from src.organisation.schemas import OrgOrgPostRequest, OrgQuestionnairePatchRequest, OrgStatusPatchRequest, \ diff --git a/src/service/router.py b/src/service/router.py index 5012258..f380d8a 100644 --- a/src/service/router.py +++ b/src/service/router.py @@ -8,6 +8,8 @@ Endpoints: from fastapi import APIRouter, status from src.database import db_dependency +from src.auth.service import claims_dependency +from src.auth.dependencies import super_admin_dependency, org_model_root_claim_query_dependency, org_model_root_claim_body_dependency from src.service.models import Service from src.service.utils import generate_api_key @@ -21,15 +23,13 @@ router = APIRouter( ) @router.get("/", response_model=ServiceGetServiceResponse) -async def get_all_services(db: db_dependency): - # TODO: user_dependency +async def get_all_services(db: db_dependency, org_model: org_model_root_claim_query_dependency): permission_models = db.query(Service).all() return {"services": permission_models} @router.post("/", response_model=ServicePostServiceResponse) -async def register_service(db: db_dependency, service_request: ServicePostServiceRequest): - # TODO: super_admin_dependency +async def register_service(db: db_dependency, su: super_admin_dependency, service_request: ServicePostServiceRequest): key = generate_api_key() service_model = Service(name=service_request.name, api_key=key) @@ -40,8 +40,7 @@ async def register_service(db: db_dependency, service_request: ServicePostServic return {"service": response} @router.patch("/key", response_model=ServicePatchKeyResponse) -async def regenerate_api_key(db: db_dependency, service_model: service_model_body_dependency, request_model: ServicePatchKeyRequest): - # TODO: super_admin_dependency +async def regenerate_api_key(db: db_dependency, su: super_admin_dependency, service_model: service_model_body_dependency, request_model: ServicePatchKeyRequest): key = generate_api_key() service_model.api_key = key @@ -51,7 +50,6 @@ async def regenerate_api_key(db: db_dependency, service_model: service_model_bod return {"service": response} @router.delete("/", status_code=status.HTTP_204_NO_CONTENT) -async def remove_service(db: db_dependency, service_model: service_model_body_dependency, request_model: ServiceDeleteServiceRequest): - # TODO: super_admin_dependency +async def remove_service(db: db_dependency, service_model: service_model_body_dependency, su: super_admin_dependency, request_model: ServiceDeleteServiceRequest): db.delete(service_model) db.commit()