- Notifications
You must be signed in to change notification settings - Fork1k
feat: Login via CLI#298
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
19 commits Select commitHold shift + click to select a range
6c50b85 Create initial route for generating an API key
bryphe-coderfe55c73 Add cli-auth page
bryphe-coder3bb3164 Fix lint warnings
bryphe-coder9ec938e Add login prompt for non-first-time-user case
bryphe-coder87fc9e2 Add test case for login
bryphe-coder6607a5a Factor out CliAuth token component
bryphe-coder0e323ce Add storybook for CliAuthToken
bryphe-codera33d2c7 Merge main
bryphe-coder9cc7e94 Add test case for CliAuthToken
bryphe-coder7774e29 Add codersdk function + test
bryphe-coder8ea2920 Fix lint issues
bryphe-coder669f2ca Discard output of browser pkg
bryphe-coder0a43941 Merge main
bryphe-coder5ecba6d Add mask for session token prompt
bryphe-coder13696a7 Inline saveSessionToken into both code paths
bryphe-coderdccb009 Move setting browser.Stderr/Stdout to init
bryphe-coderca1a458 Change route /api-keys -> /users/{user}/keys
bryphe-coderb232d0c Remove leftover saveSessionToken func
bryphe-coder0d829b3 Update route in UI for getting new token
bryphe-coderFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
98 changes: 97 additions & 1 deletioncli/login.go
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,39 @@ 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" | ||
| goosDarwin = "darwin" | ||
| ) | ||
| func init() { | ||
| // Hide output from the browser library, | ||
| // otherwise we can get really verbose and non-actionable messages | ||
| // when in SSH or another type of headless session | ||
| // NOTE: This needs to be in `init` to prevent data races | ||
| // (multiple threads trying to set the global browser.Std* variables) | ||
| browser.Stderr = ioutil.Discard | ||
| browser.Stdout = ioutil.Discard | ||
| } | ||
| func login() *cobra.Command { | ||
| return &cobra.Command{ | ||
| Use: "login <url>", | ||
| @@ -116,8 +135,10 @@ func login() *cobra.Command { | ||
| if err != nil { | ||
| return xerrors.Errorf("login with password: %w", err) | ||
| } | ||
| sessionToken := resp.SessionToken | ||
| config := createConfig(cmd) | ||
| err = config.Session().Write(sessionToken) | ||
| if err != nil { | ||
| return xerrors.Errorf("write session token: %w", err) | ||
| } | ||
| @@ -130,7 +151,82 @@ func login() *cobra.Command { | ||
| 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()) | ||
| } | ||
| sessionToken, err := prompt(cmd, &promptui.Prompt{ | ||
| Label: "Paste your token here:", | ||
| Mask: '*', | ||
| Validate: func(token string) error { | ||
bryphe-coder marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| 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("paste token prompt: %w", err) | ||
| } | ||
| // 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: %w", 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(urlToOpen 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"} | ||
| urlToOpen = strings.ReplaceAll(urlToOpen, "&", "^&") | ||
| args = append(args, urlToOpen) | ||
| return exec.Command(cmd, args...).Start() | ||
| } | ||
| return browser.OpenURL(urlToOpen) | ||
| } | ||
58 changes: 58 additions & 0 deletionscli/login_test.go
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
9 changes: 6 additions & 3 deletionscoderd/coderd.go
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
49 changes: 49 additions & 0 deletionscoderd/users.go
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
27 changes: 27 additions & 0 deletionscoderd/users_test.go
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
14 changes: 14 additions & 0 deletionscodersdk/users.go
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
1 change: 1 addition & 0 deletionsgo.mod
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
1 change: 1 addition & 0 deletionsgo.sum
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
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
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.