feat: Login via CLI #298
Add login prompt for non-first-time-user case
- Loading branch information
commit 9ec938ec7bd58d4c50f9d05955c44c5be341bed8
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,20 +2,30 @@ package cli | |
|
|
||
| import ( | ||
| "fmt" | ||
| "io/ioutil" | ||
| "net/url" | ||
| "os/exec" | ||
| "os/user" | ||
| "runtime" | ||
| "strings" | ||
|
|
||
| "github.com/fatih/color" | ||
| "github.com/go-playground/validator/v10" | ||
| "github.com/manifoldco/promptui" | ||
| "github.com/pkg/browser" | ||
| "github.com/spf13/cobra" | ||
| "golang.org/x/xerrors" | ||
|
|
||
| "github.com/coder/coder/coderd" | ||
| "github.com/coder/coder/codersdk" | ||
| ) | ||
|
|
||
| const ( | ||
| goosWindows = "windows" | ||
| goosLinux = "linux" | ||
| goosDarwin = "darwin" | ||
| ) | ||
|
|
||
| func login() *cobra.Command { | ||
| return &cobra.Command{ | ||
| Use: "login <url>", | ||
|
|
@@ -116,21 +126,99 @@ func login() *cobra.Command { | |
| if err != nil { | ||
| return xerrors.Errorf("login with password: %w", err) | ||
| } | ||
|
|
||
| err = saveSessionToken(cmd, client, resp.SessionToken, serverURL) | ||
| if err != nil { | ||
| return xerrors.Errorf("save session token: %w", err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| authURL := *serverURL | ||
| authURL.Path = serverURL.Path + "/cli-auth" | ||
| if err := openURL(authURL.String()); err != nil { | ||
| _, _ = fmt.Fprintf(cmd.OutOrStdout(), "Open the following in your browser:\n\n\t%s\n\n", authURL.String()) | ||
| } else { | ||
| _, _ = fmt.Fprintf(cmd.OutOrStdout(), "Your browser has been opened to visit:\n\n\t%s\n\n", authURL.String()) | ||
| } | ||
|
|
||
| apiKey, err := prompt(cmd, &promptui.Prompt{ | ||
| Label: "Paste your token here:", | ||
| Validate: func(token string) error { | ||
| client.SessionToken = token | ||
| _, err := client.User(cmd.Context(), "me") | ||
| if err != nil { | ||
| return xerrors.New("That's not a valid token!") | ||
| } | ||
| return err | ||
| }, | ||
| }) | ||
| if err != nil { | ||
| return xerrors.Errorf("specify email prompt: %w", err) | ||
| } | ||
|
|
||
| err = saveSessionToken(cmd, client, apiKey, serverURL) | ||
| if err != nil { | ||
| return xerrors.Errorf("save session token after login: %w", err) | ||
| } | ||
|
|
||
| return nil | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func saveSessionToken(cmd *cobra.Command, client *codersdk.Client, sessionToken string, serverURL *url.URL) error { | ||
|
There was a problem hiding this comment. I'm hesitant to rip this into a distinct function. We already validate the "me" user request above, so feels like that should be reused. There was a problem hiding this comment. The alternative is to duplicate the persistence code both in the 'create initial user' and 'login' flows - inlined this function in 13696a7 Another thing we could consider is bringing the |
||
| // Login to get user data - verify it is OK before persisting | ||
| client.SessionToken = sessionToken | ||
| resp, err := client.User(cmd.Context(), "me") | ||
| if err != nil { | ||
| return xerrors.Errorf("get user: ", err) | ||
| } | ||
|
|
||
| config := createConfig(cmd) | ||
| err = config.Session().Write(sessionToken) | ||
| if err != nil { | ||
| return xerrors.Errorf("write session token: %w", err) | ||
| } | ||
| err = config.URL().Write(serverURL.String()) | ||
| if err != nil { | ||
| return xerrors.Errorf("write server url: %w", err) | ||
| } | ||
|
|
||
| _, _ = fmt.Fprintf(cmd.OutOrStdout(), "%s Welcome to Coder, %s! You're authenticated.\n", color.HiBlackString(">"), color.HiCyanString(resp.Username)) | ||
| return nil | ||
| } | ||
|
|
||
| // isWSL determines if coder-cli is running within Windows Subsystem for Linux | ||
| func isWSL() (bool, error) { | ||
| if runtime.GOOS == goosDarwin || runtime.GOOS == goosWindows { | ||
| return false, nil | ||
| } | ||
| data, err := ioutil.ReadFile("/proc/version") | ||
| if err != nil { | ||
| return false, xerrors.Errorf("read /proc/version: %w", err) | ||
| } | ||
| return strings.Contains(strings.ToLower(string(data)), "microsoft"), nil | ||
| } | ||
|
|
||
| // openURL opens the provided URL via user's default browser | ||
| func openURL(url string) error { | ||
| var cmd string | ||
| var args []string | ||
|
|
||
| wsl, err := isWSL() | ||
| if err != nil { | ||
| return xerrors.Errorf("test running Windows Subsystem for Linux: %w", err) | ||
| } | ||
|
|
||
| if wsl { | ||
| cmd = "cmd.exe" | ||
| args = []string{"/c", "start"} | ||
| url = strings.ReplaceAll(url, "&", "^&") | ||
| args = append(args, url) | ||
| return exec.Command(cmd, args...).Start() | ||
| } | ||
|
|
||
| return browser.OpenURL(url) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.