Skip to content

feat(application): prompt user to log in and re-run command when login is required #692

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

Open
tronghn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(application): prompt user to log in and re-run command when login is required #692

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
29 changes: 27 additions & 2 deletions internal/application/application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import (
vulnerabilities "github.com/nais/cli/internal/vulnerability/command"
"github.com/nais/naistrix"
"github.com/pterm/pterm"
"golang.org/x/term"
)

type Application struct {
Expand Down Expand Up @@ -119,8 +120,32 @@ func Run(ctx context.Context, w io.Writer) error {

if err != nil {
if errors.Is(err, naisapi.ErrNeedsLogin) {
// TODO(tronghn): If tty; prompt for login (y/n)?
pterm.Error.Println("You are not logged in. Please run `nais auth login --nais` to authenticate.")
pterm.Println()
pterm.Warning.Println("You must (re-)authenticate to run this command.")

if !autoComplete && term.IsTerminal(int(os.Stdin.Fd())) {
pterm.Println()
result, _ := pterm.DefaultInteractiveConfirm.
WithDefaultValue(true).
Show("Would you like to log in and re-run the command?")

if result {
pterm.Println()
if err := naisapi.Login(ctx, naistrix.NewOutputWriter(w, &f.VerboseLevel)); err != nil {
return err
}

pterm.Println()
pterm.Info.Printf("Re-running command %s\n", executedCommand)

pterm.Println()
return app.Run(naistrix.RunWithContext(ctx))
}
}

pterm.Println()
pterm.Error.Println("Please run `nais auth login --nais` to (re-)authenticate.")
return nil
}

return err
Expand Down
Loading