sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-28 23:39:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/user-info-with-role-permissions' into feature/users-roles-endpoint

Browse Source 
# Conflicts:
#	management/server/permissions/manager.go
#	management/server/permissions/manager_mock.go
This commit is contained in:
Pedro Costa
2025-04-17 19:29:17 +01:00
parent a4de398b08 808b7703aa
commit 17b4a6bfcb
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
management/server/permissions/manager.go
+3 -3
View File
@@ -21,7 +21,7 @@ type Manager interface {
ValidateRoleModuleAccess(ctx context.Context, accountID string, role roles.RolePermissions, module modules.Module, operation operations.Operation) bool
ValidateAccountAccess(ctx context.Context, accountID string, user *types.User, allowOwnerAndAdmin bool) error
GetRolePermissions(ctx context.Context, role types.UserRole) (roles.Permissions, error)
GetPermissionsByRole(ctx context.Context, role types.UserRole) (roles.Permissions, error)
GetPermissions(ctx context.Context) []roles.RolePermissions
}
@@ -100,7 +100,7 @@ func (m *managerImpl) ValidateAccountAccess(ctx context.Context, accountID strin
return nil
}
func (m *managerImpl) GetRolePermissions(ctx context.Context, role types.UserRole) (roles.Permissions, error) {
func (m *managerImpl) GetPermissionsByRole(ctx context.Context, role types.UserRole) (roles.Permissions, error) {
roleMap, ok := roles.RolesMap[role]
if !ok {
return roles.Permissions{}, status.NewUserRoleNotFoundError(string(role))
@@ -122,7 +122,7 @@ func (m *managerImpl) GetRolePermissions(ctx context.Context, role types.UserRol
func (m *managerImpl) GetPermissions(ctx context.Context) []roles.RolePermissions {
permissions := make([]roles.RolePermissions, 0, len(roles.RolesMap))
for role, roleMap := range roles.RolesMap {
rolePermissions, _ := m.GetRolePermissions(ctx, role)
rolePermissions, _ := m.GetPermissionsByRole(ctx, role)
permissions = append(permissions, roles.RolePermissions{
Role: role,