Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Change URLs from absolute to relative in ModifyQueryString

supportc45849e8fd5c
diff --git a/src/Business/Grand.Business.Core/Extensions/AffiliateExtensions.cs b/src/Business/Grand.Business.Core/Extensions/AffiliateExtensions.cs
index 552edb61e..049e0617e 100644
--- a/src/Business/Grand.Business.Core/Extensions/AffiliateExtensions.cs
+++ b/src/Business/Grand.Business.Core/Extensions/AffiliateExtensions.cs
@@ -3,6 +3,7 @@ using Grand.Domain.Affiliates;
using Grand.Domain.Seo;
using Grand.Infrastructure.Extensions;
using Grand.SharedKernel.Extensions;
+using System.Security.Policy;
namespace Grand.Business.Core.Extensions
{
@@ -48,11 +49,15 @@ namespace Grand.Business.Core.Extensions
if (string.IsNullOrEmpty(host))
throw new ArgumentNullException(nameof(host));
- var url = !string.IsNullOrEmpty(affiliate.FriendlyUrlName) ?
- CommonExtensions.ModifyQueryString(host, "affiliate", affiliate.FriendlyUrlName)
- : CommonExtensions.ModifyQueryString(host, "affiliateid", affiliate.Id);
+ var uriBuilder = new UriBuilder(host);
+ var query = System.Web.HttpUtility.ParseQueryString(uriBuilder.Query);
+ if (!string.IsNullOrEmpty(affiliate.FriendlyUrlName))
+ query["affiliate"] = affiliate.FriendlyUrlName;
+ else
+ query["affiliateid"] = affiliate.Id;
- return url;
+ uriBuilder.Query = query.ToString();
+ return uriBuilder.ToString();
}
/// <summary>
diff --git a/src/Core/Grand.Infrastructure/Extensions/CommonExtensions.cs b/src/Core/Grand.Infrastructure/Extensions/CommonExtensions.cs
index 4dc7621e9..5387562d7 100644
--- a/src/Core/Grand.Infrastructure/Extensions/CommonExtensions.cs
+++ b/src/Core/Grand.Infrastructure/Extensions/CommonExtensions.cs
@@ -13,24 +13,44 @@ namespace Grand.Infrastructure.Extensions
if (string.IsNullOrEmpty(key))
return url;
- var uri = new Uri(url);
- var baseUri = uri.GetComponents(UriComponents.Scheme | UriComponents.Host | UriComponents.Port | UriComponents.Path, UriFormat.UriEscaped);
-
- var query = QueryHelpers.ParseQuery(uri.Query);
-
- var items = query.SelectMany(x => x.Value, (col, val) =>
- new KeyValuePair<string, string>(col.Key, val)).ToList();
+ var baseUrl = "";
+ var queryString = "";
+
+ if (Uri.IsWellFormedUriString(url, UriKind.Absolute))
+ {
+ var uri = new Uri(url);
+ baseUrl = uri.AbsolutePath;
+ queryString = uri.Query;
+ }
+ else
+ {
+ var questionMarkIndex = url.IndexOf('?');
+ if (questionMarkIndex != -1)
+ {
+ baseUrl = url.Substring(0, questionMarkIndex);
+ queryString = url.Substring(questionMarkIndex);
+ }
+ else
+ {
+ baseUrl = url;
+ }
+ }
+
+ var query = QueryHelpers.ParseQuery(queryString);
+
+ var items = query.SelectMany(x => x.Value, (col, val) => new KeyValuePair<string, string>(col.Key, val)).ToList();
items.RemoveAll(x => x.Key == key);
- var qb = new QueryBuilder(items);
-
if (!string.IsNullOrEmpty(value))
- qb.Add(key, value);
+ {
+ items.Add(new KeyValuePair<string, string>(key, value));
+ }
- var returnUrl = baseUri + qb.ToQueryString();
- return returnUrl;
+ var qb = new QueryBuilder(items);
+
+ return baseUrl + qb.ToQueryString();
}
-
+
}
}
diff --git a/src/Plugins/Theme.Modern/Views/Modern/Catalog/Partials/ModelScript.cshtml b/src/Plugins/Theme.Modern/Views/Modern/Catalog/Partials/ModelScript.cshtml
index c1b9d79a8..2a3ded5be 100644
--- a/src/Plugins/Theme.Modern/Views/Modern/Catalog/Partials/ModelScript.cshtml
+++ b/src/Plugins/Theme.Modern/Views/Modern/Catalog/Partials/ModelScript.cshtml
@@ -11,7 +11,7 @@
methods: {
loadProducts(url) {
//set state
- var stateurl = new URL(url);
+ var stateurl = new URL(url, window.location.origin);
stateurl.searchParams.delete('timestamp');
stateurl.searchParams.delete('pagenumber');
@@ -28,7 +28,7 @@
window.history.replaceState({ path: stateurl.href }, '', stateurl.href);
},
getResponse(url) {
- url = new URL(url);
+ url = new URL(url, window.location.origin);
url.searchParams.set('timestamp', new Date().getTime());
const options = {
headers: {
diff --git a/src/Tests/Grand.Infrastructure.Tests/Extensions/CommonExtensionsTests.cs b/src/Tests/Grand.Infrastructure.Tests/Extensions/CommonExtensionsTests.cs
index 1e4cba105..7881348eb 100644
--- a/src/Tests/Grand.Infrastructure.Tests/Extensions/CommonExtensionsTests.cs
+++ b/src/Tests/Grand.Infrastructure.Tests/Extensions/CommonExtensionsTests.cs
@@ -9,38 +9,38 @@ namespace Grand.Infrastructure.Tests.Extensions
[TestMethod()]
public void ModifyQueryStringTest_url_withoutparam()
{
- var url = new Uri("http://google.com");
+ var url = new Uri("http://google.com/computers");
var param = "param";
var value = "value";
var query = CommonExtensions.ModifyQueryString(url.ToString(), param, value);
- Assert.AreEqual(query, $"http://google.com/?{param}={value}");
+ Assert.AreEqual(query, $"/computers?{param}={value}");
}
[TestMethod()]
public void ModifyQueryStringTest_url_with1param()
{
- var url = new Uri("http://google.com?param=aaa");
+ var url = new Uri("http://google.com/computers?param=aaa");
var param = "param";
var value = "value";
var query = CommonExtensions.ModifyQueryString(url.ToString(), param, value);
- Assert.AreEqual(query, $"http://google.com/?{param}={value}");
+ Assert.AreEqual(query, $"/computers?{param}={value}");
}
[TestMethod()]
public void ModifyQueryStringTest_url_with2params()
{
- var url = new Uri("http://google.com?param=bbb&param2=cccc");
+ var url = new Uri("http://google.com/computers?param=bbb&param2=cccc");
var param = "param";
var value = "value";
var query = CommonExtensions.ModifyQueryString(url.ToString(), param, value);
- Assert.AreEqual(query, $"http://google.com/?param2=cccc&{param}={value}");
+ Assert.AreEqual(query, $"/computers?param2=cccc&{param}={value}");
}
[TestMethod()]
public void ModifyQueryStringTest_url_with3params()
{
- var url = new Uri("http://google.com?vvv=azaz&param=bbb&param2=cccc");
+ var url = new Uri("http://google.com/computers?vvv=azaz&param=bbb&param2=cccc");
var param = "param";
var value = "value";
var query = CommonExtensions.ModifyQueryString(url.ToString(), param, value);
- Assert.AreEqual(query, $"http://google.com/?vvv=azaz&param2=cccc&{param}={value}");
+ Assert.AreEqual(query, $"/computers?vvv=azaz&param2=cccc&{param}={value}");
}
}
diff --git a/src/Web/Grand.Web/Views/Catalog/Partials/ModelScript.cshtml b/src/Web/Grand.Web/Views/Catalog/Partials/ModelScript.cshtml
index a4ceead09..7d19ea70f 100644
--- a/src/Web/Grand.Web/Views/Catalog/Partials/ModelScript.cshtml
+++ b/src/Web/Grand.Web/Views/Catalog/Partials/ModelScript.cshtml
@@ -11,7 +11,7 @@
loadProducts(url) {
catalog.getResponse(url);
//set state
- var stateurl = new URL(url);
+ var stateurl = new URL(url, window.location.origin);
stateurl.searchParams.delete('timestamp');
window.history.replaceState({ path: stateurl.href }, '', stateurl.href);
},
@@ -28,7 +28,7 @@
this.loadProducts(url.href);
},
getResponse(url) {
- url = new URL(url);
+ url = new URL(url, window.location.origin);
url.searchParams.set('timestamp', new Date().getTime());
const options = {
headers: {