Merge pull request #895 from Lombiq/issue/OSOE-903

OSOE-903: Upgrade to Orchard Core 2.1.2

Readme.md

@@ -50,7 +50,7 @@ Note that this solution also has an Orchard 1 counterpart, [Lombiq's Open-Source
 - [`Lombiq.Hosting.Tenants.Maintenance`](https://github.com/Lombiq/Hosting-Tenants/tree/dev/Lombiq.Hosting.Tenants.Maintenance): With the help of this module, you can execute maintenance tasks on tenants.
 - [`Lombiq.Hosting.Tenants.Management`](https://github.com/Lombiq/Hosting-Tenants/tree/dev/Lombiq.Hosting.Tenants.Management): With the help of this module, you can set restrictions on tenant creation and set tenant level shell settings in the tenant editor.
 - [`Lombiq.JsonEditor`](https://github.com/Lombiq/Orchard-JSON-Editor): Orchard Core module for displaying a JSON Editor like on [jsoneditoronline.org](https://jsoneditoronline.org/). Watch a demo video of it from the Orchard Community Meeting [here](https://www.youtube.com/watch?app=desktop&v=nFhRjhXTKAY).
-- [`Lombiq.LoginAsAnybody`](https://github.com/Lombiq/Orchard-Login-as-Anybody): With the help of this module, a user with the site owner permission can log in as anybody on the admin dashboard.
+- [`Lombiq.LoginAsAnybody`](https://github.com/Lombiq/Orchard-Login-as-Anybody): With the help of this module, an administrator can log in as anybody on the admin dashboard.
 - [`Lombiq.OSOCE.Samples`](https://github.com/Lombiq/Open-Source-Orchard-Core-Extensions/tree/dev/src/Modules/Lombiq.OSOCE.Samples): This is a placeholder module that will contain sample code for UI tests and demonstration content for our open-source Orchard Core extensions.
 - [`Lombiq.Privacy`](https://github.com/Lombiq/Orchard-Privacy): Orchard module containing features related to data protection/privacy and the EU law on it, the [General Data Protection Regulation](https://eur-lex.europa.eu/legal-content/EN/TXT/?qid=1462439808430&uri=CELEX:32016R0679) (GDPR). Check out a demo video of this module [here](https://www.youtube.com/watch?v=GnyYL9Zdo8Q). **Important!** Using this module will not make your site GDPR-compliant alone. Do not forget to create a privacy policy page that you need to link to from the various consent-asking features.
 - [`Lombiq.TrainingDemo`](https://github.com/Lombiq/Orchard-Training-Demo-Module): Demo Orchard Core module for training purposes guiding you to become an Orchard developer. Note that this module also has an Orchard 1.x version in the [`dev-orchard-1` branch of the repository](https://github.com/Lombiq/Orchard-Training-Demo-Module/tree/dev-orchard-1). If you prefer tutorial videos more then check out the [Dojo Course 3, the complete Orchard Core tutorial series](https://orcharddojo.net/orchard-training/dojo-course-3-the-full-orchard-core-tutorial).

src/Lombiq.OSOCE.Web/Lombiq.OSOCE.Web.csproj

@@ -58,9 +58,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Admin.Abstractions" Version="2.0.1" />
-    <PackageReference Include="OrchardCore.Application.Cms.Targets" Version="2.0.1" />
-    <PackageReference Include="OrchardCore.Logging.NLog" Version="2.0.1" />
+    <PackageReference Include="OrchardCore.Admin.Abstractions" Version="2.1.2" />
+    <PackageReference Include="OrchardCore.Application.Cms.Targets" Version="2.1.2" />
+    <PackageReference Include="OrchardCore.Logging.NLog" Version="2.1.2" />
     <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.3" />
   </ItemGroup>
 

src/Lombiq.OSOCE.Web/Recipes/Lombiq.OSOCE.Tests.recipe.json

@@ -35,7 +35,7 @@
         "Lombiq.Hosting.Tenants.Management.ShellSettingsEditor",
         "Lombiq.Hosting.Tenants.Maintenance",
         "Lombiq.Hosting.Tenants.Maintenance.UpdateSiteUrl",
-        "Lombiq.Hosting.Tenants.Maintenance.AddSiteOwnerPermissionToRole",
+        "Lombiq.Hosting.Tenants.Maintenance.AddAdministratorRoleToUsersWithRole",
         "Lombiq.Hosting.Tenants.Maintenance.ChangeUserSensitiveContent",
         "Lombiq.Hosting.Tenants.IdleTenantManagement.ShutDownIdleTenants",
         "Lombiq.Hosting.Tenants.EmailQuotaManagement",
@@ -166,44 +166,6 @@
             "ManageWorkflows",
             "ExecuteWorkflows"
           ]
-        },
-        {
-          "Name": "Administrator",
-          "Description": "Administrator role",
-          "Permissions": [
-            "ManageSettings",
-            "AccessAdminPanel",
-            "ManageAdminSettings",
-            "ManageUsers",
-            "ManageRoles",
-            "SiteOwner",
-            "ManageTenants",
-            "ApplyTheme",
-            "PublishContent",
-            "EditContent",
-            "DeleteContent",
-            "PreviewContent",
-            "CloneContent",
-            "AccessContentApi",
-            "ListContent",
-            "ViewContentTypes",
-            "EditContentTypes",
-            "ManageMediaContent",
-            "ManageAttachedMediaFieldsFolder",
-            "ManageMediaProfiles",
-            "ViewMediaOptions",
-            "ManageAssetCache",
-            "ViewAzureMediaOptions",
-            "ManageBackgroundTasks",
-            "ManageEmailSettings",
-            "ManageWorkflows",
-            "ExecuteWorkflows",
-            "SetHomepage",
-            "Import",
-            "Export",
-            "ViewAuditTrail",
-            "ManageAuditTrailSettings"
-          ]
         }
       ]
     },

src/Modules/Lombiq.OSOCE.Samples/Lombiq.OSOCE.Samples.csproj

@@ -11,10 +11,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OrchardCore.Module.Targets" Version="2.0.0" />
-    <PackageReference Include="OrchardCore.ContentManagement" Version="2.0.0" />
-    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.0.0" />
-    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.0.0" />
+    <PackageReference Include="OrchardCore.Module.Targets" Version="2.1.0" />
+    <PackageReference Include="OrchardCore.ContentManagement" Version="2.1.0" />
+    <PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="2.1.0" />
+    <PackageReference Include="OrchardCore.DisplayManagement" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>

test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorLoginAsAnybodyTests.cs

@@ -14,11 +14,11 @@ public BehaviorLoginAsAnybodyTests(ITestOutputHelper testOutputHelper)
 
     [Fact]
     public Task SwitchingUserShouldWorkCorrectly() =>
-        ExecuteTestAfterSetupAsync(context => context.TestLoginAsAnybodyAsync());
+        ExecuteTestAfterSetupAsync(context => context.SwitchingUserShouldWorkCorrectlyAsync());
 
     [Fact]
     public Task PermissionCheckShouldWorkCorrectly() =>
         ExecuteTestAfterSetupAsync(
-            context => context.TestLoginAsAnybodyAuthorizationAsync(),
+            context => context.PermissionCheckShouldWorkCorrectlyAsync(),
             changeConfiguration: Configurations.IgnoreUnauthorizedBrowserLogEntries);
 }

test/Lombiq.OSOCE.Tests.UI/Tests/ModuleTests/BehaviorMaintenanceTests.cs

@@ -14,16 +14,16 @@ public BehaviorMaintenanceTests(ITestOutputHelper testOutputHelper)
     }
 
     [Fact]
-    public Task MaintenanceTaskShouldBeExecutedSuccessfully() =>
+    public Task UpdateSiteUrlMaintenanceTaskShouldBeExecutedSuccessfully() =>
         ExecuteTestAfterSetupAsync(
             context => context.TestSiteUrlMaintenanceExecutionAsync(),
             configuration => configuration.SetUpdateSiteUrlMaintenanceConfiguration());
 
     [Fact]
-    public Task AddSiteOwnerPermissionToRoleMaintenanceTaskShouldBeExecutedSuccessfully() =>
+    public Task AddAdministratorRoleToUsersWithRoleMaintenanceTaskShouldBeExecutedSuccessfully() =>
         ExecuteTestAfterSetupAsync(
-            context => context.TestSiteOwnerPermissionToRoleMaintenanceExecutionAsync(),
-            configuration => configuration.SetAddSiteOwnerPermissionToRoleMaintenanceConfiguration());
+            context => context.TestAdministratorRoleToUsersWithRoleMaintenanceExecutionAsync(),
+            configuration => configuration.SetAddAdministratorRoleToUsersWithRoleConfiguration());
 
     // This test uses ExecuteTestAsync with a different setup delegate instead of ExecuteTestAfterSetupAsync because the
     // maintenance does changes to the DB on startup only necessary for this test (like depersonalizing user accounts).