cli · vilmibm · May 25, 2020 · Feb 24, 2020 · Feb 24, 2020 · Feb 24, 2020
diff --git a/api/client.go b/api/client.go
@@ -145,6 +145,41 @@ func (gr GraphQLErrorResponse) Error() string {
 	return fmt.Sprintf("graphql error: '%s'", strings.Join(errorMessages, ", "))
 }
 
+// Returns whether or not scopes are present, appID, and error
+func (c Client) HasScopes(wantedScopes ...string) (bool, string, error) {
+	url := "https://api.github.com/user"
+	req, err := http.NewRequest("GET", url, nil)
+	if err != nil {
+		return false, "", err
+	}
+
+	req.Header.Set("Content-Type", "application/json; charset=utf-8")
+
+	res, err := c.http.Do(req)
+	if err != nil {
+		return false, "", err
+	}
+	defer res.Body.Close()
+
+	appID := res.Header.Get("X-Oauth-Client-Id")
+	hasScopes := strings.Split(res.Header.Get("X-Oauth-Scopes"), ",")
+
+	found := 0
+	for _, s := range hasScopes {
+		for _, w := range wantedScopes {
+			if w == strings.TrimSpace(s) {
+				found++
+			}
+		}
+	}
+
+	if found == len(wantedScopes) {
+		return true, appID, nil
+	}
+
+	return false, appID, nil
+}
+
 // GraphQL performs a GraphQL request and parses the response
 func (c Client) GraphQL(query string, variables map[string]interface{}, data interface{}) error {
 	url := "https://api.github.com/graphql"

diff --git a/api/queries_gist.go b/api/queries_gist.go
@@ -0,0 +1,52 @@
+package api
+
+import (
+	"bytes"
+	"encoding/json"
+)
+
+// Gist represents a GitHub's gist.
+type Gist struct {
+	Description string                    `json:"description,omitempty"`
+	Public      bool                      `json:"public,omitempty"`
+	Files       map[GistFilename]GistFile `json:"files,omitempty"`
+	HTMLURL     string                    `json:"html_url,omitempty"`
+}
+
+type GistFilename string
+
+type GistFile struct {
+	Content string `json:"content,omitempty"`
+}
+
+// Create a gist for authenticated user.
+//
+// GitHub API docs: https://developer.github.com/v3/gists/#create-a-gist
+func GistCreate(client *Client, description string, public bool, files map[string]string) (*Gist, error) {
+	gistFiles := map[GistFilename]GistFile{}
+
+	for filename, content := range files {
+		gistFiles[GistFilename(filename)] = GistFile{content}
+	}
+
+	path := "gists"
+	body := &Gist{
+		Description: description,
+		Public:      public,
+		Files:       gistFiles,
+	}
+	result := Gist{}
+
+	requestByte, err := json.Marshal(body)
+	if err != nil {
+		return nil, err
+	}
+	requestBody := bytes.NewReader(requestByte)
+
+	err = client.REST("POST", path, requestBody, &result)
+	if err != nil {
+		return nil, err
+	}
+
+	return &result, nil
+}
diff --git a/command/gist.go b/command/gist.go
@@ -0,0 +1,150 @@
+package command
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"path"
+
+	"github.com/cli/cli/api"
+	"github.com/cli/cli/utils"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	RootCmd.AddCommand(gistCmd)
+	gistCmd.AddCommand(gistCreateCmd)
+	gistCreateCmd.Flags().StringP("desc", "d", "", "A description for this gist")
+	gistCreateCmd.Flags().BoolP("public", "p", false, "When true, the gist will be public and available for anyone to see (default: private)")
+}
+
+var gistCmd = &cobra.Command{
+	Use:   "gist",
+	Short: "Create gists",
+	Long:  `Work with GitHub gists.`,
+}
+
+var gistCreateCmd = &cobra.Command{
+	Use:   `create {<filename>|-}...`,
+	Short: "Create a new gist",
+	Long: `gh gist create: create gists
+
+Gists can be created from one or many files. This command can also read from STDIN. By default, gists are private; use --public to change this.
+
+Examples
+
+    gh gist create hello.py                   # turn file hello.py into a gist
+    gh gist create --public hello.py          # turn file hello.py into a public gist
+    gh gist create -d"a file!" hello.py       # turn file hello.py into a gist, with description
+    gh gist create hello.py world.py cool.txt # make a gist out of several files
+    gh gist create -                          # read from STDIN to create a gist
+    cat cool.txt | gh gist create             # read the output of another command and make a gist out of it
+`,
+	RunE: gistCreate,
+}
+
+type Opts struct {
+	Description string
+	Public      bool
+}
+
+func gistCreate(cmd *cobra.Command, args []string) error {
+	ctx := contextForCommand(cmd)
+	client, err := apiClientForContext(ctx)
+	if err != nil {
+		return err
+	}
+
+	// This performs a dummy query, checks what scopes we have, and then asks for a user to reauth
+	// with expanded scopes. it introduces latency whenever this command is run: a trade-off to avoid
+	// having every single user reauth as a result of this feature even if they never once use gists.
+	//
+	// In the future we'd rather have the ability to detect a "reauth needed" scenario and replay
+	// failed requests but some short spikes indicated that that would be a fair bit of work.
+	client, err = ensureScopes(ctx, client, "gist")
+	if err != nil {
+		return err
+	}
+
+	opts, err := processOpts(cmd)
+	if err != nil {
+		return fmt.Errorf("did not understand arguments: %w", err)
+	}
+
+	info, err := os.Stdin.Stat()
+	if err != nil {
+		return fmt.Errorf("failed to check STDIN: %w", err)
+	}
+	if (info.Mode() & os.ModeCharDevice) != os.ModeCharDevice {
+		args = append(args, "-")
+	}
+
+	files, err := processFiles(os.Stdin, args)
+	if err != nil {
+		return fmt.Errorf("failed to collect files for posting: %w", err)
+	}
+
+	errOut := colorableErr(cmd)
+	fmt.Fprintf(errOut, "%s Creating gist...\n", utils.Gray("-"))
+
+	gist, err := api.GistCreate(client, opts.Description, opts.Public, files)
+	if err != nil {
+		return fmt.Errorf("%s Failed to create gist: %w", utils.Red("X"), err)
+	}
+
+	fmt.Fprintf(errOut, "%s Created gist\n", utils.Green("✓"))
+
+	fmt.Fprintln(cmd.OutOrStdout(), gist.HTMLURL)
+
+	return nil
+}
+
+func processOpts(cmd *cobra.Command) (*Opts, error) {
+	description, err := cmd.Flags().GetString("desc")
+	if err != nil {
+		return nil, err
+	}
+
+	public, err := cmd.Flags().GetBool("public")
+	if err != nil {
+		return nil, err
+	}
+
+	return &Opts{
+		Description: description,
+		Public:      public,
+	}, err
+}
+
+func processFiles(stdin io.Reader, filenames []string) (map[string]string, error) {
+	fs := map[string]string{}
+
+	if len(filenames) == 0 {
+		return fs, errors.New("no filenames passed and nothing on STDIN")
+	}
+
+	for i, f := range filenames {
+		var filename string
+		var content []byte
+		var err error
+		if f == "-" {
+			filename = fmt.Sprintf("gistfile%d.txt", i)
+			content, err = ioutil.ReadAll(stdin)
+			if err != nil {
+				return fs, fmt.Errorf("failed to read from stdin: %w", err)
+			}
+		} else {
+			content, err = ioutil.ReadFile(f)
+			if err != nil {
+				return fs, fmt.Errorf("failed to read file %s: %w", f, err)
+			}
+			filename = path.Base(f)
+		}
+
+		fs[filename] = string(content)
+	}
+
+	return fs, nil
+}
diff --git a/command/gist_test.go b/command/gist_test.go
@@ -0,0 +1,52 @@
+package command
+
+import (
+	"bytes"
+	"encoding/json"
+	"io/ioutil"
+	"strings"
+	"testing"
+)
+
+func TestGistCreate(t *testing.T) {
+	initBlankContext("", "OWNER/REPO", "trunk")
+
+	http := initFakeHTTP()
+	http.StubResponse(200, bytes.NewBufferString(`
+	{
+		"html_url": "https://gist.github.com/aa5a315d61ae9438b18d"
+	}
+	`))
+
+	output, err := RunCommand(`gist create "../test/fixtures/gistCreate.json" -d "Gist description" --public`)
+	eq(t, err, nil)
+
+	bodyBytes, _ := ioutil.ReadAll(http.Requests[0].Body)
+	reqBody := struct {
+		Description string
+		Public      bool
+		Files       map[string]struct {
+			Content string
+		}
+	}{}
+
+	err = json.Unmarshal(bodyBytes, &reqBody)
+	if err != nil {
+		t.Fatalf("unexpected json error: %s", err)
+	}
+
+	eq(t, reqBody.Description, "Gist description")
+	eq(t, reqBody.Public, true)
+	eq(t, reqBody.Files["gistCreate.json"].Content, "{}")
+	eq(t, output.String(), "https://gist.github.com/aa5a315d61ae9438b18d\n")
+}
+
+func TestGistCreate_stdin(t *testing.T) {
+	fakeStdin := strings.NewReader("hey cool how is it going")
+	files, err := processFiles(fakeStdin, []string{"-"})
+	if err != nil {
+		t.Fatalf("unexpected error processing files: %s", err)
+	}
+
+	eq(t, files["gistfile0.txt"], "hey cool how is it going")
+}
diff --git a/command/root.go b/command/root.go
@@ -1,6 +1,7 @@
 package command
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -183,6 +184,49 @@ var apiClientForContext = func(ctx context.Context) (*api.Client, error) {
 	return api.NewClient(opts...), nil
 }
 
+var ensureScopes = func(ctx context.Context, client *api.Client, wantedScopes ...string) (*api.Client, error) {
+	hasScopes, appID, err := client.HasScopes(wantedScopes...)
+	if err != nil {
+		return client, err
+	}
+
+	if hasScopes {
+		return client, nil
+	}
+
+	if config.IsGitHubApp(appID) && utils.IsTerminal(os.Stdin) && utils.IsTerminal(os.Stderr) {
+		newToken, loginHandle, err := config.AuthFlow("Notice: additional authorization required")
+		if err != nil {
+			return client, err
+		}
+		cfg, err := ctx.Config()
+		if err != nil {
+			return client, err
+		}
+		_ = cfg.Set(defaultHostname, "oauth_token", newToken)
+		_ = cfg.Set(defaultHostname, "user", loginHandle)
+		// update config file on disk
+		err = cfg.Write()
+		if err != nil {
+			return client, err
+		}
+		// update configuration in memory
+		config.AuthFlowComplete()
+		reloadedClient, err := apiClientForContext(ctx)
+		if err != nil {
+			return client, err
+		}
+
+		return reloadedClient, nil
+	} else {
+		fmt.Fprintln(os.Stderr, fmt.Sprintf("Warning: gh now requires the `%s` OAuth scope(s).", wantedScopes))
+		fmt.Fprintln(os.Stderr, fmt.Sprintf("Visit https://github.com/settings/tokens and edit your token to enable %s", wantedScopes))
+		fmt.Fprintln(os.Stderr, "or generate a new token and paste it via `gh config set -h github.com oauth_token MYTOKEN`")
+		return client, errors.New("Unable to reauthenticate")
+	}
+
+}
+
 func apiVerboseLog() api.ClientOption {
 	logTraffic := strings.Contains(os.Getenv("DEBUG"), "api")
 	colorize := utils.IsTerminal(os.Stderr)

diff --git a/command/testing.go b/command/testing.go
@@ -96,6 +96,9 @@ func initBlankContext(cfg, repo, branch string) {
 
 func initFakeHTTP() *httpmock.Registry {
 	http := &httpmock.Registry{}
+	ensureScopes = func(ctx context.Context, client *api.Client, wantedScopes ...string) (*api.Client, error) {
+		return client, nil
+	}
 	apiClientForContext = func(context.Context) (*api.Client, error) {
 		return api.NewClient(api.ReplaceTripper(http)), nil
 	}

diff --git a/internal/config/config_setup.go b/internal/config/config_setup.go
@@ -41,7 +41,7 @@ func AuthFlow(notice string) (string, string, error) {
 		Hostname:     oauthHost,
 		ClientID:     oauthClientID,
 		ClientSecret: oauthClientSecret,
-		Scopes:       []string{"repo", "read:org"},
+		Scopes:       []string{"repo", "read:org", "gist"},
 		WriteSuccessHTML: func(w io.Writer) {
 			fmt.Fprintln(w, oauthSuccessPage)
 		},

diff --git a/test/fixtures/gistCreate.json b/test/fixtures/gistCreate.json
@@ -0,0 +1 @@
+{}