fixed wrapError handlers (#81)

Author: maikelmclauflin

controllers/grants.go

@@ -53,13 +53,13 @@ func ClaimGrant(service *grant.Service) handlers.AppHandler {
 
 		body, err := ioutil.ReadAll(r.Body)
 		if err != nil {
-			return handlers.WrapError("Error reading body", err)
+			return handlers.WrapError(err, "Error reading body", 0)
 		}
 
 		var req grant.ClaimGrantRequest
 		err = json.Unmarshal(body, &req)
 		if err != nil {
-			return handlers.WrapError("Error unmarshalling body", err)
+			return handlers.WrapError(err, "Error unmarshalling body", 0)
 		}
 		_, err = govalidator.ValidateStruct(req)
 		if err != nil {
@@ -82,7 +82,7 @@ func ClaimGrant(service *grant.Service) handlers.AppHandler {
 			err = service.Claim(r.Context(), &req, grantID)
 			if err != nil {
 				// FIXME not all errors are 4xx
-				return handlers.WrapError("Error claiming grant", err)
+				return handlers.WrapError(err, "Error claiming grant", 0)
 			}
 		}
 
@@ -98,13 +98,13 @@ func RedeemGrants(service *grant.Service) handlers.AppHandler {
 
 		body, err := ioutil.ReadAll(r.Body)
 		if err != nil {
-			return handlers.WrapError("Error reading body", err)
+			return handlers.WrapError(err, "Error reading body", 0)
 		}
 
 		var req grant.RedeemGrantsRequest
 		err = json.Unmarshal(body, &req)
 		if err != nil {
-			return handlers.WrapError("Error unmarshalling body", err)
+			return handlers.WrapError(err, "Error unmarshalling body", 0)
 		}
 		_, err = govalidator.ValidateStruct(req)
 		if err != nil {
@@ -113,7 +113,7 @@ func RedeemGrants(service *grant.Service) handlers.AppHandler {
 
 		redeemedIDs, err := service.GetRedeemedIDs(r.Context(), req.Grants)
 		if err != nil {
-			return handlers.WrapError("Error checking grant redemption status", err)
+			return handlers.WrapError(err, "Error checking grant redemption status", 0)
 		}
 
 		if len(redeemedIDs) > 0 {
@@ -127,7 +127,7 @@ func RedeemGrants(service *grant.Service) handlers.AppHandler {
 		txInfo, err := service.Redeem(r.Context(), &req)
 		if err != nil {
 			// FIXME not all errors are 4xx
-			return handlers.WrapError("Error redeeming grant", err)
+			return handlers.WrapError(err, "Error redeeming grant", 0)
 		}
 
 		w.WriteHeader(http.StatusOK)

promotion/controllers.go

@@ -82,7 +82,7 @@ func GetAvailablePromotions(service *Service) handlers.AppHandler {
 
 		promotions, err := service.GetAvailablePromotions(r.Context(), id)
 		if err != nil {
-			return handlers.WrapError("Error getting available promotions", err)
+			return handlers.WrapError(err, "Error getting available promotions", 0)
 		}
 
 		w.WriteHeader(http.StatusOK)
@@ -110,13 +110,13 @@ func ClaimPromotion(service *Service) handlers.AppHandler {
 		limit := int64(1024 * 1024 * 10) // 10MiB
 		body, err := ioutil.ReadAll(io.LimitReader(r.Body, limit))
 		if err != nil {
-			return handlers.WrapError("Error reading body", err)
+			return handlers.WrapError(err, "Error reading body", 0)
 		}
 
 		var req ClaimRequest
 		err = json.Unmarshal(body, &req)
 		if err != nil {
-			return handlers.WrapError("Error unmarshalling body", err)
+			return handlers.WrapError(err, "Error unmarshalling body", 0)
 		}
 		_, err = govalidator.ValidateStruct(req)
 		if err != nil {
@@ -125,7 +125,7 @@ func ClaimPromotion(service *Service) handlers.AppHandler {
 
 		keyID, err := middleware.GetKeyID(r.Context())
 		if err != nil {
-			return handlers.WrapError("Error looking up http signature info", err)
+			return handlers.WrapError(err, "Error looking up http signature info", 0)
 		}
 		if req.PaymentID.String() != keyID {
 			return &handlers.AppError{
@@ -159,7 +159,7 @@ func ClaimPromotion(service *Service) handlers.AppHandler {
 
 		claimID, err := service.ClaimPromotionForWallet(r.Context(), pID, req.PaymentID, req.BlindedCreds)
 		if err != nil {
-			return handlers.WrapError("Error claiming promotion", err)
+			return handlers.WrapError(err, "Error claiming promotion", 0)
 		}
 
 		w.WriteHeader(http.StatusOK)
@@ -200,7 +200,7 @@ func GetClaim(service *Service) handlers.AppHandler {
 
 		claim, err := service.datastore.GetClaimCreds(id)
 		if err != nil {
-			return handlers.WrapError("Error getting claim", err)
+			return handlers.WrapError(err, "Error getting claim", 0)
 		}
 
 		if claim == nil {

utils/handlers/handlers.go

@@ -26,9 +26,16 @@ func (e AppError) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }
 
 // WrapError with an additional message as an AppError
-func WrapError(msg string, err error) *AppError {
+func WrapError(err error, msg string, code int) *AppError {
 	// FIXME err should probably be first
-	return &AppError{Error: err, Message: msg, Code: http.StatusBadRequest}
+	if code == 0 {
+		code = http.StatusBadRequest
+	}
+	return &AppError{
+		Error:   err,
+		Message: msg,
+		Code:    code,
+	}
 }
 
 // WrapValidationError from govalidator