Refactor GitHub tools to use GraphQL for organization members and outside collaborators

- Updated GetOrgMembers to utilize GraphQL for fetching organization members with roles.
- Refactored ListOutsideCollaborators to use the GitHub API for listing outside collaborators.
- Improved error handling and response structures in both tools.
- Added tests for new GraphQL implementations and ensured compatibility with existing functionality.

Author: cointem

README.md

@@ -672,9 +672,9 @@ The following sets of tools are available:
   - No parameters required
 
 - **get_org_members** - Get organization members
+  - **Required OAuth Scopes**: `read:org`
+  - **Accepted OAuth Scopes**: `admin:org`, `read:org`, `write:org`
   - `org`: Organization login (owner) to get members for. (string, required)
-  - `page`: Page number for pagination (number, optional)
-  - `per_page`: Results per page (max 100) (number, optional)
   - `role`: Filter by role: all, admin, member (string, optional)
 
 - **get_team_members** - Get team members
@@ -689,9 +689,9 @@ The following sets of tools are available:
   - `user`: Username to get teams for. If not provided, uses the authenticated user. (string, optional)
 
 - **list_outside_collaborators** - List outside collaborators
+  - **Required OAuth Scopes**: `read:org`
+  - **Accepted OAuth Scopes**: `admin:org`, `read:org`, `write:org`
   - `org`: The organization name (string, required)
-  - `page`: Page number for pagination (number, optional)
-  - `per_page`: Results per page (max 100) (number, optional)
 
 </details>
 

go.mod

@@ -1,6 +1,8 @@
 module github.com/github/github-mcp-server
 
-go 1.24.0
+go 1.24.4
+
+toolchain go1.24.11
 
 require (
 	github.com/google/go-github/v79 v79.0.0
@@ -13,6 +15,12 @@ require (
 	github.com/stretchr/testify v1.11.1
 )
 
+require (
+	github.com/google/go-github/v73 v73.0.0 // indirect
+	github.com/gorilla/mux v1.8.1 // indirect
+	golang.org/x/time v0.11.0 // indirect
+)
+
 require (
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -27,6 +35,7 @@ require (
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/lithammer/fuzzysearch v1.1.8
 	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/migueleliasweb/go-github-mock v1.5.0
 	github.com/modelcontextprotocol/go-sdk v1.2.0
 	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect

go.sum

@@ -24,6 +24,8 @@ github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVI
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/go-github/v73 v73.0.0 h1:aR+Utnh+Y4mMkS+2qLQwcQ/cF9mOTpdwnzlaw//rG24=
+github.com/google/go-github/v73 v73.0.0/go.mod h1:fa6w8+/V+edSU0muqdhCVY7Beh1M8F1IlQPZIANKIYw=
 github.com/google/go-github/v79 v79.0.0 h1:MdodQojuFPBhmtwHiBcIGLw/e/wei2PvFX9ndxK0X4Y=
 github.com/google/go-github/v79 v79.0.0/go.mod h1:OAFbNhq7fQwohojb06iIIQAB9CBGYLq999myfUFnrS4=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
@@ -32,6 +34,8 @@ github.com/google/jsonschema-go v0.4.2 h1:tmrUohrwoLZZS/P3x7ex0WAVknEkBZM46iALbc
 github.com/google/jsonschema-go v0.4.2/go.mod h1:r5quNTdLOYEz95Ru18zA0ydNbBuYoo9tgaYcxEYhJVE=
 github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
 github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
+github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
+github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/josephburnett/jd v1.9.2 h1:ECJRRFXCCqbtidkAHckHGSZm/JIaAxS1gygHLF8MI5Y=
@@ -55,6 +59,8 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk=
 github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
+github.com/migueleliasweb/go-github-mock v1.5.0 h1:dIr6vgVz8QY9sDiDopWxk6pDw4d7K/xIcCk/NQe4ajM=
+github.com/migueleliasweb/go-github-mock v1.5.0/go.mod h1:/DUmhXkxrgVlDOVBqGoUXkV4w0ms5n1jDQHotYm135o=
 github.com/modelcontextprotocol/go-sdk v1.2.0 h1:Y23co09300CEk8iZ/tMxIX1dVmKZkzoSBZOpJwUnc/s=
 github.com/modelcontextprotocol/go-sdk v1.2.0/go.mod h1:6fM3LCm3yV7pAs8isnKLn07oKtB0MP9LHd3DfAcKw10=
 github.com/muesli/cache2go v0.0.0-20221011235721-518229cd8021 h1:31Y+Yu373ymebRdJN1cWLLooHH8xAr0MhKTEJGV/87g=
@@ -138,6 +144,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
 golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
+golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
+golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

pkg/github/__toolsnaps__/get_org_members.snap

@@ -1,7 +1,7 @@
 {
   "annotations": {
-    "title": "Get organization members",
-    "readOnlyHint": true
+    "readOnlyHint": true,
+    "title": "Get organization members"
   },
   "description": "Get member users of a specific organization. Returns a list of user objects with fields: login, id, avatar_url, type. Limited to organizations accessible with current credentials",
   "inputSchema": {
@@ -10,14 +10,6 @@
         "description": "Organization login (owner) to get members for.",
         "type": "string"
       },
-      "page": {
-        "description": "Page number for pagination",
-        "type": "number"
-      },
-      "per_page": {
-        "description": "Results per page (max 100)",
-        "type": "number"
-      },
       "role": {
         "description": "Filter by role: all, admin, member",
         "type": "string"

pkg/github/__toolsnaps__/list_outside_collaborators.snap

@@ -1,22 +1,14 @@
 {
   "annotations": {
-    "title": "List outside collaborators",
-    "readOnlyHint": true
+    "readOnlyHint": true,
+    "title": "List outside collaborators"
   },
   "description": "List all outside collaborators of an organization (users with access to organization repositories but not members).",
   "inputSchema": {
     "properties": {
       "org": {
         "description": "The organization name",
         "type": "string"
-      },
-      "page": {
-        "description": "Page number for pagination",
-        "type": "number"
-      },
-      "per_page": {
-        "description": "Results per page (max 100)",
-        "type": "number"
       }
     },
     "required": [