Updated endoint scopes

Author: djthorpe

pkg/handler/auth/endpoints.go

@@ -51,7 +51,6 @@ func (service *auth) AddEndpoints(ctx context.Context, r server.Router) {
 	// Scopes: write // TODO: Add scopes
 	// Description: Create a new token
 	r.AddHandlerFuncRe(ctx, reRoot, service.CreateToken, http.MethodPost).(router.Route).
-		SetScope(service.ScopeRead()...).
 		SetScope(service.ScopeWrite()...)
 
 	// Path: /<token-name>
@@ -66,7 +65,6 @@ func (service *auth) AddEndpoints(ctx context.Context, r server.Router) {
 	// Scopes: write // TODO: Add scopes
 	// Description: Delete or update a token
 	r.AddHandlerFuncRe(ctx, reToken, service.UpdateToken, http.MethodDelete, http.MethodPatch).(router.Route).
-		SetScope(service.ScopeRead()...).
 		SetScope(service.ScopeWrite()...)
 
 }

pkg/handler/nginx/endpoints.go

@@ -50,42 +50,48 @@ var (
 // PUBLIC METHODS - ENDPOINTS
 
 // Add endpoints to the router
-func (service *nginx) AddEndpoints(ctx context.Context, router server.Router) {
+func (service *nginx) AddEndpoints(ctx context.Context, r server.Router) {
 	// Path: /
 	// Methods: GET
-	// Scopes: read // TODO: Add scopes
+	// Scopes: read
 	// Description: Get nginx status (version, uptime, available and enabled configurations)
-	router.AddHandlerFuncRe(ctx, reRoot, service.GetHealth, http.MethodGet)
+	r.AddHandlerFuncRe(ctx, reRoot, service.GetHealth, http.MethodGet).(router.Route).
+		SetScope(service.ScopeRead()...)
 
 	// Path: /(test|reload|reopen)
 	// Methods: PUT
-	// Scopes: write // TODO: Add scopes
+	// Scopes: write
 	// Description: Test, reload and reopen nginx configuration
-	router.AddHandlerFuncRe(ctx, reAction, service.PutAction, http.MethodPut)
+	r.AddHandlerFuncRe(ctx, reAction, service.PutAction, http.MethodPut).(router.Route).
+		SetScope(service.ScopeWrite()...)
 
 	// Path: /config
 	// Methods: GET
-	// Scopes: read // TODO: Add scopes
+	// Scopes: read
 	// Description: Read the current set of configurations
-	router.AddHandlerFuncRe(ctx, reListConfig, service.ListConfig, http.MethodGet)
+	r.AddHandlerFuncRe(ctx, reListConfig, service.ListConfig, http.MethodGet).(router.Route).
+		SetScope(service.ScopeRead()...)
 
 	// Path: /config
 	// Methods: POST
-	// Scopes: read // TODO: Add scopes
+	// Scopes: write
 	// Description: Create a new configuration
-	router.AddHandlerFuncRe(ctx, reListConfig, service.CreateConfig, http.MethodPost)
+	r.AddHandlerFuncRe(ctx, reListConfig, service.CreateConfig, http.MethodPost).(router.Route).
+		SetScope(service.ScopeWrite()...)
 
 	// Path: /config/{id}
 	// Methods: GET
-	// Scopes: read // TODO: Add scopes
+	// Scopes: read
 	// Description: Read a configuration
-	router.AddHandlerFuncRe(ctx, reConfig, service.ReadConfig, http.MethodGet)
+	r.AddHandlerFuncRe(ctx, reConfig, service.ReadConfig, http.MethodGet).(router.Route).
+		SetScope(service.ScopeRead()...)
 
 	// Path: /config/{id}
 	// Methods: DELETE, POST, PATCH
-	// Scopes: write // TODO: Add scopes
+	// Scopes: write
 	// Description: Modify a configuration
-	router.AddHandlerFuncRe(ctx, reConfig, service.WriteConfig, http.MethodDelete, http.MethodPatch)
+	r.AddHandlerFuncRe(ctx, reConfig, service.WriteConfig, http.MethodDelete, http.MethodPatch).(router.Route).
+		SetScope(service.ScopeWrite()...)
 }
 
 ///////////////////////////////////////////////////////////////////////////////

pkg/handler/nginx/scope.go

@@ -0,0 +1,33 @@
+package nginx
+
+import (
+	// Packages
+	"github.com/mutablelogic/go-server/pkg/version"
+)
+
+////////////////////////////////////////////////////////////////////////////////
+// GLOBALS
+
+var (
+	// Prefix
+	scopePrefix = version.GitSource + "/scope/"
+)
+
+////////////////////////////////////////////////////////////////////////////////
+// PUBLIC METHODS
+
+func (nginx *nginx) ScopeRead() []string {
+	// Return read (list, get) scopes
+	return []string{
+		scopePrefix + nginx.Label() + "/read",
+		scopePrefix + defaultName + "/read",
+	}
+}
+
+func (nginx *nginx) ScopeWrite() []string {
+	// Return write (create, delete, update) scopes
+	return []string{
+		scopePrefix + nginx.Label() + "/write",
+		scopePrefix + defaultName + "/write",
+	}
+}