Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Seal all Startup, Configuration and Filter classes #16238

Merged
merged 12 commits into from
Jun 5, 2024
4 changes: 2 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.Admin/AdminMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

namespace OrchardCore.Admin
{
public class AdminMenu : INavigationProvider
public sealed class AdminMenu : INavigationProvider
{
private static readonly RouteValueDictionary _routeValues = new()
{
{ "area", "OrchardCore.Settings" },
{ "groupId", AdminSiteSettingsDisplayDriver.GroupId },
};

protected readonly IStringLocalizer S;
internal readonly IStringLocalizer S;

public AdminMenu(IStringLocalizer<AdminMenu> localizer)
{
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Admin/Permissions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace OrchardCore.Admin;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
[Obsolete("This will be removed in a future release. Instead use 'AdminPermissions.AccessAdminPanel'.")]
public static readonly Permission AccessAdminPanel = AdminPermissions.AccessAdminPanel;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace OrchardCore.Admin;

public class PermissionsAdminSettings : IPermissionProvider
public sealed class PermissionsAdminSettings : IPermissionProvider
{
public static readonly Permission ManageAdminSettings = new("ManageAdminSettings", "Manage Admin Settings");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace OrchardCore.AdminDashboard;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
public static readonly Permission ManageAdminDashboard = new("ManageAdminDashboard", "Manage the Admin Dashboard");
public static readonly Permission AccessAdminDashboard = new("AccessAdminDashboard", "Access the Admin Dashboard", new[] { ManageAdminDashboard });
Expand Down
5 changes: 3 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.AdminMenu/AdminMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@

namespace OrchardCore.AdminMenu
{
public class AdminMenu : INavigationProvider
public sealed class AdminMenu : INavigationProvider
{
private readonly AdminMenuNavigationProvidersCoordinator _adminMenuNavigationProvider;
private protected IStringLocalizer S;

internal readonly IStringLocalizer S;

public AdminMenu(AdminMenuNavigationProvidersCoordinator adminMenuNavigationProvider,
IStringLocalizer<AdminMenu> localizer)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace OrchardCore.AdminMenu;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
public static readonly Permission ManageAdminMenu = new("ManageAdminMenu", "Manage the admin menu");
public static readonly Permission ViewAdminMenuAll = new("ViewAdminMenuAll", "View Admin Menu - View All", new[] { ManageAdminMenu });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace OrchardCore.AdminMenu.Services
// Those are classes that add new 'AdminNodes' to a 'NavigationBuilder' using custom logic specific to the module that register them.
// This class handles their inclusion on the admin menu.
// This class is itself one more 'INavigationProvider' so it can be called from this module's AdminMenu.cs.
public class AdminMenuNavigationProvidersCoordinator : INavigationProvider
public sealed class AdminMenuNavigationProvidersCoordinator : INavigationProvider
{
private readonly IAdminMenuService _adminMenuService;
private readonly IAuthorizationService _authorizationService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace OrchardCore.AdminMenu.Services;

public class AdminMenuPermissionService : IAdminMenuPermissionService
public sealed class AdminMenuPermissionService : IAdminMenuPermissionService
{
private readonly IEnumerable<IPermissionProvider> _permissionProviders;

Expand Down
4 changes: 2 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/AdminMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

namespace OrchardCore.Apis.GraphQL
{
public class AdminMenu : INavigationProvider
public sealed class AdminMenu : INavigationProvider
{
protected readonly IStringLocalizer S;
internal readonly IStringLocalizer S;

public AdminMenu(IStringLocalizer<AdminMenu> localizer)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace OrchardCore.Apis.GraphQL;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
[Obsolete("This will be removed in a future release. Instead use 'OrchardCore.Apis.GraphQL.CommonPermissions.ExecuteGraphQLMutations'.")]
public static readonly Permission ExecuteGraphQLMutations = CommonPermissions.ExecuteGraphQLMutations;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

namespace OrchardCore.AuditTrail.Navigation
{
public class AuditTrailAdminMenu : INavigationProvider
public sealed class AuditTrailAdminMenu : INavigationProvider
{
private static readonly RouteValueDictionary _routeValues = new()
{
{ "area", "OrchardCore.AuditTrail" },
{ "correlationId", string.Empty },
};

protected readonly IStringLocalizer S;
internal readonly IStringLocalizer S;

public AuditTrailAdminMenu(IStringLocalizer<AuditTrailAdminMenu> stringLocalizer)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

namespace OrchardCore.AuditTrail.Navigation
{
public class AuditTrailSettingsAdminMenu : INavigationProvider
public sealed class AuditTrailSettingsAdminMenu : INavigationProvider
{
private static readonly RouteValueDictionary _routeValues = new()
{
{ "area", "OrchardCore.Settings" },
{ "groupId", AuditTrailSettingsGroup.Id },
};

protected readonly IStringLocalizer S;
internal readonly IStringLocalizer S;

public AuditTrailSettingsAdminMenu(IStringLocalizer<AuditTrailSettingsAdminMenu> stringLocalizer)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace OrchardCore.AuditTrail;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
[Obsolete("This will be removed in a future release. Instead use 'OrchardCore.AuditTrail.AuditTrailPermissions.ViewAuditTrail'.")]
public static readonly Permission ViewAuditTrail = AuditTrailPermissions.ViewAuditTrail;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace OrchardCore.Autoroute;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
public static readonly Permission SetHomepage = new("SetHomepage", "Set homepage.");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

namespace OrchardCore.BackgroundTasks
{
public class AdminMenu : INavigationProvider
public sealed class AdminMenu : INavigationProvider
{
protected readonly IStringLocalizer S;
internal readonly IStringLocalizer S;

public AdminMenu(IStringLocalizer<AdminMenu> localizer) => S = localizer;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace OrchardCore.BackgroundTasks;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
public static readonly Permission ManageBackgroundTasks = new("ManageBackgroundTasks", "Manage background tasks");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace OrchardCore.ContentLocalization
{
public class AdminMenu : INavigationProvider
public sealed class AdminMenu : INavigationProvider
{
private static readonly RouteValueDictionary _providersRouteValues = new()
{
Expand All @@ -20,7 +20,7 @@ public class AdminMenu : INavigationProvider
{ "groupId", ContentCulturePickerSettingsDriver.GroupId },
};

protected readonly IStringLocalizer S;
internal readonly IStringLocalizer S;

public AdminMenu(IStringLocalizer<AdminMenu> localizer)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace OrchardCore.ContentLocalization;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
public static readonly Permission LocalizeContent = new("LocalizeContent", "Localize content for others");
public static readonly Permission LocalizeOwnContent = new("LocalizeOwnContent", "Localize own content", new[] { LocalizeContent });
Expand Down
4 changes: 2 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.ContentTypes/AdminMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

namespace OrchardCore.ContentTypes
{
public class AdminMenu : INavigationProvider
public sealed class AdminMenu : INavigationProvider
{
private static readonly string _adminControllerName = typeof(AdminController).ControllerName();

protected readonly IStringLocalizer S;
internal readonly IStringLocalizer S;

public AdminMenu(IStringLocalizer<AdminMenu> localizer)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace OrchardCore.ContentTypes;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
public static readonly Permission ViewContentTypes = new("ViewContentTypes", "View content types.");
public static readonly Permission EditContentTypes = new("EditContentTypes", "Edit content types.", isSecurityCritical: true);
Expand Down
5 changes: 3 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.Contents/AdminMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

namespace OrchardCore.Contents
{
public class AdminMenu : INavigationProvider
public sealed class AdminMenu : INavigationProvider
{
private static readonly RouteValueDictionary _routeValues = new()
{
Expand All @@ -37,7 +37,8 @@ public class AdminMenu : INavigationProvider
private readonly LinkGenerator _linkGenerator;
private readonly IAuthorizationService _authorizationService;
private readonly ISiteService _siteService;
protected readonly IStringLocalizer S;

internal readonly IStringLocalizer S;

public AdminMenu(
IContentDefinitionManager contentDefinitionManager,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@

namespace OrchardCore.Contents.Deployment.ExportContentToDeploymentTarget
{
public class ExportContentToDeploymentTargetAdminMenu : INavigationProvider
public sealed class ExportContentToDeploymentTargetAdminMenu : INavigationProvider
{
private static readonly RouteValueDictionary _routeValues = new()
{
{ "area", "OrchardCore.Settings" },
{ "groupId", ExportContentToDeploymentTargetSettingsDisplayDriver.GroupId },
};

protected readonly IStringLocalizer S;
internal readonly IStringLocalizer S;

public ExportContentToDeploymentTargetAdminMenu(IStringLocalizer<AdminMenu> localizer)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace OrchardCore.Contents;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
// Note - in code you should demand PublishContent, EditContent, or DeleteContent.
// Do not demand the "Own" variations - those are applied automatically when you demand the main ones.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace OrchardCore.Contents.Security;

public class ContentTypePermissions : IPermissionProvider
public sealed class ContentTypePermissions : IPermissionProvider
{
private readonly IContentDefinitionManager _contentDefinitionManager;

Expand Down
4 changes: 2 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.Cors/AdminMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

namespace OrchardCore.Cors
{
public class AdminMenu : INavigationProvider
public sealed class AdminMenu : INavigationProvider
{
protected readonly IStringLocalizer S;
internal readonly IStringLocalizer S;

public AdminMenu(IStringLocalizer<AdminMenu> localizer)
{
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Cors/Permissions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace OrchardCore.Cors;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
public static readonly Permission ManageCorsSettings = new("ManageCorsSettings", "Managing Cors Settings", isSecurityCritical: true);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@

namespace OrchardCore.CustomSettings
{
public class AdminMenu : INavigationProvider
public sealed class AdminMenu : INavigationProvider
{
private readonly CustomSettingsService _customSettingsService;
protected readonly IStringLocalizer S;
private static readonly ConcurrentDictionary<string, RouteValueDictionary> _routeValues = [];

private readonly CustomSettingsService _customSettingsService;

internal readonly IStringLocalizer S;

public AdminMenu(
IStringLocalizer<AdminMenu> localizer,
CustomSettingsService customSettingsService)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace OrchardCore.CustomSettings;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
private static readonly Permission _manageCustomSettings = new("ManageCustomSettings_{0}", "Manage Custom Settings - {0}", new[] { new Permission("ManageResourceSettings") });

Expand Down
4 changes: 2 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.Demo/AdminMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

namespace OrchardCore.Demo
{
public class AdminMenu : INavigationProvider
public sealed class AdminMenu : INavigationProvider
{
protected readonly IStringLocalizer S;
internal readonly IStringLocalizer S;

public AdminMenu(IStringLocalizer<AdminMenu> localizer)
{
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Modules/OrchardCore.Demo/Permissions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace OrchardCore.Demo;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
public static readonly Permission DemoAPIAccess = new("DemoAPIAccess", "Access to Demo API ");
public static readonly Permission ManageOwnUserProfile = new("ManageOwnUserProfile", "Manage own user profile", new Permission[] { CommonPermissions.ManageUsers });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

namespace OrchardCore.Deployment.Remote
{
public class AdminMenu : INavigationProvider
public sealed class AdminMenu : INavigationProvider
{
protected readonly IStringLocalizer S;
internal readonly IStringLocalizer S;

public AdminMenu(IStringLocalizer<AdminMenu> localizer)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace OrchardCore.Deployment.Remote;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
public static readonly Permission ManageRemoteInstances = new("ManageRemoteInstances", "Manage remote instances");
public static readonly Permission ManageRemoteClients = new("ManageRemoteClients", "Manage remote clients");
Expand Down
4 changes: 2 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.Deployment/AdminMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

namespace OrchardCore.Deployment
{
public class AdminMenu : INavigationProvider
public sealed class AdminMenu : INavigationProvider
{
protected readonly IStringLocalizer S;
internal readonly IStringLocalizer S;

public AdminMenu(IStringLocalizer<AdminMenu> localizer)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace OrchardCore.Deployment;

public class Permissions : IPermissionProvider
public sealed class Permissions : IPermissionProvider
{
[Obsolete("This will be removed in a future release. Instead use 'OrchardCore.Deployment.CommonPermissions.ManageDeploymentPlan'.")]
public static readonly Permission ManageDeploymentPlan = CommonPermissions.ManageDeploymentPlan;
Expand Down
Loading