Skip to content

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.

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 19 commits into from
Feb 18, 2022
Merged

feat: Login via CLI #298

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6c50b85
Create initial route for generating an API key
bryphe-coder Feb 16, 2022
fe55c73
Add cli-auth page
bryphe-coder Feb 16, 2022
3bb3164
Fix lint warnings
bryphe-coder Feb 16, 2022
9ec938e
Add login prompt for non-first-time-user case
bryphe-coder Feb 16, 2022
87fc9e2
Add test case for login
bryphe-coder Feb 17, 2022
6607a5a
Factor out CliAuth token component
bryphe-coder Feb 17, 2022
0e323ce
Add storybook for CliAuthToken
bryphe-coder Feb 17, 2022
a33d2c7
Merge main
bryphe-coder Feb 17, 2022
9cc7e94
Add test case for CliAuthToken
bryphe-coder Feb 17, 2022
7774e29
Add codersdk function + test
bryphe-coder Feb 17, 2022
8ea2920
Fix lint issues
bryphe-coder Feb 17, 2022
669f2ca
Discard output of browser pkg
bryphe-coder Feb 17, 2022
0a43941
Merge main
bryphe-coder Feb 17, 2022
5ecba6d
Add mask for session token prompt
bryphe-coder Feb 17, 2022
13696a7
Inline saveSessionToken into both code paths
bryphe-coder Feb 17, 2022
dccb009
Move setting browser.Stderr/Stdout to init
bryphe-coder Feb 17, 2022
ca1a458
Change route /api-keys -> /users/{user}/keys
bryphe-coder Feb 17, 2022
b232d0c
Remove leftover saveSessionToken func
bryphe-coder Feb 17, 2022
0d829b3
Update route in UI for getting new token
bryphe-coder Feb 18, 2022
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
Prev Previous commit
Next Next commit
Inline saveSessionToken into both code paths
  • Loading branch information
@bryphe-coder
bryphe-coder committed Feb 17, 2022
commit 13696a7a663f7edb332615fdf7b57136352b1fba
47 changes: 25 additions & 22 deletions cli/login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,18 @@ func login() *cobra.Command {
return xerrors.Errorf("login with password: %w", err)
}

err = saveSessionToken(cmd, client, resp.SessionToken, serverURL)
sessionToken := resp.SessionToken
config := createConfig(cmd)
err = config.Session().Write(sessionToken)
if err != nil {
return xerrors.Errorf("save session token: %w", err)
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(username))
return nil
}

Expand All @@ -142,7 +149,7 @@ func login() *cobra.Command {
_, _ = 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{
sessionToken, err := prompt(cmd, &promptui.Prompt{
Label: "Paste your token here:",
Mask: '*',
Validate: func(token string) error {
Expand All @@ -158,35 +165,31 @@ func login() *cobra.Command {
return xerrors.Errorf("paste token prompt: %w", err)
}

err = saveSessionToken(cmd, client, apiKey, serverURL)
// 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("save session token after login: %w", err)
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
},
}
}

func saveSessionToken(cmd *cobra.Command, client *codersdk.Client, sessionToken string, serverURL *url.URL) error {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 "me" check above (since it's only required for initial login), and factor out the common save-session-token-and-url logic into this function. Happy with whichever you prefer.

// 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
}

Expand Down