Add AddPermissionProvider extension

src/OrchardCore.Modules/OrchardCore.Admin/Startup.cs

@@ -51,11 +51,11 @@ public override void ConfigureServices(IServiceCollection services)
         });
 
         services.AddTransient<IAreaControllerRouteMapper, AdminAreaControllerRouteMapper>();
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddScoped<IThemeSelector, AdminThemeSelector>();
         services.AddScoped<IAdminThemeService, AdminThemeService>();
         services.AddSiteDisplayDriver<AdminSiteSettingsDisplayDriver>();
-        services.AddScoped<IPermissionProvider, PermissionsAdminSettings>();
+        services.AddPermissionProvider<PermissionsAdminSettings>();
         services.AddNavigationProvider<AdminMenu>();
         services.AddSingleton<IPageRouteModelProvider, AdminPageRouteModelProvider>();
         services.AddScoped<IDisplayDriver<Navbar>, VisitSiteNavbarDisplayDriver>();

src/OrchardCore.Modules/OrchardCore.AdminDashboard/Startup.cs

@@ -31,7 +31,7 @@ public Startup(IOptions<AdminOptions> adminOptions)
 
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
 
         services.AddScoped<IAdminDashboardService, AdminDashboardService>();
         services.AddIndexProvider<DashboardPartIndexProvider>();

src/OrchardCore.Modules/OrchardCore.AdminMenu/Startup.cs

@@ -15,7 +15,7 @@ public sealed class Startup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<IAdminMenuPermissionService, AdminMenuPermissionService>();
 

src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Startup.cs

@@ -45,7 +45,7 @@ public override void ConfigureServices(IServiceCollection services)
             return new ErrorInfoProvider(new ErrorInfoProviderOptions { ExposeExceptionDetails = settings.Value.ExposeExceptions });
         });
 
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddNavigationProvider<AdminMenu>();
         services.AddSingleton<GraphQLMiddleware>();
 

src/OrchardCore.Modules/OrchardCore.AuditTrail/Startup.cs

@@ -42,7 +42,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddIndexProvider<AuditTrailEventIndexProvider>();
         services.AddSingleton<IBackgroundTask, AuditTrailBackgroundTask>();
 
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddNavigationProvider<AuditTrailAdminMenu>();
         services.AddNavigationProvider<AuditTrailSettingsAdminMenu>();
 

src/OrchardCore.Modules/OrchardCore.Autoroute/Startup.cs

@@ -74,7 +74,7 @@ public override void ConfigureServices(IServiceCollection services)
 
         services.AddScoped<IContentHandler, DefaultRouteContentHandler>();
         services.AddScoped<IContentHandler, AutorouteContentHandler>();
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddScoped<IContentTypePartDefinitionDisplayDriver, AutoroutePartSettingsDisplayDriver>();
         services.AddScoped<IContentPartIndexHandler, AutoroutePartIndexHandler>();
 

src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Startup.cs

@@ -12,7 +12,7 @@ public override void ConfigureServices(IServiceCollection services)
     {
         services
             .AddScoped<BackgroundTaskManager>()
-            .AddScoped<IPermissionProvider, Permissions>()
+            .AddPermissionProvider<Permissions>()
             .AddNavigationProvider<AdminMenu>()
             .AddScoped<IBackgroundTaskSettingsProvider, BackgroundTaskSettingsProvider>();
     }

src/OrchardCore.Modules/OrchardCore.ContentLocalization/Startup.cs

@@ -39,7 +39,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddSingleton<ILocalizationEntries, LocalizationEntries>();
         services.AddContentLocalization();
 
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddScoped<IAuthorizationHandler, LocalizeContentAuthorizationHandler>();
 
         services.AddScoped<IContentsAdminListFilter, LocalizationPartContentsAdminListFilter>();

src/OrchardCore.Modules/OrchardCore.ContentTypes/Startup.cs

@@ -19,7 +19,7 @@ public sealed class Startup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<IContentDefinitionService, ContentDefinitionService>();
         services.AddScoped<IStereotypeService, StereotypeService>();

src/OrchardCore.Modules/OrchardCore.Contents/Startup.cs

@@ -139,8 +139,8 @@ static async Task<FluidValue> GetContentByHandleAsync(LiquidTemplateContext cont
 
         services.AddContentManagement();
         services.AddContentManagementDisplay();
-        services.AddScoped<IPermissionProvider, Permissions>();
-        services.AddScoped<IPermissionProvider, ContentTypePermissions>();
+        services.AddPermissionProvider<Permissions>();
+        services.AddPermissionProvider<ContentTypePermissions>();
         services.AddScoped<IAuthorizationHandler, ContentTypeAuthorizationHandler>();
         services.AddScoped<IShapeTableProvider, Shapes>();
         services.AddNavigationProvider<AdminMenu>();

src/OrchardCore.Modules/OrchardCore.Cors/Startup.cs

@@ -25,7 +25,7 @@ public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder ro
     public override void ConfigureServices(IServiceCollection services)
     {
         services.AddNavigationProvider<AdminMenu>();
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddSingleton<CorsService>();
 
         services.TryAddEnumerable(ServiceDescriptor

src/OrchardCore.Modules/OrchardCore.CustomSettings/Startup.cs

@@ -24,7 +24,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddScoped<CustomSettingsService>();
         services.AddScoped<IStereotypesProvider, CustomSettingsStereotypesProvider>();
         // Permissions
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddScoped<IAuthorizationHandler, CustomSettingsAuthorizationHandler>();
 
         services.AddRecipeExecutionStep<CustomSettingsStep>();

src/OrchardCore.Modules/OrchardCore.Demo/Startup.cs

@@ -89,7 +89,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<IContentDisplayDriver, TestContentElementDisplayDriver>();
         services.AddDataMigration<Migrations>();
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddContentPart<TestContentPartA>();
         services.AddScoped<IUserClaimsProvider, UserProfileClaimsProvider>();
 

src/OrchardCore.Modules/OrchardCore.Deployment.Remote/Startup.cs

@@ -17,6 +17,6 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddScoped<RemoteInstanceService>();
         services.AddScoped<RemoteClientService>();
         services.AddScoped<IDeploymentTargetProvider, RemoteInstanceDeploymentTargetProvider>();
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
     }
 }

src/OrchardCore.Modules/OrchardCore.Deployment/Startup.cs

@@ -20,7 +20,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddDeploymentServices();
 
         services.AddNavigationProvider<AdminMenu>();
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
 
         services.AddSingleton<IDeploymentTargetProvider, FileDownloadDeploymentTargetProvider>();
 

src/OrchardCore.Modules/OrchardCore.Email/Startup.cs

@@ -16,7 +16,7 @@ public override void ConfigureServices(IServiceCollection services)
     {
         services.AddEmailServices()
             .AddSiteDisplayDriver<EmailSettingsDisplayDriver>()
-            .AddScoped<IPermissionProvider, Permissions>()
+            .AddPermissionProvider<Permissions>()
             .AddNavigationProvider<AdminMenu>();
 
         services.AddDataMigration<EmailMigrations>();

src/OrchardCore.Modules/OrchardCore.Facebook/Startup.cs

@@ -26,7 +26,7 @@ public override void Configure(IApplicationBuilder builder, IEndpointRouteBuilde
 
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddNavigationProvider<AdminMenu>();
 
         services.AddSingleton<IFacebookService, FacebookService>();

src/OrchardCore.Modules/OrchardCore.Facebook/StartupPixel.cs

@@ -15,7 +15,7 @@ public sealed class StartupPixel : StartupBase
     public override void ConfigureServices(IServiceCollection services)
     {
         services.AddSiteDisplayDriver<FacebookPixelSettingsDisplayDriver>();
-        services.AddScoped<IPermissionProvider, PixelPermissionProvider>();
+        services.AddPermissionProvider<PixelPermissionProvider>();
         services.AddNavigationProvider<AdminMenuPixel>();
 
         services.Configure<MvcOptions>((options) =>

src/OrchardCore.Modules/OrchardCore.Features/Startup.cs

@@ -18,7 +18,7 @@ public sealed class Startup : StartupBase
     public override void ConfigureServices(IServiceCollection services)
     {
         services.AddRecipeExecutionStep<FeatureStep>();
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddScoped<IModuleService, ModuleService>();
         services.AddNavigationProvider<AdminMenu>();
 

src/OrchardCore.Modules/OrchardCore.GitHub/Startup.cs

@@ -19,7 +19,7 @@ public sealed class Startup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
     }
 }
 

src/OrchardCore.Modules/OrchardCore.Google/GoogleAuthenticationStartup.cs

@@ -29,7 +29,7 @@ public sealed class GoogleAuthenticationStartup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<IPermissionProvider, GoogleAuthenticationPermissionProvider>();
+        services.AddPermissionProvider<GoogleAuthenticationPermissionProvider>();
         services.AddSingleton<GoogleAuthenticationService, GoogleAuthenticationService>();
         services.AddSiteDisplayDriver<GoogleAuthenticationSettingsDisplayDriver>();
         services.AddNavigationProvider<GoogleAuthenticationAdminMenu>();
@@ -53,7 +53,7 @@ public sealed class GoogleAnalyticsStartup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<IPermissionProvider, GoogleAnalyticsPermissionsProvider>();
+        services.AddPermissionProvider<GoogleAnalyticsPermissionsProvider>();
         services.AddSingleton<IGoogleAnalyticsService, GoogleAnalyticsService>();
 
         services.AddSiteDisplayDriver<GoogleAnalyticsSettingsDisplayDriver>();
@@ -71,7 +71,7 @@ public sealed class GoogleTagManagerStartup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<IPermissionProvider, GoogleTagManagerPermissionProvider>();
+        services.AddPermissionProvider<GoogleTagManagerPermissionProvider>();
         services.AddSingleton<IGoogleTagManagerService, GoogleTagManagerService>();
         services.AddSiteDisplayDriver<GoogleTagManagerSettingsDisplayDriver>();
         services.AddNavigationProvider<GoogleTagManagerAdminMenu>();

src/OrchardCore.Modules/OrchardCore.Https/Startup.cs

@@ -37,7 +37,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddNavigationProvider<AdminMenu>();
         services.AddSingleton<IHttpsService, HttpsService>();
 
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
 
         services.AddOptions<HttpsRedirectionOptions>()
             .Configure<IHttpsService>((options, service) =>

src/OrchardCore.Modules/OrchardCore.Layers/Startup.cs

@@ -46,7 +46,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddScoped<IContentHandler, LayerMetadataHandler>();
         services.AddIndexProvider<LayerMetadataIndexProvider>();
         services.AddDataMigration<Migrations>();
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddRecipeExecutionStep<LayerStep>();
         services.AddDeployment<AllLayersDeploymentSource, AllLayersDeploymentStep, AllLayersDeploymentStepDriver>();
         services.AddSingleton<IGlobalMethodProvider, DefaultLayersMethodProvider>();

src/OrchardCore.Modules/OrchardCore.Localization/Startup.cs

@@ -29,7 +29,7 @@ public override void ConfigureServices(IServiceCollection services)
     {
         services.AddSiteDisplayDriver<LocalizationSettingsDisplayDriver>();
         services.AddNavigationProvider<AdminMenu>();
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddScoped<ILocalizationService, LocalizationService>();
 
         services.AddPortableObjectLocalization(options => options.ResourcesPath = "Localization").

src/OrchardCore.Modules/OrchardCore.Media.AmazonS3/Startup.cs

@@ -34,7 +34,7 @@ public Startup(IShellConfiguration configuration,
 
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddNavigationProvider<AdminMenu>();
         services.AddTransient<IConfigureOptions<AwsStorageOptions>, AwsStorageOptionsConfiguration>();
 

src/OrchardCore.Modules/OrchardCore.Media.Azure/Startup.cs

@@ -39,7 +39,7 @@ public override int Order
 
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddNavigationProvider<AdminMenu>();
         services.AddTransient<IConfigureOptions<MediaBlobStorageOptions>, MediaBlobStorageOptionsConfiguration>();
 

src/OrchardCore.Modules/OrchardCore.Media/Startup.cs

@@ -135,7 +135,7 @@ public override void ConfigureServices(IServiceCollection services)
             return new DefaultMediaFileStore(fileStore, mediaUrlBase, mediaOptions.CdnBaseUrl, mediaEventHandlers, mediaCreatingEventHandlers, logger);
         });
 
-        services.AddScoped<IPermissionProvider, PermissionProvider>();
+        services.AddPermissionProvider<PermissionProvider>();
         services.AddScoped<IAuthorizationHandler, ManageMediaFolderAuthorizationHandler>();
         services.AddNavigationProvider<AdminMenu>();
 
@@ -235,7 +235,7 @@ public sealed class MediaCacheStartup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<IPermissionProvider, MediaCachePermissions>();
+        services.AddPermissionProvider<MediaCachePermissions>();
         services.AddNavigationProvider<MediaCacheAdminMenu>();
     }
 }
@@ -328,7 +328,7 @@ public override void ConfigureServices(IServiceCollection services)
     {
         // Marker service to easily detect if the feature has been enabled.
         services.AddSingleton<SecureMediaMarker>();
-        services.AddScoped<IPermissionProvider, SecureMediaPermissions>();
+        services.AddPermissionProvider<SecureMediaPermissions>();
         services.AddScoped<IAuthorizationHandler, ViewMediaFolderAuthorizationHandler>();
 
         services.AddSingleton<IMediaEventHandler, SecureMediaFileStoreEventHandler>();

src/OrchardCore.Modules/OrchardCore.Menu/Startup.cs

@@ -23,7 +23,7 @@ public override void ConfigureServices(IServiceCollection services)
     {
         services.AddDataMigration<Migrations>();
         services.AddScoped<IShapeTableProvider, MenuShapes>();
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddNavigationProvider<AdminMenu>();
 
         services.AddScoped<IStereotypesProvider, MenuItemStereotypesProvider>();

src/OrchardCore.Modules/OrchardCore.MiniProfiler/Startup.cs

@@ -25,7 +25,7 @@ public override void ConfigureServices(IServiceCollection services)
 
         services.AddMiniProfiler();
 
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
     }
 
     public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)

src/OrchardCore.Modules/OrchardCore.Notifications/Startup.cs

@@ -46,7 +46,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.Configure<StoreCollectionOptions>(o => o.Collections.Add(NotificationConstants.NotificationCollection));
         services.AddScoped<INotificationEvents, CoreNotificationEventsHandler>();
 
-        services.AddScoped<IPermissionProvider, NotificationPermissionsProvider>();
+        services.AddPermissionProvider<NotificationPermissionsProvider>();
         services.AddScoped<IDisplayDriver<ListNotificationOptions>, ListNotificationOptionsDisplayDriver>();
         services.AddScoped<IDisplayDriver<Notification>, NotificationDisplayDriver>();
         services.AddTransient<INotificationAdminListFilterProvider, DefaultNotificationsAdminListFilterProvider>();

src/OrchardCore.Modules/OrchardCore.Placements/Startup.cs

@@ -18,7 +18,7 @@ public sealed class Startup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddNavigationProvider<AdminMenu>();
 
         services.TryAddScoped<IPlacementStore, DatabasePlacementsStore>();

src/OrchardCore.Modules/OrchardCore.Queries/Sql/Startup.cs

@@ -18,7 +18,7 @@ public sealed class Startup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddScoped<IDisplayDriver<Query>, SqlQueryDisplayDriver>();
         services.AddQuerySource<SqlQuerySource>(SqlQuerySource.SourceName);
 

src/OrchardCore.Modules/OrchardCore.Queries/Startup.cs

@@ -26,7 +26,7 @@ public override void ConfigureServices(IServiceCollection services)
     {
         services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<IDisplayDriver<Query>, QueryDisplayDriver>();
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
     }
 }
 

src/OrchardCore.Modules/OrchardCore.ReCaptcha/Startup.cs

@@ -22,7 +22,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddReCaptcha();
         services.AddSiteDisplayDriver<ReCaptchaSettingsDisplayDriver>();
         services.AddNavigationProvider<AdminMenu>();
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
     }
 }
 

src/OrchardCore.Modules/OrchardCore.ReverseProxy/Startup.cs

@@ -27,7 +27,7 @@ public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder ro
     public override void ConfigureServices(IServiceCollection services)
     {
         services.AddNavigationProvider<AdminMenu>();
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddSiteDisplayDriver<ReverseProxySettingsDisplayDriver>();
 
         services.AddSingleton<ReverseProxyService>();

src/OrchardCore.Modules/OrchardCore.Roles/Startup.cs

@@ -26,7 +26,7 @@ public override void ConfigureServices(IServiceCollection services)
 
         services.AddRecipeExecutionStep<RolesStep>();
         services.AddScoped<IAuthorizationHandler, RolesPermissionsHandler>();
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddNavigationProvider<AdminMenu>();
     }
 }

src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Startup.cs

@@ -93,7 +93,7 @@ public override void ConfigureServices(IServiceCollection services)
         });
 
         services.AddElasticServices();
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
         services.AddNavigationProvider<AdminMenu>();
         services.AddScoped<IDisplayDriver<Query>, ElasticQueryDisplayDriver>();
         services.AddDataMigration<ElasticsearchQueryMigrations>();

src/OrchardCore.Modules/OrchardCore.Search.Lucene/Startup.cs

@@ -41,7 +41,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddScoped<IModularTenantEvents, LuceneIndexInitializerService>();
         services.AddScoped<ILuceneSearchQueryService, LuceneSearchQueryService>();
         services.AddNavigationProvider<AdminMenu>();
-        services.AddScoped<IPermissionProvider, Permissions>();
+        services.AddPermissionProvider<Permissions>();
 
         services.Configure<LuceneOptions>(o =>
             o.Analyzers.Add(new LuceneAnalyzer(LuceneSettings.StandardAnalyzer,