Merge branch 'main' into skrypt/build

Skrypt · Skrypt · commit 7bf7c01d9524 · 2025-05-06T14:18:48.000-04:00
# Conflicts:
#	.github/workflows/build-and-test.yml
#	Directory.Packages.props
#	src/Modules/OrchardCore.Commerce.ContentFields/OrchardCore.Commerce.ContentFields.csproj
#	src/Modules/OrchardCore.Commerce.Payment.Stripe/OrchardCore.Commerce.Payment.Stripe.csproj
#	src/Modules/OrchardCore.Commerce.Payment/OrchardCore.Commerce.Payment.csproj
#	src/Modules/OrchardCore.Commerce.Payment/wwwroot/css/payment-form.css
#	src/Modules/OrchardCore.Commerce/Startup.cs
#	src/Modules/OrchardCore.Commerce/wwwroot/css/error.css
#	src/Modules/OrchardCore.Commerce/wwwroot/css/shopping-cart-widget.css
#	src/Modules/OrchardCore.Commerce/wwwroot/css/shopping-cart.css
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,6 @@
+# Ignore any App_Data folder
+**/App_Data/
+
+# Ignore all built assets
+**/[b|B]in/
+**/[O|o]bj/
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -34,11 +34,11 @@ jobs:
     uses: Lombiq/GitHub-Actions/.github/workflows/codespell.yml@dev
 
   lint:
-    name: Lint Scripts and Styles
-    uses: Lombiq/NodeJs-Extensions/.github/workflows/lint.yml@issue/OCC-314
+    name: Lint Scripts, Styles, and Texts
+    uses: Lombiq/NodeJs-Extensions/.github/workflows/lint.yml@dev
     with:
-      script-paths: src/Modules/OrchardCore.Commerce,src/Modules/OrchardCore.Commerce.ContentFields,src/Modules/OrchardCore.Commerce.Payment.Stripe
-      style-css-paths: src/Modules/OrchardCore.Commerce,src/Modules/OrchardCore.Commerce.Payment
+      scripts: 'src/Modules/OrchardCore.Commerce, src/Modules/OrchardCore.Commerce.ContentFields, src/Modules/OrchardCore.Commerce.Payment.Stripe'
+      styles-css: 'src/Modules/OrchardCore.Commerce, src/Modules/OrchardCore.Commerce.Payment'
 
   post-pull-request-checks-automation:
     needs: [build-and-test-linux, build-and-test-windows, codespell, lint]
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@
 obj/
 bin/
 artifacts/
-wwwroot/
+is-cache/
 node_modules/
 *.user
 .pnpm-debug.log
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -43,10 +43,9 @@
     <PackageVersion Include="OrchardCore.Title" Version="$(OrchardCoreVersion)" />
     <PackageVersion Include="OrchardCore.Workflows.Abstractions" Version="$(OrchardCoreVersion)" />
     <PackageVersion Include="Shouldly" Version="4.3.0" />
-    <PackageVersion Include="Stripe.net" Version="48.0.2" />
-
-    <PackageVersion Include="xunit.v3" Version="2.0.1" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
+    <PackageVersion Include="Stripe.net" Version="48.1.0" />
+    <PackageVersion Include="xunit.v3" Version="2.0.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'" >
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,25 @@
+# TARGETARCH and TARGETOS are set automatically when --platform is provided.
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
+ARG TARGETOS
+LABEL stage=build-env
+WORKDIR /source
+
+# copy required files for building
+# .dockerignore excludes App_Data and binaries from these
+COPY ./src ./src
+COPY Directory.Build.props .
+COPY Directory.Packages.props .
+
+# build, results are placed in /app
+RUN dotnet publish src/OrchardCore.Commerce.Web/OrchardCore.Commerce.Web.csproj -c Release -o /app --framework net8.0 /p:RunAnalyzers=false
+
+# build runtime image
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-1809 AS build_windows
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS build_linux
+FROM build_${TARGETOS} AS aspnet
+
+EXPOSE 80
+ENV ASPNETCORE_URLS=http://+:80
+WORKDIR /app
+COPY --from=build-env /app/ .
+ENTRYPOINT ["dotnet", "OrchardCore.Commerce.Web.dll"]
diff --git a/Dockerfile-CI b/Dockerfile-CI
@@ -0,0 +1,14 @@
+# This Docker file is intended for the CI
+# A prerequisite is a published application in the .build/release  
+FROM --platform=$BUILDPLATFORM golang:alpine AS build
+ARG TARGETOS
+
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-nanoserver-1809 AS build_windows
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS build_linux
+FROM build_${TARGETOS} AS aspnet
+
+EXPOSE 80
+ENV ASPNETCORE_URLS http://+:80
+WORKDIR /app
+COPY .build/release /app
+ENTRYPOINT ["dotnet", "OrchardCore.Commerce.Web.dll"]
diff --git a/Dockerfile-CI.dockerignore b/Dockerfile-CI.dockerignore
@@ -0,0 +1,7 @@
+# Buildkit Only working in linux
+
+# Ignore all
+**
+
+# Except precompiled files
+!/.build/release/*
diff --git a/src/Libraries/OrchardCore.Commerce.Abstractions/Abstractions/IShoppingCartPersistence.cs b/src/Libraries/OrchardCore.Commerce.Abstractions/Abstractions/IShoppingCartPersistence.cs
@@ -1,5 +1,4 @@
 using OrchardCore.Commerce.Abstractions.Models;
-using OrchardCore.Commerce.Services;
 using System.Threading.Tasks;
 
 namespace OrchardCore.Commerce.Abstractions;
@@ -8,8 +7,8 @@ namespace OrchardCore.Commerce.Abstractions;
 /// Service that provides a way to retain shopping cart information.
 /// </summary>
 /// <remarks><para>
-/// When deriving a custom implementation, please inherit from <see cref="ShoppingCartPersistenceBase"/> to retain event
-/// handling and dependency injection scope level caching.
+/// When deriving a custom implementation, please inherit from <c>ShoppingCartPersistenceBase</c> in the
+/// <c>OrchardCore.Commerce</c> project to retain event handling and dependency injection scope level caching.
 /// </para></remarks>
 public interface IShoppingCartPersistence
 {
@@ -22,9 +21,17 @@ public interface IShoppingCartPersistence
     Task<ShoppingCart> RetrieveAsync(string shoppingCartId);
 
     /// <summary>
-    /// Saves a shopping cart by a given ID.
+    /// Saves the provided <see cref="ShoppingCart"/> <paramref name="items"/>.
     /// </summary>
     Task StoreAsync(ShoppingCart items);
+
+    /// <summary>
+    /// Remove a <see cref="ShoppingCart"/> identified by <paramref name="shoppingCartId"/>.
+    /// </summary>
+    /// <param name="shoppingCartId">
+    /// The name used to identify the shopping cart. <see langword="null"/> refers to the default shopping cart.
+    /// </param>
+    Task RemoveAsync(string shoppingCartId);
 }
 
 public static class ShoppingCartPersistenceExtensions
diff --git a/src/Modules/OrchardCore.Commerce.ContentFields/OrchardCore.Commerce.ContentFields.csproj b/src/Modules/OrchardCore.Commerce.ContentFields/OrchardCore.Commerce.ContentFields.csproj
@@ -44,12 +44,4 @@
     <PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" />
   </ItemGroup>
 
-  <Target Name="Copy JavaScript Assets"
-          AfterTargets="AfterResolveReferences">
-    <ItemGroup>
-      <JavaScriptAssets Include="Assets\Scripts\**\*.js"/>
-    </ItemGroup>
-    <Copy SourceFiles="@(JavaScriptAssets)" DestinationFolder="wwwroot\js\%(RecursiveDir)" SkipUnchangedFiles="true" />
-  </Target>
-
 </Project>
diff --git a/src/Modules/OrchardCore.Commerce.ContentFields/wwwroot/js/commerce-regions.js b/src/Modules/OrchardCore.Commerce.ContentFields/wwwroot/js/commerce-regions.js
diff --git a/src/Modules/OrchardCore.Commerce.Payment.Stripe/OrchardCore.Commerce.Payment.Stripe.csproj b/src/Modules/OrchardCore.Commerce.Payment.Stripe/OrchardCore.Commerce.Payment.Stripe.csproj
@@ -45,12 +45,4 @@
     <ProjectReference Include="..\OrchardCore.Commerce\OrchardCore.Commerce.csproj" />
   </ItemGroup>
 
-  <Target Name="Copy JavaScript Assets"
-          AfterTargets="AfterResolveReferences">
-    <ItemGroup>
-      <JavaScriptAssets Include="Assets\Scripts\**\*.js"/>
-    </ItemGroup>
-    <Copy SourceFiles="@(JavaScriptAssets)" DestinationFolder="wwwroot\js\%(RecursiveDir)" SkipUnchangedFiles="true" />
-  </Target>
-
 </Project>
diff --git a/src/Modules/OrchardCore.Commerce.Payment.Stripe/wwwroot/js/stripe-payment-form.js b/src/Modules/OrchardCore.Commerce.Payment.Stripe/wwwroot/js/stripe-payment-form.js
diff --git a/src/Modules/OrchardCore.Commerce.Payment/OrchardCore.Commerce.Payment.csproj b/src/Modules/OrchardCore.Commerce.Payment/OrchardCore.Commerce.Payment.csproj
@@ -53,12 +53,4 @@
     <PackageReference Include="Lombiq.HelpfulLibraries.AspNetCore" />
   </ItemGroup>
 
-  <Target Name="Copy CSS Assets"
-          AfterTargets="AfterResolveReferences">
-    <ItemGroup>
-      <CssAssets Include="Assets\Styles\**\*.css"/>
-    </ItemGroup>
-    <Copy SourceFiles="@(CssAssets)" DestinationFolder="wwwroot\css\%(RecursiveDir)" SkipUnchangedFiles="true" />
-  </Target>
-
 </Project>
diff --git a/src/Modules/OrchardCore.Commerce.Payment/Services/PaymentService.cs b/src/Modules/OrchardCore.Commerce.Payment/Services/PaymentService.cs
@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc.Localization;
 using Microsoft.Extensions.Logging;
+using OrchardCore.Commerce.Abstractions;
 using OrchardCore.Commerce.Abstractions.Abstractions;
 using OrchardCore.Commerce.Abstractions.Constants;
 using OrchardCore.Commerce.Abstractions.Models;
@@ -33,6 +34,7 @@ namespace OrchardCore.Commerce.Payment.Services;
 
 public class PaymentService : IPaymentService
 {
+    private readonly IShoppingCartPersistence _shoppingCartPersistence;
     private readonly IFieldsOnlyDisplayManager _fieldsOnlyDisplayManager;
     private readonly IContentManager _contentManager;
     private readonly IShoppingCartHelpers _shoppingCartHelpers;
@@ -51,6 +53,7 @@ public class PaymentService : IPaymentService
     // We need all of them.
 #pragma warning disable S107 // Methods should not have too many parameters
     public PaymentService(
+        IShoppingCartPersistence shoppingCartPersistence,
         IFieldsOnlyDisplayManager fieldsOnlyDisplayManager,
         IOrchardServices<PaymentService> services,
         IShoppingCartHelpers shoppingCartHelpers,
@@ -64,6 +67,7 @@ public PaymentService(
         IMoneyService moneyService)
 #pragma warning restore S107 // Methods should not have too many parameters
     {
+        _shoppingCartPersistence = shoppingCartPersistence;
         _fieldsOnlyDisplayManager = fieldsOnlyDisplayManager;
         _contentManager = services.ContentManager.Value;
         _shoppingCartHelpers = shoppingCartHelpers;
@@ -177,11 +181,7 @@ public async Task FinalModificationOfOrderAsync(ContentItem order, string? shopp
         await _orderEvents.AwaitEachAsync(orderEvent =>
             orderEvent.FinalizeAsync(order, shoppingCartId, paymentProviderName));
 
-        await _shoppingCartHelpers.UpdateAsync(shoppingCartId, cart =>
-        {
-            cart.Items?.Clear();
-            return Task.CompletedTask;
-        });
+        await _shoppingCartPersistence.RemoveAsync(shoppingCartId);
 
         if (!string.IsNullOrEmpty(paymentProviderName))
         {
diff --git a/src/Modules/OrchardCore.Commerce.Payment/wwwroot/css/payment-form.css b/src/Modules/OrchardCore.Commerce.Payment/wwwroot/css/payment-form.css
diff --git a/src/Modules/OrchardCore.Commerce/Services/SessionShoppingCartPersistence.cs b/src/Modules/OrchardCore.Commerce/Services/SessionShoppingCartPersistence.cs
@@ -45,4 +45,19 @@ protected override async Task<bool> StoreInnerAsync(string key, ShoppingCart ite
 
         return true;
     }
+
+    protected override Task<bool> RemoveInnerAsync(string key)
+    {
+        try
+        {
+            Session.Clear();
+            _httpContextAccessor.HttpContext?.Response.Cookies.Delete(key);
+        }
+        catch
+        {
+            return Task.FromResult(false);
+        }
+
+        return Task.FromResult(true);
+    }
 }
diff --git a/src/Modules/OrchardCore.Commerce/Services/ShoppingCartPersistenceBase.cs b/src/Modules/OrchardCore.Commerce/Services/ShoppingCartPersistenceBase.cs
@@ -49,6 +49,16 @@ public async Task StoreAsync(ShoppingCart items)
         }
     }
 
+    public async Task RemoveAsync(string shoppingCartId)
+    {
+        var key = GetCacheId(shoppingCartId);
+
+        if (await RemoveInnerAsync(key))
+        {
+            _scopeCache.Remove(key, out _);
+        }
+    }
+
     /// <summary>
     /// Retrieves the items using the <see cref="ShoppingCartPersistenceBase"/>-specific <paramref name="key"/>.
     /// </summary>
@@ -68,6 +78,12 @@ public async Task StoreAsync(ShoppingCart items)
     /// </returns>
     protected abstract Task<bool> StoreInnerAsync(string key, ShoppingCart items);
 
+    /// <summary>
+    /// Remove the items using the <see cref="ShoppingCartPersistenceBase"/>-specific <paramref name="key"/>.
+    /// </summary>
+    /// <param name="key">A prefix and (if set) the shopping cart ID combined.</param>
+    /// <returns>A value indicating whether the removal was successful.</returns>
+    protected abstract Task<bool> RemoveInnerAsync(string key);
     protected string GetCacheId(string shoppingCartId) =>
         string.IsNullOrEmpty(shoppingCartId) ? ShoppingCartPrefix : $"{ShoppingCartPrefix}_{shoppingCartId}";
 }
diff --git a/src/Modules/OrchardCore.Commerce/Startup.cs b/src/Modules/OrchardCore.Commerce/Startup.cs
@@ -250,11 +250,7 @@ public override void ConfigureServices(IServiceCollection services)
         services.AddCommerceApiServices();
     }
 
-    public override void Configure(
-        IApplicationBuilder app,
-        IEndpointRouteBuilder routes,
-        IServiceProvider serviceProvider
-    )
+    public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
     {
         app.UseResourceFilters();
         routes.AddShoppingCartApiEndpoints();
diff --git a/src/Modules/OrchardCore.Commerce/wwwroot/css/error.css b/src/Modules/OrchardCore.Commerce/wwwroot/css/error.css
diff --git a/src/Modules/OrchardCore.Commerce/wwwroot/css/shopping-cart-widget.css b/src/Modules/OrchardCore.Commerce/wwwroot/css/shopping-cart-widget.css
diff --git a/src/Modules/OrchardCore.Commerce/wwwroot/css/shopping-cart.css b/src/Modules/OrchardCore.Commerce/wwwroot/css/shopping-cart.css
diff --git a/src/Modules/OrchardCore.Commerce/wwwroot/js/toggle-second-address.js b/src/Modules/OrchardCore.Commerce/wwwroot/js/toggle-second-address.js
diff --git a/test/OrchardCore.Commerce.Tests/Fakes/FakeCartStorage.cs b/test/OrchardCore.Commerce.Tests/Fakes/FakeCartStorage.cs
@@ -30,4 +30,10 @@ public Task StoreAsync(ShoppingCart items)
         _carts[items.Id ?? string.Empty] = new ShoppingCart(items.Items);
         return Task.CompletedTask;
     }
+
+    public Task RemoveAsync(string shoppingCartId)
+    {
+        _carts.Remove(shoppingCartId);
+        return Task.CompletedTask;
+    }
 }
