remove "Admin" from some AuthZ models

backend/server/src/handler/ratings.rs

@@ -1,7 +1,7 @@
 use crate::models::app::AppState;
 use crate::models::auth::{
-    ApplicationCreatorAdminGivenApplicationId, ApplicationReviewerAdminGivenApplicationId,
-    ApplicationReviewerAdminGivenRatingId, RatingCreator, SuperUser,
+    ApplicationCreatorGivenApplicationId, ApplicationReviewerGivenApplicationId,
+    ApplicationReviewerGivenRatingId, RatingCreator, SuperUser,
 };
 use crate::models::error::ChaosError;
 use crate::models::ratings::{NewRating, Rating};
@@ -17,7 +17,7 @@ impl RatingsHandler {
     pub async fn create_rating(
         State(state): State<AppState>,
         Path(application_id): Path<i64>,
-        _admin: ApplicationCreatorAdminGivenApplicationId,
+        _admin: ApplicationCreatorGivenApplicationId,
         mut transaction: DBTransaction<'_>,
         Json(new_rating): Json<NewRating>,
     ) -> Result<impl IntoResponse, ChaosError> {
@@ -47,7 +47,7 @@ impl RatingsHandler {
     pub async fn get_ratings_for_application(
         State(_state): State<AppState>,
         Path(application_id): Path<i64>,
-        _admin: ApplicationReviewerAdminGivenApplicationId,
+        _admin: ApplicationReviewerGivenApplicationId,
         mut transaction: DBTransaction<'_>,
     ) -> Result<impl IntoResponse, ChaosError> {
         let ratings =
@@ -60,7 +60,7 @@ impl RatingsHandler {
     pub async fn get(
         State(_state): State<AppState>,
         Path(rating_id): Path<i64>,
-        _admin: ApplicationReviewerAdminGivenRatingId,
+        _admin: ApplicationReviewerGivenRatingId,
         mut transaction: DBTransaction<'_>,
     ) -> Result<impl IntoResponse, ChaosError> {
         let org = Rating::get_rating(rating_id, &mut transaction.tx).await?;
@@ -71,7 +71,7 @@ impl RatingsHandler {
     pub async fn delete(
         State(_state): State<AppState>,
         Path(rating_id): Path<i64>,
-        _admin: ApplicationReviewerAdminGivenRatingId,
+        _admin: ApplicationReviewerGivenRatingId,
         mut transaction: DBTransaction<'_>,
     ) -> Result<impl IntoResponse, ChaosError> {
         Rating::delete(rating_id, &mut transaction.tx).await?;

backend/server/src/models/auth.rs

@@ -4,7 +4,7 @@ use crate::service::auth::is_super_user;
 use crate::service::jwt::decode_auth_token;
 use crate::service::organisation::assert_user_is_admin;
 use crate::service::ratings::{
-    assert_user_is_application_reviewer_admin_given_rating_id, assert_user_is_organisation_member,
+    assert_user_is_application_reviewer_given_rating_id, assert_user_is_organisation_member,
     assert_user_is_rating_creator_and_organisation_member,
 };
 use axum::extract::{FromRef, FromRequestParts, Path};
@@ -157,12 +157,12 @@ where
 // and ApplicationCreatorAdminGivenApplicationId, but that might change, so separating just in case.
 
 /// Get the application reviewer given a path that contains the application id.
-pub struct ApplicationReviewerAdminGivenApplicationId {
+pub struct ApplicationReviewerGivenApplicationId {
     pub user_id: i64,
 }
 
 #[async_trait]
-impl<S> FromRequestParts<S> for ApplicationReviewerAdminGivenApplicationId
+impl<S> FromRequestParts<S> for ApplicationReviewerGivenApplicationId
 where
     AppState: FromRef<S>,
     S: Send + Sync,
@@ -194,17 +194,17 @@ where
 
         assert_user_is_organisation_member(user_id, application_id, pool).await?;
 
-        Ok(ApplicationReviewerAdminGivenApplicationId { user_id })
+        Ok(ApplicationReviewerGivenApplicationId { user_id })
     }
 }
 
 /// Get the application reviewer given a path that contains the application id.
-pub struct ApplicationCreatorAdminGivenApplicationId {
+pub struct ApplicationCreatorGivenApplicationId {
     pub user_id: i64,
 }
 
 #[async_trait]
-impl<S> FromRequestParts<S> for ApplicationCreatorAdminGivenApplicationId
+impl<S> FromRequestParts<S> for ApplicationCreatorGivenApplicationId
 where
     AppState: FromRef<S>,
     S: Send + Sync,
@@ -236,17 +236,17 @@ where
 
         assert_user_is_organisation_member(user_id, application_id, pool).await?;
 
-        Ok(ApplicationCreatorAdminGivenApplicationId { user_id })
+        Ok(ApplicationCreatorGivenApplicationId { user_id })
     }
 }
 
 /// Get the application reviewer given a path that contains the rating id.
-pub struct ApplicationReviewerAdminGivenRatingId {
+pub struct ApplicationReviewerGivenRatingId {
     pub user_id: i64,
 }
 
 #[async_trait]
-impl<S> FromRequestParts<S> for ApplicationReviewerAdminGivenRatingId
+impl<S> FromRequestParts<S> for ApplicationReviewerGivenRatingId
 where
     AppState: FromRef<S>,
     S: Send + Sync,
@@ -276,9 +276,9 @@ where
             .await
             .map_err(|_| ChaosError::BadRequest)?;
 
-        assert_user_is_application_reviewer_admin_given_rating_id(user_id, rating_id, pool).await?;
+        assert_user_is_application_reviewer_given_rating_id(user_id, rating_id, pool).await?;
 
-        Ok(ApplicationReviewerAdminGivenRatingId { user_id })
+        Ok(ApplicationReviewerGivenRatingId { user_id })
     }
 }
 

backend/server/src/service/ratings.rs

@@ -10,7 +10,7 @@ use uuid::Uuid;
 /// Any member of the organisation that owns the campaign is an application
 /// viewer, because all members are either directors or execs (TODO: might be
 /// changed in the future).
-pub async fn assert_user_is_application_reviewer_admin_given_rating_id(
+pub async fn assert_user_is_application_reviewer_given_rating_id(
     user_id: i64,
     rating_id: i64,
     pool: &Pool<Postgres>,