Skip to content

Commit 732b4b6

Browse files
authored
Merge pull request #156 from auth0/set-default-tenant
[CLI-68] add prompt for user to change default tenant after login
2 parents 36abf07 + 51e0982 commit 732b4b6

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

internal/cli/login.go

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"github.com/auth0/auth0-cli/internal/ansi"
99
"github.com/auth0/auth0-cli/internal/auth"
1010
"github.com/auth0/auth0-cli/internal/open"
11+
"github.com/auth0/auth0-cli/internal/prompt"
1112
"github.com/spf13/cobra"
1213
)
1314

@@ -62,12 +63,28 @@ func RunLogin(ctx context.Context, cli *cli, expired bool) error {
6263
cli.renderer.Infof("Successfully logged in.")
6364
cli.renderer.Infof("Tenant: %s\n", res.Tenant)
6465

65-
return cli.addTenant(tenant{
66+
err = cli.addTenant(tenant{
6667
Name: res.Tenant,
6768
Domain: res.Domain,
6869
AccessToken: res.AccessToken,
6970
ExpiresAt: time.Now().Add(
7071
time.Duration(res.ExpiresIn) * time.Second,
7172
),
7273
})
74+
if err != nil {
75+
return fmt.Errorf("Unexpected error adding tenant to config: %w", err)
76+
}
77+
78+
if cli.config.DefaultTenant != res.Tenant {
79+
promptText := fmt.Sprintf("Your default tenant is %s. Do you want to change it to %s?", cli.config.DefaultTenant, res.Tenant)
80+
if confirmed := prompt.Confirm(promptText); !confirmed {
81+
return nil
82+
}
83+
cli.config.DefaultTenant = res.Tenant
84+
if err := cli.persistConfig(); err != nil {
85+
return fmt.Errorf("An error occurred while setting the default tenant: %w", err)
86+
}
87+
}
88+
89+
return nil
7390
}

0 commit comments

Comments
 (0)