From 3bb1fccc6d67ea77aac8406693ac7ed61c37d5d3 Mon Sep 17 00:00:00 2001
From: Artem Dudarev <ad@virtoway.com>
Date: Sat, 10 Aug 2024 01:24:57 +0200
Subject: [PATCH] VCST-1431: Ignore expired password when using external sign
 in (#5)

* Ignore expired password when using external sign in

* Update dependencies
---
 .../VirtoCommerce.XOrder.Core.csproj                          | 2 +-
 .../Queries/BaseQueries/BaseSearchOrderQueryBuilder.cs        | 2 +-
 src/VirtoCommerce.XOrder.Data/Schemas/OrderSchema.cs          | 2 +-
 .../VirtoCommerce.XOrder.Data.csproj                          | 2 +-
 src/VirtoCommerce.XOrder.Web/module.manifest                  | 4 ++--
 .../VirtoCommerce.XOrder.Tests.csproj                         | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/VirtoCommerce.XOrder.Core/VirtoCommerce.XOrder.Core.csproj b/src/VirtoCommerce.XOrder.Core/VirtoCommerce.XOrder.Core.csproj
index a5f3b57..e9f7fe8 100644
--- a/src/VirtoCommerce.XOrder.Core/VirtoCommerce.XOrder.Core.csproj
+++ b/src/VirtoCommerce.XOrder.Core/VirtoCommerce.XOrder.Core.csproj
@@ -11,7 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.0" />
-    <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.800.0" />
+    <PackageReference Include="VirtoCommerce.Xapi.Core" Version="3.802.0" />
     <PackageReference Include="VirtoCommerce.XCatalog.Core" Version="3.800.0" />
     <PackageReference Include="VirtoCommerce.XCart.Core" Version="3.800.0" />
     <PackageReference Include="VirtoCommerce.OrdersModule.Core" Version="3.803.0" />
diff --git a/src/VirtoCommerce.XOrder.Data/Queries/BaseQueries/BaseSearchOrderQueryBuilder.cs b/src/VirtoCommerce.XOrder.Data/Queries/BaseQueries/BaseSearchOrderQueryBuilder.cs
index 9766a4a..4b93cd2 100644
--- a/src/VirtoCommerce.XOrder.Data/Queries/BaseQueries/BaseSearchOrderQueryBuilder.cs
+++ b/src/VirtoCommerce.XOrder.Data/Queries/BaseQueries/BaseSearchOrderQueryBuilder.cs
@@ -77,7 +77,7 @@ protected override Task AfterMediatorSend(IResolveFieldContext<object> context,
 
         protected override async Task Authorize(IResolveFieldContext context, object resource, IAuthorizationRequirement requirement)
         {
-            await _userManagerCore.CheckUserState(context.GetCurrentUserId(), allowAnonymous: false);
+            await _userManagerCore.CheckCurrentUserState(context, allowAnonymous: false);
 
             await base.Authorize(context, resource, requirement);
         }
diff --git a/src/VirtoCommerce.XOrder.Data/Schemas/OrderSchema.cs b/src/VirtoCommerce.XOrder.Data/Schemas/OrderSchema.cs
index cd4d048..b206e26 100644
--- a/src/VirtoCommerce.XOrder.Data/Schemas/OrderSchema.cs
+++ b/src/VirtoCommerce.XOrder.Data/Schemas/OrderSchema.cs
@@ -282,7 +282,7 @@ private async Task<CartAggregate> GetCartAggregateAsync(string cartId)
 
         private async Task AuthorizeAsync(IResolveFieldContext context, object resource, bool allowAnonymous)
         {
-            await _userManagerCore.CheckUserState(context.GetCurrentUserId(), allowAnonymous);
+            await _userManagerCore.CheckCurrentUserState(context, allowAnonymous);
             var authorizationResult = await _authorizationService.AuthorizeAsync(context.GetCurrentPrincipal(), resource, new CanAccessOrderAuthorizationRequirement());
 
             if (!authorizationResult.Succeeded)
diff --git a/src/VirtoCommerce.XOrder.Data/VirtoCommerce.XOrder.Data.csproj b/src/VirtoCommerce.XOrder.Data/VirtoCommerce.XOrder.Data.csproj
index ad88506..46c04dd 100644
--- a/src/VirtoCommerce.XOrder.Data/VirtoCommerce.XOrder.Data.csproj
+++ b/src/VirtoCommerce.XOrder.Data/VirtoCommerce.XOrder.Data.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.841.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Security" Version="3.848.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.XOrder.Core\VirtoCommerce.XOrder.Core.csproj" />
diff --git a/src/VirtoCommerce.XOrder.Web/module.manifest b/src/VirtoCommerce.XOrder.Web/module.manifest
index 8a7777a..fa06a6b 100644
--- a/src/VirtoCommerce.XOrder.Web/module.manifest
+++ b/src/VirtoCommerce.XOrder.Web/module.manifest
@@ -4,9 +4,9 @@
   <version>3.802.0</version>
   <version-tag></version-tag>
 
-  <platformVersion>3.841.0</platformVersion>
+  <platformVersion>3.848.0</platformVersion>
   <dependencies>
-    <dependency id="VirtoCommerce.Xapi" version="3.800.0" />
+    <dependency id="VirtoCommerce.Xapi" version="3.802.0" />
     <dependency id="VirtoCommerce.XCart" version="3.800.0" />
     <dependency id="VirtoCommerce.XCatalog" version="3.800.0" />
     <dependency id="VirtoCommerce.Orders" version="3.803.0" />
diff --git a/tests/VirtoCommerce.XOrder.Tests/VirtoCommerce.XOrder.Tests.csproj b/tests/VirtoCommerce.XOrder.Tests/VirtoCommerce.XOrder.Tests.csproj
index 60f9afa..8e3e0ea 100644
--- a/tests/VirtoCommerce.XOrder.Tests/VirtoCommerce.XOrder.Tests.csproj
+++ b/tests/VirtoCommerce.XOrder.Tests/VirtoCommerce.XOrder.Tests.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AutoFixture" Version="4.18.1" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>