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

Rename fixed extension method to GetUmbracoBackOfficeUrl and obsolete old one

Browse Source
This commit is contained in:
Ronald Barendse
2022-12-19 11:52:48 +01:00
committed by Bjarke Berg
parent 751c1883ce
commit 58da7f754b
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.BackOffice/Install/InstallAuthorizeAttribute.cs
View File

@@ -42,7 +42,7 @@ public class InstallAuthorizeAttribute : TypeFilterAttribute
// Only authorize when the installer is enabled
context.Result = new ForbidResult(new AuthenticationProperties()
{
RedirectUri = _linkGenerator.GetBackOfficeUrl(_hostingEnvironment)
RedirectUri = _linkGenerator.GetUmbracoBackOfficeUrl(_hostingEnvironment)
});
}
else if (_runtimeState.Level == RuntimeLevel.Upgrade && (await context.HttpContext.AuthenticateBackOfficeAsync()).Succeeded == false)

24
src/Umbraco.Web.Common/Extensions/LinkGeneratorExtensions.cs
View File

@@ -13,25 +13,35 @@ namespace Umbraco.Extensions;
public static class LinkGeneratorExtensions
{
/// <summary>
/// Gets the backoffice URL (if the back office is installed).
/// Gets the Umbraco backoffice URL (if Umbraco is installed).
/// </summary>
/// <param name="linkGenerator">The link generator.</param>
/// <returns>
/// The backoffice URL.
/// The Umbraco backoffice URL.
/// </returns>
public static string? GetBackOfficeUrl(this LinkGenerator linkGenerator)
public static string? GetUmbracoBackOfficeUrl(this LinkGenerator linkGenerator)
=> linkGenerator.GetPathByAction("Default", "BackOffice", new { area = Constants.Web.Mvc.BackOfficeArea });
/// <summary>
/// Gets the backoffice URL (if the back office is installed) or application virtual path (in most cases just <c>"/"</c>).
/// Gets the Umbraco backoffice URL (if Umbraco is installed) or application virtual path (in most cases just <c>"/"</c>).
/// </summary>
/// <param name="linkGenerator">The link generator.</param>
/// <param name="hostingEnvironment">The hosting environment.</param>
/// <returns>
/// The backoffice URL.
/// The Umbraco backoffice URL.
/// </returns>
public static string GetBackOfficeUrl(this LinkGenerator linkGenerator, IHostingEnvironment hostingEnvironment)
=> GetBackOfficeUrl(linkGenerator) ?? hostingEnvironment.ApplicationVirtualPath;
public static string GetUmbracoBackOfficeUrl(this LinkGenerator linkGenerator, IHostingEnvironment hostingEnvironment)
=> GetUmbracoBackOfficeUrl(linkGenerator) ?? hostingEnvironment.ApplicationVirtualPath;
/// <summary>
/// Return the back office url if the back office is installed
/// </summary>
/// <remarks>
/// This method contained a bug that would result in always returning "/".
/// </remarks>
[Obsolete("Use the GetUmbracoBackOfficeUrl extension method instead. This method will be removed in Umbraco 13.")]
public static string? GetBackOfficeUrl(this LinkGenerator linkGenerator, IHostingEnvironment hostingEnvironment)
=> "/";
/// <summary>
/// Return the Url for a Web Api service