Skip to content

Commit

Permalink
fix: Send response with 404 status when quering non-exist account (#14)
Browse files Browse the repository at this point in the history
  • Loading branch information
kukugi authored and Sangyeop.lee committed Dec 8, 2020
1 parent 3d73f3e commit 6e253d5
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 9 deletions.
48 changes: 48 additions & 0 deletions types/rest/http_status_table.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package rest

//TODO : Intergrate http status mapping for every REST API
import (
"net/http"

"github.com/cosmos/cosmos-sdk/client/context"
"github.com/cosmos/cosmos-sdk/types/errors"
)

//HTTPStatusMappingTable is map to mapping an error type and a http status
type HTTPStatusMappingTable map[string]map[uint32]int

var (
table = HTTPStatusMappingTable{
errors.RootCodespace: {
9: http.StatusNotFound,
},
}
)

func parsingError(rawErr error) *errors.Error {
if rawErr == nil {
return nil
}
if err, ok := rawErr.(*context.Error); ok {
return errors.New(err.Codespace, err.Code, err.Message)
}
if err, ok := rawErr.(*errors.Error); ok {
return err
}
return errors.New(errors.UndefinedCodespace, 1, "internal")
}

//GetHTTPStatus is method to get http status for given error
func GetHTTPStatusWithError(err error) int {
abciErr := parsingError(err)
if abciErr == nil {
return http.StatusOK
}
result := http.StatusInternalServerError
if codeTable, ok := table[abciErr.Codespace()]; ok {
if status, ok := codeTable[abciErr.ABCICode()]; ok {
result = status
}
}
return result
}
11 changes: 2 additions & 9 deletions x/auth/client/rest/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,8 @@ func QueryAccountRequestHandlerFn(storeName string, cliCtx context.CLIContext) h

account, height, err := accGetter.GetAccountWithHeight(addr)
if err != nil {
// TODO: Handle more appropriately based on the error type.
// Ref: https://github.com/cosmos/cosmos-sdk/issues/4923
if err := accGetter.EnsureExists(addr); err != nil {
cliCtx = cliCtx.WithHeight(height)
rest.PostProcessResponse(w, cliCtx, types.BaseAccount{})
return
}

rest.WriteErrorResponse(w, http.StatusInternalServerError, err.Error())
httpStatus := rest.GetHTTPStatusWithError(err)
rest.WriteErrorResponse(w, httpStatus, err.Error())
return
}

Expand Down

0 comments on commit 6e253d5

Please sign in to comment.