Address feedback

src/OrchardCore.Modules/OrchardCore.Roles/Migrations/RolesMigrations.cs

@@ -16,13 +16,19 @@ public sealed class RolesMigrations : DataMigration
     private static readonly string _alternativeAdminRoleName = "SiteOwner";
 
     private readonly SystemRoleOptions _systemRoleOptions;
+    private readonly ISystemRoleNameProvider _systemRoleNameProvider;
+    private readonly RoleManager<IRole> _roleManager;
     private readonly ILogger _logger;
 
     public RolesMigrations(
         IOptions<SystemRoleOptions> systemRoleOptions,
+        ISystemRoleNameProvider systemRoleNameProvider,
+        RoleManager<IRole> roleManager,
         ILogger<RolesMigrations> logger)
     {
         _systemRoleOptions = systemRoleOptions.Value;
+        _systemRoleNameProvider = systemRoleNameProvider;
+        _roleManager = roleManager;
         _logger = logger;
     }
 
@@ -126,6 +132,18 @@ await HttpBackgroundJob.ExecuteAfterEndOfRequestAsync("MigrateAdminUsersToNewAdm
         return 1;
     }
 
+    public async Task<int> UpdateFrom1Async()
+    {
+        var systemRoles = await _systemRoleNameProvider.GetSystemRolesAsync();
+
+        foreach (var role in systemRoles)
+        {
+            await _roleManager.CreateAsync(new Role { RoleName = role });
+        }
+
+        return 2;
+    }
+
     private static string GenerateNewAdminRoleName(List<IRole> roles)
     {
         var counter = 1;

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

@@ -1,7 +1,5 @@
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
@@ -81,7 +79,4 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddScoped<IRoleCreatedEventHandler>(sp => sp.GetRequiredService<RoleUpdater>());
         services.AddScoped<IRoleRemovedEventHandler>(sp => sp.GetRequiredService<RoleUpdater>());
     }
-
-    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
-        => app.UseSystemRoles();
 }

src/OrchardCore.Themes/TheAdmin/Recipes/blank.recipe.json

@@ -65,6 +65,31 @@
       "name": "themes",
       "admin": "TheAdmin",
       "site": ""
+    },
+    {
+      "name": "Roles",
+      "Roles": [
+        {
+          "Name": "Moderator",
+          "Description": "Grants users the ability to moderate content.",
+          "Permissions": []
+        },
+        {
+          "Name": "Editor",
+          "Description": "Grants users the ability to edit existing content.",
+          "Permissions": []
+        },
+        {
+          "Name": "Author",
+          "Description": "Grants users the ability to create content.",
+          "Permissions": []
+        },
+        {
+          "Name": "Contributor",
+          "Description": "Grants users the ability to contribute content.",
+          "Permissions": []
+        }
+      ]
     }
   ]
 }

src/OrchardCore.Themes/TheAdmin/Recipes/headless.recipe.json

@@ -61,6 +61,31 @@
         "TheAdmin"
       ]
     },
+    {
+      "name": "Roles",
+      "Roles": [
+        {
+          "Name": "Moderator",
+          "Description": "Grants users the ability to moderate content.",
+          "Permissions": []
+        },
+        {
+          "Name": "Editor",
+          "Description": "Grants users the ability to edit existing content.",
+          "Permissions": []
+        },
+        {
+          "Name": "Author",
+          "Description": "Grants users the ability to create content.",
+          "Permissions": []
+        },
+        {
+          "Name": "Contributor",
+          "Description": "Grants users the ability to contribute content.",
+          "Permissions": []
+        }
+      ]
+    },
     {
       "name": "settings",
       "HomeRoute": {

src/OrchardCore.Themes/TheAgencyTheme/Recipes/agency.recipe.json

@@ -70,6 +70,31 @@
       "admin": "TheAdmin",
       "site": "TheAgencyTheme"
     },
+    {
+      "name": "Roles",
+      "Roles": [
+        {
+          "Name": "Moderator",
+          "Description": "Grants users the ability to moderate content.",
+          "Permissions": []
+        },
+        {
+          "Name": "Editor",
+          "Description": "Grants users the ability to edit existing content.",
+          "Permissions": []
+        },
+        {
+          "Name": "Author",
+          "Description": "Grants users the ability to create content.",
+          "Permissions": []
+        },
+        {
+          "Name": "Contributor",
+          "Description": "Grants users the ability to contribute content.",
+          "Permissions": []
+        }
+      ]
+    },
     {
       "name": "settings",
       "HomeRoute": {

src/OrchardCore.Themes/TheBlogTheme/Recipes/blog.recipe.json

@@ -84,6 +84,31 @@
       "admin": "TheAdmin",
       "site": "TheBlogTheme"
     },
+    {
+      "name": "Roles",
+      "Roles": [
+        {
+          "Name": "Moderator",
+          "Description": "Grants users the ability to moderate content.",
+          "Permissions": []
+        },
+        {
+          "Name": "Editor",
+          "Description": "Grants users the ability to edit existing content.",
+          "Permissions": []
+        },
+        {
+          "Name": "Author",
+          "Description": "Grants users the ability to create content.",
+          "Permissions": []
+        },
+        {
+          "Name": "Contributor",
+          "Description": "Grants users the ability to contribute content.",
+          "Permissions": []
+        }
+      ]
+    },
     {
       "name": "settings",
       "HomeRoute": {

src/OrchardCore.Themes/TheComingSoonTheme/Recipes/comingsoon.recipe.json

@@ -67,6 +67,31 @@
       "admin": "TheAdmin",
       "site": "TheComingSoonTheme"
     },
+    {
+      "name": "Roles",
+      "Roles": [
+        {
+          "Name": "Moderator",
+          "Description": "Grants users the ability to moderate content.",
+          "Permissions": []
+        },
+        {
+          "Name": "Editor",
+          "Description": "Grants users the ability to edit existing content.",
+          "Permissions": []
+        },
+        {
+          "Name": "Author",
+          "Description": "Grants users the ability to create content.",
+          "Permissions": []
+        },
+        {
+          "Name": "Contributor",
+          "Description": "Grants users the ability to contribute content.",
+          "Permissions": []
+        }
+      ]
+    },
     {
       "name": "settings",
       "HomeRoute": {