Test permissions use api (#784)

* initial push

* fmt; clippy

---------

Co-authored-by: Geometrically <18202329+Geometrically@users.noreply.github.com>

tests/common/api_common/mod.rs

@@ -1,12 +1,13 @@
 use std::collections::HashMap;
 
 use self::models::{
-    CommonCategoryData, CommonImageData, CommonLoaderData, CommonNotification, CommonProject,
-    CommonTeamMember, CommonVersion,
+    CommonCategoryData, CommonLoaderData, CommonNotification, CommonProject, CommonTeamMember,
+    CommonVersion,
 };
-use self::request_data::ProjectCreationRequestData;
+use self::request_data::{ImageData, ProjectCreationRequestData};
 use actix_web::dev::ServiceResponse;
 use async_trait::async_trait;
+use chrono::{DateTime, Utc};
 use labrinth::{
     models::{
         projects::{ProjectId, VersionType},
@@ -38,12 +39,12 @@ pub trait ApiProject {
         slug: &str,
         version_jar: Option<TestFile>,
         modify_json: Option<json_patch::Patch>,
-        pat: &str,
+        pat: Option<&str>,
     ) -> (CommonProject, Vec<CommonVersion>);
     async fn create_project(
         &self,
         creation_data: ProjectCreationRequestData,
-        pat: &str,
+        pat: Option<&str>,
     ) -> ServiceResponse;
     async fn get_public_project_creation_data_json(
         &self,
@@ -51,32 +52,71 @@ pub trait ApiProject {
         version_jar: Option<&TestFile>,
     ) -> serde_json::Value;
 
-    async fn remove_project(&self, id_or_slug: &str, pat: &str) -> ServiceResponse;
-    async fn get_project(&self, id_or_slug: &str, pat: &str) -> ServiceResponse;
-    async fn get_project_deserialized_common(&self, id_or_slug: &str, pat: &str) -> CommonProject;
-    async fn get_user_projects(&self, user_id_or_username: &str, pat: &str) -> ServiceResponse;
+    async fn remove_project(&self, id_or_slug: &str, pat: Option<&str>) -> ServiceResponse;
+    async fn get_project(&self, id_or_slug: &str, pat: Option<&str>) -> ServiceResponse;
+    async fn get_project_deserialized_common(
+        &self,
+        id_or_slug: &str,
+        pat: Option<&str>,
+    ) -> CommonProject;
+    async fn get_user_projects(
+        &self,
+        user_id_or_username: &str,
+        pat: Option<&str>,
+    ) -> ServiceResponse;
     async fn get_user_projects_deserialized_common(
         &self,
         user_id_or_username: &str,
-        pat: &str,
+        pat: Option<&str>,
     ) -> Vec<CommonProject>;
     async fn edit_project(
         &self,
         id_or_slug: &str,
         patch: serde_json::Value,
-        pat: &str,
+        pat: Option<&str>,
     ) -> ServiceResponse;
     async fn edit_project_bulk(
         &self,
         ids_or_slugs: &[&str],
         patch: serde_json::Value,
-        pat: &str,
+        pat: Option<&str>,
     ) -> ServiceResponse;
     async fn edit_project_icon(
         &self,
         id_or_slug: &str,
-        icon: Option<CommonImageData>,
-        pat: &str,
+        icon: Option<ImageData>,
+        pat: Option<&str>,
+    ) -> ServiceResponse;
+    async fn schedule_project(
+        &self,
+        id_or_slug: &str,
+        requested_status: &str,
+        date: DateTime<Utc>,
+        pat: Option<&str>,
+    ) -> ServiceResponse;
+    #[allow(clippy::too_many_arguments)]
+    async fn add_gallery_item(
+        &self,
+        id_or_slug: &str,
+        image: ImageData,
+        featured: bool,
+        title: Option<String>,
+        description: Option<String>,
+        ordering: Option<i32>,
+        pat: Option<&str>,
+    ) -> ServiceResponse;
+    async fn remove_gallery_item(
+        &self,
+        id_or_slug: &str,
+        url: &str,
+        pat: Option<&str>,
+    ) -> ServiceResponse;
+    async fn edit_gallery_item(
+        &self,
+        id_or_slug: &str,
+        url: &str,
+        patch: HashMap<String, String>,
+        pat: Option<&str>,
     ) -> ServiceResponse;
 }
 
@@ -90,55 +130,72 @@ pub trait ApiTags {
 
 #[async_trait(?Send)]
 pub trait ApiTeams {
-    async fn get_team_members(&self, team_id: &str, pat: &str) -> ServiceResponse;
+    async fn get_team_members(&self, team_id: &str, pat: Option<&str>) -> ServiceResponse;
     async fn get_team_members_deserialized_common(
         &self,
         team_id: &str,
-        pat: &str,
+        pat: Option<&str>,
     ) -> Vec<CommonTeamMember>;
-    async fn get_project_members(&self, id_or_slug: &str, pat: &str) -> ServiceResponse;
+    async fn get_project_members(&self, id_or_slug: &str, pat: Option<&str>) -> ServiceResponse;
     async fn get_project_members_deserialized_common(
         &self,
         id_or_slug: &str,
-        pat: &str,
+        pat: Option<&str>,
     ) -> Vec<CommonTeamMember>;
-    async fn get_organization_members(&self, id_or_title: &str, pat: &str) -> ServiceResponse;
+    async fn get_organization_members(
+        &self,
+        id_or_title: &str,
+        pat: Option<&str>,
+    ) -> ServiceResponse;
     async fn get_organization_members_deserialized_common(
         &self,
         id_or_title: &str,
-        pat: &str,
+        pat: Option<&str>,
     ) -> Vec<CommonTeamMember>;
-    async fn join_team(&self, team_id: &str, pat: &str) -> ServiceResponse;
-    async fn remove_from_team(&self, team_id: &str, user_id: &str, pat: &str) -> ServiceResponse;
+    async fn join_team(&self, team_id: &str, pat: Option<&str>) -> ServiceResponse;
+    async fn remove_from_team(
+        &self,
+        team_id: &str,
+        user_id: &str,
+        pat: Option<&str>,
+    ) -> ServiceResponse;
     async fn edit_team_member(
         &self,
         team_id: &str,
         user_id: &str,
         patch: serde_json::Value,
-        pat: &str,
+        pat: Option<&str>,
     ) -> ServiceResponse;
     async fn transfer_team_ownership(
         &self,
         team_id: &str,
         user_id: &str,
-        pat: &str,
+        pat: Option<&str>,
     ) -> ServiceResponse;
-    async fn get_user_notifications(&self, user_id: &str, pat: &str) -> ServiceResponse;
+    async fn get_user_notifications(&self, user_id: &str, pat: Option<&str>) -> ServiceResponse;
     async fn get_user_notifications_deserialized_common(
         &self,
         user_id: &str,
-        pat: &str,
+        pat: Option<&str>,
     ) -> Vec<CommonNotification>;
-    async fn mark_notification_read(&self, notification_id: &str, pat: &str) -> ServiceResponse;
+    async fn mark_notification_read(
+        &self,
+        notification_id: &str,
+        pat: Option<&str>,
+    ) -> ServiceResponse;
     async fn add_user_to_team(
         &self,
         team_id: &str,
         user_id: &str,
         project_permissions: Option<ProjectPermissions>,
         organization_permissions: Option<OrganizationPermissions>,
-        pat: &str,
+        pat: Option<&str>,
+    ) -> ServiceResponse;
+    async fn delete_notification(
+        &self,
+        notification_id: &str,
+        pat: Option<&str>,
     ) -> ServiceResponse;
-    async fn delete_notification(&self, notification_id: &str, pat: &str) -> ServiceResponse;
 }
 
 #[async_trait(?Send)]
@@ -150,7 +207,7 @@ pub trait ApiVersion {
         version_jar: TestFile,
         ordering: Option<i32>,
         modify_json: Option<json_patch::Patch>,
-        pat: &str,
+        pat: Option<&str>,
     ) -> ServiceResponse;
     async fn add_public_version_deserialized_common(
         &self,
@@ -159,45 +216,49 @@ pub trait ApiVersion {
         version_jar: TestFile,
         ordering: Option<i32>,
         modify_json: Option<json_patch::Patch>,
-        pat: &str,
+        pat: Option<&str>,
     ) -> CommonVersion;
-    async fn get_version(&self, id_or_slug: &str, pat: &str) -> ServiceResponse;
-    async fn get_version_deserialized_common(&self, id_or_slug: &str, pat: &str) -> CommonVersion;
-    async fn get_versions(&self, ids_or_slugs: Vec<String>, pat: &str) -> ServiceResponse;
+    async fn get_version(&self, id_or_slug: &str, pat: Option<&str>) -> ServiceResponse;
+    async fn get_version_deserialized_common(
+        &self,
+        id_or_slug: &str,
+        pat: Option<&str>,
+    ) -> CommonVersion;
+    async fn get_versions(&self, ids_or_slugs: Vec<String>, pat: Option<&str>) -> ServiceResponse;
     async fn get_versions_deserialized_common(
         &self,
         ids_or_slugs: Vec<String>,
-        pat: &str,
+        pat: Option<&str>,
     ) -> Vec<CommonVersion>;
     async fn edit_version(
         &self,
         id_or_slug: &str,
         patch: serde_json::Value,
-        pat: &str,
+        pat: Option<&str>,
     ) -> ServiceResponse;
     async fn get_version_from_hash(
         &self,
         id_or_slug: &str,
         hash: &str,
-        pat: &str,
+        pat: Option<&str>,
     ) -> ServiceResponse;
     async fn get_version_from_hash_deserialized_common(
         &self,
         id_or_slug: &str,
         hash: &str,
-        pat: &str,
+        pat: Option<&str>,
     ) -> CommonVersion;
     async fn get_versions_from_hashes(
         &self,
         hashes: &[&str],
         algorithm: &str,
-        pat: &str,
+        pat: Option<&str>,
     ) -> ServiceResponse;
     async fn get_versions_from_hashes_deserialized_common(
         &self,
         hashes: &[&str],
         algorithm: &str,
-        pat: &str,
+        pat: Option<&str>,
     ) -> HashMap<String, CommonVersion>;
     async fn get_update_from_hash(
         &self,
@@ -206,7 +267,7 @@ pub trait ApiVersion {
         loaders: Option<Vec<String>>,
         game_versions: Option<Vec<String>>,
         version_types: Option<Vec<String>>,
-        pat: &str,
+        pat: Option<&str>,
     ) -> ServiceResponse;
     async fn get_update_from_hash_deserialized_common(
         &self,
@@ -215,7 +276,7 @@ pub trait ApiVersion {
         loaders: Option<Vec<String>>,
         game_versions: Option<Vec<String>>,
         version_types: Option<Vec<String>>,
-        pat: &str,
+        pat: Option<&str>,
     ) -> CommonVersion;
     async fn update_files(
         &self,
@@ -224,7 +285,7 @@ pub trait ApiVersion {
         loaders: Option<Vec<String>>,
         game_versions: Option<Vec<String>>,
         version_types: Option<Vec<String>>,
-        pat: &str,
+        pat: Option<&str>,
     ) -> ServiceResponse;
     async fn update_files_deserialized_common(
         &self,
@@ -233,7 +294,7 @@ pub trait ApiVersion {
         loaders: Option<Vec<String>>,
         game_versions: Option<Vec<String>>,
         version_types: Option<Vec<String>>,
-        pat: &str,
+        pat: Option<&str>,
     ) -> HashMap<String, CommonVersion>;
     #[allow(clippy::too_many_arguments)]
     async fn get_project_versions(
@@ -245,7 +306,7 @@ pub trait ApiVersion {
         version_type: Option<VersionType>,
         limit: Option<usize>,
         offset: Option<usize>,
-        pat: &str,
+        pat: Option<&str>,
     ) -> ServiceResponse;
     #[allow(clippy::too_many_arguments)]
     async fn get_project_versions_deserialized_common(
@@ -257,12 +318,34 @@ pub trait ApiVersion {
         version_type: Option<VersionType>,
         limit: Option<usize>,
         offset: Option<usize>,
-        pat: &str,
+        pat: Option<&str>,
     ) -> Vec<CommonVersion>;
     async fn edit_version_ordering(
         &self,
         version_id: &str,
         ordering: Option<i32>,
-        pat: &str,
+        pat: Option<&str>,
     ) -> ServiceResponse;
+    async fn upload_file_to_version(
+        &self,
+        version_id: &str,
+        file: &TestFile,
+        pat: Option<&str>,
+    ) -> ServiceResponse;
+    async fn remove_version(&self, id_or_slug: &str, pat: Option<&str>) -> ServiceResponse;
+    async fn remove_version_file(&self, hash: &str, pat: Option<&str>) -> ServiceResponse;
+}
+
+pub trait AppendsOptionalPat {
+    fn append_pat(self, pat: Option<&str>) -> Self;
+}
+// Impl this on all actix_web::test::TestRequest
+impl AppendsOptionalPat for actix_web::test::TestRequest {
+    fn append_pat(self, pat: Option<&str>) -> Self {
+        if let Some(pat) = pat {
+            self.append_header(("Authorization", pat))
+        } else {
+            self
+        }
+    }
 }