Recognize the write:org OAuth scope as satisfying read:org

mislav · mislav · commit 0be2033d5118 · 2021-02-15T17:52:41.000+01:00
If someone pastes a PAT with `write:org` scope, this avoids the error
complaining that the token doesn't have `read:org` permissions. On
GitHub, `write:org` implies `read:org`.
diff --git a/api/client.go b/api/client.go
@@ -216,7 +216,7 @@ func (c Client) HasMinimumScopes(hostname string) error {
 		missingScopes = append(missingScopes, "repo")
 	}
 
-	if !search["read:org"] && !search["admin:org"] {
+	if !search["read:org"] && !search["write:org"] && !search["admin:org"] {
 		missingScopes = append(missingScopes, "read:org")
 	}
 
diff --git a/api/client_test.go b/api/client_test.go
@@ -131,6 +131,11 @@ func Test_HasMinimumScopes(t *testing.T) {
 			header:  "repo, admin:org",
 			wantErr: "",
 		},
+		{
+			name:    "write:org satisfies read:org",
+			header:  "repo, write:org",
+			wantErr: "",
+		},
 		{
 			name:    "insufficient scope",
 			header:  "repo",

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ func (c Client) HasMinimumScopes(hostname string) error {`
`216`	`216`	`missingScopes = append(missingScopes, "repo")`
`217`	`217`	`}`
`218`	`218`
`219`		`- if !search["read:org"] && !search["admin:org"] {`
	`219`	`+ if !search["read:org"] && !search["write:org"] && !search["admin:org"] {`
`220`	`220`	`missingScopes = append(missingScopes, "read:org")`
`221`	`221`	`}`
`222`	`222`