bridge: various improvement on the global token PR

1 files changed, 44 insertions, 7 deletions

diff --git a/commands/bridge_token_add.go b/commands/bridge_token_add.go
index 58e9f472..d2c697fa 100644
--- a/commands/bridge_token_add.go
+++ b/commands/bridge_token_add.go
@@ -1,37 +1,74 @@
 package commands
 
 import (
+	"bufio"
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/mattn/go-isatty"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
+	"github.com/MichaelMure/git-bug/bridge"
 	"github.com/MichaelMure/git-bug/bridge/core"
 )
 
 var (
-	bridgeTokenValue  string
 	bridgeTokenTarget string
 )
 
 func runBridgeTokenAdd(cmd *cobra.Command, args []string) error {
-	token := core.NewToken(bridgeTokenValue, bridgeTokenTarget)
+	var value string
+
+	if bridgeTokenTarget == "" {
+		return fmt.Errorf("token target is required")
+	}
+
+	if !core.TargetExist(bridgeTokenTarget) {
+		return fmt.Errorf("unknown target")
+	}
+
+	if len(args) == 1 {
+		value = args[0]
+	} else {
+		// Read from Stdin
+		if isatty.IsTerminal(os.Stdin.Fd()) {
+			fmt.Println("Enter the token:")
+		}
+		reader := bufio.NewReader(os.Stdin)
+		raw, err := reader.ReadString('\n')
+		if err != nil {
+			return fmt.Errorf("reading from stdin: %v", err)
+		}
+		value = strings.TrimSuffix(raw, "\n")
+	}
+
+	token := core.NewToken(value, bridgeTokenTarget)
 	if err := token.Validate(); err != nil {
 		return errors.Wrap(err, "invalid token")
 	}
 
-	return core.StoreToken(repo, token)
+	err := core.StoreToken(repo, token)
+	if err != nil {
+		return err
+	}
+
+	fmt.Printf("token %s added\n", token.ID())
+	return nil
 }
 
 var bridgeTokenAddCmd = &cobra.Command{
 	Use:     "add",
-	Short:   "Create and store a new token",
+	Short:   "Store a new token",
 	PreRunE: loadRepo,
 	RunE:    runBridgeTokenAdd,
-	Args:    cobra.NoArgs,
+	Args:    cobra.MaximumNArgs(1),
 }
 
 func init() {
 	bridgeTokenCmd.AddCommand(bridgeTokenAddCmd)
-	bridgeTokenAddCmd.Flags().StringVarP(&bridgeTokenValue, "value", "v", "", "")
-	bridgeTokenAddCmd.Flags().StringVarP(&bridgeTokenTarget, "target", "t", "", "")
+	bridgeTokenAddCmd.Flags().StringVarP(&bridgeTokenTarget, "target", "t", "",
+		fmt.Sprintf("The target of the bridge. Valid values are [%s]", strings.Join(bridge.Targets(), ",")))
 	bridgeTokenAddCmd.Flags().SortFlags = false
 }