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 Woosang Son committed Mar 19, 2021
1 parent ffc1a8b commit 4d92d7f
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 3 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/line/lbm-sdk/v2/client"
"github.com/line/lbm-sdk/v2/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.(client.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
}
4 changes: 1 addition & 3 deletions x/auth/client/rest/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,13 @@ func QueryAccountRequestHandlerFn(storeName string, clientCtx client.Context) ht

account, height, err := accGetter.GetAccountWithHeight(clientCtx, 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(clientCtx, addr); err != nil {
clientCtx = clientCtx.WithHeight(height)
rest.PostProcessResponse(w, clientCtx, types.BaseAccount{})
return
}

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

Expand Down

0 comments on commit 4d92d7f

Please sign in to comment.