Skip to content

auth init redux #43

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
sgsullivan merged 3 commits into from
Jun 23, 2020
Merged

auth init redux #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68e3f65
move auth init to go-prompt
sgsullivan Jun 20, 2020
8a8a672
rm debug
sgsullivan Jun 20, 2020
57344f7
force lowercase in auth add context, too
sgsullivan Jun 20, 2020
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
3 changes: 3 additions & 0 deletions cmd/authAddContext.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package cmd
import (
"fmt"
"os"
"strings"

"github.com/spf13/cobra"

Expand All @@ -38,6 +39,8 @@ Use this if you've already setup contexts with "auth init".`,
insecure, _ := cmd.Flags().GetBool("insecure")
timeout, _ := cmd.Flags().GetInt("timeout")

contextName = strings.ToLower(contextName)

file, err := getExpectedConfigPath()
if err != nil {
lwCliInst.Die(err)
Expand Down
205 changes: 64 additions & 141 deletions cmd/authInit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,15 @@ package cmd
import (
"bytes"
"fmt"
"io"
"os"
"strings"

"golang.org/x/crypto/ssh/terminal"

"github.com/spf13/cast"
"github.com/c-bata/go-prompt"
"github.com/spf13/cobra"

"github.com/liquidweb/liquidweb-cli/types/cmd"
"github.com/liquidweb/liquidweb-cli/types/errors"
"github.com/liquidweb/liquidweb-cli/utils"
"github.com/liquidweb/liquidweb-cli/validate"
)
Expand Down Expand Up @@ -65,218 +64,142 @@ func setAuthDataInteractively() error {
}

func fetchAuthDataInteractively() (writeConfig bool, err error) {
if !terminal.IsTerminal(0) || !terminal.IsTerminal(1) {
err = errorTypes.UnknownTerminal
return
}
oldState, termMakeErr := terminal.MakeRaw(0)
if termMakeErr != nil {
err = termMakeErr
return
}
defer terminal.Restore(0, oldState)
screen := struct {
io.Reader
io.Writer
}{os.Stdin, os.Stdout}
term := terminal.NewTerminal(screen, "")
term.SetPrompt(cast.ToString(term.Escape.Blue) + " > " + cast.ToString(term.Escape.Reset))

moreAdds := false

// warn before deleting config
var haveProceedAnswer bool
var (
moreAdds bool
haveProceedAnswer bool
)

for !haveProceedAnswer {
if _, err = term.Write([]byte("Warning: This will delete all auth contexts. Continue (yes/[no])?: ")); err != nil {
return
}
proceedBytes, readErr := term.ReadLine()
if readErr != nil {
err = readErr
return
}
proceedString := cast.ToString(proceedBytes)
if proceedString != "yes" && proceedString != "no" && proceedString != "" {
if _, err = term.Write([]byte("invalid input.\n")); err != nil {
return
f := func(d prompt.Document) []prompt.Suggest {
s := []prompt.Suggest{
{Text: "yes", Description: "delete all auth contexts"},
{Text: "no", Description: "keep my auth contexts and exit"},
}
continue
return prompt.FilterHasPrefix(s, d.GetWordBeforeCursor(), true)
}

if proceedString == "yes" {
fmt.Println("Warning: If you proceed, any set auth context will be deleted.")
fmt.Print("\nAre you sure? ")
answer := strings.ToLower(prompt.Input("> ", f, prompt.OptionShowCompletionAtStart()))
if answer == "yes" {
moreAdds = true
haveProceedAnswer = true
} else if proceedString == "" || proceedString == "no" {
} else if answer == "no" {
haveProceedAnswer = true
moreAdds = false
}
}

// return if user didnt acknowledge to proceed
if !moreAdds {
return
}

// create context add loop channels
userInputComplete := make(chan bool)
userInputError := make(chan error)
userInputExitEarly := make(chan bool)
userInputContext := make(chan cmdTypes.AuthContext)

if _, err = term.Write([]byte("\nTo exit early, type 'exit' or send EOF (ctrl+d)\n\n")); err != nil {
return
}
fmt.Println("\nTo exit early, type 'exit'\n")

// start context add loop
go func() {
WHILEMOREADDS:
for moreAdds {
var (
context cmdTypes.AuthContext
contextNameAnswer string
haveContextNameAnswer bool
usernameAnswer string
haveUsernameAnswer bool
passwordAnswer string
havePasswordAnswer bool
haveMakeCurrentContextAnswer bool
haveMoreContextsToAddAnswer bool
)

// context name
for !haveContextNameAnswer {
if _, err := term.Write([]byte("Name this context: ")); err != nil {
userInputError <- err
break WHILEMOREADDS
}
contextNameBytes, err := term.ReadLine()
if err != nil {
userInputError <- err
break WHILEMOREADDS
}
contextNameAnswer = cast.ToString(contextNameBytes)
if contextNameAnswer == "exit" {
fmt.Print("Name this context: ")
answer := strings.ToLower(prompt.Input("> ", func(d prompt.Document) (s []prompt.Suggest) { return }))
if answer == "exit" {
userInputExitEarly <- true
break WHILEMOREADDS
} else if contextNameAnswer == "" {
if _, err := term.Write([]byte("context name cannot be blank.\n")); err != nil {
userInputError <- err
break WHILEMOREADDS
}
} else {
} else if answer != "" {
haveContextNameAnswer = true
context.ContextName = contextNameAnswer
context.ContextName = answer
}
}

// username
for !haveUsernameAnswer {
if _, err := term.Write([]byte("LiquidWeb username: ")); err != nil {
userInputError <- err
break WHILEMOREADDS
}
usernameBytes, err := term.ReadLine()
if err != nil {
userInputError <- err
break WHILEMOREADDS
}
usernameAnswer = cast.ToString(usernameBytes)
if usernameAnswer == "exit" {
fmt.Print("LiquidWeb username: ")
answer := prompt.Input("> ", func(d prompt.Document) (s []prompt.Suggest) { return })
if answer == "exit" {
userInputExitEarly <- true
break WHILEMOREADDS
} else if usernameAnswer == "" {
if _, err := term.Write([]byte("username cannot be blank.\n")); err != nil {
userInputError <- err
break WHILEMOREADDS
}
} else {
} else if answer != "" {
haveUsernameAnswer = true
context.Username = usernameAnswer
context.Username = answer
}
}

// password
for !havePasswordAnswer {
passwordBytes, err := term.ReadPassword("LiquidWeb password: ")
fmt.Print("LiquidWeb password: ")
passwordBytes, err := terminal.ReadPassword(0)
if err != nil {
userInputError <- err
break WHILEMOREADDS
}
passwordAnswer = cast.ToString(passwordBytes)
if passwordAnswer == "exit" {
answer := string(passwordBytes)
if answer == "exit" {
userInputExitEarly <- true
break WHILEMOREADDS
} else if passwordAnswer == "" {
if _, err := term.Write([]byte("password cannot be blank.\n")); err != nil {
userInputError <- err
break WHILEMOREADDS
}
} else {
} else if answer != "" {
havePasswordAnswer = true
context.Password = passwordAnswer
context.Password = answer
}
fmt.Println("")
}

// make current context?
for !haveMakeCurrentContextAnswer {
if _, err := term.Write([]byte("Make current context? ([yes]/no)")); err != nil {
userInputError <- err
break WHILEMOREADDS
}
makeCurrentContextBytes, err := term.ReadLine()
if err != nil {
userInputError <- err
break WHILEMOREADDS
f := func(d prompt.Document) []prompt.Suggest {
s := []prompt.Suggest{
{Text: "yes", Description: "Make this my default context"},
{Text: "no", Description: "I will switch to this context when I need it"},
}
return prompt.FilterHasPrefix(s, d.GetWordBeforeCursor(), true)
}
makeCurrentContextString := cast.ToString(makeCurrentContextBytes)
if makeCurrentContextString == "exit" {
fmt.Print("Make current context? ")
answer := strings.ToLower(prompt.Input("> ", f, prompt.OptionShowCompletionAtStart()))
if answer == "yes" || answer == "no" {
haveMakeCurrentContextAnswer = true
if answer == "yes" {
context.CurrentContext = true
}
} else if answer == "exit" {
userInputExitEarly <- true
break WHILEMOREADDS
}
if makeCurrentContextString != "" && makeCurrentContextString != "yes" && makeCurrentContextString != "no" {
if _, err := term.Write([]byte("invalid input.\n")); err != nil {
userInputError <- err
break WHILEMOREADDS
}
continue
}

haveMakeCurrentContextAnswer = true
if makeCurrentContextString == "yes" || makeCurrentContextString == "" {
context.CurrentContext = true
}
}

// more contexts to add ?
for !haveMoreContextsToAddAnswer {
if _, err := term.Write([]byte("Add another context? (yes/[no]): ")); err != nil {
userInputError <- err
break WHILEMOREADDS
}
moreContextsBytes, err := term.ReadLine()
if err != nil {
userInputError <- err
break WHILEMOREADDS
}

answer := cast.ToString(moreContextsBytes)
if answer == "exit" {
userInputExitEarly <- true
break WHILEMOREADDS
}
if answer != "" && answer != "yes" && answer != "no" {
if _, err := term.Write([]byte("invalid input.\n")); err != nil {
userInputError <- err
break WHILEMOREADDS
f := func(d prompt.Document) []prompt.Suggest {
s := []prompt.Suggest{
{Text: "yes", Description: "I have more auth contexts to add"},
{Text: "no", Description: "I'm all done adding auth contexts"},
}
continue
return prompt.FilterHasPrefix(s, d.GetWordBeforeCursor(), true)
}

if answer == "no" || answer == "" {
fmt.Print("Add another context? ")
answer := strings.ToLower(prompt.Input("> ", f, prompt.OptionShowCompletionAtStart()))
if answer == "no" {
haveMoreContextsToAddAnswer = true
moreAdds = false
} else if answer == "yes" {
haveMoreContextsToAddAnswer = true
moreAdds = true
} else if answer == "exit" {
userInputExitEarly <- true
break WHILEMOREADDS
}

haveMoreContextsToAddAnswer = true
}

// when these defaults are unsuitable, see `auth update-context` to change it later
Expand Down
6 changes: 6 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,17 @@ module github.com/liquidweb/liquidweb-cli
go 1.13

require (
github.com/c-bata/go-prompt v0.2.3
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/liquidweb/go-lwApi v0.0.0-20190605172801-52a4864d2738
github.com/mattn/go-colorable v0.1.6 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/mattn/go-tty v0.0.3 // indirect
github.com/mitchellh/go-homedir v1.1.0
github.com/mitchellh/mapstructure v1.2.2
github.com/pelletier/go-toml v1.6.0 // indirect
github.com/pkg/term v0.0.0-20200520122047-c3ffed290a03 // indirect
github.com/securego/gosec v0.0.0-20200401082031-e946c8c39989 // indirect
github.com/spf13/afero v1.2.2 // indirect
github.com/spf13/cast v1.3.1
github.com/spf13/cobra v0.0.6
Expand Down
Loading