Revert "Add limited http handlers functionality to rest handler"

This reverts commit e2f1f28facaca54713db76a588839cd2733cf673.

controllers/controller.go

@@ -3,19 +3,19 @@ package controller
 import (
 	"context"
 	"fmt"
-	"github.com/gorilla/handlers"
 	"net/http"
 	"strings"
 	"sync"
 	"time"
 
+	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
 	"github.com/gravitl/netmaker/logger"
 	"github.com/gravitl/netmaker/servercfg"
 )
 
-// FullHttpHandlers - handler functions for REST interactions
-var FullHttpHandlers = []func(r *mux.Router){
+// HttpHandlers - handler functions for REST interactions
+var HttpHandlers = []interface{}{
 	nodeHandlers,
 	userHandlers,
 	networkHandlers,
@@ -30,13 +30,8 @@ var FullHttpHandlers = []func(r *mux.Router){
 	legacyHandlers,
 }
 
-// LimitedHttpHandlers - limited handler functions for REST interactions
-var LimitedHttpHandlers = []func(r *mux.Router){
-	serverHandlers,
-}
-
 // HandleRESTRequests - handles the rest requests
-func HandleRESTRequests(wg *sync.WaitGroup, ctx context.Context, httpHandlers []func(r *mux.Router)) {
+func HandleRESTRequests(wg *sync.WaitGroup, ctx context.Context) {
 	defer wg.Done()
 
 	r := mux.NewRouter()
@@ -47,8 +42,8 @@ func HandleRESTRequests(wg *sync.WaitGroup, ctx context.Context, httpHandlers []
 	originsOk := handlers.AllowedOrigins(strings.Split(servercfg.GetAllowedOrigin(), ","))
 	methodsOk := handlers.AllowedMethods([]string{http.MethodGet, http.MethodPut, http.MethodPost, http.MethodDelete})
 
-	for _, handler := range httpHandlers {
-		handler(r)
+	for _, handler := range HttpHandlers {
+		handler.(func(*mux.Router))(r)
 	}
 
 	port := servercfg.GetAPIPort()

ee/initialize.go

@@ -19,8 +19,8 @@ func InitEE() {
 	setIsEnterprise()
 	servercfg.Is_EE = true
 	models.SetLogo(retrieveEELogo())
-	controller.FullHttpHandlers = append(
-		controller.FullHttpHandlers,
+	controller.HttpHandlers = append(
+		controller.HttpHandlers,
 		ee_controllers.MetricHandlers,
 		ee_controllers.NetworkUsersHandlers,
 		ee_controllers.UserGroupsHandlers,

main.go

@@ -148,7 +148,7 @@ func startControllers(wg *sync.WaitGroup, ctx context.Context) {
 			}
 		}
 		wg.Add(1)
-		go controller.HandleRESTRequests(wg, ctx, controller.FullHttpHandlers)
+		go controller.HandleRESTRequests(wg, ctx)
 	}
 	//Run MessageQueue
 	if servercfg.IsMessageQueueBackend() {