Revert "Merge branch 'main' into feature/remote-debug"

This reverts commit 6d6333058c, reversing
changes made to 446aded1f7.

management/server/http/handlers/accounts/accounts_handler.go

@@ -11,11 +11,11 @@ import (
 
 	"github.com/netbirdio/netbird/management/server/account"
 	nbcontext "github.com/netbirdio/netbird/management/server/context"
-	"github.com/netbirdio/netbird/management/server/settings"
-	"github.com/netbirdio/netbird/management/server/types"
 	"github.com/netbirdio/netbird/shared/management/http/api"
 	"github.com/netbirdio/netbird/shared/management/http/util"
+	"github.com/netbirdio/netbird/management/server/settings"
 	"github.com/netbirdio/netbird/shared/management/status"
+	"github.com/netbirdio/netbird/management/server/types"
 )
 
 const (
@@ -198,7 +198,6 @@ func (h *handler) updateAccount(w http.ResponseWriter, r *http.Request) {
 	if req.Settings.Extra != nil {
 		settings.Extra = &types.ExtraSettings{
 			PeerApprovalEnabled:      req.Settings.Extra.PeerApprovalEnabled,
-			UserApprovalRequired:     req.Settings.Extra.UserApprovalRequired,
 			FlowEnabled:              req.Settings.Extra.NetworkTrafficLogsEnabled,
 			FlowGroups:               req.Settings.Extra.NetworkTrafficLogsGroups,
 			FlowPacketCounterEnabled: req.Settings.Extra.NetworkTrafficPacketCounterEnabled,
@@ -328,7 +327,6 @@ func toAccountResponse(accountID string, settings *types.Settings, meta *types.A
 	if settings.Extra != nil {
 		apiSettings.Extra = &api.AccountExtraSettings{
 			PeerApprovalEnabled:                settings.Extra.PeerApprovalEnabled,
-			UserApprovalRequired:               settings.Extra.UserApprovalRequired,
 			NetworkTrafficLogsEnabled:          settings.Extra.FlowEnabled,
 			NetworkTrafficLogsGroups:           settings.Extra.FlowGroups,
 			NetworkTrafficPacketCounterEnabled: settings.Extra.FlowPacketCounterEnabled,

management/server/http/handlers/accounts/accounts_handler_test.go

@@ -15,11 +15,11 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	nbcontext "github.com/netbirdio/netbird/management/server/context"
+	"github.com/netbirdio/netbird/shared/management/http/api"
 	"github.com/netbirdio/netbird/management/server/mock_server"
 	"github.com/netbirdio/netbird/management/server/settings"
-	"github.com/netbirdio/netbird/management/server/types"
-	"github.com/netbirdio/netbird/shared/management/http/api"
 	"github.com/netbirdio/netbird/shared/management/status"
+	"github.com/netbirdio/netbird/management/server/types"
 )
 
 func initAccountsTestData(t *testing.T, account *types.Account) *handler {

management/server/http/handlers/peers/peers_handler.go

@@ -488,33 +488,33 @@ func toPeerListItemResponse(peer *nbpeer.Peer, groupsInfo []api.GroupMinimum, dn
 	}
 
 	return &api.PeerBatch{
-		CreatedAt:                   peer.CreatedAt,
-		Id:                          peer.ID,
-		Name:                        peer.Name,
-		Ip:                          peer.IP.String(),
-		ConnectionIp:                peer.Location.ConnectionIP.String(),
-		Connected:                   peer.Status.Connected,
-		LastSeen:                    peer.Status.LastSeen,
-		Os:                          fmt.Sprintf("%s %s", peer.Meta.OS, osVersion),
-		KernelVersion:               peer.Meta.KernelVersion,
-		GeonameId:                   int(peer.Location.GeoNameID),
-		Version:                     peer.Meta.WtVersion,
-		Groups:                      groupsInfo,
-		SshEnabled:                  peer.SSHEnabled,
-		Hostname:                    peer.Meta.Hostname,
-		UserId:                      peer.UserID,
-		UiVersion:                   peer.Meta.UIVersion,
-		DnsLabel:                    fqdn(peer, dnsDomain),
-		ExtraDnsLabels:              fqdnList(peer.ExtraDNSLabels, dnsDomain),
-		LoginExpirationEnabled:      peer.LoginExpirationEnabled,
-		LastLogin:                   peer.GetLastLogin(),
-		LoginExpired:                peer.Status.LoginExpired,
-		AccessiblePeersCount:        accessiblePeersCount,
-		CountryCode:                 peer.Location.CountryCode,
-		CityName:                    peer.Location.CityName,
-		SerialNumber:                peer.Meta.SystemSerialNumber,
+		CreatedAt:              peer.CreatedAt,
+		Id:                     peer.ID,
+		Name:                   peer.Name,
+		Ip:                     peer.IP.String(),
+		ConnectionIp:           peer.Location.ConnectionIP.String(),
+		Connected:              peer.Status.Connected,
+		LastSeen:               peer.Status.LastSeen,
+		Os:                     fmt.Sprintf("%s %s", peer.Meta.OS, osVersion),
+		KernelVersion:          peer.Meta.KernelVersion,
+		GeonameId:              int(peer.Location.GeoNameID),
+		Version:                peer.Meta.WtVersion,
+		Groups:                 groupsInfo,
+		SshEnabled:             peer.SSHEnabled,
+		Hostname:               peer.Meta.Hostname,
+		UserId:                 peer.UserID,
+		UiVersion:              peer.Meta.UIVersion,
+		DnsLabel:               fqdn(peer, dnsDomain),
+		ExtraDnsLabels:         fqdnList(peer.ExtraDNSLabels, dnsDomain),
+		LoginExpirationEnabled: peer.LoginExpirationEnabled,
+		LastLogin:              peer.GetLastLogin(),
+		LoginExpired:           peer.Status.LoginExpired,
+		AccessiblePeersCount:   accessiblePeersCount,
+		CountryCode:            peer.Location.CountryCode,
+		CityName:               peer.Location.CityName,
+		SerialNumber:           peer.Meta.SystemSerialNumber,
+
 		InactivityExpirationEnabled: peer.InactivityExpirationEnabled,
-		Ephemeral:                   peer.Ephemeral,
 	}
 }
 

management/server/http/handlers/routes/routes_handler.go

@@ -8,19 +8,17 @@ import (
 
 	"github.com/gorilla/mux"
 
+	"github.com/netbirdio/netbird/shared/management/domain"
 	"github.com/netbirdio/netbird/management/server/account"
 	nbcontext "github.com/netbirdio/netbird/management/server/context"
-	"github.com/netbirdio/netbird/route"
-	"github.com/netbirdio/netbird/shared/management/domain"
 	"github.com/netbirdio/netbird/shared/management/http/api"
 	"github.com/netbirdio/netbird/shared/management/http/util"
 	"github.com/netbirdio/netbird/shared/management/status"
+	"github.com/netbirdio/netbird/route"
 )
 
 const failedToConvertRoute = "failed to convert route to response: %v"
 
-const exitNodeCIDR = "0.0.0.0/0"
-
 // handler is the routes handler of the account
 type handler struct {
 	accountManager account.Manager
@@ -126,16 +124,8 @@ func (h *handler) createRoute(w http.ResponseWriter, r *http.Request) {
 		accessControlGroupIds = *req.AccessControlGroups
 	}
 
-	// Set default skipAutoApply value for exit nodes (0.0.0.0/0 routes)
-	skipAutoApply := false
-	if req.SkipAutoApply != nil {
-		skipAutoApply = *req.SkipAutoApply
-	} else if newPrefix.String() == exitNodeCIDR {
-		skipAutoApply = false
-	}
-
 	newRoute, err := h.accountManager.CreateRoute(r.Context(), accountID, newPrefix, networkType, domains, peerId, peerGroupIds,
-		req.Description, route.NetID(req.NetworkId), req.Masquerade, req.Metric, req.Groups, accessControlGroupIds, req.Enabled, userID, req.KeepRoute, skipAutoApply)
+		req.Description, route.NetID(req.NetworkId), req.Masquerade, req.Metric, req.Groups, accessControlGroupIds, req.Enabled, userID, req.KeepRoute)
 
 	if err != nil {
 		util.WriteError(r.Context(), err, w)
@@ -152,31 +142,23 @@ func (h *handler) createRoute(w http.ResponseWriter, r *http.Request) {
 }
 
 func (h *handler) validateRoute(req api.PostApiRoutesJSONRequestBody) error {
-	return h.validateRouteCommon(req.Network, req.Domains, req.Peer, req.PeerGroups, req.NetworkId)
-}
-
-func (h *handler) validateRouteUpdate(req api.PutApiRoutesRouteIdJSONRequestBody) error {
-	return h.validateRouteCommon(req.Network, req.Domains, req.Peer, req.PeerGroups, req.NetworkId)
-}
-
-func (h *handler) validateRouteCommon(network *string, domains *[]string, peer *string, peerGroups *[]string, networkId string) error {
-	if network != nil && domains != nil {
+	if req.Network != nil && req.Domains != nil {
 		return status.Errorf(status.InvalidArgument, "only one of 'network' or 'domains' should be provided")
 	}
 
-	if network == nil && domains == nil {
+	if req.Network == nil && req.Domains == nil {
 		return status.Errorf(status.InvalidArgument, "either 'network' or 'domains' should be provided")
 	}
 
-	if peer == nil && peerGroups == nil {
+	if req.Peer == nil && req.PeerGroups == nil {
 		return status.Errorf(status.InvalidArgument, "either 'peer' or 'peer_groups' should be provided")
 	}
 
-	if peer != nil && peerGroups != nil {
+	if req.Peer != nil && req.PeerGroups != nil {
 		return status.Errorf(status.InvalidArgument, "only one of 'peer' or 'peer_groups' should be provided")
 	}
 
-	if utf8.RuneCountInString(networkId) > route.MaxNetIDChar || networkId == "" {
+	if utf8.RuneCountInString(req.NetworkId) > route.MaxNetIDChar || req.NetworkId == "" {
 		return status.Errorf(status.InvalidArgument, "identifier should be between 1 and %d characters",
 			route.MaxNetIDChar)
 	}
@@ -213,7 +195,7 @@ func (h *handler) updateRoute(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if err := h.validateRouteUpdate(req); err != nil {
+	if err := h.validateRoute(req); err != nil {
 		util.WriteError(r.Context(), err, w)
 		return
 	}
@@ -223,24 +205,15 @@ func (h *handler) updateRoute(w http.ResponseWriter, r *http.Request) {
 		peerID = *req.Peer
 	}
 
-	// Set default skipAutoApply value for exit nodes (0.0.0.0/0 routes)
-	skipAutoApply := false
-	if req.SkipAutoApply != nil {
-		skipAutoApply = *req.SkipAutoApply
-	} else if req.Network != nil && *req.Network == exitNodeCIDR {
-		skipAutoApply = false
-	}
-
 	newRoute := &route.Route{
-		ID:            route.ID(routeID),
-		NetID:         route.NetID(req.NetworkId),
-		Masquerade:    req.Masquerade,
-		Metric:        req.Metric,
-		Description:   req.Description,
-		Enabled:       req.Enabled,
-		Groups:        req.Groups,
-		KeepRoute:     req.KeepRoute,
-		SkipAutoApply: skipAutoApply,
+		ID:          route.ID(routeID),
+		NetID:       route.NetID(req.NetworkId),
+		Masquerade:  req.Masquerade,
+		Metric:      req.Metric,
+		Description: req.Description,
+		Enabled:     req.Enabled,
+		Groups:      req.Groups,
+		KeepRoute:   req.KeepRoute,
 	}
 
 	if req.Domains != nil {
@@ -348,19 +321,18 @@ func toRouteResponse(serverRoute *route.Route) (*api.Route, error) {
 	}
 	network := serverRoute.Network.String()
 	route := &api.Route{
-		Id:            string(serverRoute.ID),
-		Description:   serverRoute.Description,
-		NetworkId:     string(serverRoute.NetID),
-		Enabled:       serverRoute.Enabled,
-		Peer:          &serverRoute.Peer,
-		Network:       &network,
-		Domains:       &domains,
-		NetworkType:   serverRoute.NetworkType.String(),
-		Masquerade:    serverRoute.Masquerade,
-		Metric:        serverRoute.Metric,
-		Groups:        serverRoute.Groups,
-		KeepRoute:     serverRoute.KeepRoute,
-		SkipAutoApply: &serverRoute.SkipAutoApply,
+		Id:          string(serverRoute.ID),
+		Description: serverRoute.Description,
+		NetworkId:   string(serverRoute.NetID),
+		Enabled:     serverRoute.Enabled,
+		Peer:        &serverRoute.Peer,
+		Network:     &network,
+		Domains:     &domains,
+		NetworkType: serverRoute.NetworkType.String(),
+		Masquerade:  serverRoute.Masquerade,
+		Metric:      serverRoute.Metric,
+		Groups:      serverRoute.Groups,
+		KeepRoute:   serverRoute.KeepRoute,
 	}
 
 	if len(serverRoute.PeerGroups) > 0 {

management/server/http/handlers/routes/routes_handler_test.go

@@ -15,13 +15,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/netbirdio/netbird/shared/management/domain"
 	nbcontext "github.com/netbirdio/netbird/management/server/context"
+	"github.com/netbirdio/netbird/shared/management/http/api"
 	"github.com/netbirdio/netbird/management/server/mock_server"
+	"github.com/netbirdio/netbird/shared/management/status"
 	"github.com/netbirdio/netbird/management/server/util"
 	"github.com/netbirdio/netbird/route"
-	"github.com/netbirdio/netbird/shared/management/domain"
-	"github.com/netbirdio/netbird/shared/management/http/api"
-	"github.com/netbirdio/netbird/shared/management/status"
 )
 
 const (
@@ -62,22 +62,21 @@ func initRoutesTestData() *handler {
 	return &handler{
 		accountManager: &mock_server.MockAccountManager{
 			GetRouteFunc: func(_ context.Context, _ string, routeID route.ID, _ string) (*route.Route, error) {
-				switch routeID {
-				case existingRouteID:
+				if routeID == existingRouteID {
 					return baseExistingRoute, nil
-				case existingRouteID2:
+				}
+				if routeID == existingRouteID2 {
 					route := baseExistingRoute.Copy()
 					route.PeerGroups = []string{existingGroupID}
 					return route, nil
-				case existingRouteID3:
+				} else if routeID == existingRouteID3 {
 					route := baseExistingRoute.Copy()
 					route.Domains = domain.List{existingDomain}
 					return route, nil
-				default:
-					return nil, status.Errorf(status.NotFound, "route with ID %s not found", routeID)
 				}
+				return nil, status.Errorf(status.NotFound, "route with ID %s not found", routeID)
 			},
-			CreateRouteFunc: func(_ context.Context, accountID string, prefix netip.Prefix, networkType route.NetworkType, domains domain.List, peerID string, peerGroups []string, description string, netID route.NetID, masquerade bool, metric int, groups, accessControlGroups []string, enabled bool, _ string, keepRoute bool, skipAutoApply bool) (*route.Route, error) {
+			CreateRouteFunc: func(_ context.Context, accountID string, prefix netip.Prefix, networkType route.NetworkType, domains domain.List, peerID string, peerGroups []string, description string, netID route.NetID, masquerade bool, metric int, groups, accessControlGroups []string, enabled bool, _ string, keepRoute bool) (*route.Route, error) {
 				if peerID == notFoundPeerID {
 					return nil, status.Errorf(status.InvalidArgument, "peer with ID %s not found", peerID)
 				}
@@ -104,7 +103,6 @@ func initRoutesTestData() *handler {
 					Groups:              groups,
 					KeepRoute:           keepRoute,
 					AccessControlGroups: accessControlGroups,
-					SkipAutoApply:       skipAutoApply,
 				}, nil
 			},
 			SaveRouteFunc: func(_ context.Context, _, _ string, r *route.Route) error {
@@ -192,20 +190,19 @@ func TestRoutesHandlers(t *testing.T) {
 			requestType: http.MethodPost,
 			requestPath: "/api/routes",
 			requestBody: bytes.NewBuffer(
-				[]byte(fmt.Sprintf(`{"Description":"Post","Network":"192.168.0.0/16","network_id":"awesomeNet","Peer":"%s","groups":["%s"],"skip_auto_apply":false}`, existingPeerID, existingGroupID))),
+				[]byte(fmt.Sprintf(`{"Description":"Post","Network":"192.168.0.0/16","network_id":"awesomeNet","Peer":"%s","groups":["%s"]}`, existingPeerID, existingGroupID))),
 			expectedStatus: http.StatusOK,
 			expectedBody:   true,
 			expectedRoute: &api.Route{
-				Id:            existingRouteID,
-				Description:   "Post",
-				NetworkId:     "awesomeNet",
-				Network:       util.ToPtr("192.168.0.0/16"),
-				Peer:          &existingPeerID,
-				NetworkType:   route.IPv4NetworkString,
-				Masquerade:    false,
-				Enabled:       false,
-				Groups:        []string{existingGroupID},
-				SkipAutoApply: util.ToPtr(false),
+				Id:          existingRouteID,
+				Description: "Post",
+				NetworkId:   "awesomeNet",
+				Network:     util.ToPtr("192.168.0.0/16"),
+				Peer:        &existingPeerID,
+				NetworkType: route.IPv4NetworkString,
+				Masquerade:  false,
+				Enabled:     false,
+				Groups:      []string{existingGroupID},
 			},
 		},
 		{
@@ -213,22 +210,21 @@ func TestRoutesHandlers(t *testing.T) {
 			requestType: http.MethodPost,
 			requestPath: "/api/routes",
 			requestBody: bytes.NewBuffer(
-				[]byte(fmt.Sprintf(`{"description":"Post","domains":["example.com"],"network_id":"domainNet","peer":"%s","groups":["%s"],"keep_route":true,"skip_auto_apply":false}`, existingPeerID, existingGroupID))),
+				[]byte(fmt.Sprintf(`{"description":"Post","domains":["example.com"],"network_id":"domainNet","peer":"%s","groups":["%s"],"keep_route":true}`, existingPeerID, existingGroupID))),
 			expectedStatus: http.StatusOK,
 			expectedBody:   true,
 			expectedRoute: &api.Route{
-				Id:            existingRouteID,
-				Description:   "Post",
-				NetworkId:     "domainNet",
-				Network:       util.ToPtr("invalid Prefix"),
-				KeepRoute:     true,
-				Domains:       &[]string{existingDomain},
-				Peer:          &existingPeerID,
-				NetworkType:   route.DomainNetworkString,
-				Masquerade:    false,
-				Enabled:       false,
-				Groups:        []string{existingGroupID},
-				SkipAutoApply: util.ToPtr(false),
+				Id:          existingRouteID,
+				Description: "Post",
+				NetworkId:   "domainNet",
+				Network:     util.ToPtr("invalid Prefix"),
+				KeepRoute:   true,
+				Domains:     &[]string{existingDomain},
+				Peer:        &existingPeerID,
+				NetworkType: route.DomainNetworkString,
+				Masquerade:  false,
+				Enabled:     false,
+				Groups:      []string{existingGroupID},
 			},
 		},
 		{
@@ -236,7 +232,7 @@ func TestRoutesHandlers(t *testing.T) {
 			requestType: http.MethodPost,
 			requestPath: "/api/routes",
 			requestBody: bytes.NewBuffer(
-				[]byte(fmt.Sprintf("{\"Description\":\"Post\",\"Network\":\"192.168.0.0/16\",\"network_id\":\"awesomeNet\",\"Peer\":\"%s\",\"groups\":[\"%s\"],\"access_control_groups\":[\"%s\"],\"skip_auto_apply\":false}", existingPeerID, existingGroupID, existingGroupID))),
+				[]byte(fmt.Sprintf("{\"Description\":\"Post\",\"Network\":\"192.168.0.0/16\",\"network_id\":\"awesomeNet\",\"Peer\":\"%s\",\"groups\":[\"%s\"],\"access_control_groups\":[\"%s\"]}", existingPeerID, existingGroupID, existingGroupID))),
 			expectedStatus: http.StatusOK,
 			expectedBody:   true,
 			expectedRoute: &api.Route{
@@ -250,7 +246,6 @@ func TestRoutesHandlers(t *testing.T) {
 				Enabled:             false,
 				Groups:              []string{existingGroupID},
 				AccessControlGroups: &[]string{existingGroupID},
-				SkipAutoApply:       util.ToPtr(false),
 			},
 		},
 		{
@@ -341,63 +336,60 @@ func TestRoutesHandlers(t *testing.T) {
 			name:           "Network PUT OK",
 			requestType:    http.MethodPut,
 			requestPath:    "/api/routes/" + existingRouteID,
-			requestBody:    bytes.NewBufferString(fmt.Sprintf("{\"Description\":\"Post\",\"Network\":\"192.168.0.0/16\",\"network_id\":\"awesomeNet\",\"Peer\":\"%s\",\"groups\":[\"%s\"],\"is_selected\":true}", existingPeerID, existingGroupID)),
+			requestBody:    bytes.NewBufferString(fmt.Sprintf("{\"Description\":\"Post\",\"Network\":\"192.168.0.0/16\",\"network_id\":\"awesomeNet\",\"Peer\":\"%s\",\"groups\":[\"%s\"]}", existingPeerID, existingGroupID)),
 			expectedStatus: http.StatusOK,
 			expectedBody:   true,
 			expectedRoute: &api.Route{
-				Id:            existingRouteID,
-				Description:   "Post",
-				NetworkId:     "awesomeNet",
-				Network:       util.ToPtr("192.168.0.0/16"),
-				Peer:          &existingPeerID,
-				NetworkType:   route.IPv4NetworkString,
-				Masquerade:    false,
-				Enabled:       false,
-				Groups:        []string{existingGroupID},
-				SkipAutoApply: util.ToPtr(false),
+				Id:          existingRouteID,
+				Description: "Post",
+				NetworkId:   "awesomeNet",
+				Network:     util.ToPtr("192.168.0.0/16"),
+				Peer:        &existingPeerID,
+				NetworkType: route.IPv4NetworkString,
+				Masquerade:  false,
+				Enabled:     false,
+				Groups:      []string{existingGroupID},
 			},
 		},
 		{
 			name:           "Domains PUT OK",
 			requestType:    http.MethodPut,
 			requestPath:    "/api/routes/" + existingRouteID,
-			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"Description":"Post","domains":["example.com"],"network_id":"awesomeNet","Peer":"%s","groups":["%s"],"keep_route":true,"skip_auto_apply":false}`, existingPeerID, existingGroupID)),
+			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"Description":"Post","domains":["example.com"],"network_id":"awesomeNet","Peer":"%s","groups":["%s"],"keep_route":true}`, existingPeerID, existingGroupID)),
 			expectedStatus: http.StatusOK,
 			expectedBody:   true,
 			expectedRoute: &api.Route{
-				Id:            existingRouteID,
-				Description:   "Post",
-				NetworkId:     "awesomeNet",
-				Network:       util.ToPtr("invalid Prefix"),
-				Domains:       &[]string{existingDomain},
-				Peer:          &existingPeerID,
-				NetworkType:   route.DomainNetworkString,
-				Masquerade:    false,
-				Enabled:       false,
-				Groups:        []string{existingGroupID},
-				KeepRoute:     true,
-				SkipAutoApply: util.ToPtr(false),
+				Id:          existingRouteID,
+				Description: "Post",
+				NetworkId:   "awesomeNet",
+				Network:     util.ToPtr("invalid Prefix"),
+				Domains:     &[]string{existingDomain},
+				Peer:        &existingPeerID,
+				NetworkType: route.DomainNetworkString,
+				Masquerade:  false,
+				Enabled:     false,
+				Groups:      []string{existingGroupID},
+				KeepRoute:   true,
 			},
 		},
 		{
 			name:           "PUT OK when peer_groups provided",
 			requestType:    http.MethodPut,
 			requestPath:    "/api/routes/" + existingRouteID,
-			requestBody:    bytes.NewBufferString(fmt.Sprintf("{\"Description\":\"Post\",\"Network\":\"192.168.0.0/16\",\"network_id\":\"awesomeNet\",\"peer_groups\":[\"%s\"],\"groups\":[\"%s\"],\"skip_auto_apply\":false}", existingGroupID, existingGroupID)),
+			requestBody:    bytes.NewBufferString(fmt.Sprintf("{\"Description\":\"Post\",\"Network\":\"192.168.0.0/16\",\"network_id\":\"awesomeNet\",\"peer_groups\":[\"%s\"],\"groups\":[\"%s\"]}", existingGroupID, existingGroupID)),
 			expectedStatus: http.StatusOK,
 			expectedBody:   true,
 			expectedRoute: &api.Route{
-				Id:            existingRouteID,
-				Description:   "Post",
-				NetworkId:     "awesomeNet",
-				Network:       util.ToPtr("192.168.0.0/16"),
-				Peer:          &emptyString,
-				PeerGroups:    &[]string{existingGroupID},
-				NetworkType:   route.IPv4NetworkString,
-				Masquerade:    false,
-				Enabled:       false,
-				Groups:        []string{existingGroupID},
-				SkipAutoApply: util.ToPtr(false),
+				Id:          existingRouteID,
+				Description: "Post",
+				NetworkId:   "awesomeNet",
+				Network:     util.ToPtr("192.168.0.0/16"),
+				Peer:        &emptyString,
+				PeerGroups:  &[]string{existingGroupID},
+				NetworkType: route.IPv4NetworkString,
+				Masquerade:  false,
+				Enabled:     false,
+				Groups:      []string{existingGroupID},
 			},
 		},
 		{

management/server/http/handlers/users/users_handler.go

@@ -9,11 +9,11 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	"github.com/netbirdio/netbird/management/server/account"
-	"github.com/netbirdio/netbird/management/server/types"
-	"github.com/netbirdio/netbird/management/server/users"
 	"github.com/netbirdio/netbird/shared/management/http/api"
 	"github.com/netbirdio/netbird/shared/management/http/util"
 	"github.com/netbirdio/netbird/shared/management/status"
+	"github.com/netbirdio/netbird/management/server/types"
+	"github.com/netbirdio/netbird/management/server/users"
 
 	nbcontext "github.com/netbirdio/netbird/management/server/context"
 )
@@ -31,8 +31,6 @@ func AddEndpoints(accountManager account.Manager, router *mux.Router) {
 	router.HandleFunc("/users/{userId}", userHandler.deleteUser).Methods("DELETE", "OPTIONS")
 	router.HandleFunc("/users", userHandler.createUser).Methods("POST", "OPTIONS")
 	router.HandleFunc("/users/{userId}/invite", userHandler.inviteUser).Methods("POST", "OPTIONS")
-	router.HandleFunc("/users/{userId}/approve", userHandler.approveUser).Methods("POST", "OPTIONS")
-	router.HandleFunc("/users/{userId}/reject", userHandler.rejectUser).Methods("DELETE", "OPTIONS")
 	addUsersTokensEndpoint(accountManager, router)
 }
 
@@ -325,76 +323,17 @@ func toUserResponse(user *types.UserInfo, currenUserID string) *api.User {
 	}
 
 	isCurrent := user.ID == currenUserID
-
 	return &api.User{
-		Id:              user.ID,
-		Name:            user.Name,
-		Email:           user.Email,
-		Role:            user.Role,
-		AutoGroups:      autoGroups,
-		Status:          userStatus,
-		IsCurrent:       &isCurrent,
-		IsServiceUser:   &user.IsServiceUser,
-		IsBlocked:       user.IsBlocked,
-		LastLogin:       &user.LastLogin,
-		Issued:          &user.Issued,
-		PendingApproval: user.PendingApproval,
+		Id:            user.ID,
+		Name:          user.Name,
+		Email:         user.Email,
+		Role:          user.Role,
+		AutoGroups:    autoGroups,
+		Status:        userStatus,
+		IsCurrent:     &isCurrent,
+		IsServiceUser: &user.IsServiceUser,
+		IsBlocked:     user.IsBlocked,
+		LastLogin:     &user.LastLogin,
+		Issued:        &user.Issued,
 	}
 }
-
-// approveUser is a POST request to approve a user that is pending approval
-func (h *handler) approveUser(w http.ResponseWriter, r *http.Request) {
-	if r.Method != http.MethodPost {
-		util.WriteErrorResponse("wrong HTTP method", http.StatusMethodNotAllowed, w)
-		return
-	}
-
-	vars := mux.Vars(r)
-	targetUserID := vars["userId"]
-	if len(targetUserID) == 0 {
-		util.WriteErrorResponse("invalid user ID", http.StatusBadRequest, w)
-		return
-	}
-
-	userAuth, err := nbcontext.GetUserAuthFromContext(r.Context())
-	if err != nil {
-		util.WriteError(r.Context(), err, w)
-		return
-	}
-	user, err := h.accountManager.ApproveUser(r.Context(), userAuth.AccountId, userAuth.UserId, targetUserID)
-	if err != nil {
-		util.WriteError(r.Context(), err, w)
-		return
-	}
-
-	userResponse := toUserResponse(user, userAuth.UserId)
-	util.WriteJSONObject(r.Context(), w, userResponse)
-}
-
-// rejectUser is a DELETE request to reject a user that is pending approval
-func (h *handler) rejectUser(w http.ResponseWriter, r *http.Request) {
-	if r.Method != http.MethodDelete {
-		util.WriteErrorResponse("wrong HTTP method", http.StatusMethodNotAllowed, w)
-		return
-	}
-
-	vars := mux.Vars(r)
-	targetUserID := vars["userId"]
-	if len(targetUserID) == 0 {
-		util.WriteErrorResponse("invalid user ID", http.StatusBadRequest, w)
-		return
-	}
-
-	userAuth, err := nbcontext.GetUserAuthFromContext(r.Context())
-	if err != nil {
-		util.WriteError(r.Context(), err, w)
-		return
-	}
-	err = h.accountManager.RejectUser(r.Context(), userAuth.AccountId, userAuth.UserId, targetUserID)
-	if err != nil {
-		util.WriteError(r.Context(), err, w)
-		return
-	}
-
-	util.WriteJSONObject(r.Context(), w, util.EmptyObject{})
-}

management/server/http/handlers/users/users_handler_test.go

@@ -16,13 +16,13 @@ import (
 	"github.com/stretchr/testify/require"
 
 	nbcontext "github.com/netbirdio/netbird/management/server/context"
+	"github.com/netbirdio/netbird/shared/management/http/api"
 	"github.com/netbirdio/netbird/management/server/mock_server"
 	"github.com/netbirdio/netbird/management/server/permissions/modules"
 	"github.com/netbirdio/netbird/management/server/permissions/roles"
+	"github.com/netbirdio/netbird/shared/management/status"
 	"github.com/netbirdio/netbird/management/server/types"
 	"github.com/netbirdio/netbird/management/server/users"
-	"github.com/netbirdio/netbird/shared/management/http/api"
-	"github.com/netbirdio/netbird/shared/management/status"
 )
 
 const (
@@ -725,133 +725,3 @@ func stringifyPermissionsKeys(permissions roles.Permissions) map[string]map[stri
 	}
 	return modules
 }
-
-func TestApproveUserEndpoint(t *testing.T) {
-	adminUser := &types.User{
-		Id:         "admin-user",
-		Role:       types.UserRoleAdmin,
-		AccountID:  existingAccountID,
-		AutoGroups: []string{},
-	}
-
-	pendingUser := &types.User{
-		Id:              "pending-user",
-		Role:            types.UserRoleUser,
-		AccountID:       existingAccountID,
-		Blocked:         true,
-		PendingApproval: true,
-		AutoGroups:      []string{},
-	}
-
-	tt := []struct {
-		name           string
-		expectedStatus int
-		expectedBody   bool
-		requestingUser *types.User
-	}{
-		{
-			name:           "approve user as admin should return 200",
-			expectedStatus: 200,
-			expectedBody:   true,
-			requestingUser: adminUser,
-		},
-	}
-
-	for _, tc := range tt {
-		t.Run(tc.name, func(t *testing.T) {
-			am := &mock_server.MockAccountManager{}
-			am.ApproveUserFunc = func(ctx context.Context, accountID, initiatorUserID, targetUserID string) (*types.UserInfo, error) {
-				approvedUserInfo := &types.UserInfo{
-					ID:              pendingUser.Id,
-					Email:           "pending@example.com",
-					Name:            "Pending User",
-					Role:            string(pendingUser.Role),
-					AutoGroups:      []string{},
-					IsServiceUser:   false,
-					IsBlocked:       false,
-					PendingApproval: false,
-					LastLogin:       time.Now(),
-					Issued:          types.UserIssuedAPI,
-				}
-				return approvedUserInfo, nil
-			}
-
-			handler := newHandler(am)
-			router := mux.NewRouter()
-			router.HandleFunc("/users/{userId}/approve", handler.approveUser).Methods("POST")
-
-			req, err := http.NewRequest("POST", "/users/pending-user/approve", nil)
-			require.NoError(t, err)
-
-			userAuth := nbcontext.UserAuth{
-				AccountId: existingAccountID,
-				UserId:    tc.requestingUser.Id,
-			}
-			ctx := nbcontext.SetUserAuthInContext(req.Context(), userAuth)
-			req = req.WithContext(ctx)
-
-			rr := httptest.NewRecorder()
-			router.ServeHTTP(rr, req)
-
-			assert.Equal(t, tc.expectedStatus, rr.Code)
-
-			if tc.expectedBody {
-				var response api.User
-				err = json.Unmarshal(rr.Body.Bytes(), &response)
-				require.NoError(t, err)
-				assert.Equal(t, "pending-user", response.Id)
-				assert.False(t, response.IsBlocked)
-				assert.False(t, response.PendingApproval)
-			}
-		})
-	}
-}
-
-func TestRejectUserEndpoint(t *testing.T) {
-	adminUser := &types.User{
-		Id:         "admin-user",
-		Role:       types.UserRoleAdmin,
-		AccountID:  existingAccountID,
-		AutoGroups: []string{},
-	}
-
-	tt := []struct {
-		name           string
-		expectedStatus int
-		requestingUser *types.User
-	}{
-		{
-			name:           "reject user as admin should return 200",
-			expectedStatus: 200,
-			requestingUser: adminUser,
-		},
-	}
-
-	for _, tc := range tt {
-		t.Run(tc.name, func(t *testing.T) {
-			am := &mock_server.MockAccountManager{}
-			am.RejectUserFunc = func(ctx context.Context, accountID, initiatorUserID, targetUserID string) error {
-				return nil
-			}
-
-			handler := newHandler(am)
-			router := mux.NewRouter()
-			router.HandleFunc("/users/{userId}/reject", handler.rejectUser).Methods("DELETE")
-
-			req, err := http.NewRequest("DELETE", "/users/pending-user/reject", nil)
-			require.NoError(t, err)
-
-			userAuth := nbcontext.UserAuth{
-				AccountId: existingAccountID,
-				UserId:    tc.requestingUser.Id,
-			}
-			ctx := nbcontext.SetUserAuthInContext(req.Context(), userAuth)
-			req = req.WithContext(ctx)
-
-			rr := httptest.NewRecorder()
-			router.ServeHTTP(rr, req)
-
-			assert.Equal(t, tc.expectedStatus, rr.Code)
-		})
-	}
-}