Merge branch 'main' into UserPickerField

EasyOC · Mar 17, 2024 · 52cc64b · 52cc64b
2 parents 1418b06 + a2d529e
commit 52cc64b
Show file tree

Hide file tree

Showing 214 changed files with 4,684 additions and 1,952 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -1805,10 +1805,10 @@
       ]
     },
     {
-      "login": "DAud-IcI",
-      "name": "El-Saig Dávid",
+      "login": "sarahelsaig",
+      "name": "Sára El-Saig",
       "avatar_url": "https://avatars1.githubusercontent.com/u/4007293?v=4",
-      "profile": "https://github.com/DAud-IcI",
+      "profile": "https://github.com/sarahelsaig",
       "contributions": [
         "code"
       ]
@@ -2825,6 +2825,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "w-ko",
+      "name": "Holerö",
+      "avatar_url": "https://avatars.githubusercontent.com/u/126988022?v=4",
+      "profile": "https://github.com/w-ko",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "skipCi": true,

diff --git a/.github/workflows/contributor_map.yml b/.github/workflows/contributor_map.yml
@@ -1,10 +1,10 @@
 name: Contributor Map
 
 on:
+  # Running this automatically would require jumping through a lot of hoops because tunaitis/contributor-map commits to
+  # the branch where the workflow was triggered, i.e. `main` for the schedule trigger. So, better to occasionally run
+  # it manually in a PR.
   workflow_dispatch:
-  schedule:
-    # At 3:00 AM UTC every Monday.
-    - cron: "0 3 * * 1"
 
 jobs:
   update-contributor-map:

diff --git a/OrchardCore.sln b/OrchardCore.sln
@@ -511,9 +511,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Search.AzureAI"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Search.AzureAI.Core", "src\OrchardCore\OrchardCore.Search.AzureAI.Core\OrchardCore.Search.AzureAI.Core.csproj", "{E9428DE8-5D81-4359-BF84-31435041FF1A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrchardCore.Media.Indexing.Pdf", "src\OrchardCore.Modules\OrchardCore.Media.Indexing.Pdf\OrchardCore.Media.Indexing.Pdf.csproj", "{95187E6A-5B74-4475-8FEB-758ACD012DCC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Media.Indexing.Pdf", "src\OrchardCore.Modules\OrchardCore.Media.Indexing.Pdf\OrchardCore.Media.Indexing.Pdf.csproj", "{95187E6A-5B74-4475-8FEB-758ACD012DCC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrchardCore.Media.Indexing.OpenXML", "src\OrchardCore.Modules\OrchardCore.Media.Indexing.OpenXML\OrchardCore.Media.Indexing.OpenXML.csproj", "{47777735-7432-4CCA-A8C5-672E9EE65121}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Media.Indexing.OpenXML", "src\OrchardCore.Modules\OrchardCore.Media.Indexing.OpenXML\OrchardCore.Media.Indexing.OpenXML.csproj", "{47777735-7432-4CCA-A8C5-672E9EE65121}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Email.Azure", "src\OrchardCore.Modules\OrchardCore.Email.Azure\OrchardCore.Email.Azure.csproj", "{C35AB37B-5A09-4896-BEEE-B126B7E7018A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Email.Smtp", "src\OrchardCore.Modules\OrchardCore.Email.Smtp\OrchardCore.Email.Smtp.csproj", "{E8A1097D-A65A-4B17-A3A2-F50D79552732}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1359,6 +1363,14 @@ Global
 		{47777735-7432-4CCA-A8C5-672E9EE65121}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{47777735-7432-4CCA-A8C5-672E9EE65121}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47777735-7432-4CCA-A8C5-672E9EE65121}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C35AB37B-5A09-4896-BEEE-B126B7E7018A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C35AB37B-5A09-4896-BEEE-B126B7E7018A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C35AB37B-5A09-4896-BEEE-B126B7E7018A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C35AB37B-5A09-4896-BEEE-B126B7E7018A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E8A1097D-A65A-4B17-A3A2-F50D79552732}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E8A1097D-A65A-4B17-A3A2-F50D79552732}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E8A1097D-A65A-4B17-A3A2-F50D79552732}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E8A1097D-A65A-4B17-A3A2-F50D79552732}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1594,6 +1606,8 @@ Global
 		{E9428DE8-5D81-4359-BF84-31435041FF1A} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
 		{95187E6A-5B74-4475-8FEB-758ACD012DCC} = {90030E85-0C4F-456F-B879-443E8A3F220D}
 		{47777735-7432-4CCA-A8C5-672E9EE65121} = {90030E85-0C4F-456F-B879-443E8A3F220D}
+		{C35AB37B-5A09-4896-BEEE-B126B7E7018A} = {A066395F-6F73-45DC-B5A6-B4E306110DCE}
+		{E8A1097D-A65A-4B17-A3A2-F50D79552732} = {A066395F-6F73-45DC-B5A6-B4E306110DCE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {46A1D25A-78D1-4476-9CBF-25B75E296341}

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -208,6 +208,8 @@ nav:
           - Data Migrations: docs/reference/modules/Migrations/README.md
           - Dynamic Cache: docs/reference/modules/DynamicCache/README.md
           - Email: docs/reference/modules/Email/README.md
+          - SMTP Provider: docs/reference/modules/Email.Smtp/README.md
+          - Azure Email Provider: docs/reference/modules/Email.Azure/README.md
           - GraphQL: docs/reference/modules/Apis.GraphQL/README.md
           - GraphQL queries: docs/reference/core/Apis.GraphQL.Abstractions/README.md
           - Health Check: docs/reference/modules/HealthChecks/README.md

diff --git a/src/OrchardCore.Build/Dependencies.AspNetCore.props b/src/OrchardCore.Build/Dependencies.AspNetCore.props
@@ -20,8 +20,8 @@
   <!-- These versions are used for the NuGet packages that are dependent on the current TFM -->
   <!-- Versions are preset for the default TFM (there may be no TFM in an evaluation phase) -->
   <PropertyGroup>
-    <AspNetCorePackagesVersion>8.0.2</AspNetCorePackagesVersion>
-    <MicrosoftExtensionsPackagesVersion>8.0.2</MicrosoftExtensionsPackagesVersion>
+    <AspNetCorePackagesVersion>8.0.3</AspNetCorePackagesVersion>
+    <MicrosoftExtensionsPackagesVersion>8.0.3</MicrosoftExtensionsPackagesVersion>
   </PropertyGroup>
 
   <!-- When dual-targeting frameworks, add both of them to CommonTargetFrameworks above, when add PropertyGroups like

diff --git a/src/OrchardCore.Build/Dependencies.props b/src/OrchardCore.Build/Dependencies.props
@@ -8,60 +8,61 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageManagement Include="AngleSharp" Version="1.1.0" />
+    <PackageManagement Include="AngleSharp" Version="1.1.2" />
     <PackageManagement Include="AWSSDK.S3" Version="3.7.104.11" />
     <PackageManagement Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.7" />
     <PackageManagement Include="AWSSDK.SecurityToken" Version="3.7.101.60" />
+    <PackageManagement Include="Azure.Communication.Email" Version="1.0.1" />
     <PackageManagement Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.1" />
     <PackageManagement Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.3.3" />
     <PackageManagement Include="Azure.Identity" Version="1.10.4" />
     <PackageManagement Include="Azure.Search.Documents" Version="11.5.1" />
     <PackageManagement Include="Azure.Storage.Blobs" Version="12.19.1" />
     <PackageManagement Include="BenchmarkDotNet" Version="0.13.12" />
     <PackageManagement Include="Castle.Core" Version="5.1.1" />
-    <PackageManagement Include="DocumentFormat.OpenXml" Version="3.0.1" />
-    <PackageManagement Include="Fluid.Core" Version="2.5.0" />
+    <PackageManagement Include="DocumentFormat.OpenXml" Version="3.0.2" />
+    <PackageManagement Include="Fluid.Core" Version="2.6.0" />
     <PackageManagement Include="GraphQL" Version="7.8.0" />
     <PackageManagement Include="GraphQL.DataLoader" Version="7.8.0" />
     <PackageManagement Include="GraphQL.MicrosoftDI" Version="7.8.0" />
     <PackageManagement Include="GraphQL.SystemTextJson" Version="7.8.0" />
-    <PackageManagement Include="Jint" Version="3.0.0" />
+    <PackageManagement Include="Jint" Version="3.0.1" />
     <PackageManagement Include="HtmlSanitizer" Version="8.1.844-beta" />
     <PackageManagement Include="Irony.Core" Version="1.0.7" />
-    <PackageManagement Include="libphonenumber-csharp" Version="8.13.30" />
+    <PackageManagement Include="libphonenumber-csharp" Version="8.13.32" />
     <PackageManagement Include="Lorem.Universal.NET" Version="4.0.80" />
     <PackageManagement Include="Lucene.Net" Version="4.8.0-beta00016" />
     <PackageManagement Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00016" />
     <PackageManagement Include="Lucene.Net.QueryParser" Version="4.8.0-beta00016" />
     <PackageManagement Include="Lucene.Net.Spatial" Version="4.8.0-beta00016" />
-    <PackageManagement Include="MailKit" Version="4.3.0" />
-    <PackageManagement Include="Markdig" Version="0.35.0" />
+    <PackageManagement Include="MailKit" Version="4.4.0" />
+    <PackageManagement Include="Markdig" Version="0.36.2" />
     <PackageManagement Include="MessagePack" Version="2.2.60" />
     <PackageManagement Include="Microsoft.Extensions.Azure" Version="1.7.2" />
-    <PackageManagement Include="Microsoft.Extensions.Http.Resilience" Version="8.2.0" />
-    <PackageManagement Include="Microsoft.Identity.Web" Version="2.17.0" />
+    <PackageManagement Include="Microsoft.Extensions.Http.Resilience" Version="8.3.0" />
+    <PackageManagement Include="Microsoft.Identity.Web" Version="2.17.2" />
     <PackageManagement Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageManagement Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-    <PackageManagement Include="MimeKit" Version="4.3.0" />
+    <PackageManagement Include="MimeKit" Version="4.4.0" />
     <PackageManagement Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
     <PackageManagement Include="Moq" Version="4.20.70" />
     <PackageManagement Include="ncrontab" Version="3.3.3" />
     <PackageManagement Include="NEST" Version="7.17.5" />
     <PackageManagement Include="NJsonSchema" Version="11.0.0" />
     <PackageManagement Include="NLog.Web.AspNetCore" Version="5.3.8" />
     <PackageManagement Include="NodaTime" Version="3.1.11" />
-    <PackageManagement Include="OpenIddict.Core" Version="5.2.0" />
-    <PackageManagement Include="OpenIddict.Server.AspNetCore" Version="5.2.0" />
-    <PackageManagement Include="OpenIddict.Server.DataProtection" Version="5.2.0" />
-    <PackageManagement Include="OpenIddict.Validation.AspNetCore" Version="5.2.0" />
-    <PackageManagement Include="OpenIddict.Validation.DataProtection" Version="5.2.0" />
-    <PackageManagement Include="OpenIddict.Validation.SystemNetHttp" Version="5.2.0" />
+    <PackageManagement Include="OpenIddict.Core" Version="5.3.0" />
+    <PackageManagement Include="OpenIddict.Server.AspNetCore" Version="5.3.0" />
+    <PackageManagement Include="OpenIddict.Server.DataProtection" Version="5.3.0" />
+    <PackageManagement Include="OpenIddict.Validation.AspNetCore" Version="5.3.0" />
+    <PackageManagement Include="OpenIddict.Validation.DataProtection" Version="5.3.0" />
+    <PackageManagement Include="OpenIddict.Validation.SystemNetHttp" Version="5.3.0" />
     <PackageManagement Include="OrchardCore.Translations.All" Version="1.8.0" />
     <PackageManagement Include="PdfPig" Version="0.1.8" />
-    <PackageManagement Include="Serilog.AspNetCore" Version="7.0.0" />
+    <PackageManagement Include="Serilog.AspNetCore" Version="8.0.1" />
     <PackageManagement Include="Shortcodes" Version="1.3.3" />
-    <PackageManagement Include="SixLabors.ImageSharp.Web" Version="3.1.0" />
-    <PackageManagement Include="StackExchange.Redis" Version="2.7.20" />
+    <PackageManagement Include="SixLabors.ImageSharp.Web" Version="3.1.1" />
+    <PackageManagement Include="StackExchange.Redis" Version="2.7.33" />
     <PackageManagement Include="StyleCop.Analyzers" Version="1.1.118" />
     <PackageManagement Include="System.Linq.Async" Version="6.0.1" />
     <PackageManagement Include="xunit" Version="2.7.0" />

diff --git a/src/OrchardCore.Cms.Web/NLog.config b/src/OrchardCore.Cms.Web/NLog.config
@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       autoReload="true"
       internalLogLevel="Warn"
-      internalLogFile="App_Data/logs/internal-nlog.txt">
+      internalLogFile="${var:configDir}/logs/internal-nlog.txt">
 
     <extensions>
         <add assembly="NLog.Web.AspNetCore"/>
@@ -13,7 +13,7 @@
     <targets>
         <!-- file target -->
         <target xsi:type="File" name="file"
-                fileName="${var:configDir}/App_Data/logs/orchard-log-${shortdate}.log"
+                fileName="${var:configDir}/logs/orchard-log-${shortdate}.log"
                 layout="${longdate}|${orchard-tenant-name}|${aspnet-traceidentifier}|${event-properties:item=EventId}|${logger}|${uppercase:${level}}|${message} ${exception:format=ToString,StackTrace}"
         />
 

diff --git a/src/OrchardCore.Cms.Web/appsettings.json b/src/OrchardCore.Cms.Web/appsettings.json
@@ -201,7 +201,7 @@
     //"OrchardCore_HealthChecks": {
     //  "Url": "/health/live"
     //},
-    //"OrchardCore_Email": {
+    //"OrchardCore_Email_Smtp": {
     //  "DefaultSender": "",
     //  "DeliveryMethod": "Network",
     //  "PickupDirectoryLocation": "",
@@ -217,6 +217,10 @@
     //  "Username": "",
     //  "Password": ""
     //},
+    //"OrchardCore_Email_Azure": {
+    //  "DefaultSender": "",
+    //  "ConnectionString": ""
+    //}
     //"OrchardCore_ReverseProxy": {
     //  "ForwardedHeaders": "None"
     //},

diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Deployment/AdminMenuDeploymentSource.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Deployment/AdminMenuDeploymentSource.cs
@@ -4,6 +4,7 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.AdminMenu.Services;
 using OrchardCore.Deployment;
+using OrchardCore.Json;
 
 namespace OrchardCore.AdminMenu.Deployment
 {
@@ -12,10 +13,11 @@ public class AdminMenuDeploymentSource : IDeploymentSource
         private readonly IAdminMenuService _adminMenuService;
         private readonly JsonSerializerOptions _serializationOptions;
 
-        public AdminMenuDeploymentSource(IAdminMenuService adminMenuService, IOptions<JsonSerializerOptions> serializationOptions)
+        public AdminMenuDeploymentSource(IAdminMenuService adminMenuService,
+            IOptions<ContentSerializerJsonOptions> serializationOptions)
         {
             _adminMenuService = adminMenuService;
-            _serializationOptions = serializationOptions.Value;
+            _serializationOptions = serializationOptions.Value.SerializerOptions;
         }
 
         public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)

diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Recipes/AdminMenuStep.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Recipes/AdminMenuStep.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Options;
 using OrchardCore.AdminMenu.Services;
+using OrchardCore.Json;
 using OrchardCore.Recipes.Models;
 using OrchardCore.Recipes.Services;
 
@@ -20,12 +21,12 @@ public class AdminMenuStep : IRecipeStepHandler
 
         public AdminMenuStep(
             IAdminMenuService adminMenuService,
-            IOptions<JsonSerializerOptions> serializationOptions)
+            IOptions<ContentSerializerJsonOptions> serializationOptions)
         {
             _adminMenuService = adminMenuService;
 
             // The recipe step contains polymorphic types (menu items) which need to be resolved
-            _serializationOptions = serializationOptions.Value;
+            _serializationOptions = serializationOptions.Value.SerializerOptions;
         }
 
         public async Task ExecuteAsync(RecipeExecutionContext context)

diff --git a/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Models/BackgroundTaskDocument.cs b/src/OrchardCore.Modules/OrchardCore.BackgroundTasks/Models/BackgroundTaskDocument.cs
@@ -2,10 +2,9 @@
 using System.Collections.Generic;
 using OrchardCore.Data.Documents;
 
-namespace OrchardCore.BackgroundTasks.Models
+namespace OrchardCore.BackgroundTasks.Models;
+
+public class BackgroundTaskDocument : Document
 {
-    public class BackgroundTaskDocument : Document
-    {
-        public Dictionary<string, BackgroundTaskSettings> Settings { get; } = new(StringComparer.OrdinalIgnoreCase);
-    }
+    public Dictionary<string, BackgroundTaskSettings> Settings { get; init; } = new(StringComparer.OrdinalIgnoreCase);
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailContentsDriver.cs b/src/OrchardCore.Modules/OrchardCore.Contents/AuditTrail/Drivers/AuditTrailContentsDriver.cs
@@ -1,3 +1,6 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using OrchardCore.AuditTrail;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Display.ContentDisplay;
 using OrchardCore.ContentManagement.Display.ViewModels;
@@ -8,10 +11,22 @@ namespace OrchardCore.Contents.AuditTrail.Drivers
 {
     public class AuditTrailContentsDriver : ContentDisplayDriver
     {
-        // TODO: What permission are we looking for here?
+        private readonly IHttpContextAccessor _httpContextAccessor;
+        private readonly IAuthorizationService _authorizationService;
+
+        public AuditTrailContentsDriver(
+            IHttpContextAccessor httpContextAccessor,
+            IAuthorizationService authorizationService)
+        {
+            _httpContextAccessor = httpContextAccessor;
+            _authorizationService = authorizationService;
+        }
+
         public override IDisplayResult Display(ContentItem contentItem, IUpdateModel updater)
         {
-            return Initialize<ContentItemViewModel>("AuditTrailContentsAction_SummaryAdmin", m => m.ContentItem = contentItem).Location("SummaryAdmin", "ActionsMenu:10");
+            return Initialize<ContentItemViewModel>("AuditTrailContentsAction_SummaryAdmin", m => m.ContentItem = contentItem)
+                .Location("SummaryAdmin", "ActionsMenu:10")
+                .RenderWhen(() => _authorizationService.AuthorizeAsync(_httpContextAccessor.HttpContext?.User, AuditTrailPermissions.ViewAuditTrail));
         }
     }
 }