yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v9/dev' into v9/9.0-rc001

Browse Source
This commit is contained in:
Bjarke Berg
2021-07-07 18:50:07 +02:00
parent c1c114104d d8b969a3c1
commit 19b58a5d9c
8 changed files with 194 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactoryTests.cs
View File

@@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.AspNetCore.Mvc.Infrastructure;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.Logging.Abstractions;
using Microsoft.Extensions.Options;
using Moq;
using NUnit.Framework;
using Umbraco.Cms.Core.Features;
@@ -29,7 +30,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Routing
{
private UmbracoRouteValuesFactory GetFactory(
out Mock<IPublishedRouter> publishedRouter,
out UmbracoRenderingDefaults renderingDefaults,
out IOptions<UmbracoRenderingDefaultsOptions> renderingDefaults,
out IPublishedRequest request)
{
var builder = new PublishedRequestBuilder(new Uri("https://example.com"), Mock.Of<IFileService>());
@@ -41,7 +42,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Routing
.Returns((IPublishedRequest r, IPublishedContent c) => Task.FromResult(builtRequest))
.Verifiable();
renderingDefaults = new UmbracoRenderingDefaults();
renderingDefaults = Mock.Of<IOptions<UmbracoRenderingDefaultsOptions>>(x => x.Value.DefaultControllerType == typeof(RenderController));
// add the default one
var actionDescriptors = new List<ActionDescriptor>
@@ -82,12 +83,12 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Routing
[Test]
public async Task Adds_Result_To_Route_Value_Dictionary()
{
UmbracoRouteValuesFactory factory = GetFactory(out _, out UmbracoRenderingDefaults renderingDefaults, out IPublishedRequest request);
UmbracoRouteValuesFactory factory = GetFactory(out _, out IOptions<UmbracoRenderingDefaultsOptions> renderingDefaults, out IPublishedRequest request);
UmbracoRouteValues result = await factory.CreateAsync(new DefaultHttpContext(), request);
Assert.IsNotNull(result);
Assert.AreEqual(renderingDefaults.DefaultControllerType, result.ControllerType);
Assert.AreEqual(renderingDefaults.Value.DefaultControllerType, result.ControllerType);
Assert.AreEqual(UmbracoRouteValues.DefaultActionName, result.ActionName);
Assert.IsNull(result.TemplateName);
}

50
src/Umbraco.Web.Common/Extensions/FriendlyUrlHelperExtensions.cs Normal file
View File

@@ -0,0 +1,50 @@
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Cms.Core.Web;
using Umbraco.Cms.Web.Common.DependencyInjection;
namespace Umbraco.Extensions
{
public static class FriendlyUrlHelperExtensions
{
private static IUmbracoContext UmbracoContext { get; } =
StaticServiceProvider.Instance.GetRequiredService<IUmbracoContextAccessor>().GetRequiredUmbracoContext();
private static IDataProtectionProvider DataProtectionProvider { get; } =
StaticServiceProvider.Instance.GetRequiredService<IDataProtectionProvider>();
/// <summary>
/// Generates a URL based on the current Umbraco URL with a custom query string that will route to the specified SurfaceController
/// </summary>
/// <param name="url"></param>
/// <param name="action"></param>
/// <param name="controllerName"></param>
/// <returns></returns>
public static string SurfaceAction(this IUrlHelper url, string action, string controllerName)
=> UrlHelperExtensions.SurfaceAction(url, UmbracoContext, DataProtectionProvider, action, controllerName);
/// <summary>
/// Generates a URL based on the current Umbraco URL with a custom query string that will route to the specified SurfaceController
/// </summary>
/// <param name="url"></param>
/// <param name="action"></param>
/// <param name="controllerName"></param>
/// <param name="additionalRouteVals"></param>
/// <returns></returns>
public static string SurfaceAction(this IUrlHelper url, string action, string controllerName, object additionalRouteVals)
=> UrlHelperExtensions.SurfaceAction(url, UmbracoContext, DataProtectionProvider, action, controllerName, additionalRouteVals);
/// <summary>
/// Generates a URL based on the current Umbraco URL with a custom query string that will route to the specified SurfaceController
/// </summary>
/// <param name="url"></param>
/// <param name="action"></param>
/// <param name="controllerName"></param>
/// <param name="area"></param>
/// <param name="additionalRouteVals"></param>
/// <returns></returns>
public static string SurfaceAction(this IUrlHelper url, string action, string controllerName, string area, object additionalRouteVals)
=> UrlHelperExtensions.SurfaceAction(url, UmbracoContext, DataProtectionProvider, action, controllerName, area, additionalRouteVals);
}
}

50
src/Umbraco.Web.Common/Extensions/UrlHelperExtensions.cs
View File

@@ -1,8 +1,10 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Linq.Expressions;
using System.Web;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Html;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Routing;
@@ -12,8 +14,10 @@ using Umbraco.Cms.Core.Hosting;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.PropertyEditors.ValueConverters;
using Umbraco.Cms.Core.Web;
using Umbraco.Cms.Core.WebAssets;
using Umbraco.Cms.Web.Common.Controllers;
using Umbraco.Cms.Web.Common.Security;
namespace Umbraco.Extensions
{
@@ -280,5 +284,51 @@ namespace Umbraco.Extensions
return htmlEncode ? new HtmlString(HttpUtility.HtmlEncode(url)) : new HtmlString(url);
}
/// <summary>
/// Generates a URL based on the current Umbraco URL with a custom query string that will route to the specified SurfaceController
/// </summary>
/// <param name="url"></param>
/// <param name="action"></param>
/// <param name="controllerName"></param>
/// <returns></returns>
public static string SurfaceAction(this IUrlHelper url, IUmbracoContext umbracoContext, IDataProtectionProvider dataProtectionProvider,string action, string controllerName)
{
return url.SurfaceAction(umbracoContext, dataProtectionProvider, action, controllerName, null);
}
/// <summary>
/// Generates a URL based on the current Umbraco URL with a custom query string that will route to the specified SurfaceController
/// </summary>
/// <param name="url"></param>
/// <param name="action"></param>
/// <param name="controllerName"></param>
/// <param name="additionalRouteVals"></param>
/// <returns></returns>
public static string SurfaceAction(this IUrlHelper url, IUmbracoContext umbracoContext, IDataProtectionProvider dataProtectionProvider,string action, string controllerName, object additionalRouteVals)
{
return url.SurfaceAction(umbracoContext, dataProtectionProvider, action, controllerName, "", additionalRouteVals);
}
/// <summary>
/// Generates a URL based on the current Umbraco URL with a custom query string that will route to the specified SurfaceController
/// </summary>
/// <param name="url"></param>
/// <param name="action"></param>
/// <param name="controllerName"></param>
/// <param name="area"></param>
/// <param name="additionalRouteVals"></param>
/// <returns></returns>
public static string SurfaceAction(this IUrlHelper url, IUmbracoContext umbracoContext, IDataProtectionProvider dataProtectionProvider, string action, string controllerName, string area, object additionalRouteVals)
{
if (action == null) throw new ArgumentNullException(nameof(action));
if (string.IsNullOrEmpty(action)) throw new ArgumentException("Value can't be empty.", nameof(action));
if (controllerName == null) throw new ArgumentNullException(nameof(controllerName));
if (string.IsNullOrEmpty(controllerName)) throw new ArgumentException("Value can't be empty.", nameof(controllerName));
var encryptedRoute = EncryptionHelper.CreateEncryptedRouteString(dataProtectionProvider, controllerName, action, area, additionalRouteVals);
var result = umbracoContext.OriginalRequestUrl.AbsolutePath.EnsureEndsWith('?') + "ufprt=" + encryptedRoute;
return result;
}
}
}

14
src/Umbraco.Web.Website/Controllers/UmbracoRenderingDefaults.cs
View File

@@ -1,14 +0,0 @@
using System;
using Umbraco.Cms.Web.Common.Controllers;
namespace Umbraco.Cms.Web.Website.Controllers
{
/// <summary>
/// The defaults used for rendering Umbraco front-end pages
/// </summary>
public class UmbracoRenderingDefaults : IUmbracoRenderingDefaults
{
/// <inheritdoc/>
public Type DefaultControllerType => typeof(RenderController);
}
}

5
src/Umbraco.Web.Website/Controllers/IUmbracoRenderingDefaults.cs → src/Umbraco.Web.Website/Controllers/UmbracoRenderingDefaultsOptions.cs
View File

@@ -1,15 +1,16 @@
using System;
using Umbraco.Cms.Web.Common.Controllers;
namespace Umbraco.Cms.Web.Website.Controllers
{
/// <summary>
/// The defaults used for rendering Umbraco front-end pages
/// </summary>
public interface IUmbracoRenderingDefaults
public class UmbracoRenderingDefaultsOptions
{
/// <summary>
/// Gets the default umbraco render controller type
/// </summary>
Type DefaultControllerType { get; }
public Type DefaultControllerType { get; set; } = typeof(RenderController);
}
}

1
src/Umbraco.Web.Website/DependencyInjection/UmbracoBuilderExtensions.cs
View File

@@ -40,7 +40,6 @@ namespace Umbraco.Extensions
builder.Services.AddScoped<UmbracoRouteValueTransformer>();
builder.Services.AddSingleton<IControllerActionSearcher, ControllerActionSearcher>();
builder.Services.AddSingleton<IUmbracoRouteValuesFactory, UmbracoRouteValuesFactory>();
builder.Services.AddSingleton<IUmbracoRenderingDefaults, UmbracoRenderingDefaults>();
builder.Services.AddSingleton<IRoutableDocumentFilter, RoutableDocumentFilter>();
builder.Services.AddSingleton<FrontEndRoutes>();

7
src/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactory.cs
View File

@@ -2,6 +2,7 @@ using System;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.Extensions.Options;
using Umbraco.Cms.Core.Features;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.Routing;
@@ -18,7 +19,6 @@ namespace Umbraco.Cms.Web.Website.Routing
/// </summary>
public class UmbracoRouteValuesFactory : IUmbracoRouteValuesFactory
{
private readonly IUmbracoRenderingDefaults _renderingDefaults;
private readonly IShortStringHelper _shortStringHelper;
private readonly UmbracoFeatures _umbracoFeatures;
private readonly IControllerActionSearcher _controllerActionSearcher;
@@ -30,18 +30,17 @@ namespace Umbraco.Cms.Web.Website.Routing
/// Initializes a new instance of the <see cref="UmbracoRouteValuesFactory"/> class.
/// </summary>
public UmbracoRouteValuesFactory(
IUmbracoRenderingDefaults renderingDefaults,
IOptions<UmbracoRenderingDefaultsOptions> renderingDefaults,
IShortStringHelper shortStringHelper,
UmbracoFeatures umbracoFeatures,
IControllerActionSearcher controllerActionSearcher,
IPublishedRouter publishedRouter)
{
_renderingDefaults = renderingDefaults;
_shortStringHelper = shortStringHelper;
_umbracoFeatures = umbracoFeatures;
_controllerActionSearcher = controllerActionSearcher;
_publishedRouter = publishedRouter;
_defaultControllerName = new Lazy<string>(() => ControllerExtensions.GetControllerName(_renderingDefaults.DefaultControllerType));
_defaultControllerName = new Lazy<string>(() => ControllerExtensions.GetControllerName(renderingDefaults.Value.DefaultControllerType));
_defaultControllerDescriptor = new Lazy<ControllerActionDescriptor>(() =>
{
ControllerActionDescriptor descriptor = _controllerActionSearcher.Find<IRenderController>(

166
src/Umbraco.Web/UrlHelperRenderExtensions.cs
View File

@@ -261,52 +261,52 @@ namespace Umbraco.Web
//
// #endregion
/// <summary>
/// Generates a URL based on the current Umbraco URL with a custom query string that will route to the specified SurfaceController
/// </summary>
/// <param name="url"></param>
/// <param name="action"></param>
/// <param name="controllerName"></param>
/// <returns></returns>
public static string SurfaceAction(this UrlHelper url, string action, string controllerName)
{
return url.SurfaceAction(action, controllerName, null);
}
/// <summary>
/// Generates a URL based on the current Umbraco URL with a custom query string that will route to the specified SurfaceController
/// </summary>
/// <param name="url"></param>
/// <param name="action"></param>
/// <param name="controllerName"></param>
/// <param name="additionalRouteVals"></param>
/// <returns></returns>
public static string SurfaceAction(this UrlHelper url, string action, string controllerName, object additionalRouteVals)
{
return url.SurfaceAction(action, controllerName, "", additionalRouteVals);
}
/// <summary>
/// Generates a URL based on the current Umbraco URL with a custom query string that will route to the specified SurfaceController
/// </summary>
/// <param name="url"></param>
/// <param name="action"></param>
/// <param name="controllerName"></param>
/// <param name="area"></param>
/// <param name="additionalRouteVals"></param>
/// <returns></returns>
public static string SurfaceAction(this UrlHelper url, string action, string controllerName, string area, object additionalRouteVals)
{
if (action == null) throw new ArgumentNullException(nameof(action));
if (string.IsNullOrEmpty(action)) throw new ArgumentException("Value can't be empty.", nameof(action));
if (controllerName == null) throw new ArgumentNullException(nameof(controllerName));
if (string.IsNullOrEmpty(controllerName)) throw new ArgumentException("Value can't be empty.", nameof(controllerName));
var encryptedRoute = CreateEncryptedRouteString(controllerName, action, area, additionalRouteVals);
var result = Current.UmbracoContext.OriginalRequestUrl.AbsolutePath.EnsureEndsWith('?') + "ufprt=" + encryptedRoute;
return result;
}
// /// <summary>
// /// Generates a URL based on the current Umbraco URL with a custom query string that will route to the specified SurfaceController
// /// </summary>
// /// <param name="url"></param>
// /// <param name="action"></param>
// /// <param name="controllerName"></param>
// /// <returns></returns>
// public static string SurfaceAction(this UrlHelper url, string action, string controllerName)
// {
// return url.SurfaceAction(action, controllerName, null);
// }
//
// /// <summary>
// /// Generates a URL based on the current Umbraco URL with a custom query string that will route to the specified SurfaceController
// /// </summary>
// /// <param name="url"></param>
// /// <param name="action"></param>
// /// <param name="controllerName"></param>
// /// <param name="additionalRouteVals"></param>
// /// <returns></returns>
// public static string SurfaceAction(this UrlHelper url, string action, string controllerName, object additionalRouteVals)
// {
// return url.SurfaceAction(action, controllerName, "", additionalRouteVals);
// }
//
// /// <summary>
// /// Generates a URL based on the current Umbraco URL with a custom query string that will route to the specified SurfaceController
// /// </summary>
// /// <param name="url"></param>
// /// <param name="action"></param>
// /// <param name="controllerName"></param>
// /// <param name="area"></param>
// /// <param name="additionalRouteVals"></param>
// /// <returns></returns>
// public static string SurfaceAction(this UrlHelper url, string action, string controllerName, string area, object additionalRouteVals)
// {
// if (action == null) throw new ArgumentNullException(nameof(action));
// if (string.IsNullOrEmpty(action)) throw new ArgumentException("Value can't be empty.", nameof(action));
// if (controllerName == null) throw new ArgumentNullException(nameof(controllerName));
// if (string.IsNullOrEmpty(controllerName)) throw new ArgumentException("Value can't be empty.", nameof(controllerName));
//
// var encryptedRoute = CreateEncryptedRouteString(controllerName, action, area, additionalRouteVals);
//
// var result = Current.UmbracoContext.OriginalRequestUrl.AbsolutePath.EnsureEndsWith('?') + "ufprt=" + encryptedRoute;
// return result;
// }
//TODO Move to LinkGenerator
// /// <summary>
@@ -384,42 +384,42 @@ namespace Umbraco.Web
// return url.SurfaceAction(action, typeof (T), additionalRouteVals);
// }
/// <summary>
/// This is used in methods like BeginUmbracoForm and SurfaceAction to generate an encrypted string which gets submitted in a request for which
/// Umbraco can decrypt during the routing process in order to delegate the request to a specific MVC Controller.
/// </summary>
/// <param name="controllerName"></param>
/// <param name="controllerAction"></param>
/// <param name="area"></param>
/// <param name="additionalRouteVals"></param>
/// <returns></returns>
internal static string CreateEncryptedRouteString(string controllerName, string controllerAction, string area, object additionalRouteVals = null)
{
if (controllerName == null) throw new ArgumentNullException(nameof(controllerName));
if (string.IsNullOrEmpty(controllerName)) throw new ArgumentException("Value can't be empty.", nameof(controllerName));
if (controllerAction == null) throw new ArgumentNullException(nameof(controllerAction));
if (string.IsNullOrEmpty(controllerAction)) throw new ArgumentException("Value can't be empty.", nameof(controllerAction));
if (area == null) throw new ArgumentNullException(nameof(area));
//need to create a params string as Base64 to put into our hidden field to use during the routes
var surfaceRouteParams = $"c={HttpUtility.UrlEncode(controllerName)}&a={HttpUtility.UrlEncode(controllerAction)}&ar={area}";
//checking if the additional route values is already a dictionary and convert to querystring
string additionalRouteValsAsQuery;
if (additionalRouteVals != null)
{
if (additionalRouteVals is Dictionary<string, object> additionalRouteValsAsDictionary)
additionalRouteValsAsQuery = additionalRouteValsAsDictionary.ToQueryString();
else
additionalRouteValsAsQuery = additionalRouteVals.ToDictionary<object>().ToQueryString();
}
else
additionalRouteValsAsQuery = null;
if (additionalRouteValsAsQuery.IsNullOrWhiteSpace() == false)
surfaceRouteParams += "&" + additionalRouteValsAsQuery;
return surfaceRouteParams.EncryptWithMachineKey();
}
// /// <summary>
// /// This is used in methods like BeginUmbracoForm and SurfaceAction to generate an encrypted string which gets submitted in a request for which
// /// Umbraco can decrypt during the routing process in order to delegate the request to a specific MVC Controller.
// /// </summary>
// /// <param name="controllerName"></param>
// /// <param name="controllerAction"></param>
// /// <param name="area"></param>
// /// <param name="additionalRouteVals"></param>
// /// <returns></returns>
// internal static string CreateEncryptedRouteString(string controllerName, string controllerAction, string area, object additionalRouteVals = null)
// {
// if (controllerName == null) throw new ArgumentNullException(nameof(controllerName));
// if (string.IsNullOrEmpty(controllerName)) throw new ArgumentException("Value can't be empty.", nameof(controllerName));
// if (controllerAction == null) throw new ArgumentNullException(nameof(controllerAction));
// if (string.IsNullOrEmpty(controllerAction)) throw new ArgumentException("Value can't be empty.", nameof(controllerAction));
// if (area == null) throw new ArgumentNullException(nameof(area));
//
// //need to create a params string as Base64 to put into our hidden field to use during the routes
// var surfaceRouteParams = $"c={HttpUtility.UrlEncode(controllerName)}&a={HttpUtility.UrlEncode(controllerAction)}&ar={area}";
//
// //checking if the additional route values is already a dictionary and convert to querystring
// string additionalRouteValsAsQuery;
// if (additionalRouteVals != null)
// {
// if (additionalRouteVals is Dictionary<string, object> additionalRouteValsAsDictionary)
// additionalRouteValsAsQuery = additionalRouteValsAsDictionary.ToQueryString();
// else
// additionalRouteValsAsQuery = additionalRouteVals.ToDictionary<object>().ToQueryString();
// }
// else
// additionalRouteValsAsQuery = null;
//
// if (additionalRouteValsAsQuery.IsNullOrWhiteSpace() == false)
// surfaceRouteParams += "&" + additionalRouteValsAsQuery;
//
// return surfaceRouteParams.EncryptWithMachineKey();
// }
}
}