models/team: Inline can_add_team() fn

Author: Turbo87

src/controllers/krate/owners.rs

@@ -2,7 +2,7 @@
 
 use crate::controllers::krate::CratePath;
 use crate::models::krate::OwnerRemoveError;
-use crate::models::team::can_add_team;
+use crate::models::team::{is_gh_org_owner, team_with_gh_id_contains_user};
 use crate::models::{
     krate::NewOwnerInvite, token::EndpointScope, CrateOwner, NewCrateOwnerInvitation,
     NewCrateOwnerInvitationOutcome, NewTeam,
@@ -411,7 +411,11 @@ pub async fn create_or_update_github_team(
     let org_id = team.organization.id;
     let gh_login = &req_user.gh_login;
 
-    if !can_add_team(gh_client, org_id, team.id, gh_login, &token).await? {
+    let can_add_team = team_with_gh_id_contains_user(gh_client, org_id, team.id, gh_login, &token)
+        .await?
+        || is_gh_org_owner(gh_client, org_id, gh_login, &token).await?;
+
+    if !can_add_team {
         return Err(custom(
             StatusCode::FORBIDDEN,
             "only members of a team or organization owners can add it as an owner",

src/models/team.rs

@@ -82,20 +82,7 @@ impl Team {
     }
 }
 
-pub async fn can_add_team(
-    gh_client: &dyn GitHubClient,
-    org_id: i32,
-    team_id: i32,
-    gh_login: &str,
-    token: &AccessToken,
-) -> Result<bool, GitHubError> {
-    Ok(
-        team_with_gh_id_contains_user(gh_client, org_id, team_id, gh_login, token).await?
-            || is_gh_org_owner(gh_client, org_id, gh_login, token).await?,
-    )
-}
-
-async fn is_gh_org_owner(
+pub async fn is_gh_org_owner(
     gh_client: &dyn GitHubClient,
     org_id: i32,
     gh_login: &str,
@@ -105,7 +92,7 @@ async fn is_gh_org_owner(
     Ok(membership.is_some_and(|m| m.is_active_admin()))
 }
 
-async fn team_with_gh_id_contains_user(
+pub async fn team_with_gh_id_contains_user(
     gh_client: &dyn GitHubClient,
     github_org_id: i32,
     github_team_id: i32,