From a562a402938aa64318d300621098151edca993ec Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Fri, 12 Aug 2022 10:11:40 +0100 Subject: [PATCH] Tell me more about what went wrong --- clientapi/routing/admin.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/clientapi/routing/admin.go b/clientapi/routing/admin.go index 1cf0fb265..0c5f8c167 100644 --- a/clientapi/routing/admin.go +++ b/clientapi/routing/admin.go @@ -106,7 +106,10 @@ func AdminResetPassword(req *http.Request, cfg *config.ClientAPI, device *userap Password string `json:"password"` }{} if err := json.NewDecoder(req.Body).Decode(&request); err != nil { - return util.MessageResponse(http.StatusBadRequest, err.Error()) + return util.JSONResponse{ + Code: http.StatusBadRequest, + JSON: jsonerror.Unknown("Failed to decode request body: " + err.Error()), + } } if request.Password == "" { return util.JSONResponse{ @@ -121,7 +124,10 @@ func AdminResetPassword(req *http.Request, cfg *config.ClientAPI, device *userap } updateRes := &userapi.PerformPasswordUpdateResponse{} if err := userAPI.PerformPasswordUpdate(req.Context(), updateReq, updateRes); err != nil { - return util.MessageResponse(http.StatusBadRequest, err.Error()) + return util.JSONResponse{ + Code: http.StatusBadRequest, + JSON: jsonerror.Unknown("Failed to perform password update: " + err.Error()), + } } return util.JSONResponse{ Code: http.StatusOK,