Merge pull request #23 from pavanka/emails

add multiple email support for account keys

Author: pavanka

config.go

@@ -45,6 +45,10 @@ type projectConfig struct {
 	// Currently jssdk version is the only
 	// project level config for Parse type.
 	Parse *parseProjectConfig `json:"parse,omitempty"`
+	// ParserEmail is an email id of the Parse developer.
+	// It is associated with this project.
+	// It is used to fetch appropriate credentials from netrc.
+	ParserEmail string `json:"email,omitempty"`
 }
 
 func getConfigFile(e *env) string {
@@ -168,6 +172,7 @@ func storeProjectConfig(e *env, c config) error {
 		}
 		lconf := &legacyConfig{Applications: p.Applications}
 		lconf.Global.ParseVersion = p.projectConfig.Parse.JSSDK
+		lconf.Global.ParserEmail = p.projectConfig.ParserEmail
 		return writeLegacyConfigFile(
 			lconf,
 			filepath.Join(e.Root, legacyConfigFile),

configure_cmd.go

@@ -8,7 +8,8 @@ import (
 )
 
 type configureCmd struct {
-	login login
+	login     login
+	isDefault bool
 }
 
 func (c *configureCmd) accountKey(e *env) error {
@@ -17,29 +18,61 @@ func (c *configureCmd) accountKey(e *env) error {
 		return err
 	}
 
-	credentials := credentials{token: token}
-	_, err = (&apps{login: login{credentials: credentials}}).restFetchApps(e)
+	email, err := c.login.authToken(e, token)
 	if err != nil {
-		if err == errAuth {
-			fmt.Fprintf(e.Err,
-				`Sorry, the account key you provided is not valid.
-Please follow instructions at %s to generate a new account key.
-`,
-				keysURL,
+		fmt.Fprintln(e.Err, "Could not store credentials. Please try again.\n")
+		return err
+	}
+
+	if c.isDefault {
+		email = ""
+	}
+
+	creds, _ := (&login{}).getTokenCredentials(e, email)
+	if creds != nil {
+		if c.isDefault {
+			fmt.Fprintln(
+				e.Err,
+				"Note: this operation will overwrite the default account key",
 			)
 		} else {
-			fmt.Fprintf(e.Err, "Unable to validate token with error:\n%s\n", err)
+			fmt.Fprintf(
+				e.Err,
+				`Note: this operation will overwrite the account key:
+ %q
+for email: %q
+`,
+				last4(token),
+				email,
+			)
 		}
-		return stackerr.New("Could not store credentials. Please try again.")
 	}
 
-	err = c.login.storeCredentials(e, &credentials)
+	err = c.login.storeCredentials(e, email, &credentials{token: token})
 	if err == nil {
 		fmt.Fprintln(e.Out, "Successfully stored credentials.")
 	}
 	return stackerr.Wrap(err)
 }
 
+func (c *configureCmd) parserEmail(e *env, args []string) error {
+	config, err := configFromDir(e.Root)
+	if err != nil {
+		return err
+	}
+	if len(args) != 1 {
+		return fmt.Errorf("Invalid args: %v, only an email argument is expected.", args)
+	}
+	config.getProjectConfig().ParserEmail = args[0]
+	err = storeProjectConfig(e, config)
+	if err != nil {
+		fmt.Fprintln(e.Err, "Could not set parser email for project.")
+		return err
+	}
+	fmt.Fprintf(e.Out, "Successfully configured email for current project to: %q\n", args[0])
+	return nil
+}
+
 func newConfigureCmd(e *env) *cobra.Command {
 	var c configureCmd
 
@@ -51,12 +84,25 @@ func newConfigureCmd(e *env) *cobra.Command {
 			c.Help()
 		},
 	}
-	cmd.AddCommand(&cobra.Command{
+
+	keyCmd := &cobra.Command{
 		Use:     "accountkey",
 		Short:   "Store Parse account key on machine",
 		Long:    "Stores Parse account key in ~/.parse/netrc.",
 		Run:     runNoArgs(e, c.accountKey),
 		Aliases: []string{"key"},
-	})
+	}
+	keyCmd.Flags().BoolVarP(&c.isDefault, "default", "d", c.isDefault,
+		"Make this token a system default")
+	cmd.AddCommand(keyCmd)
+
+	emailCmd := &cobra.Command{
+		Use:   "email",
+		Short: "Configures the parser email for this project",
+		Long:  "Configures the parser email for current project.",
+		Run:   runWithArgs(e, c.parserEmail),
+	}
+	cmd.AddCommand(emailCmd)
+
 	return cmd
 }

configure_cmd_test.go

@@ -2,17 +2,18 @@ package main
 
 import (
 	"io/ioutil"
+	"path/filepath"
 	"regexp"
 	"strings"
 	"testing"
 
 	"github.com/facebookgo/ensure"
 )
 
-func TestConfigureAcessToken(t *testing.T) {
+func TestConfigureAccessToken(t *testing.T) {
 	t.Parallel()
 
-	h, _ := newAppHarness(t)
+	h := newTokenHarness(t)
 	defer h.Stop()
 
 	c := configureCmd{login: login{tokenReader: strings.NewReader("")}}
@@ -26,11 +27,38 @@ Input your account key or press enter to generate a new one.
 Account Key: Successfully stored credentials.
 `)
 	h.env.In = ioutil.NopCloser(strings.NewReader("email\ninvalid\n"))
-	ensure.Err(t, c.accountKey(h.env), regexp.MustCompile("Please try again"))
+	ensure.Err(t, c.accountKey(h.env), regexp.MustCompile("is not valid"))
 	ensure.DeepEqual(t,
 		h.Err.String(),
-		`Sorry, the account key you provided is not valid.
-Please follow instructions at https://www.parse.com/account_keys to generate a new account key.
+		"Could not store credentials. Please try again.\n\n",
+	)
+}
+
+func TestParserEmail(t *testing.T) {
+	t.Parallel()
+
+	h := newTokenHarness(t)
+	h.makeEmptyRoot()
+	defer h.Stop()
+
+	var n newCmd
+	ensure.Nil(t, n.createConfigWithContent(filepath.Join(h.env.Root, parseLocal), "{}"))
+	ensure.Nil(t,
+		n.createConfigWithContent(
+			filepath.Join(h.env.Root, parseProject),
+			`{"project_type": 1}`,
+		),
+	)
+
+	var c configureCmd
+	ensure.Nil(t, c.parserEmail(h.env, []string{"email2"}))
+	ensure.DeepEqual(
+		t,
+		h.Out.String(),
+		`Successfully configured email for current project to: "email2"
 `,
 	)
+
+	ensure.Err(t, c.parserEmail(h.env, nil), regexp.MustCompile("Invalid args:"))
+	ensure.Err(t, c.parserEmail(h.env, []string{"a", "b"}), regexp.MustCompile("Invalid args:"))
 }

legacy_config.go

@@ -16,6 +16,7 @@ var legacyConfigFile = filepath.Join(configDir, "global.json")
 type legacyConfig struct {
 	Global struct {
 		ParseVersion string `json:"parseVersion,omitempty"`
+		ParserEmail  string `json:"email,omitempty"`
 	} `json:"global,omitempty"`
 	Applications map[string]*parseAppConfig `json:"applications,omitempty"`
 }

list_cmd.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"os"
 
 	"github.com/facebookgo/stackerr"
@@ -23,6 +24,7 @@ func (l *listCmd) printListOfApps(e *env) error {
 		return stackerr.Wrap(err)
 	}
 	config.pprintApps(e)
+	fmt.Fprintln(e.Out, "")
 	return nil
 }