From d9d9fbe9db5de80c8e995bfa1c3a865d589566c2 Mon Sep 17 00:00:00 2001 From: ramya18101 Date: Thu, 20 Nov 2025 11:00:09 +0530 Subject: [PATCH] Enhance login process by prompting for default tenant domain --- internal/cli/cli.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/internal/cli/cli.go b/internal/cli/cli.go index 8ef80e8ec..a6634aff3 100644 --- a/internal/cli/cli.go +++ b/internal/cli/cli.go @@ -15,6 +15,7 @@ import ( "github.com/auth0/auth0-cli/internal/config" "github.com/auth0/auth0-cli/internal/display" "github.com/auth0/auth0-cli/internal/iostream" + "github.com/auth0/auth0-cli/internal/prompt" ) const userAgent = "Auth0 CLI" @@ -92,7 +93,7 @@ func (c *cli) setupWithAuthentication(ctx context.Context) error { "secret in the keyring.\n\n"+ "Please re-authenticate by running: %s", err, - ansi.Bold("auth0 login --domain --client-secret "), + ansi.Bold("auth0 login --domain --client-id --client-secret "), ) return errorMessage } @@ -100,7 +101,15 @@ func (c *cli) setupWithAuthentication(ctx context.Context) error { c.renderer.Warnf("Failed to renew access token: %s", err) c.renderer.Warnf("Please log in to re-authorize the CLI.\n") - tenant, err = RunLoginAsUser(ctx, c, tenant.GetExtraRequestedScopes(), "") + // Determine tenant domain for login. + tenantDomain := "" + if c.Config.DefaultTenant != "" { + if prompt.Confirm(fmt.Sprintf("Continue login with default tenant '%s'?", c.Config.DefaultTenant)) { + tenantDomain = c.Config.DefaultTenant + } + } + + tenant, err = RunLoginAsUser(ctx, c, tenant.GetExtraRequestedScopes(), tenantDomain) if err != nil { return err }