From e88dc6a347a2c9d6dc78e369445a82d5743f6e46 Mon Sep 17 00:00:00 2001
From: Oleg Zhuk <zhukoo@gmail.com>
Date: Fri, 1 Nov 2024 15:17:14 +0200
Subject: [PATCH] VCST-2048: Use ClaimsPrincipalExtensions GetUserId (#124)

feat: Replace custom code with ClaimsPrincipalExtensions that resolves user id and name from IdentityOptions settings.
---
 .../VirtoCommerce.QuoteModule.Core.csproj                    | 2 +-
 .../VirtoCommerce.QuoteModule.Data.MySql.csproj              | 4 ++--
 .../VirtoCommerce.QuoteModule.Data.PostgreSql.csproj         | 4 ++--
 .../VirtoCommerce.QuoteModule.Data.SqlServer.csproj          | 4 ++--
 .../VirtoCommerce.QuoteModule.Data.csproj                    | 4 ++--
 .../Authorization/QuoteAuthorizationHandler.cs               | 5 +----
 src/VirtoCommerce.QuoteModule.Web/module.manifest            | 2 +-
 7 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/VirtoCommerce.QuoteModule.Core/VirtoCommerce.QuoteModule.Core.csproj b/src/VirtoCommerce.QuoteModule.Core/VirtoCommerce.QuoteModule.Core.csproj
index 0e327da..403829b 100644
--- a/src/VirtoCommerce.QuoteModule.Core/VirtoCommerce.QuoteModule.Core.csproj
+++ b/src/VirtoCommerce.QuoteModule.Core/VirtoCommerce.QuoteModule.Core.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="VirtoCommerce.CartModule.Core" Version="3.810.0" />
     <PackageReference Include="VirtoCommerce.CatalogModule.Core" Version="3.800.0" />
     <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.800.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.841.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.861.0" />
     <PackageReference Include="VirtoCommerce.TaxModule.Core" Version="3.800.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/VirtoCommerce.QuoteModule.Data.MySql/VirtoCommerce.QuoteModule.Data.MySql.csproj b/src/VirtoCommerce.QuoteModule.Data.MySql/VirtoCommerce.QuoteModule.Data.MySql.csproj
index 4f8585b..331665f 100644
--- a/src/VirtoCommerce.QuoteModule.Data.MySql/VirtoCommerce.QuoteModule.Data.MySql.csproj
+++ b/src/VirtoCommerce.QuoteModule.Data.MySql/VirtoCommerce.QuoteModule.Data.MySql.csproj
@@ -5,11 +5,11 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="VirtoCommerce.Platform.Data.MySql" Version="3.841.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data.MySql" Version="3.861.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.QuoteModule.Data\VirtoCommerce.QuoteModule.Data.csproj" />
diff --git a/src/VirtoCommerce.QuoteModule.Data.PostgreSql/VirtoCommerce.QuoteModule.Data.PostgreSql.csproj b/src/VirtoCommerce.QuoteModule.Data.PostgreSql/VirtoCommerce.QuoteModule.Data.PostgreSql.csproj
index ba2dbaa..388fa99 100644
--- a/src/VirtoCommerce.QuoteModule.Data.PostgreSql/VirtoCommerce.QuoteModule.Data.PostgreSql.csproj
+++ b/src/VirtoCommerce.QuoteModule.Data.PostgreSql/VirtoCommerce.QuoteModule.Data.PostgreSql.csproj
@@ -6,11 +6,11 @@
     <noWarn>NU1903</noWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="VirtoCommerce.Platform.Data.PostgreSql" Version="3.841.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data.PostgreSql" Version="3.861.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.QuoteModule.Data\VirtoCommerce.QuoteModule.Data.csproj" />
diff --git a/src/VirtoCommerce.QuoteModule.Data.SqlServer/VirtoCommerce.QuoteModule.Data.SqlServer.csproj b/src/VirtoCommerce.QuoteModule.Data.SqlServer/VirtoCommerce.QuoteModule.Data.SqlServer.csproj
index e2ac6aa..0a7b18b 100644
--- a/src/VirtoCommerce.QuoteModule.Data.SqlServer/VirtoCommerce.QuoteModule.Data.SqlServer.csproj
+++ b/src/VirtoCommerce.QuoteModule.Data.SqlServer/VirtoCommerce.QuoteModule.Data.SqlServer.csproj
@@ -5,11 +5,11 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="VirtoCommerce.Platform.Data.SqlServer" Version="3.841.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data.SqlServer" Version="3.861.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\VirtoCommerce.QuoteModule.Data\VirtoCommerce.QuoteModule.Data.csproj" />
diff --git a/src/VirtoCommerce.QuoteModule.Data/VirtoCommerce.QuoteModule.Data.csproj b/src/VirtoCommerce.QuoteModule.Data/VirtoCommerce.QuoteModule.Data.csproj
index 8026a04..2887aad 100644
--- a/src/VirtoCommerce.QuoteModule.Data/VirtoCommerce.QuoteModule.Data.csproj
+++ b/src/VirtoCommerce.QuoteModule.Data/VirtoCommerce.QuoteModule.Data.csproj
@@ -13,8 +13,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.841.0" />
-    <PackageReference Include="VirtoCommerce.Platform.Hangfire" Version="3.841.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Data" Version="3.861.0" />
+    <PackageReference Include="VirtoCommerce.Platform.Hangfire" Version="3.861.0" />
     <PackageReference Include="VirtoCommerce.ShippingModule.Core" Version="3.800.0" />
     <PackageReference Include="VirtoCommerce.StoreModule.Core" Version="3.800.0" />
   </ItemGroup>
diff --git a/src/VirtoCommerce.QuoteModule.ExperienceApi/Authorization/QuoteAuthorizationHandler.cs b/src/VirtoCommerce.QuoteModule.ExperienceApi/Authorization/QuoteAuthorizationHandler.cs
index d89c73f..b50e507 100644
--- a/src/VirtoCommerce.QuoteModule.ExperienceApi/Authorization/QuoteAuthorizationHandler.cs
+++ b/src/VirtoCommerce.QuoteModule.ExperienceApi/Authorization/QuoteAuthorizationHandler.cs
@@ -122,9 +122,6 @@ private async Task<Contact> GetContact(string userId)
 
     private static string GetUserId(AuthorizationHandlerContext context)
     {
-        return
-            context.User.FindFirstValue(ClaimTypes.NameIdentifier) ??
-            context.User.FindFirstValue("name") ??
-            AnonymousUser.UserName;
+        return context.User.GetUserId() ?? AnonymousUser.UserName;
     }
 }
diff --git a/src/VirtoCommerce.QuoteModule.Web/module.manifest b/src/VirtoCommerce.QuoteModule.Web/module.manifest
index 88214a5..6ca068e 100644
--- a/src/VirtoCommerce.QuoteModule.Web/module.manifest
+++ b/src/VirtoCommerce.QuoteModule.Web/module.manifest
@@ -4,7 +4,7 @@
   <version>3.818.0</version>
   <version-tag />
 
-  <platformVersion>3.841.0</platformVersion>
+  <platformVersion>3.861.0</platformVersion>
   <dependencies>
     <dependency id="VirtoCommerce.Assets" version="3.800.0" />
     <dependency id="VirtoCommerce.Cart" version="3.810.0" />