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

Show file tree
Hide file tree
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
Change route /api-keys -> /users/{user}/keys
  • Loading branch information
@bryphe-coder
bryphe-coder committed Feb 17, 2022
commit ca1a4583889e849f5b5f86bc8dc8a53004e57cfd
14 changes: 5 additions & 9 deletions coderd/coderd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@ func New(options *Options) http.Handler {
})
r.Post("/login", api.postLogin)
r.Post("/logout", api.postLogout)
r.Route("/api-keys", func(r chi.Router) {
r.Use(
httpmw.ExtractAPIKey(options.Database, nil),
)
r.Post("/", api.postAPIKey)
})

// Used for setup.
r.Get("/user", api.user)
Expand All @@ -51,10 +45,12 @@ func New(options *Options) http.Handler {
httpmw.ExtractAPIKey(options.Database, nil),
)
r.Post("/", api.postUsers)
r.Group(func(r chi.Router) {

r.Route("/{user}", func(r chi.Router) {
r.Use(httpmw.ExtractUserParam(options.Database))
r.Get("/{user}", api.userByName)
r.Get("/{user}/organizations", api.organizationsByUser)
r.Get("/", api.userByName)
r.Get("/organizations", api.organizationsByUser)
r.Post("/keys", api.postKeyForUser)
})
})
r.Route("/projects", func(r chi.Router) {
Expand Down
15 changes: 11 additions & 4 deletions coderd/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,17 @@ func (api *api) postLogin(rw http.ResponseWriter, r *http.Request) {
})
}

// Creates a new API key, used for logging in via the CLI
func (api *api) postAPIKey(rw http.ResponseWriter, r *http.Request) {
// Creates a new session key, used for logging in via the CLI
func (api *api) postKeyForUser(rw http.ResponseWriter, r *http.Request) {
user := httpmw.UserParam(r)
apiKey := httpmw.APIKey(r)
userID := apiKey.UserID

if user.ID != apiKey.UserID {
httpapi.Write(rw, http.StatusUnauthorized, httpapi.Response{
Message: "Keys can only be generated for the authenticated user",
})
return
}

keyID, keySecret, err := generateAPIKeyIDSecret()
if err != nil {
Expand All @@ -333,7 +340,7 @@ func (api *api) postAPIKey(rw http.ResponseWriter, r *http.Request) {

_, err = api.Database.InsertAPIKey(r.Context(), database.InsertAPIKeyParams{
ID: keyID,
UserID: userID,
UserID: apiKey.UserID,
ExpiresAt: database.Now().AddDate(1, 0, 0), // Expire after 1 year (same as v1)
CreatedAt: database.Now(),
UpdatedAt: database.Now(),
Expand Down
2 changes: 1 addition & 1 deletion coderd/users_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func TestOrganizationsByUser(t *testing.T) {
require.Len(t, orgs, 1)
}

func TestPostAPIKey(t *testing.T) {
func TestPostKey(t *testing.T) {
t.Parallel()
t.Run("InvalidUser", func(t *testing.T) {
t.Parallel()
Expand Down
2 changes: 1 addition & 1 deletion codersdk/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func (c *Client) CreateUser(ctx context.Context, req coderd.CreateUserRequest) (

// CreateAPIKey calls the /api-key API
func (c *Client) CreateAPIKey(ctx context.Context) (*coderd.GenerateAPIKeyResponse, error) {
res, err := c.request(ctx, http.MethodPost, "/api/v2/api-keys", nil)
res, err := c.request(ctx, http.MethodPost, "/api/v2/users/me/keys", nil)
if err != nil {
return nil, err
}
Expand Down