Fix bug with trimming ReturnUrl on the challenge responses

VirtoCommerce · Jan 17, 2020 · 20e58b8 · 20e58b8
1 parent 0ebae53
commit 20e58b8
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/VirtoCommerce.Storefront/Controllers/AccountController.cs b/VirtoCommerce.Storefront/Controllers/AccountController.cs
@@ -58,7 +58,7 @@ public async Task<ActionResult> GetAccount()
             var authorizationResult = await _authorizationService.AuthorizeAsync(User, OnlyRegisteredUserAuthorizationRequirement.PolicyName);
             if (!authorizationResult.Succeeded)
             {
-                return StoreFrontRedirect("~/account/login");
+                return Challenge();
             }
 
             // Customer should be already populated in WorkContext middle-ware
@@ -71,7 +71,7 @@ public async Task<ActionResult> GetOrderDetails(string number)
             var authorizationResult = await _authorizationService.AuthorizeAsync(User, OnlyRegisteredUserAuthorizationRequirement.PolicyName);
             if (!authorizationResult.Succeeded)
             {
-                return StoreFrontRedirect("~/account/login");
+                return Challenge();
             }
 
             var order = WorkContext.CurrentUser?.Orders.FirstOrDefault(x => x.Number.EqualsInvariant(number));
@@ -89,7 +89,7 @@ public async Task<ActionResult> GetAddresses()
             var authorizationResult = await _authorizationService.AuthorizeAsync(User, OnlyRegisteredUserAuthorizationRequirement.PolicyName);
             if (!authorizationResult.Succeeded)
             {
-                return StoreFrontRedirect("~/account/login");
+                return Challenge();
             }
 
             return View("customers/addresses", WorkContext);
@@ -288,7 +288,7 @@ public ActionResult Login()
         [HttpPost("login")]
         [AllowAnonymous]
         [ValidateAntiForgeryToken]
-        public async Task<ActionResult> Login([FromForm] Login login, string returnUrl)
+        public async Task<ActionResult> Login([FromForm] Login login, [FromQuery]string returnUrl)
         {
             TryValidateModel(login);