feat(git):

- improve git communication
- fix authentication issues
- better information on task selection

Author: Aien Saidi

.github/workflows/go.yml

@@ -20,3 +20,4 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           goos: ${{ matrix.goos }}
           goarch: ${{ matrix.goarch }}
+          ldflags: -X "main.ClientId=${{ secrets.CLIENT_ID }}" -X "main.ClientSecret=${{ secrets.CLIENT_SECRET }}"

git.go

@@ -2,13 +2,14 @@ package main
 
 import (
 	"fmt"
+	"log"
+	"os/exec"
+	"strings"
+
 	"github.com/ddliu/go-httpclient"
 	"github.com/iancoleman/strcase"
 	"github.com/manifoldco/promptui"
 	"github.com/urfave/cli/v2"
-	"log"
-	"os/exec"
-	"strings"
 )
 
 type Task struct {
@@ -63,21 +64,8 @@ var GitCommand = &cli.Command{
 			return err
 		}
 
-		tokenRes, err := httpclient.Post("https://quire.io/oauth/token", map[string]string{
-			"grant_type":    "authorization_code",
-			"code":          conf.QuireAuthToken,
-			"client_id":     conf.ClientId,
-			"client_secret": conf.ClientSecret,
-		})
-		defer tokenRes.Body.Close()
-
-		bodyString, err := ReadBody(tokenRes)
-		if err != nil {
-			return err
-		}
-
 		httpclient.Defaults(httpclient.Map{
-			"Authorization": fmt.Sprintf("%s %s", bodyString["token_type"], bodyString["access_token"]),
+			"Authorization": fmt.Sprintf("%s %s", conf.TokenType, conf.AccessToken),
 		})
 
 		projRes, err := httpclient.Get(fmt.Sprintf("https://quire.io/api/task/list/id/%s", c.String("projectId")))
@@ -149,8 +137,7 @@ var GitCommand = &cli.Command{
 {{ "Name:" }}	{{ .Name }}
 {{ "Id:" }}	{{ .Id }}
 {{ "Status:" }}	{{ .Status }}%
-{{ "Assigned to:" }}	{{ .ListAssignees }}
-{{ "Description:" }}	{{ .Description }}`,
+{{ "Assigned to:" }}	{{ .ListAssignees }}`,
 		}
 
 		prompt := promptui.Select{
@@ -175,16 +162,18 @@ var GitCommand = &cli.Command{
 
 		branchName := fmt.Sprintf("%s/%.0f-%s", strcase.ToKebab(task.ListAssignees()), task.Id, strcase.ToKebab(task.Name))
 
-		log.Printf("creating branch %q based on %q", branchName, c.String("projectId"))
+		log.Printf("creating branch %q based on %q", branchName, c.String("from"))
 
-		err = exec.Command("git", "checkout", "-b", branchName, c.String("projectId")).Run()
+		err = exec.Command("git", "checkout", "-b", branchName, c.String("from")).Run()
 		if err != nil {
+			log.Fatalln(err)
 			return err
 		}
 
 		log.Println("updating task status")
 		_, err = httpclient.PutJson(fmt.Sprintf("https://quire.io/api/task/id/%s/%.0f", c.String("projectId"), task.Id), `{"status": 15}`)
 		if err != nil {
+			log.Fatalln(err)
 			return err
 		}
 

go.mod

@@ -1,4 +1,4 @@
-module riant.jetbrains.space/p/services/code/lo-quire-cli
+module lo.jetbrains.space/p/services/code/lo-quire-cli
 
 go 1.14
 

main.go

@@ -2,22 +2,28 @@ package main
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
-	"github.com/ddliu/go-httpclient"
-	"github.com/urfave/cli/v2"
 	"log"
 	"net/http"
+	urllib "net/url"
 	"os"
 	"os/exec"
 	"runtime"
+
+	"github.com/ddliu/go-httpclient"
+	"github.com/urfave/cli/v2"
 )
 
 type Configuration struct {
-	QuireAuthToken string
-	ClientId       string
-	ClientSecret   string
+	AccessToken  string `json:"access_token"`
+	TokenType    string `json:"token_type"`
+	RefreshToken string `json:"refresh_token"`
 }
 
+var ClientId string
+var ClientSecret string
+
 func main() {
 
 	httpclient.Defaults(httpclient.Map{
@@ -33,27 +39,17 @@ func main() {
 				Email: "aien@lo.agency",
 			},
 		},
-		Version: "0.0.1",
+		Version: "0.0.2",
 		Commands: []*cli.Command{
 			GitCommand,
 			{
 				Name:  "authorize",
 				Usage: "Authorize the app to use Quire Boards",
-				Flags: []cli.Flag{
-					&cli.StringFlag{
-						Name:  "clientId",
-						Usage: "Quire client id",
-					},
-					&cli.StringFlag{
-						Name:  "clientSecret",
-						Usage: "Quire client secret",
-					},
-				},
 				Action: func(c *cli.Context) error {
 					var err error
 					var cmd *exec.Cmd
 
-					var url = fmt.Sprintf("https://quire.io/oauth?client_id=%s&redirect_uri=http://localhost:1992", c.String("clientId"))
+					var url = fmt.Sprintf("https://quire.io/oauth?client_id=%s&redirect_uri=http://localhost:1992", ClientId)
 
 					switch runtime.GOOS {
 					case "linux":
@@ -86,13 +82,31 @@ func main() {
 						// we only want the single item.
 						key := keys[0]
 
-						configuration := Configuration{
-							QuireAuthToken: key,
-							ClientSecret:   c.String("clientSecret"),
-							ClientId:       c.String("clientId"),
+						formData := urllib.Values{
+							"grant_type":    {"authorization_code"},
+							"code":          {key},
+							"client_id":     {ClientId},
+							"client_secret": {ClientSecret},
+						}
+
+						resp, err := http.PostForm("https://quire.io/oauth/token", formData)
+						if err != nil {
+							log.Fatalln(err)
 						}
 
-						err := SaveConfig(configuration)
+						var result Configuration
+
+						/*
+							{
+								"access_token":"ACCESS_TOKEN",
+								"token_type":"bearer",
+								"expires_in":2592000,
+								"refresh_token":"REFRESH_TOKEN"
+							}
+						*/
+						json.NewDecoder(resp.Body).Decode(&result)
+
+						err = SaveConfig(result)
 						if err != nil {
 							w.WriteHeader(http.StatusInternalServerError)
 							_, _ = w.Write([]byte(err.Error()))

util.go

@@ -2,12 +2,15 @@ package main
 
 import (
 	"encoding/json"
-	"github.com/ddliu/go-httpclient"
 	"io/ioutil"
 	"os/user"
 	"path"
+
+	"github.com/ddliu/go-httpclient"
 )
 
+const ConfigFileName = ".quirecli"
+
 func ReadBody(res *httpclient.Response) (map[string]interface{}, error) {
 	bodyBytes, err := ioutil.ReadAll(res.Body)
 	if err != nil {
@@ -49,7 +52,7 @@ func LoadConfig() (*Configuration, error) {
 		return nil, err
 	}
 
-	file, err := ioutil.ReadFile(path.Join(u.HomeDir, ".gitlo"))
+	file, err := ioutil.ReadFile(path.Join(u.HomeDir, ConfigFileName))
 	if err != nil {
 		return nil, err
 	}
@@ -75,6 +78,5 @@ func SaveConfig(configuration Configuration) error {
 		return err
 	}
 
-	return ioutil.WriteFile(path.Join(u.HomeDir, ".gitlo"), file, 0644)
+	return ioutil.WriteFile(path.Join(u.HomeDir, ConfigFileName), file, 0644)
 }
-