diff --git a/backend/api/issues/resources.py b/backend/api/issues/resources.py index 737f4f84ed..d392c7d154 100644 --- a/backend/api/issues/resources.py +++ b/backend/api/issues/resources.py @@ -7,7 +7,7 @@ from backend.models.dtos.mapping_issues_dto import MappingIssueCategoryDTO from backend.models.dtos.user_dto import AuthUserDTO from backend.services.mapping_issues_service import MappingIssueCategoryService -from backend.services.users.authentication_service import pm_only +from backend.services.users.authentication_service import admin_only router = APIRouter( prefix="/tasks", @@ -52,7 +52,7 @@ async def get_issue(category_id: int, db: Database = Depends(get_db)): async def patch_issue( request: Request, category_id: int, - user: AuthUserDTO = Depends(pm_only), + user: AuthUserDTO = Depends(admin_only), db: Database = Depends(get_db), data: MappingIssueCategoryDTO = Body(...), ): @@ -121,7 +121,7 @@ async def patch_issue( async def delete_issue( request: Request, category_id: int, - user: AuthUserDTO = Depends(pm_only), + user: AuthUserDTO = Depends(admin_only), db: Database = Depends(get_db), ): """ @@ -200,7 +200,7 @@ async def get_issues_categories( @router.post("/issues/categories/", response_model=MappingIssueCategoryDTO) async def post_issues_categories( request: Request, - user: AuthUserDTO = Depends(pm_only), + user: AuthUserDTO = Depends(admin_only), db: Database = Depends(get_db), data: dict = Body(...), ): diff --git a/backend/api/licenses/resources.py b/backend/api/licenses/resources.py index 429bb1ad86..8cf277a2a1 100644 --- a/backend/api/licenses/resources.py +++ b/backend/api/licenses/resources.py @@ -6,7 +6,7 @@ from backend.models.dtos.licenses_dto import LicenseDTO from backend.models.dtos.user_dto import AuthUserDTO from backend.services.license_service import LicenseService -from backend.services.users.authentication_service import pm_only +from backend.services.users.authentication_service import admin_only router = APIRouter( prefix="/licenses", @@ -19,7 +19,7 @@ async def post_license( license_dto: LicenseDTO, db: Database = Depends(get_db), - user: AuthUserDTO = Depends(pm_only), + user: AuthUserDTO = Depends(admin_only), ): """ Creates a new mapping license @@ -100,7 +100,7 @@ async def patch_license( license_dto: LicenseDTO, license_id: int, db: Database = Depends(get_db), - user: AuthUserDTO = Depends(pm_only), + user: AuthUserDTO = Depends(admin_only), ): """ Update a specified mapping license @@ -155,7 +155,7 @@ async def patch_license( async def delete_license( license_id: int, db: Database = Depends(get_db), - user: AuthUserDTO = Depends(pm_only), + user: AuthUserDTO = Depends(admin_only), ): """ Delete a specified mapping license diff --git a/backend/api/mapping_badges/resources.py b/backend/api/mapping_badges/resources.py index 580454ffe9..5243646694 100644 --- a/backend/api/mapping_badges/resources.py +++ b/backend/api/mapping_badges/resources.py @@ -11,7 +11,7 @@ ) from backend.models.dtos.user_dto import AuthUserDTO from backend.services.mapping_badges import MappingBadgeService -from backend.services.users.authentication_service import pm_only +from backend.services.users.authentication_service import admin_only router = APIRouter( prefix="/badges", @@ -39,7 +39,7 @@ async def get_mapping_badges( async def create_mapping_badge( data: MappingBadgeCreateDTO, db: Database = Depends(get_db), - user: AuthUserDTO = Depends(pm_only), + user: AuthUserDTO = Depends(admin_only), ) -> MappingBadgeDTO: """ Creates a new MappingBadge @@ -73,7 +73,7 @@ async def update_mapping_badge( data: MappingBadgeUpdateDTO, badge_id: int, db: Database = Depends(get_db), - user: AuthUserDTO = Depends(pm_only), + user: AuthUserDTO = Depends(admin_only), ) -> MappingBadgeDTO: """ Updates a mapping badge @@ -92,7 +92,7 @@ async def update_mapping_badge( async def delete_mapping_badge( badge_id: int, db: Database = Depends(get_db), - user: AuthUserDTO = Depends(pm_only), + user: AuthUserDTO = Depends(admin_only), ): """ Deletes a mapping badge diff --git a/backend/api/mapping_levels/resources.py b/backend/api/mapping_levels/resources.py index 569e6f8164..2ede8009bf 100644 --- a/backend/api/mapping_levels/resources.py +++ b/backend/api/mapping_levels/resources.py @@ -8,7 +8,7 @@ ) from backend.models.dtos.user_dto import AuthUserDTO from backend.services.mapping_levels import MappingLevelService -from backend.services.users.authentication_service import pm_only +from backend.services.users.authentication_service import admin_only router = APIRouter( prefix="/levels", @@ -36,7 +36,7 @@ async def get_mapping_levels( async def create_mapping_level( data: MappingLevelCreateDTO, db: Database = Depends(get_db), - user: AuthUserDTO = Depends(pm_only), + user: AuthUserDTO = Depends(admin_only), ): """ Create a new mapping level @@ -70,7 +70,7 @@ async def update_mapping_level( data: MappingLevelUpdateDTO, level_id: int, db: Database = Depends(get_db), - user: AuthUserDTO = Depends(pm_only), + user: AuthUserDTO = Depends(admin_only), ): """ Update a given mapping level @@ -89,7 +89,7 @@ async def update_mapping_level( async def delete_mapping_level( level_id: int, db: Database = Depends(get_db), - user: AuthUserDTO = Depends(pm_only), + user: AuthUserDTO = Depends(admin_only), ): """ Delete the specified mapping level diff --git a/backend/api/users/actions.py b/backend/api/users/actions.py index 85ba80b5ba..3c1f23a753 100644 --- a/backend/api/users/actions.py +++ b/backend/api/users/actions.py @@ -7,7 +7,7 @@ from backend.models.dtos.user_dto import AuthUserDTO, UserDTO, UserRegisterEmailDTO from backend.services.interests_service import InterestService from backend.services.messaging.message_service import MessageService -from backend.services.users.authentication_service import login_required, pm_only +from backend.services.users.authentication_service import login_required, admin_only from backend.services.users.user_service import UserService, UserServiceError router = APIRouter( @@ -117,7 +117,7 @@ async def set_mapping_level( request: Request, username, level, - user: AuthUserDTO = Depends(pm_only), + user: AuthUserDTO = Depends(admin_only), db: Database = Depends(get_db), ): """ @@ -173,7 +173,7 @@ async def set_user_role( request: Request, username: str, role: str, - user: AuthUserDTO = Depends(pm_only), + user: AuthUserDTO = Depends(admin_only), db: Database = Depends(get_db), ): """ @@ -228,7 +228,7 @@ async def set_user_role( async def update_stats( request: Request, username: str, - _: AuthUserDTO = Depends(pm_only), + _: AuthUserDTO = Depends(admin_only), db: Database = Depends(get_db), ): """ @@ -255,7 +255,7 @@ async def update_stats( async def approve_level( request: Request, username: str, - voter: AuthUserDTO = Depends(pm_only), + voter: AuthUserDTO = Depends(admin_only), db: Database = Depends(get_db), ): """ @@ -282,7 +282,7 @@ async def set_user_is_expert( request: Request, user_name, is_expert, - user: AuthUserDTO = Depends(pm_only), + user: AuthUserDTO = Depends(admin_only), db: Database = Depends(get_db), ): """ diff --git a/backend/services/users/authentication_service.py b/backend/services/users/authentication_service.py index ee6d71b53a..50b5a001b6 100644 --- a/backend/services/users/authentication_service.py +++ b/backend/services/users/authentication_service.py @@ -285,7 +285,7 @@ async def login_required_optional( return AuthUserDTO(id=user_id) -async def pm_only( +async def admin_only( Authorization: str = Security(APIKeyHeader(name="Authorization")), db: Database = Depends(get_db), ):