VP-1249: Fix building Uri for absolute redirect Uri (#371)

Checked if store Uri is absolute and handled accordingly;
VirtoCommerce · Jan 22, 2020 · 877a5d5 · 877a5d5
1 parent fb62d07
commit 877a5d5
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/VirtoCommerce.Storefront/Domain/Security/CustomCookieAuthenticationEvents.cs b/VirtoCommerce.Storefront/Domain/Security/CustomCookieAuthenticationEvents.cs
@@ -49,7 +49,16 @@ private string GetStoreAbsoluteUri(string uri)
             //Need to build from an host absolute url a  relative  store-based url
             // http://localhost/Account/Login -> http://localhost/{store}/{lang}/Account/Login
             var redirectUri = new UriBuilder(uri);
-            redirectUri.Path = _storefrontUrlBuilder.ToAppAbsolute(redirectUri.Path);
+            var storeBasedRedirectPath = _storefrontUrlBuilder.ToAppAbsolute(redirectUri.Path);
+
+            // Checks whether path is absolute path (starts with scheme), and extract local path if it is
+            if (Uri.TryCreate(storeBasedRedirectPath, UriKind.Absolute, out var absoluteUri))
+            {
+                storeBasedRedirectPath = absoluteUri.AbsolutePath;
+            }
+
+            redirectUri.Path = storeBasedRedirectPath;
+
             return redirectUri.Uri.ToString();
         }
     }