Skip to content

chore: Restores changes from #4036 #4063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 30, 2025
Merged

chore: Restores changes from #4036 #4063

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 1 addition & 74 deletions internal/cli/root/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,11 @@ import (
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/homebrew"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/latestrelease"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/log"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/plugin"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/prerun"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/sighandle"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/telemetry"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/terminal"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/usage"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/validate"
"github.com/mongodb/mongodb-atlas-cli/atlascli/internal/version"
"github.com/spf13/afero"
"github.com/spf13/cobra"
Expand All @@ -88,18 +86,6 @@ type Notifier struct {
writer io.Writer
}

type AuthRequirements int64

const (
// NoAuth command does not require authentication.
NoAuth AuthRequirements = 0
// RequiredAuth command requires authentication.
RequiredAuth AuthRequirements = 1
// OptionalAuth command can work with or without authentication,
// and if access token is found, try to refresh it.
OptionalAuth AuthRequirements = 2
)

func handleSignal() {
sighandle.Notify(func(sig os.Signal) {
telemetry.FinishTrackingCommand(telemetry.TrackOptions{
Expand Down Expand Up @@ -150,29 +136,7 @@ Use the --help flag with any command for more info on that command.`,
config.SetService(config.CloudService)
}

authReq := shouldCheckCredentials(cmd)
if authReq == NoAuth {
return nil
}

if err := prerun.ExecuteE(
opts.InitFlow(config.Default()),
func() error {
err := opts.RefreshAccessToken(cmd.Context())
if err != nil && authReq == RequiredAuth {
return err
}
return nil
},
); err != nil {
return err
}

if authReq == RequiredAuth {
return validate.Credentials()
}

return nil
return prerun.ExecuteE(opts.InitFlow(config.Default()))
},
// PersistentPostRun only runs if the command is successful
PersistentPostRun: func(cmd *cobra.Command, _ []string) {
Expand Down Expand Up @@ -290,43 +254,6 @@ func shouldSetService(cmd *cobra.Command) bool {
return true
}

func shouldCheckCredentials(cmd *cobra.Command) AuthRequirements {
searchByName := []string{
"__complete",
"help",
}
for _, n := range searchByName {
if cmd.Name() == n {
return NoAuth
}
}
customRequirements := map[string]AuthRequirements{
fmt.Sprintf("%s %s", atlas, "completion"): NoAuth, // completion commands do not require credentials
fmt.Sprintf("%s %s", atlas, "config"): NoAuth, // user wants to set credentials
fmt.Sprintf("%s %s", atlas, "auth"): NoAuth, // user wants to set credentials
fmt.Sprintf("%s %s", atlas, "register"): NoAuth, // user wants to set credentials
fmt.Sprintf("%s %s", atlas, "login"): NoAuth, // user wants to set credentials
fmt.Sprintf("%s %s", atlas, "logout"): NoAuth, // user wants to set credentials
fmt.Sprintf("%s %s", atlas, "whoami"): NoAuth, // user wants to set credentials
fmt.Sprintf("%s %s", atlas, "setup"): NoAuth, // user wants to set credentials
fmt.Sprintf("%s %s", atlas, "register"): NoAuth, // user wants to set credentials
fmt.Sprintf("%s %s", atlas, "plugin"): NoAuth, // plugin functionality requires no authentication
fmt.Sprintf("%s %s", atlas, "quickstart"): NoAuth, // command supports login
fmt.Sprintf("%s %s", atlas, "deployments"): OptionalAuth, // command supports local and Atlas
}
for p, r := range customRequirements {
if strings.HasPrefix(cmd.CommandPath(), p) {
return r
}
}

if plugin.IsPluginCmd(cmd) || pluginCmd.IsFirstClassPluginCmd(cmd) {
return OptionalAuth
}

return RequiredAuth
}

func formattedVersion() string {
return fmt.Sprintf(verTemplate,
version.Version,
Expand Down
Loading