Skip to content

chore: update v1 schema #643

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 3 commits into from
Apr 1, 2022
Merged

chore: update v1 schema #643

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f6e30f
chore: update v1 schema
coadler Mar 29, 2022
f1a33dc
remove extra columns
coadler Mar 30, 2022
da23bf5
only allow me on users
coadler Mar 31, 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
only allow me on users
  • Loading branch information
@coadler
coadler committed Apr 1, 2022
commit da23bf548aaeaf8d9a0b1d8fcfc036640fbbc3d0
2 changes: 1 addition & 1 deletion coderd/httpmw/httpmw.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func parseUUID(rw http.ResponseWriter, r *http.Request, param string) (uuid.UUID
}

// Automatically set uuid.Nil to the acting users id.
if rawID == "me" {
if param == UserKey && rawID == "me" {
key := APIKey(r)
return key.UserID, true
}
Expand Down
4 changes: 3 additions & 1 deletion coderd/httpmw/userparam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import (
"github.com/coder/coder/coderd/httpapi"
)

const UserKey = "user"

type userParamContextKey struct{}

// UserParam returns the user from the ExtractUserParam handler.
Expand All @@ -24,7 +26,7 @@ func UserParam(r *http.Request) database.User {
func ExtractUserParam(db database.Store) func(http.Handler) http.Handler {
return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
userID, ok := parseUUID(rw, r, "user")
userID, ok := parseUUID(rw, r, UserKey)
if !ok {
return
}
Expand Down