8000 chore: More UI friendly errors by Emyrk · Pull Request #1994 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

chore: More UI friendly errors #1994

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 23 commits into from
Jun 3, 2022
Merged

chore: More UI friendly errors #1994

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
352b86a
chore: More UI friendly errors
Emyrk Jun 2, 2022
7f9b66a
chore: Update BE http errors to be ui friendly
Emyrk Jun 3, 2022
46b52d5
chore: More friendly errors as responses
Emyrk Jun 3, 2022
1592d08
Fix typo
Emyrk Jun 3, 2022
6b08a08
Add internal error to the cli
Emyrk Jun 3, 2022
1b3947f
Merge remote-tracking branch 'origin/main' into stevenmasley/ui_errors
Emyrk Jun 3, 2022
deb5cf1
Remove empty switch case
Emyrk Jun 3, 2022
5e34b5f
Update coderd/gitsshkey.go
Emyrk Jun 3, 2022
f355dff
Update coderd/gitsshkey.go
Emyrk Jun 3, 2022
6566e83
Update coderd/gitsshkey.go
Emyrk Jun 3, 2022
fed7b7f
Update coderd/gitsshkey.go
Emyrk Jun 3, 2022
5c4ec92
Update coderd/gitsshkey.go
Emyrk Jun 3, 2022
e373a06
Update coderd/httpapi/httpapi.go
Emyrk Jun 3, 2022
73ffa22
Rename "Internal" -> "Detail"
Emyrk Jun 3, 2022
5d59312
Rename "Errors" -> "Validations"
Emyrk Jun 3, 2022
a8e78bb
Fix proper captalization
Emyrk Jun 3, 2022
ee2f547
Fix typo
Emyrk Jun 3, 2022
4a5d03a
Fix accidental 'detail' 8000
Emyrk Jun 3, 2022
8259e51
Merge remote-tracking branch 'origin/main' into stevenmasley/ui_errors
Emyrk Jun 3, 2022
819f2e1
PR comments addressed
Emyrk Jun 3, 2022
1116f94
Linting changes
Emyrk Jun 3, 2022
102a01f
Fix test error asserts
Emyrk Jun 3, 2022
af169f0
Fix test error asserts
Emyrk Jun 3, 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
Fix typo
  • Loading branch information
@Emyrk
Emyrk committed Jun 3, 2022
commit 1592d082645e09371d6d3aaec631277c6d132d5e
26 changes: 13 additions & 13 deletions coderd/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func (api *API) users(rw http.ResponseWriter, r *http.Request) {
}
if err != nil {
httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
Message: "Internal error fetching users",
Message: "Internal error fetching users",
Internal: err.Error(),
})
return
Expand All @@ -173,7 +173,7 @@ func (api *API) users(rw http.ResponseWriter, r *http.Request) {
}
if err != nil {
httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
Message: "Internal error fetching user's organizations",
Message: "Internal error fetching user's organizations",
Internal: err.Error(),
})
return
Expand Down Expand Up @@ -228,7 +228,7 @@ func (api *API) postUser(rw http.ResponseWriter, r *http.Request) {
_, err = api.Database.GetOrganizationByID(r.Context(), createUser.OrganizationID)
if errors.Is(err, sql.ErrNoRows) {
httpapi.Write(rw, http.StatusNotFound, httpapi.Response{
Message: fmt.Sprintf("Organization does not exist with the provided id %q", createUser.OrganizationID)
Message: fmt.Sprintf("Organization does not exist with the provided id %q", createUser.OrganizationID),
})
return
}
Expand Down Expand Up @@ -264,7 +264,7 @@ func (api *API) userByName(rw http.ResponseWriter, r *http.Request) {

if err != nil {
httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
Message: "Internal error fetching user's organizations",
Message: "Internal error fetching user's organizations",
Internal: err.Error(),
})
return
Expand Down Expand Up @@ -305,7 +305,7 @@ func (api *API) putUserProfile(rw http.ResponseWriter, r *http.Request) {
}
if !errors.Is(err, sql.ErrNoRows) && isDifferentUser {
httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
Message: "Internal error fetching user",
Message: "Internal error fetching user",
Internal: err.Error(),
})
return
Expand All @@ -320,7 +320,7 @@ func (api *API) putUserProfile(rw http.ResponseWriter, r *http.Request) {

if err != nil {
httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
Message: "Internal error updating user",
Message: "Internal error updating user",
Internal: err.Error(),
})
return
Expand All @@ -329,7 +329,7 @@ func (api *API) putUserProfile(rw http.ResponseWriter, r *http.Request) {
organizationIDs, err := userOrganizationIDs(r.Context(), api, user)
if err != nil {
httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
Message: "Internal error fetching user's organizations user",
Message: "Internal error fetching user's organizations",
Internal: err.Error(),
})
return
Expand Down Expand Up @@ -371,7 +371,7 @@ func (api *API) putUserStatus(status database.UserStatus) func(rw http.ResponseW
organizations, err := userOrganizationIDs(r.Context(), api, user)
if err != nil {
httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
Message: "Internal error fetching user's organizations",
Message: "Internal error fetching user's organizations",
Internal: err.Error(),
})
return
Expand Down Expand Up @@ -417,7 +417,7 @@ func (api *API) putUserPassword(rw http.ResponseWriter, r *http.Request) {
ok, err := userpassword.Compare(string(user.HashedPassword), params.OldPassword)
if err != nil {
httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
Message: "Internal error with passwords",
Message: "Internal error with passwords",
Internal: err.Error(),
})
return
Expand All @@ -439,7 +439,7 @@ func (api *API) putUserPassword(rw http.ResponseWriter, r *http.Request) {
hashedPassword, err := userpassword.Hash(params.Password)
if err != nil {
httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
Message: "Internal error hashing new password",
Message: "Internal error hashing new password",
Internal: err.Error(),
})
return
Expand All @@ -450,7 +450,7 @@ func (api *API) putUserPassword(rw http.ResponseWriter, r *http.Request) {
})
if err != nil {
httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
Message: "Internal error updating user's password",
Message: "Internal error updating user's password",
Internal: err.Error(),
})
return
Expand All @@ -475,7 +475,7 @@ func (api *API) userRoles(rw http.ResponseWriter, r *http.Request) {
memberships, err := api.Database.GetOrganizationMembershipsByUserID(r.Context(), user.ID)
if err != nil {
httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
Message: "Internal error fetching user's organization memberships",
Message: "Internal error fetching user's organization memberships",
Internal: err.Error(),
})
return
Expand Down Expand Up @@ -542,7 +542,7 @@ func (api *API) putUserRoles(rw http.ResponseWriter, r *http.Request) {
organizationIDs, err := userOrganizationIDs(r.Context(), api, user)
if err != nil {
httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
Message: "Internal error fetching user's organizations",
Message: "Internal error fetching user's organizations",
Internal: err.Error(),
})
return
Expand Down
0