diff --git a/controllers/controller.go b/controllers/controller.go index 1350e37d..de3f3d77 100644 --- a/controllers/controller.go +++ b/controllers/controller.go @@ -27,8 +27,6 @@ var HttpHandlers = []interface{}{ extClientHandlers, ipHandlers, loggerHandlers, - userGroupsHandlers, - networkUsersHandlers, } // HandleRESTRequests - handles the rest requests diff --git a/controllers/networkusers.go b/ee/ee_controllers/networkusers.go similarity index 99% rename from controllers/networkusers.go rename to ee/ee_controllers/networkusers.go index d2307e26..dcf6c8a6 100644 --- a/controllers/networkusers.go +++ b/ee/ee_controllers/networkusers.go @@ -1,4 +1,4 @@ -package controller +package ee_controllers import ( "encoding/json" @@ -14,7 +14,7 @@ import ( "github.com/gravitl/netmaker/models/promodels" ) -func networkUsersHandlers(r *mux.Router) { +func NetworkUsersHandlers(r *mux.Router) { r.HandleFunc("/api/networkusers", logic.SecurityCheck(true, http.HandlerFunc(getAllNetworkUsers))).Methods("GET") r.HandleFunc("/api/networkusers/{network}", logic.SecurityCheck(true, http.HandlerFunc(getNetworkUsers))).Methods("GET") r.HandleFunc("/api/networkusers/{network}/{networkuser}", logic.SecurityCheck(true, http.HandlerFunc(getNetworkUser))).Methods("GET") diff --git a/controllers/usergroups.go b/ee/ee_controllers/usergroups.go similarity index 97% rename from controllers/usergroups.go rename to ee/ee_controllers/usergroups.go index 4ade6f29..5c99f001 100644 --- a/controllers/usergroups.go +++ b/ee/ee_controllers/usergroups.go @@ -1,4 +1,4 @@ -package controller +package ee_controllers import ( "encoding/json" @@ -13,7 +13,7 @@ import ( "github.com/gravitl/netmaker/models/promodels" ) -func userGroupsHandlers(r *mux.Router) { +func UserGroupsHandlers(r *mux.Router) { r.HandleFunc("/api/usergroups", logic.SecurityCheck(true, http.HandlerFunc(getUserGroups))).Methods("GET") r.HandleFunc("/api/usergroups/{usergroup}", logic.SecurityCheck(true, http.HandlerFunc(createUserGroup))).Methods("POST") r.HandleFunc("/api/usergroups/{usergroup}", logic.SecurityCheck(true, http.HandlerFunc(deleteUserGroup))).Methods("DELETE") diff --git a/ee/initialize.go b/ee/initialize.go index 558f3715..bc25b3ae 100644 --- a/ee/initialize.go +++ b/ee/initialize.go @@ -17,7 +17,12 @@ import ( func InitEE() { setIsEnterprise() models.SetLogo(retrieveEELogo()) - controller.HttpHandlers = append(controller.HttpHandlers, ee_controllers.MetricHandlers) + controller.HttpHandlers = append( + controller.HttpHandlers, + ee_controllers.MetricHandlers, + ee_controllers.NetworkUsersHandlers, + ee_controllers.UserGroupsHandlers, + ) logic.EnterpriseCheckFuncs = append(logic.EnterpriseCheckFuncs, func() { // == License Handling == ValidateLicense()