Merge branch 'release/6.20.0'

VirtoCommerce · May 23, 2023 · cf0f00a · cf0f00a
2 parents 1db0f02 + 2dcb833
commit cf0f00a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,7 +7,7 @@
     <Authors>VirtoCommerce</Authors>
   </PropertyGroup>
    <PropertyGroup>
-    <VersionPrefix>6.19.0</VersionPrefix>
+    <VersionPrefix>6.20.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/VirtoCommerce.Storefront/Controllers/ErrorController.cs b/VirtoCommerce.Storefront/Controllers/ErrorController.cs
@@ -40,6 +40,7 @@ public IActionResult Error(int? errCode)
         [Route("AccessDenied")]
         public IActionResult AccessDenied()
         {
+            Response.StatusCode = StatusCodes.Status403Forbidden;
             return View("AccessDenied");
         }
     }

diff --git a/VirtoCommerce.Storefront/Domain/Security/CustomCookieAuthenticationEvents.cs b/VirtoCommerce.Storefront/Domain/Security/CustomCookieAuthenticationEvents.cs
@@ -38,7 +38,8 @@ public override Task RedirectToAccessDenied(RedirectContext<CookieAuthentication
                 return Task.CompletedTask;
             }
 
-            context.RedirectUri = _storefrontUrlBuilder.ToStoreAbsolute(context.RedirectUri).ToAbsolutePath();
+            var absolutePath = _storefrontUrlBuilder.ToStoreAbsolute(context.RedirectUri).ToAbsolutePath();
+            context.RedirectUri = WebUtility.UrlDecode(absolutePath);
 
             return base.RedirectToAccessDenied(context);
         }