github: Adjust org_membership() to return Result<Option<_>, _>

We can handle the `NotFound` case inside the lib, to make it easier for users of the fn.

Author: Turbo87

crates/crates_io_github/src/lib.rs

@@ -39,7 +39,7 @@ pub trait GitHubClient: Send + Sync {
         org_id: i32,
         username: &str,
         auth: &AccessToken,
-    ) -> Result<GitHubOrgMembership>;
+    ) -> Result<Option<GitHubOrgMembership>>;
     async fn public_keys(&self, username: &str, password: &str) -> Result<Vec<GitHubPublicKey>>;
 }
 
@@ -135,12 +135,13 @@ impl GitHubClient for RealGitHubClient {
         org_id: i32,
         username: &str,
         auth: &AccessToken,
-    ) -> Result<GitHubOrgMembership> {
-        self.request(
-            &format!("/organizations/{org_id}/memberships/{username}"),
-            auth,
-        )
-        .await
+    ) -> Result<Option<GitHubOrgMembership>> {
+        let url = format!("/organizations/{org_id}/memberships/{username}");
+        match self.request(&url, auth).await {
+            Ok(membership) => Ok(Some(membership)),
+            Err(GitHubError::NotFound(_)) => Ok(None),
+            Err(err) => Err(err),
+        }
     }
 
     /// Returns the list of public keys that can be used to verify GitHub secret alert signatures

src/models/team.rs

@@ -213,14 +213,11 @@ async fn is_gh_org_owner(
     user: &User,
 ) -> Result<bool, GitHubError> {
     let token = AccessToken::new(user.gh_access_token.expose_secret().to_string());
-    match gh_client
+    let membership = gh_client
         .org_membership(org_id, &user.gh_login, &token)
-        .await
-    {
-        Ok(membership) => Ok(membership.state == "active" && membership.role == "admin"),
-        Err(GitHubError::NotFound(_)) => Ok(false),
-        Err(e) => Err(e),
-    }
+        .await?;
+
+    Ok(membership.is_some_and(|m| m.state == "active" && m.role == "admin"))
 }
 
 async fn team_with_gh_id_contains_user(

src/tests/util/github.rs

@@ -143,28 +143,28 @@ impl MockData {
         &self,
         org_id: i32,
         username: &str,
-    ) -> Result<GitHubOrgMembership, GitHubError> {
+    ) -> Result<Option<GitHubOrgMembership>, GitHubError> {
         let org = self
             .orgs
             .iter()
             .find(|org| org.id == org_id)
             .ok_or_else(not_found)?;
         if org.owners.contains(&username) {
-            Ok(GitHubOrgMembership {
+            Ok(Some(GitHubOrgMembership {
                 state: "active".into(),
                 role: "admin".into(),
-            })
+            }))
         } else if org
             .teams
             .iter()
             .any(|team| team.members.contains(&username))
         {
-            Ok(GitHubOrgMembership {
+            Ok(Some(GitHubOrgMembership {
                 state: "active".into(),
                 role: "member".into(),
-            })
+            }))
         } else {
-            Err(not_found())
+            Ok(None)
         }
     }
 }