Mercurial > gemma
diff pkg/controllers/user.go @ 4243:d776110b4db0 json-handler-middleware
Made the de-serialized input of the JSON handler accessible via the context of the request.
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Thu, 22 Aug 2019 10:54:08 +0200 |
| parents | 1458c9b0fdaa |
| children | 4394daeea96a |
line wrap: on
line diff
--- a/pkg/controllers/user.go Thu Aug 22 10:18:13 2019 +0200 +++ b/pkg/controllers/user.go Thu Aug 22 10:54:08 2019 +0200 @@ -97,9 +97,7 @@ (inkluding import errors) and details on the concerned import.`)) ) -func deleteUser( - _ interface{}, req *http.Request, -) (jr JSONResult, err error) { +func deleteUser(req *http.Request) (jr JSONResult, err error) { user := mux.Vars(req)["user"] if !models.UserName(user).IsValid() { @@ -148,10 +146,7 @@ return } -func updateUser( - input interface{}, - req *http.Request, -) (jr JSONResult, err error) { +func updateUser(req *http.Request) (jr JSONResult, err error) { user := models.UserName(mux.Vars(req)["user"]) if !user.IsValid() { @@ -159,7 +154,7 @@ return } - newUser := input.(*models.User) + newUser := JSONInput(req).(*models.User) var res sql.Result db := JSONConn(req) @@ -232,12 +227,9 @@ return } -func createUser( - input interface{}, - req *http.Request, -) (jr JSONResult, err error) { +func createUser(req *http.Request) (jr JSONResult, err error) { - user := input.(*models.User) + user := JSONInput(req).(*models.User) db := JSONConn(req) @@ -280,10 +272,7 @@ return } -func listUsers( - _ interface{}, - req *http.Request, -) (jr JSONResult, err error) { +func listUsers(req *http.Request) (jr JSONResult, err error) { var rows *sql.Rows @@ -318,10 +307,7 @@ return } -func listUser( - _ interface{}, - req *http.Request, -) (jr JSONResult, err error) { +func listUser(req *http.Request) (jr JSONResult, err error) { user := models.UserName(mux.Vars(req)["user"]) if !user.IsValid() { @@ -357,10 +343,7 @@ return } -func sendTestMail( - _ interface{}, - req *http.Request, -) (jr JSONResult, err error) { +func sendTestMail(req *http.Request) (jr JSONResult, err error) { user := models.UserName(mux.Vars(req)["user"]) if !user.IsValid() {