added web admin UI, improve the login flow

Author: dstpierre

cmd/config.go

@@ -10,12 +10,13 @@ import (
 func getPublicKey() (pubKey string, ok bool) {
 	pubKey = viper.GetString("pubKey")
 	if len(pubKey) == 0 {
-		fmt.Printf("%s\n", cldanger("cannot find pubKey in your .backend config file"))
-		fmt.Println("\nMake sure to get your StaticBackend public key and save it in a .backend YAML config file.")
+		fmt.Printf("%s\n", cldanger("cannot find pubKey in your .backend.yml config file"))
+		fmt.Println("\nMake sure to get your StaticBackend public key and save it in a .backend.yml YAML config file.")
 		fmt.Println("\nFor instance:")
 		fmt.Printf("\n\t%s: na1", clsecondary("region"))
 		fmt.Printf("\n\t%s: your-key-here", clsecondary("pubKey"))
 		fmt.Println("\nYou received your public key when you created your account via email.")
+		fmt.Printf("\n%s", clbold("use \"backend login --dev\" to work with the development server.\n\n"))
 		return
 	}
 
@@ -50,7 +51,7 @@ func setBackend() bool {
 
 	region := viper.GetString("region")
 	if len(region) == 0 {
-		region = "na1"
+		region = "dev"
 	}
 
 	backend.Region = region

cmd/dbCreate.go

@@ -43,7 +43,7 @@ $> backend db create tasks "{ name: \"task 1\", assign: \"dominic\", done: false
 
 		var doc map[string]interface{}
 
-		if err := json.Unmarshal([]byte(raw), &raw); err != nil {
+		if err := json.Unmarshal([]byte(raw), &doc); err != nil {
 			fmt.Printf("%s: %v\n", cldanger("An error occured"), err)
 			return
 		}

cmd/login.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/staticbackendhq/backend-go"
-	"golang.org/x/crypto/ssh/terminal"
 )
 
 // loginCmd represents the login command
@@ -20,37 +19,67 @@ var loginCmd = &cobra.Command{
 	
 You have to authenticate to manipulate your StaticBackend data.
 	
-We're saving your email/password in the .backend file, make sure to add it to your .gitignore file.
+We're saving your root token in the .backend.yml file, make sure to add it to your .gitignore file.
 	`, clbold(clsecondary("Login to your account"))),
 	Run: func(cmd *cobra.Command, args []string) {
-		if ok := setBackend(); !ok {
+		dev, err := cmd.Flags().GetBool("dev")
+		if err != nil {
+			fmt.Println(err)
 			return
 		}
+		pk := "dev-memory-pk"
+		region := "dev"
+		rtoken := "safe-to-use-in-dev-root-token"
+
+		if !dev {
+			var err error
+
+			reader := bufio.NewReader(os.Stdin)
+			fmt.Printf("%s\n", clsecondary("enter your Public Key: "))
+			pk, err = reader.ReadString('\n')
+			if err != nil {
+				fmt.Println("error: ", err)
+				return
+			}
+
+			pk = strings.Replace(pk, "\n", "", -1)
+
+			fmt.Printf("%s\n", clsecondary("enter host URL: "))
+			region, err = reader.ReadString('\n')
+			if err != nil {
+				fmt.Println("error: ", err)
+				return
+			}
+
+			region = strings.Replace(region, "\n", "", -1)
+
+			fmt.Printf("%s\n", clsecondary("enter your Root Token: "))
+			rtoken, err = reader.ReadString('\n')
+			if err != nil {
+				fmt.Println("error: ", err)
+				return
+			}
+
+			rtoken = strings.Replace(rtoken, "\n", "", -1)
 
-		reader := bufio.NewReader(os.Stdin)
-		fmt.Printf("%s\n", clsecondary("enter your email: "))
-		email, err := reader.ReadString('\n')
-		if err != nil {
-			fmt.Println("error: ", err)
-			return
 		}
 
-		email = strings.Replace(email, "\n", "", -1)
+		backend.PublicKey = pk
+		backend.Region = region
 
-		fmt.Printf("%s\n", clsecondary("enter your password: "))
-		pw, err := terminal.ReadPassword(0)
-		if err != nil {
-			fmt.Println("error: ", err)
+		// we use the SudoListRepositories as a root token validator
+		if _, err := backend.SudoListRepositories(rtoken); err != nil {
+			fmt.Println("invalid root token: ", err)
 			return
 		}
 
-		tok, err := backend.Login(email, string(pw))
-		if err != nil {
-			fmt.Printf("%s: %v\n", cldanger("an error occured"), err)
+		s := fmt.Sprintf("pubKey: %s\nregion: %s\nrootToken: %s", pk, region, rtoken)
+		if err := os.WriteFile(".backend.yml", []byte(s), 0660); err != nil {
+			fmt.Println("unable to save your credentials: ", err)
 			return
 		}
 
-		fmt.Println("token", tok)
+		fmt.Printf("%s\n\nYou're ready to use the CLI.", clsecondary("Your .backend.yml file has been setup."))
 	},
 }
 
@@ -65,5 +94,5 @@ func init() {
 
 	// Cobra supports local flags which will only run when this command
 	// is called directly, e.g.:
-	// loginCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+	loginCmd.Flags().Bool("dev", false, "Setup for local development credentials")
 }

cmd/root.go

@@ -12,7 +12,7 @@ import (
 
 const (
 	// Version is the current version of the CLI
-	Version = "v1.4.0"
+	Version = "v1.4.3"
 )
 
 var (
@@ -47,6 +47,10 @@ This CLI gives you the following functionalities:
 - A local development server: %s
 - Managing your backend resources: %s
 - Managing your account: %s
+
+Use "backend server" to start your local dev server.
+
+Use "backend login --dev" to automatically configure for local dev.
 	`,
 		clbold(clsecondary("StaticBackend CLI "+Version)),
 		clbold("backend server"),

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/spf13/cobra v1.1.1
 	github.com/spf13/viper v1.7.0
 	github.com/staticbackendhq/backend-go v1.4.0
-	github.com/staticbackendhq/core v1.4.0
+	github.com/staticbackendhq/core v1.4.3
 	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
 )
 

go.sum

@@ -372,8 +372,8 @@ github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM=
 github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/staticbackendhq/backend-go v1.4.0 h1:JnyCrw745c9CfAOH0R2GQRRFOL0x0DGjM0NN7zEDsFc=
 github.com/staticbackendhq/backend-go v1.4.0/go.mod h1:cGTVKFtNU2CJUXJ2LcyEeA3MlkSVqNm1YthY8jffl4Q=
-github.com/staticbackendhq/core v1.4.0 h1:mrNvQaQh41ZkdD2fc+16N5diIQH7PwaD84C5l03Gzts=
-github.com/staticbackendhq/core v1.4.0/go.mod h1:mAfNAZoS7Bf1h99tjcYvh0ruZ5IZdF7YlUY9JmqJ3Tg=
+github.com/staticbackendhq/core v1.4.3 h1:ZrvTtgqsxC7StDTPdnxONDv5R1+UMXZE/mec/6UUeSk=
+github.com/staticbackendhq/core v1.4.3/go.mod h1:mAfNAZoS7Bf1h99tjcYvh0ruZ5IZdF7YlUY9JmqJ3Tg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=