Mercurial > gemma

changeset 472:39b5deee8810

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replaced 'all' by 'any' in routes.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Thu, 23 Aug 2018 12:57:15 +0200
parents 1b08432a0e5d
children b2dea4e56ff1
files pkg/controllers/routes.go
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/controllers/routes.go	Thu Aug 23 10:11:50 2018 +0200
+++ b/pkg/controllers/routes.go	Thu Aug 23 12:57:15 2018 +0200
@@ -17,11 +17,11 @@
 
 	var (
 		sysAdmin = auth.EnsureRole("sys_admin")
-		all      = auth.EnsureRole("sys_admin", "waterway_admin", "waterway_user")
+		any      = auth.EnsureRole("sys_admin", "waterway_admin", "waterway_user")
 	)
 
 	// User management.
-	api.Handle("/users", all(&JSONHandler{
+	api.Handle("/users", any(&JSONHandler{
 		Handle: listUsers,
 	})).Methods(http.MethodGet)
 
@@ -30,11 +30,11 @@
 		Handle: createUser,
 	})).Methods(http.MethodPost)
 
-	api.Handle("/users/{user}", all(&JSONHandler{
+	api.Handle("/users/{user}", any(&JSONHandler{
 		Handle: listUser,
 	})).Methods(http.MethodGet)
 
-	api.Handle("/users/{user}", all(&JSONHandler{
+	api.Handle("/users/{user}", any(&JSONHandler{
 		Input:  func() interface{} { return new(models.User) },
 		Handle: updateUser,
 	})).Methods(http.MethodPut)
@@ -59,7 +59,7 @@
 		ModifyResponse: proxyModifyResponse("/api/external/"),
 	}
 
-	externalAuth := all(external)
+	externalAuth := any(external)
 
 	api.Handle("/external/{hash}/{url}", externalAuth).
 		Methods(
@@ -77,7 +77,7 @@
 		ModifyResponse: proxyModifyResponse("/api/internal/"),
 	}
 
-	internalAuth := all(
+	internalAuth := any(
 		middleware.ModifyQuery(internal, middleware.InjectUser))
 
 	api.Handle("/internal/{hash}/{url}", internalAuth).