gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-08 04:46:45 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1758 from gravitl/refactor_ee_controllers

Browse source 
Refactor EE controllers
This commit is contained in:
dcarns 2022-11-26 10:11:16 -05:00 • committed by GitHub
commit f14f984a88
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/controller.go
View file

@ -27,8 +27,6 @@ var HttpHandlers = []interface{}{
extClientHandlers, extClientHandlers,
ipHandlers, ipHandlers,
loggerHandlers, loggerHandlers,
userGroupsHandlers,
networkUsersHandlers,
} }
// HandleRESTRequests - handles the rest requests // HandleRESTRequests - handles the rest requests

4
controllers/networkusers.go → ee/ee_controllers/networkusers.go
View file

@ -1,4 +1,4 @@
package controller package ee_controllers
import ( import (
"encoding/json" "encoding/json"
@ -14,7 +14,7 @@ import (
"github.com/gravitl/netmaker/models/promodels" "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", 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}", logic.SecurityCheck(true, http.HandlerFunc(getNetworkUsers))).Methods("GET")
r.HandleFunc("/api/networkusers/{network}/{networkuser}", logic.SecurityCheck(true, http.HandlerFunc(getNetworkUser))).Methods("GET") r.HandleFunc("/api/networkusers/{network}/{networkuser}", logic.SecurityCheck(true, http.HandlerFunc(getNetworkUser))).Methods("GET")

4
controllers/usergroups.go → ee/ee_controllers/usergroups.go
View file

@ -1,4 +1,4 @@
package controller package ee_controllers
import ( import (
"encoding/json" "encoding/json"
@ -13,7 +13,7 @@ import (
"github.com/gravitl/netmaker/models/promodels" "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", 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(createUserGroup))).Methods("POST")
r.HandleFunc("/api/usergroups/{usergroup}", logic.SecurityCheck(true, http.HandlerFunc(deleteUserGroup))).Methods("DELETE") r.HandleFunc("/api/usergroups/{usergroup}", logic.SecurityCheck(true, http.HandlerFunc(deleteUserGroup))).Methods("DELETE")

7
ee/initialize.go
View file

@ -17,7 +17,12 @@ import (
func InitEE() { func InitEE() {
setIsEnterprise() setIsEnterprise()
models.SetLogo(retrieveEELogo()) 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() { logic.EnterpriseCheckFuncs = append(logic.EnterpriseCheckFuncs, func() {
// == License Handling == // == License Handling ==
ValidateLicense() ValidateLicense()