fix merge conflicts

management/internals/modules/reverseproxy/service/manager/manager.go

@@ -99,14 +99,6 @@ func (m *Manager) StartExposeReaper(ctx context.Context) {
 
 // GetActiveClusters returns all active proxy clusters with their connected proxy count.
 func (m *Manager) GetActiveClusters(ctx context.Context, accountID, userID string) ([]proxy.Cluster, error) {
-	ok, err := m.permissionsManager.ValidateUserPermissions(ctx, accountID, userID, modules.Services, operations.Read)
-	if err != nil {
-		return nil, status.NewPermissionValidationError(err)
-	}
-	if !ok {
-		return nil, status.NewPermissionDeniedError()
-	}
-
 	return m.store.GetActiveProxyClusters(ctx)
 }
 
@@ -483,12 +475,12 @@ func (m *Manager) executeServiceUpdate(ctx context.Context, transaction store.St
 	}
 
 	if existingService.Terminated {
-			return status.Errorf(status.PermissionDenied, "service is terminated and cannot be updated")
+		return status.Errorf(status.PermissionDenied, "service is terminated and cannot be updated")
-		}
+	}
 
-		if err := validateProtocolChange(existingService.Mode, service.Mode); err != nil {
+	if err := validateProtocolChange(existingService.Mode, service.Mode); err != nil {
-			return err
+		return err
-		}
+	}
 
 	updateInfo.oldCluster = existingService.ProxyCluster
 	updateInfo.domainChanged = existingService.Domain != service.Domain

management/server/http/testing/testing_tools/channel/channel.go

@@ -127,10 +127,10 @@ func BuildApiBlackBoxWithDBState(t testing_tools.TB, sqlFile string, expectedPee
 		GetPATInfoFunc:                  authManager.GetPATInfo,
 	}
 
-	groupsManager := groups.NewManager(store, permissionsManager, am)
+	groupsManager := groups.NewManager(store, am)
-	routersManager := routers.NewManager(store, permissionsManager, am)
+	routersManager := routers.NewManager(store, am)
-	resourcesManager := resources.NewManager(store, permissionsManager, groupsManager, am, serviceManager)
+	resourcesManager := resources.NewManager(store, groupsManager, am, serviceManager)
-	networksManager := networks.NewManager(store, permissionsManager, resourcesManager, routersManager, am)
+	networksManager := networks.NewManager(store, resourcesManager, routersManager, am)
 	customZonesManager := zonesManager.NewManager(store, am, "")
 	zoneRecordsManager := recordsManager.NewManager(store, am)
 
@@ -210,8 +210,8 @@ func BuildApiBlackBoxWithDBStateAndPeerChannel(t testing_tools.TB, sqlFile strin
 	proxyController := integrations.NewController(store)
 	userManager := users.NewManager(store)
 	permissionsManager := permissions.NewManager(store)
-	settingsManager := settings.NewManager(store, userManager, integrations.NewManager(&activity.InMemoryEventStore{}), permissionsManager, settings.IdpConfig{})
+	settingsManager := settings.NewManager(store, userManager, integrations.NewManager(&activity.InMemoryEventStore{}), settings.IdpConfig{})
-	peersManager := peers.NewManager(store, permissionsManager)
+	peersManager := peers.NewManager(store)
 
 	jobManager := job.NewJobManager(nil, store, peersManager)
 
@@ -223,7 +223,7 @@ func BuildApiBlackBoxWithDBStateAndPeerChannel(t testing_tools.TB, sqlFile strin
 		t.Fatalf("Failed to create manager: %v", err)
 	}
 
-	accessLogsManager := accesslogsmanager.NewManager(store, permissionsManager, nil)
+	accessLogsManager := accesslogsmanager.NewManager(store, nil)
 	proxyTokenStore, err := nbgrpc.NewOneTimeTokenStore(ctx, 5*time.Minute, 10*time.Minute, 100)
 	if err != nil {
 		t.Fatalf("Failed to create proxy token store: %v", err)
@@ -238,13 +238,13 @@ func BuildApiBlackBoxWithDBStateAndPeerChannel(t testing_tools.TB, sqlFile strin
 		t.Fatalf("Failed to create proxy manager: %v", err)
 	}
 	proxyServiceServer := nbgrpc.NewProxyServiceServer(accessLogsManager, proxyTokenStore, pkceverifierStore, nbgrpc.ProxyOIDCConfig{}, peersManager, userManager, proxyMgr)
-	domainManager := manager.NewManager(store, proxyMgr, permissionsManager, am)
+	domainManager := manager.NewManager(store, proxyMgr, am)
 	serviceProxyController, err := proxymanager.NewGRPCController(proxyServiceServer, noopMeter)
 	if err != nil {
 		t.Fatalf("Failed to create proxy controller: %v", err)
 	}
 	domainManager.SetClusterCapabilities(serviceProxyController)
-	serviceManager := reverseproxymanager.NewManager(store, am, permissionsManager, serviceProxyController, domainManager)
+	serviceManager := reverseproxymanager.NewManager(store, am, serviceProxyController, domainManager)
 	proxyServiceServer.SetServiceManager(serviceManager)
 	am.SetServiceManager(serviceManager)
 
@@ -257,12 +257,12 @@ func BuildApiBlackBoxWithDBStateAndPeerChannel(t testing_tools.TB, sqlFile strin
 		GetPATInfoFunc:                  authManager.GetPATInfo,
 	}
 
-	groupsManager := groups.NewManager(store, permissionsManager, am)
+	groupsManager := groups.NewManager(store, am)
-	routersManager := routers.NewManager(store, permissionsManager, am)
+	routersManager := routers.NewManager(store, am)
-	resourcesManager := resources.NewManager(store, permissionsManager, groupsManager, am, serviceManager)
+	resourcesManager := resources.NewManager(store, groupsManager, am, serviceManager)
-	networksManager := networks.NewManager(store, permissionsManager, resourcesManager, routersManager, am)
+	networksManager := networks.NewManager(store, resourcesManager, routersManager, am)
-	customZonesManager := zonesManager.NewManager(store, am, permissionsManager, "")
+	customZonesManager := zonesManager.NewManager(store, am, "")
-	zoneRecordsManager := recordsManager.NewManager(store, am, permissionsManager)
+	zoneRecordsManager := recordsManager.NewManager(store, am)
 
 	apiHandler, err := http2.NewAPIHandler(context.Background(), am, networksManager, resourcesManager, routersManager, groupsManager, geoMock, authManagerMock, metrics, validatorMock, proxyController, permissionsManager, peersManager, settingsManager, customZonesManager, zoneRecordsManager, networkMapController, nil, serviceManager, nil, nil, nil, nil)
 	if err != nil {

management/server/networks/manager.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/rs/xid"
 
-	"github.com/netbirdio/netbird/management/internals/modules/permissions"
 	"github.com/netbirdio/netbird/management/server/account"
 	"github.com/netbirdio/netbird/management/server/activity"
 	"github.com/netbirdio/netbird/management/server/networks/resources"
@@ -24,23 +23,21 @@ type Manager interface {
 }
 
 type managerImpl struct {
-	store              store.Store
+	store            store.Store
-	accountManager     account.Manager
+	accountManager   account.Manager
-	permissionsManager permissions.Manager
+	resourcesManager resources.Manager
-	resourcesManager   resources.Manager
+	routersManager   routers.Manager
-	routersManager     routers.Manager
 }
 
 type mockManager struct {
 }
 
-func NewManager(store store.Store, permissionsManager permissions.Manager, resourceManager resources.Manager, routersManager routers.Manager, accountManager account.Manager) Manager {
+func NewManager(store store.Store, resourceManager resources.Manager, routersManager routers.Manager, accountManager account.Manager) Manager {
 	return &managerImpl{
-		store:              store,
+		store:            store,
-		permissionsManager: permissionsManager,
+		resourcesManager: resourceManager,
-		resourcesManager:   resourceManager,
+		routersManager:   routersManager,
-		routersManager:     routersManager,
+		accountManager:   accountManager,
-		accountManager:     accountManager,
 	}
 }
 

management/server/networks/resources/manager.go

@@ -7,7 +7,6 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/netbirdio/netbird/management/internals/modules/permissions"
 	"github.com/netbirdio/netbird/management/internals/modules/reverseproxy/service"
 	"github.com/netbirdio/netbird/management/server/account"
 	"github.com/netbirdio/netbird/management/server/activity"
@@ -31,23 +30,21 @@ type Manager interface {
 }
 
 type managerImpl struct {
-	store              store.Store
+	store          store.Store
-	permissionsManager permissions.Manager
+	groupsManager  groups.Manager
-	groupsManager      groups.Manager
+	accountManager account.Manager
-	accountManager     account.Manager
+	serviceManager service.Manager
-	serviceManager     service.Manager
 }
 
 type mockManager struct {
 }
 
-func NewManager(store store.Store, permissionsManager permissions.Manager, groupsManager groups.Manager, accountManager account.Manager, reverseproxyManager service.Manager) Manager {
+func NewManager(store store.Store, groupsManager groups.Manager, accountManager account.Manager, reverseproxyManager service.Manager) Manager {
 	return &managerImpl{
-		store:              store,
+		store:          store,
-		permissionsManager: permissionsManager,
+		groupsManager:  groupsManager,
-		groupsManager:      groupsManager,
+		accountManager: accountManager,
-		accountManager:     accountManager,
+		serviceManager: reverseproxyManager,
-		serviceManager:     reverseproxyManager,
 	}
 }
 

management/server/networks/routers/manager.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/rs/xid"
 
-	"github.com/netbirdio/netbird/management/internals/modules/permissions"
 	"github.com/netbirdio/netbird/management/server/account"
 	"github.com/netbirdio/netbird/management/server/activity"
 	"github.com/netbirdio/netbird/management/server/networks/routers/types"
@@ -27,19 +26,17 @@ type Manager interface {
 }
 
 type managerImpl struct {
-	store              store.Store
+	store          store.Store
-	permissionsManager permissions.Manager
+	accountManager account.Manager
-	accountManager     account.Manager
 }
 
 type mockManager struct {
 }
 
-func NewManager(store store.Store, permissionsManager permissions.Manager, accountManager account.Manager) Manager {
+func NewManager(store store.Store, accountManager account.Manager) Manager {
 	return &managerImpl{
-		store:              store,
+		store:          store,
-		permissionsManager: permissionsManager,
+		accountManager: accountManager,
-		accountManager:     accountManager,
 	}
 }