eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Test permissions use api (#784)

Browse Source 
* initial push

* fmt; clippy

---------

Co-authored-by: Geometrically <18202329+Geometrically@users.noreply.github.com>
This commit is contained in:
Wyatt Verchere
2023-12-11 18:24:49 -08:00
committed by GitHub
parent 27ccd3dfa8
commit 6217523cc8
32 changed files with 1558 additions and 1015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/common/api_v3/oauth.rs
View File

@@ -10,7 +10,10 @@ use labrinth::auth::oauth::{
};
use reqwest::header::{AUTHORIZATION, LOCATION};
use crate::common::{api_common::Api, asserts::assert_status};
use crate::common::{
api_common::{Api, AppendsOptionalPat},
asserts::assert_status,
};
use super::ApiV3;
@@ -22,7 +25,7 @@ impl ApiV3 {
scope: Option<&str>,
redirect_uri: Option<&str>,
state: Option<&str>,
user_pat: &str,
user_pat: Option<&str>,
) -> String {
let auth_resp = self
.oauth_authorize(client_id, scope, redirect_uri, state, user_pat)
@@ -42,21 +45,18 @@ impl ApiV3 {
scope: Option<&str>,
redirect_uri: Option<&str>,
state: Option<&str>,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let uri = generate_authorize_uri(client_id, scope, redirect_uri, state);
let req = TestRequest::get()
.uri(&uri)
.append_header((AUTHORIZATION, pat))
.to_request();
let req = TestRequest::get().uri(&uri).append_pat(pat).to_request();
self.call(req).await
}
pub async fn oauth_accept(&self, flow: &str, pat: &str) -> ServiceResponse {
pub async fn oauth_accept(&self, flow: &str, pat: Option<&str>) -> ServiceResponse {
self.call(
TestRequest::post()
.uri("/_internal/oauth/accept")
.append_header((AUTHORIZATION, pat))
.append_pat(pat)
.set_json(RespondToOAuthClientScopes {
flow: flow.to_string(),
})
@@ -65,11 +65,11 @@ impl ApiV3 {
.await
}
pub async fn oauth_reject(&self, flow: &str, pat: &str) -> ServiceResponse {
pub async fn oauth_reject(&self, flow: &str, pat: Option<&str>) -> ServiceResponse {
self.call(
TestRequest::post()
.uri("/_internal/oauth/reject")
.append_header((AUTHORIZATION, pat))
.append_pat(pat)
.set_json(RespondToOAuthClientScopes {
flow: flow.to_string(),
})

45
tests/common/api_v3/oauth_clients.rs
View File

@@ -10,10 +10,12 @@ use labrinth::{
},
routes::v3::oauth_clients::OAuthClientEdit,
};
use reqwest::header::AUTHORIZATION;
use serde_json::json;
use crate::common::{api_common::Api, asserts::assert_status};
use crate::common::{
api_common::{Api, AppendsOptionalPat},
asserts::assert_status,
};
use super::ApiV3;
@@ -23,12 +25,12 @@ impl ApiV3 {
name: String,
max_scopes: Scopes,
redirect_uris: Vec<String>,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let max_scopes = max_scopes.bits();
let req = TestRequest::post()
.uri("/_internal/oauth/app")
.append_header((AUTHORIZATION, pat))
.append_pat(pat)
.set_json(json!({
"name": name,
"max_scopes": max_scopes,
@@ -39,10 +41,14 @@ impl ApiV3 {
self.call(req).await
}
pub async fn get_user_oauth_clients(&self, user_id: &str, pat: &str) -> Vec<OAuthClient> {
pub async fn get_user_oauth_clients(
&self,
user_id: &str,
pat: Option<&str>,
) -> Vec<OAuthClient> {
let req = TestRequest::get()
.uri(&format!("/v3/user/{}/oauth_apps", user_id))
.append_header((AUTHORIZATION, pat))
.append_pat(pat)
.to_request();
let resp = self.call(req).await;
assert_status(&resp, StatusCode::OK);
@@ -50,10 +56,10 @@ impl ApiV3 {
test::read_body_json(resp).await
}
pub async fn get_oauth_client(&self, client_id: String, pat: &str) -> ServiceResponse {
pub async fn get_oauth_client(&self, client_id: String, pat: Option<&str>) -> ServiceResponse {
let req = TestRequest::get()
.uri(&format!("/_internal/oauth/app/{}", client_id))
.append_header((AUTHORIZATION, pat))
.append_pat(pat)
.to_request();
self.call(req).await
@@ -63,7 +69,7 @@ impl ApiV3 {
&self,
client_id: &str,
edit: OAuthClientEdit,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = TestRequest::patch()
.uri(&format!(
@@ -71,36 +77,43 @@ impl ApiV3 {
urlencoding::encode(client_id)
))
.set_json(edit)
.append_header((AUTHORIZATION, pat))
.append_pat(pat)
.to_request();
self.call(req).await
}
pub async fn delete_oauth_client(&self, client_id: &str, pat: &str) -> ServiceResponse {
pub async fn delete_oauth_client(&self, client_id: &str, pat: Option<&str>) -> ServiceResponse {
let req = TestRequest::delete()
.uri(&format!("/_internal/oauth/app/{}", client_id))
.append_header((AUTHORIZATION, pat))
.append_pat(pat)
.to_request();
self.call(req).await
}
pub async fn revoke_oauth_authorization(&self, client_id: &str, pat: &str) -> ServiceResponse {
pub async fn revoke_oauth_authorization(
&self,
client_id: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = TestRequest::delete()
.uri(&format!(
"/_internal/oauth/authorizations?client_id={}",
urlencoding::encode(client_id)
))
.append_header((AUTHORIZATION, pat))
.append_pat(pat)
.to_request();
self.call(req).await
}
pub async fn get_user_oauth_authorizations(&self, pat: &str) -> Vec<OAuthClientAuthorization> {
pub async fn get_user_oauth_authorizations(
&self,
pat: Option<&str>,
) -> Vec<OAuthClientAuthorization> {
let req = TestRequest::get()
.uri("/_internal/oauth/authorizations")
.append_header((AUTHORIZATION, pat))
.append_pat(pat)
.to_request();
let resp = self.call(req).await;
assert_status(&resp, StatusCode::OK);

48
tests/common/api_v3/organization.rs
View File

@@ -6,7 +6,7 @@ use bytes::Bytes;
use labrinth::models::{organizations::Organization, v3::projects::Project};
use serde_json::json;
use crate::common::api_common::{request_data::ImageData, Api};
use crate::common::api_common::{request_data::ImageData, Api, AppendsOptionalPat};
use super::ApiV3;
@@ -15,11 +15,11 @@ impl ApiV3 {
&self,
organization_title: &str,
description: &str,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = test::TestRequest::post()
.uri("/v3/organization")
.append_header(("Authorization", pat))
.append_pat(pat)
.set_json(json!({
"name": organization_title,
"description": description,
@@ -28,10 +28,10 @@ impl ApiV3 {
self.call(req).await
}
pub async fn get_organization(&self, id_or_title: &str, pat: &str) -> ServiceResponse {
pub async fn get_organization(&self, id_or_title: &str, pat: Option<&str>) -> ServiceResponse {
let req = TestRequest::get()
.uri(&format!("/v3/organization/{id_or_title}"))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
self.call(req).await
}
@@ -39,17 +39,21 @@ impl ApiV3 {
pub async fn get_organization_deserialized(
&self,
id_or_title: &str,
pat: &str,
pat: Option<&str>,
) -> Organization {
let resp = self.get_organization(id_or_title, pat).await;
assert_eq!(resp.status(), 200);
test::read_body_json(resp).await
}
pub async fn get_organization_projects(&self, id_or_title: &str, pat: &str) -> ServiceResponse {
pub async fn get_organization_projects(
&self,
id_or_title: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = test::TestRequest::get()
.uri(&format!("/v3/organization/{id_or_title}/projects"))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
self.call(req).await
}
@@ -57,7 +61,7 @@ impl ApiV3 {
pub async fn get_organization_projects_deserialized(
&self,
id_or_title: &str,
pat: &str,
pat: Option<&str>,
) -> Vec<Project> {
let resp = self.get_organization_projects(id_or_title, pat).await;
assert_eq!(resp.status(), 200);
@@ -68,11 +72,11 @@ impl ApiV3 {
&self,
id_or_title: &str,
patch: serde_json::Value,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = test::TestRequest::patch()
.uri(&format!("/v3/organization/{id_or_title}"))
.append_header(("Authorization", pat))
.append_pat(pat)
.set_json(patch)
.to_request();
@@ -83,7 +87,7 @@ impl ApiV3 {
&self,
id_or_title: &str,
icon: Option<ImageData>,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
if let Some(icon) = icon {
// If an icon is provided, upload it
@@ -92,7 +96,7 @@ impl ApiV3 {
"/v3/organization/{id_or_title}/icon?ext={ext}",
ext = icon.extension
))
.append_header(("Authorization", pat))
.append_pat(pat)
.set_payload(Bytes::from(icon.icon))
.to_request();
@@ -101,17 +105,21 @@ impl ApiV3 {
// If no icon is provided, delete the icon
let req = test::TestRequest::delete()
.uri(&format!("/v3/organization/{id_or_title}/icon"))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
self.call(req).await
}
}
pub async fn delete_organization(&self, id_or_title: &str, pat: &str) -> ServiceResponse {
pub async fn delete_organization(
&self,
id_or_title: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = test::TestRequest::delete()
.uri(&format!("/v3/organization/{id_or_title}"))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
self.call(req).await
@@ -121,11 +129,11 @@ impl ApiV3 {
&self,
id_or_title: &str,
project_id_or_slug: &str,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = test::TestRequest::post()
.uri(&format!("/v3/organization/{id_or_title}/projects"))
.append_header(("Authorization", pat))
.append_pat(pat)
.set_json(json!({
"project_id": project_id_or_slug,
}))
@@ -138,13 +146,13 @@ impl ApiV3 {
&self,
id_or_title: &str,
project_id_or_slug: &str,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = test::TestRequest::delete()
.uri(&format!(
"/v3/organization/{id_or_title}/projects/{project_id_or_slug}"
))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
self.call(req).await

177
tests/common/api_v3/project.rs
View File

@@ -17,9 +17,9 @@ use serde_json::json;
use crate::common::{
api_common::{
models::{CommonImageData, CommonProject, CommonVersion},
request_data::ProjectCreationRequestData,
Api, ApiProject,
models::{CommonProject, CommonVersion},
request_data::{ImageData, ProjectCreationRequestData},
Api, ApiProject, AppendsOptionalPat,
},
asserts::assert_status,
database::MOD_USER_PAT,
@@ -38,7 +38,7 @@ impl ApiProject for ApiV3 {
slug: &str,
version_jar: Option<TestFile>,
modify_json: Option<json_patch::Patch>,
pat: &str,
pat: Option<&str>,
) -> (CommonProject, Vec<CommonVersion>) {
let creation_data = get_public_project_creation_data(slug, version_jar, modify_json);
@@ -50,7 +50,7 @@ impl ApiProject for ApiV3 {
// Approve as a moderator.
let req = TestRequest::patch()
.uri(&format!("/v3/project/{}", slug))
.append_header(("Authorization", MOD_USER_PAT))
.append_pat(MOD_USER_PAT)
.set_json(json!(
{
"status": "approved"
@@ -66,7 +66,7 @@ impl ApiProject for ApiV3 {
// Get project's versions
let req = TestRequest::get()
.uri(&format!("/v3/project/{}/version", slug))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
let resp = self.call(req).await;
let versions: Vec<CommonVersion> = test::read_body_json(resp).await;
@@ -85,35 +85,38 @@ impl ApiProject for ApiV3 {
async fn create_project(
&self,
creation_data: ProjectCreationRequestData,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = TestRequest::post()
.uri("/v3/project")
.append_header(("Authorization", pat))
.append_pat(pat)
.set_multipart(creation_data.segment_data)
.to_request();
self.call(req).await
}
async fn remove_project(&self, project_slug_or_id: &str, pat: &str) -> ServiceResponse {
async fn remove_project(&self, project_slug_or_id: &str, pat: Option<&str>) -> ServiceResponse {
let req = test::TestRequest::delete()
.uri(&format!("/v3/project/{project_slug_or_id}"))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
let resp = self.call(req).await;
assert_eq!(resp.status(), 204);
resp
self.call(req).await
}
async fn get_project(&self, id_or_slug: &str, pat: &str) -> ServiceResponse {
async fn get_project(&self, id_or_slug: &str, pat: Option<&str>) -> ServiceResponse {
let req = TestRequest::get()
.uri(&format!("/v3/project/{id_or_slug}"))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
self.call(req).await
}
async fn get_project_deserialized_common(&self, id_or_slug: &str, pat: &str) -> CommonProject {
async fn get_project_deserialized_common(
&self,
id_or_slug: &str,
pat: Option<&str>,
) -> CommonProject {
let resp = self.get_project(id_or_slug, pat).await;
assert_eq!(resp.status(), 200);
// First, deserialize to the non-common format (to test the response is valid for this api version)
@@ -123,10 +126,14 @@ impl ApiProject for ApiV3 {
serde_json::from_value(value).unwrap()
}
async fn get_user_projects(&self, user_id_or_username: &str, pat: &str) -> ServiceResponse {
async fn get_user_projects(
&self,
user_id_or_username: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = test::TestRequest::get()
.uri(&format!("/v3/user/{}/projects", user_id_or_username))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
self.call(req).await
}
@@ -134,7 +141,7 @@ impl ApiProject for ApiV3 {
async fn get_user_projects_deserialized_common(
&self,
user_id_or_username: &str,
pat: &str,
pat: Option<&str>,
) -> Vec<CommonProject> {
let resp = self.get_user_projects(user_id_or_username, pat).await;
assert_eq!(resp.status(), 200);
@@ -149,11 +156,11 @@ impl ApiProject for ApiV3 {
&self,
id_or_slug: &str,
patch: serde_json::Value,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = test::TestRequest::patch()
.uri(&format!("/v3/project/{id_or_slug}"))
.append_header(("Authorization", pat))
.append_pat(pat)
.set_json(patch)
.to_request();
@@ -164,7 +171,7 @@ impl ApiProject for ApiV3 {
&self,
ids_or_slugs: &[&str],
patch: serde_json::Value,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let projects_str = ids_or_slugs
.iter()
@@ -176,7 +183,7 @@ impl ApiProject for ApiV3 {
"/v3/projects?ids={encoded}",
encoded = urlencoding::encode(&format!("[{projects_str}]"))
))
.append_header(("Authorization", pat))
.append_pat(pat)
.set_json(patch)
.to_request();
@@ -186,8 +193,8 @@ impl ApiProject for ApiV3 {
async fn edit_project_icon(
&self,
id_or_slug: &str,
icon: Option<CommonImageData>,
pat: &str,
icon: Option<ImageData>,
pat: Option<&str>,
) -> ServiceResponse {
if let Some(icon) = icon {
// If an icon is provided, upload it
@@ -196,7 +203,7 @@ impl ApiProject for ApiV3 {
"/v3/project/{id_or_slug}/icon?ext={ext}",
ext = icon.extension
))
.append_header(("Authorization", pat))
.append_pat(pat)
.set_payload(Bytes::from(icon.icon))
.to_request();
@@ -205,16 +212,120 @@ impl ApiProject for ApiV3 {
// If no icon is provided, delete the icon
let req = test::TestRequest::delete()
.uri(&format!("/v3/project/{id_or_slug}/icon"))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
self.call(req).await
}
}
async fn schedule_project(
&self,
id_or_slug: &str,
requested_status: &str,
date: DateTime<Utc>,
pat: Option<&str>,
) -> ServiceResponse {
let req = test::TestRequest::post()
.uri(&format!("/v3/version/{id_or_slug}/schedule"))
.set_json(json!(
{
"requested_status": requested_status,
"time": date,
}
))
.append_pat(pat)
.to_request();
self.call(req).await
}
#[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 {
let mut url = format!(
"/v3/project/{id_or_slug}/gallery?ext={ext}&featured={featured}",
ext = image.extension,
featured = featured
);
if let Some(title) = title {
url.push_str(&format!("&title={}", title));
}
if let Some(description) = description {
url.push_str(&format!("&description={}", description));
}
if let Some(ordering) = ordering {
url.push_str(&format!("&ordering={}", ordering));
}
let req = test::TestRequest::post()
.uri(&url)
.append_pat(pat)
.set_payload(Bytes::from(image.icon))
.to_request();
self.call(req).await
}
async fn edit_gallery_item(
&self,
id_or_slug: &str,
image_url: &str,
patch: HashMap<String, String>,
pat: Option<&str>,
) -> ServiceResponse {
let mut url = format!(
"/v3/project/{id_or_slug}/gallery?url={image_url}",
image_url = urlencoding::encode(image_url)
);
for (key, value) in patch {
url.push_str(&format!(
"&{key}={value}",
key = key,
value = urlencoding::encode(&value)
));
}
let req = test::TestRequest::patch()
.uri(&url)
.append_pat(pat)
.to_request();
let t = self.call(req).await;
println!("Status: {}", t.status());
println!("respone Body: {:?}", t.response().body());
t
}
async fn remove_gallery_item(
&self,
id_or_slug: &str,
url: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = test::TestRequest::delete()
.uri(&format!(
"/v3/project/{id_or_slug}/gallery?url={url}",
url = url
))
.append_pat(pat)
.to_request();
self.call(req).await
}
}
impl ApiV3 {
pub async fn get_project_deserialized(&self, id_or_slug: &str, pat: &str) -> Project {
pub async fn get_project_deserialized(&self, id_or_slug: &str, pat: Option<&str>) -> Project {
let resp = self.get_project(id_or_slug, pat).await;
assert_eq!(resp.status(), 200);
test::read_body_json(resp).await
@@ -224,7 +335,7 @@ impl ApiV3 {
&self,
query: Option<&str>,
facets: Option<serde_json::Value>,
pat: &str,
pat: Option<&str>,
) -> ReturnSearchResults {
let query_field = if let Some(query) = query {
format!("&query={}", urlencoding::encode(query))
@@ -240,7 +351,7 @@ impl ApiV3 {
let req = test::TestRequest::get()
.uri(&format!("/v3/search?{}{}", query_field, facets_field))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
let resp = self.call(req).await;
let status = resp.status();
@@ -255,7 +366,7 @@ impl ApiV3 {
start_date: Option<DateTime<Utc>>,
end_date: Option<DateTime<Utc>>,
resolution_minutes: Option<u32>,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let pv_string = if ids_are_version_ids {
let version_string: String = serde_json::to_string(&id_or_slugs).unwrap();
@@ -286,7 +397,7 @@ impl ApiV3 {
let req = test::TestRequest::get()
.uri(&format!("/v3/analytics/revenue?{pv_string}{extra_args}",))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
self.call(req).await
@@ -299,7 +410,7 @@ impl ApiV3 {
start_date: Option<DateTime<Utc>>,
end_date: Option<DateTime<Utc>>,
resolution_minutes: Option<u32>,
pat: &str,
pat: Option<&str>,
) -> HashMap<String, HashMap<i64, Decimal>> {
let resp = self
.get_analytics_revenue(

12
tests/common/api_v3/request_data.rs
View File

@@ -2,8 +2,8 @@
use serde_json::json;
use crate::common::{
api_common::request_data::{ImageData, ProjectCreationRequestData, VersionCreationRequestData},
dummy_data::{DummyImage, TestFile},
api_common::request_data::{ProjectCreationRequestData, VersionCreationRequestData},
dummy_data::TestFile,
};
use labrinth::{
models::projects::ProjectId,
@@ -133,11 +133,3 @@ pub fn get_public_creation_data_multipart(
vec![json_segment]
}
}
pub fn get_icon_data(dummy_icon: DummyImage) -> ImageData {
ImageData {
filename: dummy_icon.filename(),
extension: dummy_icon.extension(),
icon: dummy_icon.bytes(),
}
}

10
tests/common/api_v3/tags.rs
View File

@@ -11,7 +11,7 @@ use labrinth::{
use crate::common::{
api_common::{
models::{CommonCategoryData, CommonLoaderData},
Api, ApiTags,
Api, ApiTags, AppendsOptionalPat,
},
database::ADMIN_USER_PAT,
};
@@ -23,7 +23,7 @@ impl ApiTags for ApiV3 {
async fn get_loaders(&self) -> ServiceResponse {
let req = TestRequest::get()
.uri("/v3/tag/loader")
.append_header(("Authorization", ADMIN_USER_PAT))
.append_pat(ADMIN_USER_PAT)
.to_request();
self.call(req).await
}
@@ -41,7 +41,7 @@ impl ApiTags for ApiV3 {
async fn get_categories(&self) -> ServiceResponse {
let req = TestRequest::get()
.uri("/v3/tag/category")
.append_header(("Authorization", ADMIN_USER_PAT))
.append_pat(ADMIN_USER_PAT)
.to_request();
self.call(req).await
}
@@ -67,7 +67,7 @@ impl ApiV3 {
pub async fn get_loader_field_variants(&self, loader_field: &str) -> ServiceResponse {
let req = TestRequest::get()
.uri(&format!("/v3/loader_field?loader_field={}", loader_field))
.append_header(("Authorization", ADMIN_USER_PAT))
.append_pat(ADMIN_USER_PAT)
.to_request();
self.call(req).await
}
@@ -85,7 +85,7 @@ impl ApiV3 {
async fn get_games(&self) -> ServiceResponse {
let req = TestRequest::get()
.uri("/v3/games")
.append_header(("Authorization", ADMIN_USER_PAT))
.append_pat(ADMIN_USER_PAT)
.to_request();
self.call(req).await
}

79
tests/common/api_v3/team.rs
View File

@@ -10,7 +10,7 @@ use serde_json::json;
use crate::common::{
api_common::{
models::{CommonNotification, CommonTeamMember},
Api, ApiTeams,
Api, ApiTeams, AppendsOptionalPat,
},
asserts::assert_status,
};
@@ -21,14 +21,18 @@ impl ApiV3 {
pub async fn get_organization_members_deserialized(
&self,
id_or_title: &str,
pat: &str,
pat: Option<&str>,
) -> Vec<TeamMember> {
let resp = self.get_organization_members(id_or_title, pat).await;
assert_eq!(resp.status(), 200);
test::read_body_json(resp).await
}
pub async fn get_team_members_deserialized(&self, team_id: &str, pat: &str) -> Vec<TeamMember> {
pub async fn get_team_members_deserialized(
&self,
team_id: &str,
pat: Option<&str>,
) -> Vec<TeamMember> {
let resp = self.get_team_members(team_id, pat).await;
assert_eq!(resp.status(), 200);
test::read_body_json(resp).await
@@ -37,10 +41,10 @@ impl ApiV3 {
#[async_trait(?Send)]
impl ApiTeams for ApiV3 {
async fn get_team_members(&self, id_or_title: &str, pat: &str) -> ServiceResponse {
async fn get_team_members(&self, id_or_title: &str, pat: Option<&str>) -> ServiceResponse {
let req = test::TestRequest::get()
.uri(&format!("/v3/team/{id_or_title}/members"))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
self.call(req).await
}
@@ -48,7 +52,7 @@ impl ApiTeams for ApiV3 {
async fn get_team_members_deserialized_common(
&self,
id_or_title: &str,
pat: &str,
pat: Option<&str>,
) -> Vec<CommonTeamMember> {
let resp = self.get_team_members(id_or_title, pat).await;
assert_eq!(resp.status(), 200);
@@ -59,10 +63,10 @@ impl ApiTeams for ApiV3 {
serde_json::from_value(value).unwrap()
}
async fn get_project_members(&self, id_or_title: &str, pat: &str) -> ServiceResponse {
async fn get_project_members(&self, id_or_title: &str, pat: Option<&str>) -> ServiceResponse {
let req = test::TestRequest::get()
.uri(&format!("/v3/project/{id_or_title}/members"))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
self.call(req).await
}
@@ -70,7 +74,7 @@ impl ApiTeams for ApiV3 {
async fn get_project_members_deserialized_common(
&self,
id_or_title: &str,
pat: &str,
pat: Option<&str>,
) -> Vec<CommonTeamMember> {
let resp = self.get_project_members(id_or_title, pat).await;
assert_eq!(resp.status(), 200);
@@ -81,10 +85,14 @@ impl ApiTeams for ApiV3 {
serde_json::from_value(value).unwrap()
}
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 {
let req = test::TestRequest::get()
.uri(&format!("/v3/organization/{id_or_title}/members"))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
self.call(req).await
}
@@ -92,7 +100,7 @@ impl ApiTeams for ApiV3 {
async fn get_organization_members_deserialized_common(
&self,
id_or_title: &str,
pat: &str,
pat: Option<&str>,
) -> Vec<CommonTeamMember> {
let resp = self.get_organization_members(id_or_title, pat).await;
assert_eq!(resp.status(), 200);
@@ -103,18 +111,23 @@ impl ApiTeams for ApiV3 {
serde_json::from_value(value).unwrap()
}
async fn join_team(&self, team_id: &str, pat: &str) -> ServiceResponse {
async fn join_team(&self, team_id: &str, pat: Option<&str>) -> ServiceResponse {
let req = test::TestRequest::post()
.uri(&format!("/v3/team/{team_id}/join"))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
self.call(req).await
}
async fn remove_from_team(&self, team_id: &str, user_id: &str, pat: &str) -> ServiceResponse {
async fn remove_from_team(
&self,
team_id: &str,
user_id: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = test::TestRequest::delete()
.uri(&format!("/v3/team/{team_id}/members/{user_id}"))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
self.call(req).await
}
@@ -124,11 +137,11 @@ impl ApiTeams for ApiV3 {
team_id: &str,
user_id: &str,
patch: serde_json::Value,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = test::TestRequest::patch()
.uri(&format!("/v3/team/{team_id}/members/{user_id}"))
.append_header(("Authorization", pat))
.append_pat(pat)
.set_json(patch)
.to_request();
self.call(req).await
@@ -138,11 +151,11 @@ impl ApiTeams for ApiV3 {
&self,
team_id: &str,
user_id: &str,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = test::TestRequest::patch()
.uri(&format!("/v3/team/{team_id}/owner"))
.append_header(("Authorization", pat))
.append_pat(pat)
.set_json(json!({
"user_id": user_id,
}))
@@ -150,10 +163,10 @@ impl ApiTeams for ApiV3 {
self.call(req).await
}
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 {
let req = test::TestRequest::get()
.uri(&format!("/v3/user/{user_id}/notifications"))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
self.call(req).await
}
@@ -161,7 +174,7 @@ impl ApiTeams for ApiV3 {
async fn get_user_notifications_deserialized_common(
&self,
user_id: &str,
pat: &str,
pat: Option<&str>,
) -> Vec<CommonNotification> {
let resp = self.get_user_notifications(user_id, pat).await;
assert_status(&resp, StatusCode::OK);
@@ -172,10 +185,14 @@ impl ApiTeams for ApiV3 {
serde_json::from_value(value).unwrap()
}
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 {
let req = test::TestRequest::patch()
.uri(&format!("/v3/notification/{notification_id}"))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
self.call(req).await
}
@@ -185,11 +202,11 @@ impl ApiTeams for ApiV3 {
user_id: &str,
project_permissions: Option<ProjectPermissions>,
organization_permissions: Option<OrganizationPermissions>,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = test::TestRequest::post()
.uri(&format!("/v3/team/{team_id}/members"))
.append_header(("Authorization", pat))
.append_pat(pat)
.set_json(json!( {
"user_id": user_id,
"permissions" : project_permissions.map(|p| p.bits()).unwrap_or_default(),
@@ -199,10 +216,14 @@ impl ApiTeams for ApiV3 {
self.call(req).await
}
async fn delete_notification(&self, notification_id: &str, pat: &str) -> ServiceResponse {
async fn delete_notification(
&self,
notification_id: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = test::TestRequest::delete()
.uri(&format!("/v3/notification/{notification_id}"))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
self.call(req).await
}

117
tests/common/api_v3/version.rs
View File

@@ -1,12 +1,15 @@
use std::collections::HashMap;
use super::{request_data::get_public_version_creation_data, ApiV3};
use super::{
request_data::{self, get_public_version_creation_data},
ApiV3,
};
use crate::common::{
api_common::{models::CommonVersion, Api, ApiVersion},
api_common::{models::CommonVersion, Api, ApiVersion, AppendsOptionalPat},
asserts::assert_status,
dummy_data::TestFile,
};
use actix_http::{header::AUTHORIZATION, StatusCode};
use actix_http::StatusCode;
use actix_web::{
dev::ServiceResponse,
test::{self, TestRequest},
@@ -35,7 +38,7 @@ impl ApiV3 {
version_jar: TestFile,
ordering: Option<i32>,
modify_json: Option<json_patch::Patch>,
pat: &str,
pat: Option<&str>,
) -> Version {
let resp = self
.add_public_version(
@@ -55,7 +58,7 @@ impl ApiV3 {
test::read_body_json(version).await
}
pub async fn get_version_deserialized(&self, id: &str, pat: &str) -> Version {
pub async fn get_version_deserialized(&self, id: &str, pat: Option<&str>) -> Version {
let resp = self.get_version(id, pat).await;
assert_eq!(resp.status(), 200);
test::read_body_json(resp).await
@@ -65,11 +68,11 @@ impl ApiV3 {
&self,
algorithm: &str,
hashes: Vec<FileUpdateData>,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = test::TestRequest::post()
.uri("/v3/version_files/update_individual")
.append_header(("Authorization", pat))
.append_pat(pat)
.set_json(json!({
"algorithm": algorithm,
"hashes": hashes
@@ -82,7 +85,7 @@ impl ApiV3 {
&self,
algorithm: &str,
hashes: Vec<FileUpdateData>,
pat: &str,
pat: Option<&str>,
) -> HashMap<String, Version> {
let resp = self.update_individual_files(algorithm, hashes, pat).await;
assert_eq!(resp.status(), 200);
@@ -99,7 +102,7 @@ impl ApiVersion for ApiV3 {
version_jar: TestFile,
ordering: Option<i32>,
modify_json: Option<json_patch::Patch>,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let creation_data = get_public_version_creation_data(
project_id,
@@ -112,7 +115,7 @@ impl ApiVersion for ApiV3 {
// Add a versiom.
let req = TestRequest::post()
.uri("/v3/version")
.append_header(("Authorization", pat))
.append_pat(pat)
.set_multipart(creation_data.segment_data)
.to_request();
self.call(req).await
@@ -125,7 +128,7 @@ impl ApiVersion for ApiV3 {
version_jar: TestFile,
ordering: Option<i32>,
modify_json: Option<json_patch::Patch>,
pat: &str,
pat: Option<&str>,
) -> CommonVersion {
let resp = self
.add_public_version(
@@ -145,15 +148,15 @@ impl ApiVersion for ApiV3 {
serde_json::from_value(value).unwrap()
}
async fn get_version(&self, id: &str, pat: &str) -> ServiceResponse {
async fn get_version(&self, id: &str, pat: Option<&str>) -> ServiceResponse {
let req = TestRequest::get()
.uri(&format!("/v3/version/{id}"))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
self.call(req).await
}
async fn get_version_deserialized_common(&self, id: &str, pat: &str) -> CommonVersion {
async fn get_version_deserialized_common(&self, id: &str, pat: Option<&str>) -> CommonVersion {
let resp = self.get_version(id, pat).await;
assert_eq!(resp.status(), 200);
// First, deserialize to the non-common format (to test the response is valid for this api version)
@@ -167,11 +170,11 @@ impl ApiVersion for ApiV3 {
&self,
version_id: &str,
patch: serde_json::Value,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = test::TestRequest::patch()
.uri(&format!("/v3/version/{version_id}"))
.append_header(("Authorization", pat))
.append_pat(pat)
.set_json(patch)
.to_request();
@@ -182,11 +185,11 @@ impl ApiVersion for ApiV3 {
&self,
hash: &str,
algorithm: &str,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = test::TestRequest::get()
.uri(&format!("/v3/version_file/{hash}?algorithm={algorithm}"))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
self.call(req).await
}
@@ -195,7 +198,7 @@ impl ApiVersion for ApiV3 {
&self,
hash: &str,
algorithm: &str,
pat: &str,
pat: Option<&str>,
) -> CommonVersion {
let resp = self.get_version_from_hash(hash, algorithm, pat).await;
assert_eq!(resp.status(), 200);
@@ -210,11 +213,11 @@ impl ApiVersion for ApiV3 {
&self,
hashes: &[&str],
algorithm: &str,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let req = TestRequest::post()
.uri("/v3/version_files")
.append_header(("Authorization", pat))
.append_pat(pat)
.set_json(json!({
"hashes": hashes,
"algorithm": algorithm,
@@ -227,7 +230,7 @@ impl ApiVersion for ApiV3 {
&self,
hashes: &[&str],
algorithm: &str,
pat: &str,
pat: Option<&str>,
) -> HashMap<String, CommonVersion> {
let resp = self.get_versions_from_hashes(hashes, algorithm, pat).await;
assert_eq!(resp.status(), 200);
@@ -245,7 +248,7 @@ impl ApiVersion for ApiV3 {
loaders: Option<Vec<String>>,
game_versions: Option<Vec<String>>,
version_types: Option<Vec<String>>,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let mut json = json!({});
if let Some(loaders) = loaders {
@@ -264,7 +267,7 @@ impl ApiVersion for ApiV3 {
.uri(&format!(
"/v3/version_file/{hash}/update?algorithm={algorithm}"
))
.append_header(("Authorization", pat))
.append_pat(pat)
.set_json(json)
.to_request();
self.call(req).await
@@ -277,7 +280,7 @@ impl ApiVersion for ApiV3 {
loaders: Option<Vec<String>>,
game_versions: Option<Vec<String>>,
version_types: Option<Vec<String>>,
pat: &str,
pat: Option<&str>,
) -> CommonVersion {
let resp = self
.get_update_from_hash(hash, algorithm, loaders, game_versions, version_types, pat)
@@ -297,7 +300,7 @@ impl ApiVersion for ApiV3 {
loaders: Option<Vec<String>>,
game_versions: Option<Vec<String>>,
version_types: Option<Vec<String>>,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let mut json = json!({
"algorithm": algorithm,
@@ -317,7 +320,7 @@ impl ApiVersion for ApiV3 {
let req = test::TestRequest::post()
.uri("/v3/version_files/update")
.append_header(("Authorization", pat))
.append_pat(pat)
.set_json(json)
.to_request();
self.call(req).await
@@ -330,7 +333,7 @@ impl ApiVersion for ApiV3 {
loaders: Option<Vec<String>>,
game_versions: Option<Vec<String>>,
version_types: Option<Vec<String>>,
pat: &str,
pat: Option<&str>,
) -> HashMap<String, CommonVersion> {
let resp = self
.update_files(
@@ -361,7 +364,7 @@ impl ApiVersion for ApiV3 {
version_type: Option<VersionType>,
limit: Option<usize>,
offset: Option<usize>,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let mut query_string = String::new();
if let Some(game_versions) = game_versions {
@@ -396,7 +399,7 @@ impl ApiVersion for ApiV3 {
"/v3/project/{project_id_slug}/version?{}",
query_string.trim_start_matches('&')
))
.append_header(("Authorization", pat))
.append_pat(pat)
.to_request();
self.call(req).await
}
@@ -411,7 +414,7 @@ impl ApiVersion for ApiV3 {
version_type: Option<VersionType>,
limit: Option<usize>,
offset: Option<usize>,
pat: &str,
pat: Option<&str>,
) -> Vec<CommonVersion> {
let resp = self
.get_project_versions(
@@ -438,7 +441,7 @@ impl ApiVersion for ApiV3 {
&self,
version_id: &str,
ordering: Option<i32>,
pat: &str,
pat: Option<&str>,
) -> ServiceResponse {
let request = test::TestRequest::patch()
.uri(&format!("/v3/version/{version_id}"))
@@ -447,16 +450,16 @@ impl ApiVersion for ApiV3 {
"ordering": ordering
}
))
.append_header((AUTHORIZATION, pat))
.append_pat(pat)
.to_request();
self.call(request).await
}
async fn get_versions(&self, version_ids: Vec<String>, pat: &str) -> ServiceResponse {
async fn get_versions(&self, version_ids: Vec<String>, pat: Option<&str>) -> ServiceResponse {
let ids = url_encode_json_serialized_vec(&version_ids);
let request = test::TestRequest::get()
.uri(&format!("/v3/versions?ids={}", ids))
.append_header((AUTHORIZATION, pat))
.append_pat(pat)
.to_request();
self.call(request).await
}
@@ -464,7 +467,7 @@ impl ApiVersion for ApiV3 {
async fn get_versions_deserialized_common(
&self,
version_ids: Vec<String>,
pat: &str,
pat: Option<&str>,
) -> Vec<CommonVersion> {
let resp = self.get_versions(version_ids, pat).await;
assert_status(&resp, StatusCode::OK);
@@ -474,4 +477,46 @@ impl ApiVersion for ApiV3 {
let value = serde_json::to_value(v).unwrap();
serde_json::from_value(value).unwrap()
}
async fn upload_file_to_version(
&self,
version_id: &str,
file: &TestFile,
pat: Option<&str>,
) -> ServiceResponse {
let m = request_data::get_public_creation_data_multipart(
&json!({
"file_parts": [file.filename()]
}),
Some(file),
);
let request = test::TestRequest::post()
.uri(&format!(
"/v3/version/{version_id}/file",
version_id = version_id
))
.append_pat(pat)
.set_multipart(m)
.to_request();
self.call(request).await
}
async fn remove_version(&self, version_id: &str, pat: Option<&str>) -> ServiceResponse {
let request = test::TestRequest::delete()
.uri(&format!(
"/v3/version/{version_id}",
version_id = version_id
))
.append_pat(pat)
.to_request();
self.call(request).await
}
async fn remove_version_file(&self, hash: &str, pat: Option<&str>) -> ServiceResponse {
let request = test::TestRequest::delete()
.uri(&format!("/v3/version_file/{hash}"))
.append_pat(pat)
.to_request();
self.call(request).await
}
}