VCST-2048: Use ClaimsPrincipalExtensions GetUserId

src/VirtoCommerce.Xapi.Core/Extensions/ClaimsPrincipalExtensions.cs

@@ -1,4 +1,5 @@
 using System.Security.Claims;
+using VirtoCommerce.Platform.Core.Security;
 using static VirtoCommerce.Xapi.Core.ModuleConstants;
 
 namespace VirtoCommerce.Xapi.Core.Extensions;
@@ -7,6 +8,6 @@ public static class ClaimsPrincipalExtensions
 {
     public static string GetCurrentUserId(this ClaimsPrincipal claimsPrincipal)
     {
-        return claimsPrincipal?.FindFirstValue(ClaimTypes.NameIdentifier) ?? claimsPrincipal?.FindFirstValue("name") ?? AnonymousUser.UserName;
+        return claimsPrincipal?.GetUserId() ?? AnonymousUser.UserName;
     }
 }

src/VirtoCommerce.Xapi.Core/Extensions/ResolveEventStreamContextExtensions.cs

@@ -9,7 +9,7 @@ public static class ResolveEventStreamContextExtensions
         public static string GetCurrentUserId(this IResolveEventStreamContext resolveContext)
         {
             var claimsPrincipal = GetCurrentPrincipal(resolveContext);
-            return claimsPrincipal?.FindFirstValue(ClaimTypes.NameIdentifier) ?? claimsPrincipal?.FindFirstValue("name") ?? ModuleConstants.AnonymousUser.UserName;
+            return claimsPrincipal?.GetCurrentUserId();
         }
 
         public static ClaimsPrincipal GetCurrentPrincipal(this IResolveEventStreamContext resolveContext)

src/VirtoCommerce.Xapi.Core/VirtoCommerce.Xapi.Core.csproj

@@ -29,6 +29,7 @@
     <PackageReference Include="GraphQL.Server.Transports.AspNetCore.NewtonsoftJson" Version="5.0.2" />
     <PackageReference Include="PipelineNet" Version="0.9.0" />
     <PackageReference Include="RedLock.net" Version="2.3.2" />
+    <PackageReference Include="VirtoCommerce.Platform.Core" Version="3.861.0-alpha.12998-vcst-2048" />
     <PackageReference Include="VirtoCommerce.CoreModule.Core" Version="3.808.0" />
     <PackageReference Include="VirtoCommerce.CustomerModule.Core" Version="3.817.0" />
     <PackageReference Include="VirtoCommerce.SearchModule.Core" Version="3.804.0" />

src/VirtoCommerce.Xapi.Data/Services/UserManagerCore.cs

@@ -37,7 +37,7 @@ public Task CheckUserState(string userId, bool allowAnonymous)
         public Task CheckCurrentUserState(IResolveFieldContext context, bool allowAnonymous)
         {
             var principal = context.GetCurrentPrincipal();
-            var userId = principal.GetCurrentUserId();
+            var userId = principal?.GetCurrentUserId();
             var isExternalSignIn = principal.IsExternalSignIn();
 
             return CheckUserState(userId, allowAnonymous, isExternalSignIn);