Merge pull request #24 from containerum/dev-v2.4

Dev v2.4

Author: MargoTuleninova

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "vendor/github.com/boltdb/bolt"]
 	path = vendor/github.com/boltdb/bolt
 	url = https://github.com/boltdb/bolt
-[submodule "vendor/github.com/howeyc/gopass"]
-	path = vendor/github.com/howeyc/gopass
-	url = https://github.com/howeyc/gopass
 [submodule "vendor/github.com/kardianos/osext"]
 	path = vendor/github.com/kardianos/osext
 	url = https://github.com/kardianos/osext

cmd/login.go

@@ -1,42 +1,35 @@
 package cmd
 
 import (
-	"fmt"
 	"regexp"
 
 	"github.com/containerum/chkit/chlib"
 
-	"os"
+	"strings"
 
-	"github.com/containerum/chkit/helpers"
+	"syscall"
 
-	"strings"
+	"bufio"
+	"os"
 
-	"github.com/howeyc/gopass"
 	"github.com/spf13/cobra"
+	"golang.org/x/crypto/ssh/terminal"
 )
 
 const emailRegex = "(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$)"
 
 var loginCmd = &cobra.Command{
 	Use:   "login",
 	Short: "Open session and set up token",
-	PreRun: func(cmd *cobra.Command, args []string) {
-		// Hidden password input works incorrect in Windows
-		if helpers.IsWindows() {
-			if !cmd.Flag("login").Changed || !cmd.Flag("password").Changed {
-				np.FEEDBACK.Println("Login and password must be specified")
-				cmd.Usage()
-				os.Exit(1)
-			}
-		}
-	},
 	Run: func(cmd *cobra.Command, args []string) {
 		isValidMail := regexp.MustCompile(emailRegex)
 		var email string
 		if !cmd.Flag("login").Changed {
 			np.FEEDBACK.Print("Enter your email: ")
-			fmt.Scan(&email)
+			var err error
+			email, err = bufio.NewReader(os.Stdin).ReadString('\n')
+			email = strings.TrimRight(email, "\r\n")
+			exitOnErr(err)
 		} else {
 			email = cmd.Flag("login").Value.String()
 		}
@@ -47,7 +40,8 @@ var loginCmd = &cobra.Command{
 		var password string
 		if !cmd.Flag("password").Changed {
 			np.FEEDBACK.Print("Enter your password: ")
-			passwordB, _ := gopass.GetPasswdMasked()
+			passwordB, err := terminal.ReadPassword(int(syscall.Stdin))
+			exitOnErr(err)
 			password = string(passwordB)
 		} else {
 			password = cmd.Flag("password").Value.String()