Merge branch 'main' of github.com:fantasticrabbit/ClickupCLI into get…

…-list

README.md

@@ -10,7 +10,7 @@ export CLICKUP_CLIENT_SECRET=xxx
 export CLICKUP_PORT=9999
 ```
 
-## SET command
+### SET command
 
 1. You can optionally set the local host port with the set command:
 ```
@@ -22,6 +22,8 @@ clickup set --team=1234567
 ```
 1. Both parameters can be set in the same command, or provided as environment variables with the "CLICKUP_" prefix.
 
+1. You can additionally set the token manually (--token), to use a personal token or for environments without a browser
+
 ## Usage  
 
 ### Authentication

cmd/gettask.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"errors"
 	"fmt"
+	"log"
 	"strings"
 
 	"github.com/fantasticrabbit/ClickupCLI/internal"
@@ -33,7 +34,11 @@ var taskCmd = &cobra.Command{
 			TeamID:     viper.GetString("team"),
 			Subtasks:   viper.GetBool("subtasks"),
 		}
-		fmt.Println(string(t.GetJSON(t.BuildPath())))
+		x, err := internal.FormatJSON(string(t.GetJSON(t.BuildPath())))
+		if err != nil {
+			log.Fatalln(err)
+		}
+		fmt.Println(x, err)
 	},
 }
 

cmd/logout.go

@@ -13,7 +13,7 @@ var logoutCmd = &cobra.Command{
 	Long:  `logout allows the user to delete the access token for accessing a Clickup workspace`,
 	Run: func(cmd *cobra.Command, args []string) {
 		fmt.Println("deleted authentication token")
-		viper.Set("ctoken", "")
+		viper.Set("token", "")
 		viper.WriteConfigAs(config_file)
 	},
 }

cmd/root.go

@@ -62,12 +62,12 @@ func initConfig() {
 }
 
 func checkToken() {
-	if !viper.InConfig("ctoken") || viper.GetString("ctoken") == "" {
+	if !viper.InConfig("token") || viper.GetString("token") == "" {
 		token, err := internal.GetToken()
 		if err != nil {
 			log.Fatalln("auth failed")
 		}
-		viper.Set("cToken", token)
+		viper.Set("Token", token)
 		viper.WriteConfigAs(config_file)
 	}
 }

cmd/set.go

@@ -20,7 +20,7 @@ var setCmd = &cobra.Command{
 		return nil
 	},
 	Run: func(cmd *cobra.Command, args []string) {
-		keys := []string{"team", "port"}
+		keys := []string{"team", "port", "token"}
 		for _, key := range keys {
 			x, _ := cmd.Flags().GetString(key)
 			if x != "" {
@@ -37,4 +37,5 @@ func init() {
 	rootCmd.AddCommand(setCmd)
 	setCmd.Flags().StringP("team", "", "", "set the Team ID")
 	setCmd.Flags().StringP("port", "", "", "set the Redirect URL Port number")
+	setCmd.Flags().StringP("token", "", "", "set the Auth Token manually")
 }

internal/requester.go

@@ -1,6 +1,8 @@
 package internal
 
 import (
+	"bytes"
+	"encoding/json"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -29,10 +31,8 @@ func init() {
 
 //Gets JSON data for any struct that implements Requester interface
 func getJSON(apiPath string) []byte {
-	token := viper.GetString("ctoken")
 	req, _ := http.NewRequest(http.MethodGet, apiPath, nil)
-
-	req.Header.Add("Authorization", token)
+	req.Header.Add("Authorization", viper.GetString("token"))
 	req.Header.Add("Content-Type", "application/json")
 	resp, err := Client.Do(req)
 	if err != nil {
@@ -42,3 +42,11 @@ func getJSON(apiPath string) []byte {
 	resp_body, _ := ioutil.ReadAll(resp.Body)
 	return resp_body
 }
+
+func FormatJSON(str string) (string, error) {
+	var formattedJSON bytes.Buffer
+	if err := json.Indent(&formattedJSON, []byte(str), "", "    "); err != nil {
+		return "", err
+	}
+	return formattedJSON.String(), nil
+}