GitHubClient: Extract team_membership() method

Author: Turbo87

src/github.rs

@@ -25,6 +25,20 @@ impl GitHubClient {
         self.request("/user", auth)
     }
 
+    pub fn team_membership(
+        &self,
+        org_id: i32,
+        team_id: i32,
+        username: &str,
+        auth: &AccessToken,
+    ) -> AppResult<GitHubTeamMembership> {
+        let url = format!(
+            "/organizations/{}/team/{}/memberships/{}",
+            org_id, team_id, username
+        );
+        self.request(&url, auth)
+    }
+
     /// Does all the nonsense for sending a GET to Github. Doesn't handle parsing
     /// because custom error-code handling may be desirable. Use
     /// `parse_github_response` to handle the "common" processing of responses.
@@ -92,6 +106,11 @@ pub struct GithubUser {
     pub name: Option<String>,
 }
 
+#[derive(Debug, Deserialize)]
+pub struct GitHubTeamMembership {
+    pub state: String,
+}
+
 pub fn team_url(login: &str) -> String {
     let mut login_pieces = login.split(':');
     login_pieces.next();

src/models/team.rs

@@ -225,21 +225,16 @@ fn team_with_gh_id_contains_user(
     // GET /organizations/:org_id/team/:team_id/memberships/:username
     // check that "state": "active"
 
-    #[derive(Deserialize)]
-    struct Membership {
-        state: String,
-    }
-
-    let url = format!(
-        "/organizations/{}/team/{}/memberships/{}",
-        &github_org_id, &github_team_id, &user.gh_login
-    );
     let token = AccessToken::new(user.gh_access_token.clone());
-    let membership = match app.github.request::<Membership>(&url, &token) {
-        // Officially how `false` is returned
-        Err(ref e) if e.is::<NotFound>() => return Ok(false),
-        x => x?,
-    };
+    let membership =
+        match app
+            .github
+            .team_membership(github_org_id, github_team_id, &user.gh_login, &token)
+        {
+            // Officially how `false` is returned
+            Err(ref e) if e.is::<NotFound>() => return Ok(false),
+            x => x?,
+        };
 
     // There is also `state: pending` for which we could possibly give
     // some feedback, but it's not obvious how that should work.