VCST-2048: Use ClaimsPrincipalExtensions GetUserId

feat: Replace custom code with VirtoCommerce.Platform.Core.Security.ClaimsPrincipalExtensions that resolves user id and name from IdentityOptions settings.

Author: OlegoO

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

@@ -1,12 +1,15 @@
+using System;
 using System.Security.Claims;
+using VirtoCommerce.Platform.Core.Security;
 using static VirtoCommerce.Xapi.Core.ModuleConstants;
 
 namespace VirtoCommerce.Xapi.Core.Extensions;
 
 public static class ClaimsPrincipalExtensions
 {
+    [Obsolete("Use VirtoCommerce.Platform.Core.Security.GetUserId extension", DiagnosticId = "VC0009", UrlFormat = "https://docs.virtocommerce.org/platform/user-guide/versions/virto3-products-versions/")]
     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

@@ -1,6 +1,7 @@
 using System.Security.Claims;
 using GraphQL.Server.Transports.Subscriptions.Abstractions;
 using GraphQL.Subscription;
+using VirtoCommerce.Platform.Core.Security;
 
 namespace VirtoCommerce.Xapi.Core.Extensions
 {
@@ -9,7 +10,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?.GetUserId() ?? ModuleConstants.AnonymousUser.UserName;
         }
 
         public static ClaimsPrincipal GetCurrentPrincipal(this IResolveEventStreamContext resolveContext)

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

@@ -7,9 +7,11 @@
 using VirtoCommerce.CoreModule.Core.Currency;
 using VirtoCommerce.CustomerModule.Core.Extensions;
 using VirtoCommerce.Platform.Core.Common;
+using VirtoCommerce.Platform.Core.Security;
 using VirtoCommerce.Xapi.Core.Helpers;
 using VirtoCommerce.Xapi.Core.Infrastructure;
 using VirtoCommerce.Xapi.Core.Queries;
+using static VirtoCommerce.Xapi.Core.ModuleConstants;
 
 namespace VirtoCommerce.Xapi.Core.Extensions
 {
@@ -65,7 +67,7 @@ public static bool IsAuthenticated(this IResolveFieldContext resolveContext)
 
         public static string GetCurrentUserId(this IResolveFieldContext resolveContext)
         {
-            return resolveContext.GetCurrentPrincipal()?.GetCurrentUserId();
+            return resolveContext.GetCurrentPrincipal()?.GetUserId() ?? AnonymousUser.UserName;
         }
 
         public static string GetCurrentOrganizationId(this IResolveFieldContext 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/ExternalSignInUserBuilder.cs

@@ -40,7 +40,7 @@ public virtual async Task BuildNewUser(ApplicationUser user, ExternalLoginInfo e
 
     protected virtual string ResolveContactName(ApplicationUser user, ExternalLoginInfo externalLoginInfo)
     {
-        return externalLoginInfo.Principal.FindFirstValue("name");
+        return externalLoginInfo.Principal.GetUserId();
     }
 
     protected virtual string ResolveContactFirstName(ApplicationUser user, ExternalLoginInfo externalLoginInfo)

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

@@ -7,6 +7,7 @@
 using VirtoCommerce.Xapi.Core.Extensions;
 using VirtoCommerce.Xapi.Core.Security.Authorization;
 using VirtoCommerce.Xapi.Core.Services;
+using static VirtoCommerce.Xapi.Core.ModuleConstants;
 
 namespace VirtoCommerce.Xapi.Data.Services
 {
@@ -37,7 +38,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?.GetUserId() ?? AnonymousUser.UserName;
             var isExternalSignIn = principal.IsExternalSignIn();
 
             return CheckUserState(userId, allowAnonymous, isExternalSignIn);