From 3ea7945f246d5bf85e8a4fadee3b0eeedb71c069 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 5 Aug 2020 08:44:22 +0200 Subject: [PATCH] Get rid of system web in netcore and netstandard libraries --- src/Umbraco.Core/IUmbracoContextFactory.cs | 3 +- .../InstallSteps/StarterKitCleanupStep.cs | 4 +- .../PublishedContent/IndexedArrayItem.cs | 22 ++++---- .../Routing/ContentFinderByRedirectUrl.cs | 1 - .../Routing/RoutableAttemptEventArgs.cs | 4 +- .../Routing/UmbracoRequestEventArgs.cs | 1 - src/Umbraco.Core/Routing/UriUtility.cs | 1 - .../Templates/UmbracoComponentRenderer.cs | 4 +- .../Media/EmbedProviders/Flickr.cs | 8 +-- .../Media/EmbedProviders/OEmbedResponse.cs | 5 +- .../Runtime/SqlMainDomLock.cs | 1 - .../Controllers/PackageController.cs | 6 +-- .../Trees/FileSystemTreeController.cs | 10 ++-- .../Trees/UrlHelperExtensions.cs | 4 +- .../RedirectToUmbracoPageResult.cs | 52 +++---------------- .../Controllers/SurfaceController.cs | 39 ++------------ 16 files changed, 44 insertions(+), 121 deletions(-) diff --git a/src/Umbraco.Core/IUmbracoContextFactory.cs b/src/Umbraco.Core/IUmbracoContextFactory.cs index 2a6dd50618..c3ed863da8 100644 --- a/src/Umbraco.Core/IUmbracoContextFactory.cs +++ b/src/Umbraco.Core/IUmbracoContextFactory.cs @@ -1,5 +1,4 @@ -using System.Web; - + namespace Umbraco.Web { /// diff --git a/src/Umbraco.Core/Install/InstallSteps/StarterKitCleanupStep.cs b/src/Umbraco.Core/Install/InstallSteps/StarterKitCleanupStep.cs index e6cceb2c5b..adca1950f3 100644 --- a/src/Umbraco.Core/Install/InstallSteps/StarterKitCleanupStep.cs +++ b/src/Umbraco.Core/Install/InstallSteps/StarterKitCleanupStep.cs @@ -1,8 +1,8 @@ using System; using System.IO; using System.Linq; +using System.Net; using System.Threading.Tasks; -using System.Web; using Umbraco.Core.IO; using Umbraco.Web.Install.Models; @@ -33,7 +33,7 @@ namespace Umbraco.Web.Install.InstallSteps private void CleanupInstallation(int packageId, string packageFile) { - var zipFile = new FileInfo(Path.Combine(_ioHelper.MapPath(Core.Constants.SystemDirectories.Packages), HttpUtility.UrlDecode(packageFile))); + var zipFile = new FileInfo(Path.Combine(_ioHelper.MapPath(Core.Constants.SystemDirectories.Packages), WebUtility.UrlDecode(packageFile))); if (zipFile.Exists) zipFile.Delete(); diff --git a/src/Umbraco.Core/Models/PublishedContent/IndexedArrayItem.cs b/src/Umbraco.Core/Models/PublishedContent/IndexedArrayItem.cs index be87dac9e8..4b0432ca50 100644 --- a/src/Umbraco.Core/Models/PublishedContent/IndexedArrayItem.cs +++ b/src/Umbraco.Core/Models/PublishedContent/IndexedArrayItem.cs @@ -1,4 +1,4 @@ -using System.Web; +using System.Net; using Umbraco.Core.Strings; namespace Umbraco.Core.Models.PublishedContent @@ -79,7 +79,7 @@ namespace Umbraco.Core.Models.PublishedContent // TODO: This method should be removed or moved to an extension method on HtmlHelper. public IHtmlEncodedString IsFirst(string valueIfTrue, string valueIfFalse) { - return new HtmlEncodedString(HttpUtility.HtmlEncode(IsFirst() ? valueIfTrue : valueIfFalse)); + return new HtmlEncodedString(WebUtility.HtmlEncode(IsFirst() ? valueIfTrue : valueIfFalse)); } /// @@ -119,7 +119,7 @@ namespace Umbraco.Core.Models.PublishedContent // TODO: This method should be removed or moved to an extension method on HtmlHelper. public IHtmlEncodedString IsNotFirst(string valueIfTrue, string valueIfFalse) { - return new HtmlEncodedString(HttpUtility.HtmlEncode(IsNotFirst() ? valueIfTrue : valueIfFalse)); + return new HtmlEncodedString(WebUtility.HtmlEncode(IsNotFirst() ? valueIfTrue : valueIfFalse)); } /// @@ -160,7 +160,7 @@ namespace Umbraco.Core.Models.PublishedContent // TODO: This method should be removed or moved to an extension method on HtmlHelper. public IHtmlEncodedString IsIndex(int index, string valueIfTrue, string valueIfFalse) { - return new HtmlEncodedString(HttpUtility.HtmlEncode(IsIndex(index) ? valueIfTrue : valueIfFalse)); + return new HtmlEncodedString(WebUtility.HtmlEncode(IsIndex(index) ? valueIfTrue : valueIfFalse)); } /// @@ -201,7 +201,7 @@ namespace Umbraco.Core.Models.PublishedContent // TODO: This method should be removed or moved to an extension method on HtmlHelper. public IHtmlEncodedString IsModZero(int modulus, string valueIfTrue, string valueIfFalse) { - return new HtmlEncodedString(HttpUtility.HtmlEncode(IsModZero(modulus) ? valueIfTrue : valueIfFalse)); + return new HtmlEncodedString(WebUtility.HtmlEncode(IsModZero(modulus) ? valueIfTrue : valueIfFalse)); } /// @@ -243,7 +243,7 @@ namespace Umbraco.Core.Models.PublishedContent // TODO: This method should be removed or moved to an extension method on HtmlHelper. public IHtmlEncodedString IsNotModZero(int modulus, string valueIfTrue, string valueIfFalse) { - return new HtmlEncodedString(HttpUtility.HtmlEncode(IsNotModZero(modulus) ? valueIfTrue : valueIfFalse)); + return new HtmlEncodedString(WebUtility.HtmlEncode(IsNotModZero(modulus) ? valueIfTrue : valueIfFalse)); } /// @@ -285,7 +285,7 @@ namespace Umbraco.Core.Models.PublishedContent // TODO: This method should be removed or moved to an extension method on HtmlHelper. public IHtmlEncodedString IsNotIndex(int index, string valueIfTrue, string valueIfFalse) { - return new HtmlEncodedString(HttpUtility.HtmlEncode(IsNotIndex(index) ? valueIfTrue : valueIfFalse)); + return new HtmlEncodedString(WebUtility.HtmlEncode(IsNotIndex(index) ? valueIfTrue : valueIfFalse)); } /// @@ -323,7 +323,7 @@ namespace Umbraco.Core.Models.PublishedContent // TODO: This method should be removed or moved to an extension method on HtmlHelper. public IHtmlEncodedString IsLast(string valueIfTrue, string valueIfFalse) { - return new HtmlEncodedString(HttpUtility.HtmlEncode(IsLast() ? valueIfTrue : valueIfFalse)); + return new HtmlEncodedString(WebUtility.HtmlEncode(IsLast() ? valueIfTrue : valueIfFalse)); } /// @@ -362,7 +362,7 @@ namespace Umbraco.Core.Models.PublishedContent // TODO: This method should be removed or moved to an extension method on HtmlHelper. public IHtmlEncodedString IsNotLast(string valueIfTrue, string valueIfFalse) { - return new HtmlEncodedString(HttpUtility.HtmlEncode(IsNotLast() ? valueIfTrue : valueIfFalse)); + return new HtmlEncodedString(WebUtility.HtmlEncode(IsNotLast() ? valueIfTrue : valueIfFalse)); } /// @@ -400,7 +400,7 @@ namespace Umbraco.Core.Models.PublishedContent // TODO: This method should be removed or moved to an extension method on HtmlHelper. public IHtmlEncodedString IsEven(string valueIfTrue, string valueIfFalse) { - return new HtmlEncodedString(HttpUtility.HtmlEncode(IsEven() ? valueIfTrue : valueIfFalse)); + return new HtmlEncodedString(WebUtility.HtmlEncode(IsEven() ? valueIfTrue : valueIfFalse)); } /// @@ -438,7 +438,7 @@ namespace Umbraco.Core.Models.PublishedContent // TODO: This method should be removed or moved to an extension method on HtmlHelper. public IHtmlEncodedString IsOdd(string valueIfTrue, string valueIfFalse) { - return new HtmlEncodedString(HttpUtility.HtmlEncode(IsOdd() ? valueIfTrue : valueIfFalse)); + return new HtmlEncodedString(WebUtility.HtmlEncode(IsOdd() ? valueIfTrue : valueIfFalse)); } } } diff --git a/src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs b/src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs index 5b3e0a5d99..4e67779c1c 100644 --- a/src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs +++ b/src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using System.Web; using Umbraco.Core; using Umbraco.Core.Logging; using Umbraco.Core.Services; diff --git a/src/Umbraco.Core/Routing/RoutableAttemptEventArgs.cs b/src/Umbraco.Core/Routing/RoutableAttemptEventArgs.cs index 54ea98b3a4..9f80d8ed3f 100644 --- a/src/Umbraco.Core/Routing/RoutableAttemptEventArgs.cs +++ b/src/Umbraco.Core/Routing/RoutableAttemptEventArgs.cs @@ -1,6 +1,4 @@ -using System.Web; - -namespace Umbraco.Web.Routing +namespace Umbraco.Web.Routing { /// /// Event args containing information about why the request was not routable, or if it is routable diff --git a/src/Umbraco.Core/Routing/UmbracoRequestEventArgs.cs b/src/Umbraco.Core/Routing/UmbracoRequestEventArgs.cs index 4430d9689f..d93a27ddf4 100644 --- a/src/Umbraco.Core/Routing/UmbracoRequestEventArgs.cs +++ b/src/Umbraco.Core/Routing/UmbracoRequestEventArgs.cs @@ -1,5 +1,4 @@ using System; -using System.Web; namespace Umbraco.Web.Routing { diff --git a/src/Umbraco.Core/Routing/UriUtility.cs b/src/Umbraco.Core/Routing/UriUtility.cs index ad785c111f..1ff6ba7436 100644 --- a/src/Umbraco.Core/Routing/UriUtility.cs +++ b/src/Umbraco.Core/Routing/UriUtility.cs @@ -1,6 +1,5 @@ using System; using System.Text; -using System.Web; using Umbraco.Core; using Umbraco.Core.Configuration; using Umbraco.Core.Configuration.UmbracoSettings; diff --git a/src/Umbraco.Core/Templates/UmbracoComponentRenderer.cs b/src/Umbraco.Core/Templates/UmbracoComponentRenderer.cs index 91004a2f29..4618eb2822 100644 --- a/src/Umbraco.Core/Templates/UmbracoComponentRenderer.cs +++ b/src/Umbraco.Core/Templates/UmbracoComponentRenderer.cs @@ -1,9 +1,9 @@ using System; using System.Linq; using System.IO; -using System.Web; using Umbraco.Web.Templates; using System.Collections.Generic; +using System.Net; using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Strings; using Umbraco.Web; @@ -120,7 +120,7 @@ namespace Umbraco.Core.Templates //NOTE: the value could have HTML encoded values, so we need to deal with that var macroProps = parameters?.ToDictionary( x => x.Key.ToLowerInvariant(), - i => (i.Value is string) ? HttpUtility.HtmlDecode(i.Value.ToString()) : i.Value); + i => (i.Value is string) ? WebUtility.HtmlDecode(i.Value.ToString()) : i.Value); var html = _macroRenderer.Render(alias, content, macroProps).Text; diff --git a/src/Umbraco.Infrastructure/Media/EmbedProviders/Flickr.cs b/src/Umbraco.Infrastructure/Media/EmbedProviders/Flickr.cs index 861e849fe2..d067060014 100644 --- a/src/Umbraco.Infrastructure/Media/EmbedProviders/Flickr.cs +++ b/src/Umbraco.Infrastructure/Media/EmbedProviders/Flickr.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using System.Web; +using System.Net; namespace Umbraco.Web.Media.EmbedProviders { @@ -14,7 +14,7 @@ namespace Umbraco.Web.Media.EmbedProviders }; public override Dictionary RequestParams => new Dictionary(); - + public override string GetMarkup(string url, int maxWidth = 0, int maxHeight = 0) { var requestUrl = base.GetEmbedProviderUrl(url, maxWidth, maxHeight); @@ -25,7 +25,7 @@ namespace Umbraco.Web.Media.EmbedProviders var imageHeight = GetXmlProperty(xmlDocument, "/oembed/height"); var imageTitle = GetXmlProperty(xmlDocument, "/oembed/title"); - return string.Format("\"{3}\"", imageUrl, imageWidth, imageHeight, HttpUtility.HtmlEncode(imageTitle)); - } + return string.Format("\"{3}\"", imageUrl, imageWidth, imageHeight, WebUtility.HtmlEncode(imageTitle)); + } } } diff --git a/src/Umbraco.Infrastructure/Media/EmbedProviders/OEmbedResponse.cs b/src/Umbraco.Infrastructure/Media/EmbedProviders/OEmbedResponse.cs index 64b18f52d3..cc3e34931e 100644 --- a/src/Umbraco.Infrastructure/Media/EmbedProviders/OEmbedResponse.cs +++ b/src/Umbraco.Infrastructure/Media/EmbedProviders/OEmbedResponse.cs @@ -1,5 +1,4 @@ -using System.Text; -using System.Web; +using System.Net; using Newtonsoft.Json; namespace Umbraco.Web.Media.EmbedProviders @@ -52,7 +51,7 @@ namespace Umbraco.Web.Media.EmbedProviders { if (Type == "photo") { - return "\"""; + return "\"""; } return string.IsNullOrEmpty(Html) == false ? Html : string.Empty; diff --git a/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs b/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs index 3f931d6358..0d0ec703ba 100644 --- a/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs +++ b/src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs @@ -7,7 +7,6 @@ using System.Security.Cryptography; using System.Threading; using System.Threading.Tasks; using Umbraco.Core.Configuration; -using System.Web; using Umbraco.Core.Hosting; using Umbraco.Core.Logging; using Umbraco.Core.Persistence; diff --git a/src/Umbraco.Web.BackOffice/Controllers/PackageController.cs b/src/Umbraco.Web.BackOffice/Controllers/PackageController.cs index e5e39f944f..d8df34748d 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/PackageController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/PackageController.cs @@ -4,7 +4,6 @@ using System.IO; using System.Linq; using System.Net; using System.Text; -using System.Web; using Microsoft.AspNetCore.Mvc; using Microsoft.Net.Http.Headers; using Semver; @@ -113,16 +112,15 @@ namespace Umbraco.Web.BackOffice.Controllers var cd = new System.Net.Mime.ContentDisposition { - FileName = HttpUtility.UrlEncode(fileName, encoding), + FileName = WebUtility.UrlEncode(fileName), Inline = false // false = prompt the user for downloading; true = browser to try to show the file inline }; Response.Headers.Add("Content-Disposition", cd.ToString()); // Set custom header so umbRequestHelper.downloadFile can save the correct filename - Response.Headers.Add("x-filename", HttpUtility.UrlEncode(fileName, encoding)); + Response.Headers.Add("x-filename", WebUtility.UrlEncode(fileName)); return new FileStreamResult(System.IO.File.OpenRead(fullPath), new MediaTypeHeaderValue("application/octet-stream") { Charset = encoding.WebName, - }); } diff --git a/src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs b/src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs index c9bde4818f..74d2ee90f8 100644 --- a/src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs +++ b/src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs @@ -1,7 +1,7 @@ using System; using System.IO; using System.Linq; -using System.Web; +using System.Net; using Microsoft.AspNetCore.Http; using Umbraco.Core; using Umbraco.Core.IO; @@ -48,7 +48,7 @@ namespace Umbraco.Web.BackOffice.Trees protected override TreeNodeCollection GetTreeNodes(string id, FormCollection queryStrings) { var path = string.IsNullOrEmpty(id) == false && id != Constants.System.RootString - ? HttpUtility.UrlDecode(id).TrimStart("/") + ? WebUtility.UrlDecode(id).TrimStart("/") : ""; var directories = FileSystem.GetDirectories(path); @@ -59,7 +59,7 @@ namespace Umbraco.Web.BackOffice.Trees var hasChildren = FileSystem.GetFiles(directory).Any() || FileSystem.GetDirectories(directory).Any(); var name = Path.GetFileName(directory); - var node = CreateTreeNode(HttpUtility.UrlEncode(directory), path, queryStrings, name, "icon-folder", hasChildren); + var node = CreateTreeNode(WebUtility.UrlEncode(directory), path, queryStrings, name, "icon-folder", hasChildren); OnRenderFolderNode(ref node); if (node != null) nodes.Add(node); @@ -83,7 +83,7 @@ namespace Umbraco.Web.BackOffice.Trees if (withoutExt.IsNullOrWhiteSpace()) continue; var name = Path.GetFileName(file); - var node = CreateTreeNode(HttpUtility.UrlEncode(file), path, queryStrings, name, FileIcon, false); + var node = CreateTreeNode(WebUtility.UrlEncode(file), path, queryStrings, name, FileIcon, false); OnRenderFileNode(ref node); if (node != null) nodes.Add(node); @@ -159,7 +159,7 @@ namespace Umbraco.Web.BackOffice.Trees var menu = MenuItemCollectionFactory.Create(); var path = string.IsNullOrEmpty(id) == false && id != Constants.System.RootString - ? HttpUtility.UrlDecode(id).TrimStart("/") + ? WebUtility.UrlDecode(id).TrimStart("/") : ""; var isFile = FileSystem.FileExists(path); diff --git a/src/Umbraco.Web.BackOffice/Trees/UrlHelperExtensions.cs b/src/Umbraco.Web.BackOffice/Trees/UrlHelperExtensions.cs index bf4d09a497..878a23b38f 100644 --- a/src/Umbraco.Web.BackOffice/Trees/UrlHelperExtensions.cs +++ b/src/Umbraco.Web.BackOffice/Trees/UrlHelperExtensions.cs @@ -1,7 +1,7 @@ using System; using System.Linq; +using System.Net; using System.Text; -using System.Web; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Umbraco.Core; @@ -32,7 +32,7 @@ namespace Umbraco.Extensions for (var p = 0; p < pathPaths.Length; p++) { - var path = HttpUtility.UrlEncode(string.Join("/", pathPaths.Take(p + 1))); + var path = WebUtility.UrlEncode(string.Join("/", pathPaths.Take(p + 1))); if (string.IsNullOrEmpty(path) == false) { sb.Append(","); diff --git a/src/Umbraco.Web.Website/ActionResults/RedirectToUmbracoPageResult.cs b/src/Umbraco.Web.Website/ActionResults/RedirectToUmbracoPageResult.cs index d271e63e2f..4b400b35dd 100644 --- a/src/Umbraco.Web.Website/ActionResults/RedirectToUmbracoPageResult.cs +++ b/src/Umbraco.Web.Website/ActionResults/RedirectToUmbracoPageResult.cs @@ -1,8 +1,7 @@ using System; using System.Collections.Specialized; -using System.Linq; using System.Threading.Tasks; -using System.Web; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ViewFeatures; using Microsoft.Extensions.DependencyInjection; @@ -20,7 +19,7 @@ namespace Umbraco.Web.Website.ActionResults { private IPublishedContent _publishedContent; private readonly int _pageId; - private readonly NameValueCollection _queryStringValues; + private readonly QueryString _queryString; private readonly IPublishedUrlProvider _publishedUrlProvider; private readonly IUmbracoContextAccessor _umbracoContextAccessor; private string _url; @@ -79,24 +78,10 @@ namespace Umbraco.Web.Website.ActionResults /// /// /// - public RedirectToUmbracoPageResult(int pageId, NameValueCollection queryStringValues, IPublishedUrlProvider publishedUrlProvider, IUmbracoContextAccessor umbracoContextAccessor) + public RedirectToUmbracoPageResult(int pageId, QueryString queryString, IPublishedUrlProvider publishedUrlProvider, IUmbracoContextAccessor umbracoContextAccessor) { _pageId = pageId; - _queryStringValues = queryStringValues; - _publishedUrlProvider = publishedUrlProvider; - _umbracoContextAccessor = umbracoContextAccessor; - } - - /// - /// Creates a new RedirectToUmbracoResult - /// - /// - /// - /// - public RedirectToUmbracoPageResult(int pageId, string queryString, IPublishedUrlProvider publishedUrlProvider, IUmbracoContextAccessor umbracoContextAccessor) - { - _pageId = pageId; - _queryStringValues = ParseQueryString(queryString); + _queryString = queryString; _publishedUrlProvider = publishedUrlProvider; _umbracoContextAccessor = umbracoContextAccessor; } @@ -115,22 +100,6 @@ namespace Umbraco.Web.Website.ActionResults _umbracoContextAccessor = umbracoContextAccessor; } - /// - /// Creates a new RedirectToUmbracoResult - /// - /// - /// - /// - /// - public RedirectToUmbracoPageResult(IPublishedContent publishedContent, NameValueCollection queryStringValues, IPublishedUrlProvider publishedUrlProvider, IUmbracoContextAccessor umbracoContextAccessor) - { - _publishedContent = publishedContent; - _pageId = publishedContent.Id; - _queryStringValues = queryStringValues; - _publishedUrlProvider = publishedUrlProvider; - _umbracoContextAccessor = umbracoContextAccessor; - } - /// /// Creates a new RedirectToUmbracoResult /// @@ -138,11 +107,11 @@ namespace Umbraco.Web.Website.ActionResults /// /// /// - public RedirectToUmbracoPageResult(IPublishedContent publishedContent, string queryString, IPublishedUrlProvider publishedUrlProvider, IUmbracoContextAccessor umbracoContextAccessor) + public RedirectToUmbracoPageResult(IPublishedContent publishedContent, QueryString queryString, IPublishedUrlProvider publishedUrlProvider, IUmbracoContextAccessor umbracoContextAccessor) { _publishedContent = publishedContent; _pageId = publishedContent.Id; - _queryStringValues = ParseQueryString(queryString); + _queryString = queryString; _publishedUrlProvider = publishedUrlProvider; _umbracoContextAccessor = umbracoContextAccessor; } @@ -155,10 +124,9 @@ namespace Umbraco.Web.Website.ActionResults var ioHelper = httpContext.RequestServices.GetRequiredService(); var destinationUrl = ioHelper.ResolveUrl(Url); - if (!(_queryStringValues is null) && _queryStringValues.Count > 0) + if (_queryString.HasValue) { - destinationUrl += "?" + string.Join("&", - _queryStringValues.AllKeys.Select(x => x + "=" + HttpUtility.UrlEncode(_queryStringValues[x]))); + destinationUrl += _queryString.ToUriComponent(); } var tempDataDictionaryFactory = context.HttpContext.RequestServices.GetRequiredService(); @@ -170,9 +138,5 @@ namespace Umbraco.Web.Website.ActionResults return Task.CompletedTask; } - private NameValueCollection ParseQueryString(string queryString) - { - return !string.IsNullOrEmpty(queryString) ? HttpUtility.ParseQueryString(queryString) : null; - } } } diff --git a/src/Umbraco.Web.Website/Controllers/SurfaceController.cs b/src/Umbraco.Web.Website/Controllers/SurfaceController.cs index 161fe1750f..be6ee8ddce 100644 --- a/src/Umbraco.Web.Website/Controllers/SurfaceController.cs +++ b/src/Umbraco.Web.Website/Controllers/SurfaceController.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Specialized; +using Microsoft.AspNetCore.Http; using Umbraco.Core; using Umbraco.Core.Cache; using Umbraco.Core.Logging; @@ -54,24 +55,13 @@ namespace Umbraco.Web.Website.Controllers return new RedirectToUmbracoPageResult(pageId, _publishedUrlProvider, UmbracoContextAccessor); } - /// - /// Redirects to the Umbraco page with the given id and passes provided querystring - /// - /// - /// - /// - protected RedirectToUmbracoPageResult RedirectToUmbracoPage(int pageId, NameValueCollection queryStringValues) - { - return new RedirectToUmbracoPageResult(pageId, queryStringValues, _publishedUrlProvider, UmbracoContextAccessor); - } - /// /// Redirects to the Umbraco page with the given id and passes provided querystring /// /// /// /// - protected RedirectToUmbracoPageResult RedirectToUmbracoPage(int pageId, string queryString) + protected RedirectToUmbracoPageResult RedirectToUmbracoPage(int pageId, QueryString queryString) { return new RedirectToUmbracoPageResult(pageId, queryString, _publishedUrlProvider, UmbracoContextAccessor); } @@ -86,24 +76,13 @@ namespace Umbraco.Web.Website.Controllers return new RedirectToUmbracoPageResult(publishedContent, _publishedUrlProvider, UmbracoContextAccessor); } - /// - /// Redirects to the Umbraco page with the given published content and passes provided querystring - /// - /// - /// - /// - protected RedirectToUmbracoPageResult RedirectToUmbracoPage(IPublishedContent publishedContent, NameValueCollection queryStringValues) - { - return new RedirectToUmbracoPageResult(publishedContent, queryStringValues, _publishedUrlProvider, UmbracoContextAccessor); - } - /// /// Redirects to the Umbraco page with the given published content and passes provided querystring /// /// /// /// - protected RedirectToUmbracoPageResult RedirectToUmbracoPage(IPublishedContent publishedContent, string queryString) + protected RedirectToUmbracoPageResult RedirectToUmbracoPage(IPublishedContent publishedContent, QueryString queryString) { return new RedirectToUmbracoPageResult(publishedContent, queryString, _publishedUrlProvider, UmbracoContextAccessor); } @@ -117,22 +96,12 @@ namespace Umbraco.Web.Website.Controllers return new RedirectToUmbracoPageResult(CurrentPage, _publishedUrlProvider, UmbracoContextAccessor); } - /// - /// Redirects to the currently rendered Umbraco page and passes provided querystring - /// - /// - /// - protected RedirectToUmbracoPageResult RedirectToCurrentUmbracoPage(NameValueCollection queryStringValues) - { - return new RedirectToUmbracoPageResult(CurrentPage, queryStringValues, _publishedUrlProvider, UmbracoContextAccessor); - } - /// /// Redirects to the currently rendered Umbraco page and passes provided querystring /// /// /// - protected RedirectToUmbracoPageResult RedirectToCurrentUmbracoPage(string queryString) + protected RedirectToUmbracoPageResult RedirectToCurrentUmbracoPage(QueryString queryString) { return new RedirectToUmbracoPageResult(CurrentPage, queryString, _publishedUrlProvider, UmbracoContextAccessor); }