Merge branch 'dev' into feat/VCST-2241

VirtoCommerce · Nov 25, 2024 · f45ba96 · f45ba96
2 parents 299b291 + e3bf4a5
commit f45ba96
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 8 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.813.0</VersionPrefix>
+    <VersionPrefix>3.814.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/src/VirtoCommerce.Xapi.Core/Queries/SlugInfoQuery.cs b/src/VirtoCommerce.Xapi.Core/Queries/SlugInfoQuery.cs
@@ -3,6 +3,7 @@
 using GraphQL;
 using GraphQL.Types;
 using VirtoCommerce.Xapi.Core.BaseQueries;
+using VirtoCommerce.Xapi.Core.Extensions;
 using VirtoCommerce.Xapi.Core.Models;
 
 namespace VirtoCommerce.Xapi.Core.Queries
@@ -39,7 +40,7 @@ public override void Map(IResolveFieldContext context)
 #pragma warning restore VC0008
             Permalink = context.GetArgument<string>(nameof(Permalink));
             StoreId = context.GetArgument<string>(nameof(StoreId));
-            UserId = context.GetArgument<string>(nameof(UserId));
+            UserId = context.GetCurrentUserId();
             CultureName = context.GetArgument<string>(nameof(CultureName));
         }
     }

diff --git a/src/VirtoCommerce.Xapi.Core/VirtoCommerce.Xapi.Core.csproj b/src/VirtoCommerce.Xapi.Core/VirtoCommerce.Xapi.Core.csproj
@@ -31,10 +31,16 @@
     <PackageReference Include="PipelineNet" Version="0.9.0" />
     <PackageReference Include="RedLock.net" Version="2.3.2" />
     <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.861.0" />
-    <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.808.0" />
+    <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.811.0" />
     <PackageReference Include="VirtoCommerce.CustomerModule.Core" Version="3.817.0" />
     <PackageReference Include="VirtoCommerce.SearchModule.Core" Version="3.804.0" />
     <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.809.0" />
     <PackageReference Include="VirtoCommerce.TaxModule.Core" Version="3.802.0" />
   </ItemGroup>
+
+  <!--Workaround for vulnerable transitive packages-->
+  <ItemGroup>
+    <PackageReference Include="System.Net.Http" Version="4.3.4" />
+    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+  </ItemGroup>
 </Project>
diff --git a/src/VirtoCommerce.Xapi.Data/Queries/SlugInfoQueryHandler.cs b/src/VirtoCommerce.Xapi.Data/Queries/SlugInfoQueryHandler.cs
@@ -49,6 +49,7 @@ public async Task<SlugInfoResponse> Handle(SlugInfoQuery request, CancellationTo
             criteria.LanguageCode = currentCulture;
             criteria.Permalink = request.Permalink;
             criteria.Slug = lastSegment;
+            criteria.UserId = request.UserId;
 
             result.EntityInfo = await GetBestMatchingSeoInfo(criteria, store);
 

diff --git a/src/VirtoCommerce.Xapi.Data/VirtoCommerce.Xapi.Data.csproj b/src/VirtoCommerce.Xapi.Data/VirtoCommerce.Xapi.Data.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.853.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.861.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.Xapi.Core\VirtoCommerce.Xapi.Core.csproj" />

diff --git a/src/VirtoCommerce.Xapi.Web/module.manifest b/src/VirtoCommerce.Xapi.Web/module.manifest
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.Xapi</id>
-  <version>3.813.0</version>
+  <version>3.814.0</version>
   <version-tag></version-tag>
 
   <platformVersion>3.861.0</platformVersion>
   <dependencies>
-    <dependency id="VirtoCommerce.Core" version="3.808.0" />
+    <dependency id="VirtoCommerce.Core" version="3.811.0" />
     <dependency id="VirtoCommerce.Customer" version="3.817.0" />
     <dependency id="VirtoCommerce.Search" version="3.804.0" />
     <dependency id="VirtoCommerce.Store" version="3.809.0" />

diff --git a/tests/VirtoCommerce.Xapi.Tests/VirtoCommerce.Xapi.Tests.csproj b/tests/VirtoCommerce.Xapi.Tests/VirtoCommerce.Xapi.Tests.csproj
@@ -12,10 +12,10 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="6.12.1" />
+    <PackageReference Include="FluentAssertions" Version="6.12.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="Moq" Version="4.20.72" />
-    <PackageReference Include="NEST" Version="7.6.1" />
+    <PackageReference Include="NEST" Version="7.17.5" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>