Use domains for tenant name in config.json and for display (#241)

* Use domains for tenant name in config.json and for display. Use first selection for `tenant use` if no selection is made. * One last spot using name
auth0 · Apr 9, 2021 · 6c80cc1 · 6c80cc1
1 parent d0c12b5
commit 6c80cc1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/internal/cli/cli.go b/internal/cli/cli.go
@@ -137,7 +137,7 @@ func (c *cli) setup(ctx context.Context) error {
 			Client:  http.DefaultClient,
 		}
 
-		res, err := tr.Refresh(ctx, t.Name)
+		res, err := tr.Refresh(ctx, t.Domain)
 		if err != nil {
 			// ask and guide the user through the login process:
 			c.renderer.Errorf("failed to renew access token, %s", err)
@@ -222,7 +222,7 @@ func (c *cli) addTenant(ten tenant) error {
 	// If there's no existing DefaultTenant yet, might as well set the
 	// first successfully logged in tenant during onboarding.
 	if c.config.DefaultTenant == "" {
-		c.config.DefaultTenant = ten.Name
+		c.config.DefaultTenant = ten.Domain
 	}
 
 	// If we're dealing with an empty file, we'll need to initialize this
@@ -231,7 +231,7 @@ func (c *cli) addTenant(ten tenant) error {
 		c.config.Tenants = map[string]tenant{}
 	}
 
-	c.config.Tenants[ten.Name] = ten
+	c.config.Tenants[ten.Domain] = ten
 
 	if err := c.persistConfig(); err != nil {
 		return fmt.Errorf("unexpected error persisting config: %w", err)
@@ -305,7 +305,7 @@ func (c *cli) setDefaultAppID(id string) error {
 
 	tenant.DefaultAppID = id
 
-	c.config.Tenants[tenant.Name] = tenant
+	c.config.Tenants[tenant.Domain] = tenant
 	if err := c.persistConfig(); err != nil {
 		return fmt.Errorf("Unexpected error persisting config: %w", err)
 	}
@@ -333,7 +333,7 @@ func (c *cli) setFirstCommandRun(clientID string, command string) error {
 		}
 	}
 
-	c.config.Tenants[tenant.Name] = tenant
+	c.config.Tenants[tenant.Domain] = tenant
 
 	if err := c.persistConfig(); err != nil {
 		return fmt.Errorf("Unexpected error persisting config: %w", err)

diff --git a/internal/cli/login.go b/internal/cli/login.go
@@ -62,11 +62,11 @@ func RunLogin(ctx context.Context, cli *cli, expired bool) error {
 	}
 
 	cli.renderer.Infof("Successfully logged in.")
-	cli.renderer.Infof("Tenant: %s\n", res.Tenant)
+	cli.renderer.Infof("Tenant: %s\n", res.Domain)
 
 	// store the refresh token
 	secretsStore := &auth.Keyring{}
-	err = secretsStore.Set(auth.SecretsNamespace, res.Tenant, res.RefreshToken)
+	err = secretsStore.Set(auth.SecretsNamespace, res.Domain, res.RefreshToken)
 	if err != nil {
 		// log the error but move on
 		cli.renderer.Warnf("Could not store the refresh token locally, please expect to login again once your access token expired. See https://github.com/auth0/auth0-cli/blob/main/KNOWN-ISSUES.md.")
@@ -84,12 +84,12 @@ func RunLogin(ctx context.Context, cli *cli, expired bool) error {
 		return fmt.Errorf("Unexpected error adding tenant to config: %w", err)
 	}
 
-	if cli.config.DefaultTenant != res.Tenant {
-		promptText := fmt.Sprintf("Your default tenant is %s. Do you want to change it to %s?", cli.config.DefaultTenant, res.Tenant)
+	if cli.config.DefaultTenant != res.Domain {
+		promptText := fmt.Sprintf("Your default tenant is %s. Do you want to change it to %s?", cli.config.DefaultTenant, res.Domain)
 		if confirmed := prompt.Confirm(promptText); !confirmed {
 			return nil
 		}
-		cli.config.DefaultTenant = res.Tenant
+		cli.config.DefaultTenant = res.Domain
 		if err := cli.persistConfig(); err != nil {
 			return fmt.Errorf("An error occurred while setting the default tenant: %w", err)
 		}

diff --git a/internal/cli/logout.go b/internal/cli/logout.go
@@ -31,7 +31,7 @@ func logoutCmd(cli *cli) *cobra.Command {
 
 				tenNames := make([]string, len(tens))
 				for i, t := range tens {
-					tenNames[i] = t.Name
+					tenNames[i] = t.Domain
 				}
 
 				input := prompt.SelectInput("tenant", "Tenant:", "Tenant to logout", tenNames, tenNames[0], true)
@@ -44,7 +44,7 @@ func logoutCmd(cli *cli) *cobra.Command {
 				if !ok {
 					return fmt.Errorf("Unable to find tenant %s; run 'auth0 tenants use' to see your configured tenants or run 'auth0 login' to configure a new tenant", requestedTenant)
 				}
-				selectedTenant = t.Name
+				selectedTenant = t.Domain
 			}
 
 			if err := cli.removeTenant(selectedTenant); err != nil {

diff --git a/internal/cli/tenants.go b/internal/cli/tenants.go
@@ -36,7 +36,7 @@ func listTenantCmd(cli *cli) *cobra.Command {
 
 			tenNames := make([]string, len(tens))
 			for i, t := range tens {
-				tenNames[i] = t.Name
+				tenNames[i] = t.Domain
 			}
 
 			cli.renderer.ShowTenants(tenNames)
@@ -66,10 +66,10 @@ func useTenantCmd(cli *cli) *cobra.Command {
 
 				tenNames := make([]string, len(tens))
 				for i, t := range tens {
-					tenNames[i] = t.Name
+					tenNames[i] = t.Domain
 				}
 
-				input := prompt.SelectInput("tenant", "Tenant:", "Tenant to activate", tenNames, "", true)
+				input := prompt.SelectInput("tenant", "Tenant:", "Tenant to activate", tenNames, tenNames[0], true)
 				if err := prompt.AskOne(input, &selectedTenant); err != nil {
 					return fmt.Errorf("An unexpected error occurred: %w", err)
 				}
@@ -79,7 +79,7 @@ func useTenantCmd(cli *cli) *cobra.Command {
 				if !ok {
 					return fmt.Errorf("Unable to find tenant %s; run 'auth0 tenants use' to see your configured tenants or run 'auth0 login' to configure a new tenant", requestedTenant)
 				}
-				selectedTenant = t.Name
+				selectedTenant = t.Domain
 			}
 
 			cli.config.DefaultTenant = selectedTenant