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

Fixed InstallAuthorizeAttribute and simplified other things

Browse Source 
(cherry picked from commit da24ae9180)
This commit is contained in:
Bjarke Berg
2022-09-07 11:24:41 +02:00
committed by Sebastiaan Janssen
parent 3ab57ce691
commit 0a77775bb1
5 changed files with 65 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web.BackOffice/Controllers/BackOfficeController.cs
View File

@@ -24,6 +24,7 @@ using Umbraco.Cms.Core.WebAssets;
using Umbraco.Cms.Infrastructure.WebAssets;
using Umbraco.Cms.Web.BackOffice.ActionResults;
using Umbraco.Cms.Web.BackOffice.Filters;
using Umbraco.Cms.Web.BackOffice.Install;
using Umbraco.Cms.Web.BackOffice.Security;
using Umbraco.Cms.Web.Common.ActionsResults;
using Umbraco.Cms.Web.Common.Attributes;
@@ -211,6 +212,12 @@ public class BackOfficeController : UmbracoController
{
// force authentication to occur since this is not an authorized endpoint
AuthenticateResult result = await this.AuthenticateBackOfficeAsync();
if (result.Succeeded)
{
// Redirect to installer if we're already authorized
var installerUrl = Url.Action(nameof(InstallController.Index), ControllerExtensions.GetControllerName<InstallController>(), new { area = Cms.Core.Constants.Web.Mvc.InstallArea }) ?? "/";
return new LocalRedirectResult(installerUrl);
}
var viewPath = Path.Combine(Constants.SystemDirectories.Umbraco, Constants.Web.Mvc.BackOfficeArea, nameof(AuthorizeUpgrade) + ".cshtml");