# HG changeset patch # User Sascha L. Teichmann # Date 1532946731 -7200 # Node ID 02aaff4b4a66626f05544e291281e4f683e25689 # Parent d1b0d964af09b2ea20e40ff07827f28c633fed96# Parent 0b2d9f96ddb82ea769e5797b4f527a90bc12e3a3 Merged. diff -r 0b2d9f96ddb8 -r 02aaff4b4a66 controllers/routes.go --- a/controllers/routes.go Mon Jul 30 12:26:54 2018 +0200 +++ b/controllers/routes.go Mon Jul 30 12:32:11 2018 +0200 @@ -12,7 +12,10 @@ api := m.PathPrefix("/api").Subrouter() - sysAdmin := auth.EnsureRole("sys_admin") + var ( + sysAdmin = auth.EnsureRole("sys_admin") + all = auth.EnsureRole("sys_admin", "waterway_admin", "waterway_user") + ) api.Handle("/users", sysAdmin(&JSONHandler{ Handle: listUsers, @@ -23,11 +26,11 @@ Handle: createUser, })).Methods(http.MethodPost) - api.Handle("/users/{user}", sysAdmin(&JSONHandler{ + api.Handle("/users/{user}", all(&JSONHandler{ Handle: listUser, })).Methods(http.MethodGet) - api.Handle("/users/{user}", sysAdmin(&JSONHandler{ + api.Handle("/users/{user}", all(&JSONHandler{ Input: func() interface{} { return new(User) }, Handle: updateUser, })).Methods(http.MethodPut)