STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove OAuth scopes checking logic from ssh-key commands

Browse source 
Scopes checking is now handled on the HTTP client level for all commands.
This commit is contained in:
Mislav Marohnić 2021-10-14 18:36:55 +02:00
parent 693193fe84
commit 64a19ee71f
4 changed files with 2 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/cmd/ssh-key/add/add.go
View file

@ -85,12 +85,6 @@ func runAdd(opts *AddOptions) error {
err = SSHKeyUpload(httpClient, hostname, keyReader, opts.Title)
if err != nil {
if errors.Is(err, scopesError) {
cs := opts.IO.ColorScheme()
fmt.Fprint(opts.IO.ErrOut, "Error: insufficient OAuth scopes to list SSH keys\n")
fmt.Fprintf(opts.IO.ErrOut, "Run the following to grant scopes: %s\n", cs.Bold("gh auth refresh -s write:public_key"))
return cmdutil.SilentError
}
return err
}

6
pkg/cmd/ssh-key/add/http.go
View file

@ -12,8 +12,6 @@ import (
"github.com/cli/cli/v2/internal/ghinstance"
)
var scopesError = errors.New("insufficient OAuth scopes")
func SSHKeyUpload(httpClient *http.Client, hostname string, keyFile io.Reader, title string) error {
url := ghinstance.RESTPrefix(hostname) + "user/keys"
@ -43,9 +41,7 @@ func SSHKeyUpload(httpClient *http.Client, hostname string, keyFile io.Reader, t
}
defer resp.Body.Close()
if resp.StatusCode == 404 {
return scopesError
} else if resp.StatusCode > 299 {
if resp.StatusCode > 299 {
var httpError api.HTTPError
err := api.HandleHTTPError(resp)
if errors.As(err, &httpError) && isDuplicateError(&httpError) {

7
pkg/cmd/ssh-key/list/http.go
View file

@ -2,7 +2,6 @@ package list
import (
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"net/http"
@ -12,8 +11,6 @@ import (
"github.com/cli/cli/v2/internal/ghinstance"
)
var scopesError = errors.New("insufficient OAuth scopes")
type sshKey struct {
Key string
Title string
@ -37,9 +34,7 @@ func userKeys(httpClient *http.Client, host, userHandle string) ([]sshKey, error
}
defer resp.Body.Close()
if resp.StatusCode == 404 {
return nil, scopesError
} else if resp.StatusCode > 299 {
if resp.StatusCode > 299 {
return nil, api.HandleHTTPError(resp)
}

7
pkg/cmd/ssh-key/list/list.go
View file

@ -1,7 +1,6 @@
package list
import (
"errors"
"fmt"
"net/http"
"time"
@ -59,12 +58,6 @@ func listRun(opts *ListOptions) error {
sshKeys, err := userKeys(apiClient, host, "")
if err != nil {
if errors.Is(err, scopesError) {
cs := opts.IO.ColorScheme()
fmt.Fprint(opts.IO.ErrOut, "Error: insufficient OAuth scopes to list SSH keys\n")
fmt.Fprintf(opts.IO.ErrOut, "Run the following to grant scopes: %s\n", cs.Bold("gh auth refresh -s read:public_key"))
return cmdutil.SilentError
}
return err
}