Merge branch 'OrchardCMS:main' into graph-dynamic-fields-filter

src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/Migrations.cs

@@ -3,12 +3,10 @@
 using Microsoft.Extensions.Logging;
 using OrchardCore.ContentManagement.Records;
 using OrchardCore.Data.Migration;
-using OrchardCore.Modules;
 using YesSql.Sql;
 
 namespace OrchardCore.ContentFields.Indexing.SQL
 {
-    [Feature("OrchardCore.ContentFields.Indexing.SQL")]
     public class Migrations : DataMigration
     {
         private readonly ILogger _logger;

src/OrchardCore.Modules/OrchardCore.ContentFields/Indexing/SQL/UserPickerMigrations.cs

@@ -1,12 +1,10 @@
 using System.Threading.Tasks;
 using OrchardCore.ContentManagement.Records;
 using OrchardCore.Data.Migration;
-using OrchardCore.Modules;
 using YesSql.Sql;
 
 namespace OrchardCore.ContentFields.Indexing.SQL
 {
-    [Feature("OrchardCore.ContentFields.Indexing.SQL.UserPicker")]
     public class UserPickerMigrations : DataMigration
     {
         public async Task<int> CreateAsync()

src/OrchardCore.Modules/OrchardCore.ContentLocalization/AdminMenu.cs

@@ -2,12 +2,10 @@
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Localization;
 using OrchardCore.ContentLocalization.Drivers;
-using OrchardCore.Modules;
 using OrchardCore.Navigation;
 
 namespace OrchardCore.ContentLocalization
 {
-    [Feature("OrchardCore.ContentLocalization.ContentCulturePicker")]
     public class AdminMenu : INavigationProvider
     {
         private static readonly RouteValueDictionary _providersRouteValues = new()

src/OrchardCore.Modules/OrchardCore.Contents/Deployment/ExportContentToDeploymentTarget/ExportContentToDeploymentTargetMigrations.cs

@@ -3,14 +3,12 @@
 using OrchardCore.Data.Migration;
 using OrchardCore.Deployment;
 using OrchardCore.Entities;
-using OrchardCore.Modules;
 using OrchardCore.Recipes;
 using OrchardCore.Recipes.Services;
 using OrchardCore.Settings;
 
 namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget
 {
-    [Feature("OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget")]
     public class ExportContentToDeploymentTargetMigrations : DataMigration
     {
         private readonly IRecipeMigrator _recipeMigrator;

src/OrchardCore.Modules/OrchardCore.Facebook/Login/Configuration/FacebookLoginConfiguration.cs

@@ -11,11 +11,9 @@
 using OrchardCore.Facebook.Login.Services;
 using OrchardCore.Facebook.Login.Settings;
 using OrchardCore.Facebook.Settings;
-using OrchardCore.Modules;
 
 namespace OrchardCore.Facebook.Login.Configuration
 {
-    [Feature(FacebookConstants.Features.Login)]
     public class FacebookLoginConfiguration :
         IConfigureOptions<AuthenticationOptions>,
         IConfigureNamedOptions<FacebookOptions>

src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/Services/LiquidShapes.cs

@@ -7,11 +7,9 @@
 using OrchardCore.DisplayManagement.Implementation;
 using OrchardCore.Facebook.Widgets.ViewModels;
 using OrchardCore.Liquid;
-using OrchardCore.Modules;
 
 namespace OrchardCore.Facebook.Widgets.Services;
 
-[Feature(FacebookConstants.Features.Widgets)]
 public class LiquidShapes(HtmlEncoder htmlEncoder) : ShapeTableProvider
 {
     private readonly HtmlEncoder _htmlEncoder = htmlEncoder;

src/OrchardCore.Modules/OrchardCore.Facebook/Widgets/WidgetMigrations.cs

@@ -3,13 +3,11 @@
 using OrchardCore.ContentManagement.Metadata.Settings;
 using OrchardCore.Data.Migration;
 using OrchardCore.Facebook.Widgets.Models;
-using OrchardCore.Modules;
 using OrchardCore.Recipes;
 using OrchardCore.Recipes.Services;
 
 namespace OrchardCore.Facebook.Widgets
 {
-    [Feature(FacebookConstants.Features.Widgets)]
     public class WidgetMigrations : DataMigration
     {
         private readonly IRecipeMigrator _recipeMigrator;

src/OrchardCore.Modules/OrchardCore.GitHub/AdminMenuGitHubLogin.cs

@@ -1,12 +1,10 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Localization;
-using OrchardCore.Modules;
 using OrchardCore.Navigation;
 
 namespace OrchardCore.GitHub
 {
-    [Feature(GitHubConstants.Features.GitHubAuthentication)]
     public class AdminMenuGitHubLogin : INavigationProvider
     {
         private static readonly RouteValueDictionary _routeValues = new()

src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationAdminMenu.cs

@@ -1,12 +1,10 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Localization;
-using OrchardCore.Modules;
 using OrchardCore.Navigation;
 
 namespace OrchardCore.Google
 {
-    [Feature(GoogleConstants.Features.GoogleAuthentication)]
     public class GoogleAuthenticationAdminMenu : INavigationProvider
     {
         private static readonly RouteValueDictionary _routeValues = new()
@@ -46,7 +44,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
         }
     }
 
-    [Feature(GoogleConstants.Features.GoogleAnalytics)]
     public class GoogleAnalyticsAdminMenu : INavigationProvider
     {
         private static readonly RouteValueDictionary _routeValues = new()
@@ -85,7 +82,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
         }
     }
 
-    [Feature(GoogleConstants.Features.GoogleTagManager)]
     public class GoogleTagManagerAdminMenu : INavigationProvider
     {
         private static readonly RouteValueDictionary _routeValues = new()

src/OrchardCore.Modules/OrchardCore.Media/SecureMediaPermissions.cs

@@ -7,12 +7,10 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Environment.Cache;
 using OrchardCore.Media.Services;
-using OrchardCore.Modules;
 using OrchardCore.Security.Permissions;
 
 namespace OrchardCore.Media
 {
-    [Feature("OrchardCore.Media.Security")]
     public class SecureMediaPermissions : IPermissionProvider
     {
         // Note: The ManageMediaFolder permission grants all access, so viewing must be implied by it too.

src/OrchardCore.Modules/OrchardCore.Microsoft.Authentication/AdminMenuMicrosoftAccount.cs

@@ -1,12 +1,10 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Localization;
-using OrchardCore.Modules;
 using OrchardCore.Navigation;
 
 namespace OrchardCore.Microsoft.Authentication
 {
-    [Feature(MicrosoftAuthenticationConstants.Features.MicrosoftAccount)]
     public class AdminMenuMicrosoftAccount : INavigationProvider
     {
         private static readonly RouteValueDictionary _routeValues = new()
@@ -46,7 +44,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
         }
     }
 
-    [Feature(MicrosoftAuthenticationConstants.Features.AAD)]
     public class AdminMenuAAD : INavigationProvider
     {
         private static readonly RouteValueDictionary _routeValues = new()

src/OrchardCore.Modules/OrchardCore.OpenId/Configuration/OpenIdClientConfiguration.cs

@@ -9,13 +9,11 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using OrchardCore.Environment.Shell;
-using OrchardCore.Modules;
 using OrchardCore.OpenId.Services;
 using OrchardCore.OpenId.Settings;
 
 namespace OrchardCore.OpenId.Configuration
 {
-    [Feature(OpenIdConstants.Features.Client)]
     public class OpenIdClientConfiguration :
         IConfigureOptions<AuthenticationOptions>,
         IConfigureNamedOptions<OpenIdConnectOptions>

src/OrchardCore.Modules/OrchardCore.OpenId/Configuration/OpenIdServerConfiguration.cs

@@ -11,14 +11,12 @@
 using OpenIddict.Server.AspNetCore;
 using OpenIddict.Server.DataProtection;
 using OrchardCore.Environment.Shell;
-using OrchardCore.Modules;
 using OrchardCore.OpenId.Services;
 using OrchardCore.OpenId.Settings;
 using static OpenIddict.Abstractions.OpenIddictConstants;
 
 namespace OrchardCore.OpenId.Configuration
 {
-    [Feature(OpenIdConstants.Features.Server)]
     public class OpenIdServerConfiguration : IConfigureOptions<AuthenticationOptions>,
         IConfigureOptions<OpenIddictServerOptions>,
         IConfigureOptions<OpenIddictServerDataProtectionOptions>,

src/OrchardCore.Modules/OrchardCore.OpenId/Configuration/OpenIdValidationConfiguration.cs

@@ -16,16 +16,14 @@
 using OpenIddict.Validation.DataProtection;
 using OrchardCore.Environment.Shell;
 using OrchardCore.Environment.Shell.Scope;
-using OrchardCore.Modules;
 using OrchardCore.OpenId.Services;
 using OrchardCore.OpenId.Settings;
 using OrchardCore.Security;
-using SystemEnvironment = System.Environment;
 using static OpenIddict.Abstractions.OpenIddictConstants;
+using SystemEnvironment = System.Environment;
 
 namespace OrchardCore.OpenId.Configuration
 {
-    [Feature(OpenIdConstants.Features.Validation)]
     public class OpenIdValidationConfiguration : IConfigureOptions<AuthenticationOptions>,
         IConfigureOptions<OpenIddictValidationOptions>,
         IConfigureOptions<OpenIddictValidationDataProtectionOptions>,

src/OrchardCore.Modules/OrchardCore.Roles/Controllers/AdminController.cs

@@ -13,6 +13,7 @@
 using OrchardCore.DisplayManagement.Notify;
 using OrchardCore.Environment.Extensions;
 using OrchardCore.Environment.Extensions.Features;
+using OrchardCore.Environment.Shell;
 using OrchardCore.Roles.ViewModels;
 using OrchardCore.Security;
 using OrchardCore.Security.Permissions;
@@ -28,8 +29,10 @@ public class AdminController : Controller
         private readonly IAuthorizationService _authorizationService;
         private readonly IEnumerable<IPermissionProvider> _permissionProviders;
         private readonly ITypeFeatureProvider _typeFeatureProvider;
+        private readonly IShellFeaturesManager _shellFeaturesManager;
         private readonly IRoleService _roleService;
         private readonly INotifier _notifier;
+
         protected readonly IStringLocalizer S;
         protected readonly IHtmlLocalizer H;
 
@@ -39,6 +42,7 @@ public class AdminController : Controller
             IAuthorizationService authorizationService,
             IEnumerable<IPermissionProvider> permissionProviders,
             ITypeFeatureProvider typeFeatureProvider,
+            IShellFeaturesManager shellFeaturesManager,
             IRoleService roleService,
             INotifier notifier,
             IStringLocalizer<AdminController> stringLocalizer,
@@ -49,6 +53,7 @@ public class AdminController : Controller
             _authorizationService = authorizationService;
             _permissionProviders = permissionProviders;
             _typeFeatureProvider = typeFeatureProvider;
+            _shellFeaturesManager = shellFeaturesManager;
             _roleService = roleService;
             _notifier = notifier;
             S = stringLocalizer;
@@ -241,9 +246,15 @@ private RoleEntry BuildRoleEntry(IRole role)
         private async Task<IDictionary<PermissionGroupKey, IEnumerable<Permission>>> GetInstalledPermissionsAsync()
         {
             var installedPermissions = new Dictionary<PermissionGroupKey, IEnumerable<Permission>>();
+            var enabledFeatures = await _shellFeaturesManager.GetEnabledFeaturesAsync();
+
             foreach (var permissionProvider in _permissionProviders)
             {
-                var feature = _typeFeatureProvider.GetFeatureForDependency(permissionProvider.GetType());
+                // Two features could use the same permission.
+                var feature = _typeFeatureProvider
+                    .GetFeaturesForDependency(permissionProvider.GetType())
+                    .LastOrDefault(feature => enabledFeatures.Any(enabledFeature => feature.Id == enabledFeature.Id));
+
                 var permissions = await permissionProvider.GetPermissionsAsync();
 
                 foreach (var permission in permissions)

src/OrchardCore.Modules/OrchardCore.Roles/Services/RoleUpdater.cs

@@ -54,7 +54,7 @@ private async Task UpdateRolesForInstalledFeatureAsync(IFeatureInfo feature)
             _installedFeatures.Add(feature.Id);
 
             var providers = _permissionProviders
-                .Where(provider => _typeFeatureProvider.GetFeatureForDependency(provider.GetType()).Id == feature.Id);
+                .Where(provider => _typeFeatureProvider.GetFeaturesForDependency(provider.GetType()).Any(p => p.Id == feature.Id));
 
             if (!providers.Any())
             {
@@ -98,7 +98,7 @@ private async Task UpdateRolesForEnabledFeatureAsync(IFeatureInfo feature)
             }
 
             var providers = _permissionProviders
-                .Where(provider => _typeFeatureProvider.GetFeatureForDependency(provider.GetType()).Id == feature.Id);
+                .Where(provider => _typeFeatureProvider.GetFeaturesForDependency(provider.GetType()).Any(p => p.Id == feature.Id));
 
             if (!providers.Any())
             {
@@ -144,8 +144,8 @@ private async Task UpdateRoleForInstalledFeaturesAsync(string roleName)
 
             // And defining at least one 'IPermissionProvider'.
             rolesDocument.MissingFeaturesByRole[roleName] = (await _extensionManager.LoadFeaturesAsync(missingFeatures))
-                .Where(entry => entry.ExportedTypes.Any(type => type.IsAssignableTo(typeof(IPermissionProvider))))
-                .Select(entry => entry.FeatureInfo.Id)
+                .Where(entry => _typeFeatureProvider.GetTypesForFeature(entry).Any(type => type.IsAssignableTo(typeof(IPermissionProvider))))
+                .Select(entry => entry.Id)
                 .ToList();
 
             await _documentManager.UpdateAsync(rolesDocument);

src/OrchardCore.Modules/OrchardCore.Search.Lucene/Shapes/LuceneContentPickerShapeProvider.cs

@@ -3,11 +3,9 @@
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.Descriptors;
 using OrchardCore.DisplayManagement.Shapes;
-using OrchardCore.Modules;
 
 namespace OrchardCore.Search.Lucene
 {
-    [Feature("OrchardCore.Search.Lucene.ContentPicker")]
     public class LuceneContentPickerShapeProvider : IShapeAttributeProvider
     {
         protected readonly IStringLocalizer S;

src/OrchardCore.Modules/OrchardCore.Tenants/Services/TenantFeatureProfileShapeTableProvider.cs

@@ -2,12 +2,10 @@
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.Descriptors;
 using OrchardCore.DisplayManagement.Views;
-using OrchardCore.Modules;
 using OrchardCore.Tenants.ViewModels;
 
 namespace OrchardCore.Tenants.Services;
 
-[Feature("OrchardCore.Tenants.FeatureProfiles")]
 public class TenantFeatureProfileShapeTableProvider : ShapeTableProvider
 {
     public override ValueTask DiscoverAsync(ShapeTableBuilder builder)

src/OrchardCore.Modules/OrchardCore.Twitter/AdminMenuSignin.cs

@@ -1,12 +1,10 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Localization;
-using OrchardCore.Modules;
 using OrchardCore.Navigation;
 
 namespace OrchardCore.Twitter
 {
-    [Feature(TwitterConstants.Features.Signin)]
     public class AdminMenuSignin : INavigationProvider
     {
         private static readonly RouteValueDictionary _routeValues = new()
@@ -45,7 +43,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
         }
     }
 
-    [Feature(TwitterConstants.Features.Twitter)]
     public class AdminMenu : INavigationProvider
     {
         private static readonly RouteValueDictionary _routeValues = new()

src/OrchardCore.Modules/OrchardCore.Users/AdminMenu.cs

@@ -1,7 +1,6 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Localization;
-using OrchardCore.Modules;
 using OrchardCore.Navigation;
 using OrchardCore.Users.Drivers;
 using OrchardCore.Users.Models;
@@ -55,7 +54,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
         }
     }
 
-    [Feature("OrchardCore.Users.ChangeEmail")]
     public class ChangeEmailAdminMenu : INavigationProvider
     {
         private static readonly RouteValueDictionary _routeValues = new()
@@ -93,7 +91,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
         }
     }
 
-    [Feature(UserConstants.Features.UserRegistration)]
     public class RegistrationAdminMenu : INavigationProvider
     {
         private static readonly RouteValueDictionary _routeValues = new()
@@ -131,7 +128,6 @@ public Task BuildNavigationAsync(string name, NavigationBuilder builder)
         }
     }
 
-    [Feature(UserConstants.Features.ResetPassword)]
     public class ResetPasswordAdminMenu : INavigationProvider
     {
         private static readonly RouteValueDictionary _routeValues = new()

src/OrchardCore.Modules/OrchardCore.Users/Drivers/ChangeEmailSettingsDisplayDriver.cs

@@ -5,13 +5,11 @@
 using OrchardCore.DisplayManagement.Entities;
 using OrchardCore.DisplayManagement.Handlers;
 using OrchardCore.DisplayManagement.Views;
-using OrchardCore.Modules;
 using OrchardCore.Settings;
 using OrchardCore.Users.Models;
 
 namespace OrchardCore.Users.Drivers
 {
-    [Feature("OrchardCore.Users.ChangeEmail")]
     public class ChangeEmailSettingsDisplayDriver : SectionDisplayDriver<ISite, ChangeEmailSettings>
     {
         public const string GroupId = "userChangeEmail";