Merge pull request #2965 from cli/writeorg-oauth-scope

Recognize the `write:org` OAuth scope as satisfying `read:org`
cli · Feb 17, 2021 · faa6981 · faa6981
2 parents 3a224b7 + 4a49e35
commit faa6981
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/pkg/cmd/auth/shared/oauth_scopes.go b/pkg/cmd/auth/shared/oauth_scopes.go
@@ -79,7 +79,7 @@ func HasMinimumScopes(httpClient httpClient, hostname, authToken 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/pkg/cmd/auth/shared/oauth_scopes_test.go b/pkg/cmd/auth/shared/oauth_scopes_test.go
@@ -31,6 +31,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",