Merge branch 'release/6.38.0'

VirtoCommerce · Feb 15, 2024 · 323a439 · 323a439
2 parents 628b352 + 8378bef
commit 323a439
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,7 +7,7 @@
     <Authors>VirtoCommerce</Authors>
   </PropertyGroup>
    <PropertyGroup>
-    <VersionPrefix>6.37.0</VersionPrefix>
+    <VersionPrefix>6.38.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/VirtoCommerce.Storefront/Controllers/Api/ApiThemeController.cs b/VirtoCommerce.Storefront/Controllers/Api/ApiThemeController.cs
@@ -1,12 +1,14 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using System;
 using VirtoCommerce.LiquidThemeEngine;
 using VirtoCommerce.Storefront.Infrastructure;
 using VirtoCommerce.Storefront.Model;
 using VirtoCommerce.Storefront.Model.Common;
 
 namespace VirtoCommerce.Storefront.Controllers.Api
 {
+    [Obsolete]
     [StorefrontApiRoute("theme")]
     [ResponseCache(CacheProfileName = "None")]
     public class ApiThemeController : StorefrontControllerBase
@@ -19,6 +21,7 @@ public ApiThemeController(IWorkContextAccessor workContextAccessor, IStorefrontU
         }
 
         // GET: storefrontapi/theme/context
+        [Obsolete("Use store query from GraphQL")]
         [HttpGet("context")]
         [AllowAnonymous]
         public ActionResult<SpaThemeContext> GetSpaThemeContext()

diff --git a/VirtoCommerce.Storefront/Infrastructure/Autorest/BaseAuthHandler.cs b/VirtoCommerce.Storefront/Infrastructure/Autorest/BaseAuthHandler.cs
@@ -65,6 +65,7 @@ protected void AddCurrentUser(HttpRequestMessage request)
                 else
                 {
                     request.Headers.Add("VirtoCommerce-User-Name", "Anonymous");
+                    request.Headers.Add("VirtoCommerce-Anonymous-User-Id", currentUser?.Id);
                 }
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,6 +65,7 @@ protected void AddCurrentUser(HttpRequestMessage request) @@
                     else
                     {
                         request.Headers.Add("VirtoCommerce-User-Name", "Anonymous");
+                        request.Headers.Add("VirtoCommerce-Anonymous-User-Id", currentUser?.Id);
                     }
                 }
             }
@@ Expand Down @@