diff --git a/management/server/permissions/manager.go b/management/server/permissions/manager.go index ba97ba57c..778860b7d 100644 --- a/management/server/permissions/manager.go +++ b/management/server/permissions/manager.go @@ -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, diff --git a/management/server/permissions/manager_mock.go b/management/server/permissions/manager_mock.go index 3d2455f8d..f0aa26aea 100644 --- a/management/server/permissions/manager_mock.go +++ b/management/server/permissions/manager_mock.go @@ -52,19 +52,19 @@ func (mr *MockManagerMockRecorder) GetPermissions(ctx interface{}) *gomock.Call return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPermissions", reflect.TypeOf((*MockManager)(nil).GetPermissions), ctx) } -// GetRolePermissions mocks base method. -func (m *MockManager) GetRolePermissions(ctx context.Context, role types.UserRole) (roles.Permissions, error) { +// GetPermissionsByRole mocks base method. +func (m *MockManager) GetPermissionsByRole(ctx context.Context, role types.UserRole) (roles.Permissions, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetRolePermissions", ctx, role) + ret := m.ctrl.Call(m, "GetPermissionsByRole", ctx, role) ret0, _ := ret[0].(roles.Permissions) ret1, _ := ret[1].(error) return ret0, ret1 } -// GetRolePermissions indicates an expected call of GetRolePermissions. -func (mr *MockManagerMockRecorder) GetRolePermissions(ctx, role interface{}) *gomock.Call { +// GetPermissionsByRole indicates an expected call of GetPermissionsByRole. +func (mr *MockManagerMockRecorder) GetPermissionsByRole(ctx, role interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRolePermissions", reflect.TypeOf((*MockManager)(nil).GetRolePermissions), ctx, role) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPermissionsByRole", reflect.TypeOf((*MockManager)(nil).GetPermissionsByRole), ctx, role) } // ValidateAccountAccess mocks base method. diff --git a/management/server/user.go b/management/server/user.go index 75889b421..3e6ad1837 100644 --- a/management/server/user.go +++ b/management/server/user.go @@ -1244,7 +1244,7 @@ func (am *DefaultAccountManager) GetCurrentUserInfo(ctx context.Context, account Restricted: user.IsRestrictable() && settings.RegularUsersViewBlocked, } - permissions, err := am.permissionsManager.GetRolePermissions(ctx, user.Role) + permissions, err := am.permissionsManager.GetPermissionsByRole(ctx, user.Role) if err == nil { userWithPermissions.Permissions = permissions }