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

Introduced IBasicAuthService

Browse Source
This commit is contained in:
Bjarke Berg
2021-08-06 09:51:08 +02:00
parent 4f2cb09939
commit 0e7f9d93ca
9 changed files with 104 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Web.BackOffice/Security/BackOfficeCookieManager.cs
View File

@@ -25,7 +25,7 @@ namespace Umbraco.Cms.Web.BackOffice.Security
private readonly IRuntimeState _runtime;
private readonly string[] _explicitPaths;
private readonly UmbracoRequestPaths _umbracoRequestPaths;
private readonly IOptionsMonitor<BasicAuthSettings> _basicAuthSettingsMonitor;
private readonly IBasicAuthService _basicAuthService;
/// <summary>
/// Initializes a new instance of the <see cref="BackOfficeCookieManager"/> class.
@@ -34,8 +34,8 @@ namespace Umbraco.Cms.Web.BackOffice.Security
IUmbracoContextAccessor umbracoContextAccessor,
IRuntimeState runtime,
UmbracoRequestPaths umbracoRequestPaths,
IOptionsMonitor<BasicAuthSettings> basicAuthSettings)
: this(umbracoContextAccessor, runtime, null, umbracoRequestPaths, basicAuthSettings)
IBasicAuthService basicAuthService)
: this(umbracoContextAccessor, runtime, null, umbracoRequestPaths, basicAuthService)
{
}
@@ -47,13 +47,13 @@ namespace Umbraco.Cms.Web.BackOffice.Security
IRuntimeState runtime,
IEnumerable<string> explicitPaths,
UmbracoRequestPaths umbracoRequestPaths,
IOptionsMonitor<BasicAuthSettings> basicAuthSettingsMonitor)
IBasicAuthService basicAuthService)
{
_umbracoContextAccessor = umbracoContextAccessor;
_runtime = runtime;
_explicitPaths = explicitPaths?.ToArray();
_umbracoRequestPaths = umbracoRequestPaths;
_basicAuthSettingsMonitor = basicAuthSettingsMonitor;
_basicAuthService = basicAuthService;
}
/// <summary>
@@ -94,7 +94,7 @@ namespace Umbraco.Cms.Web.BackOffice.Security
return true;
}
if (_basicAuthSettingsMonitor.CurrentValue.Enabled)
if (_basicAuthService.IsBasicAuthEnabled())
{
return true;
}

7
src/Umbraco.Web.BackOffice/Security/ConfigureBackOfficeCookieOptions.cs
View File

@@ -34,6 +34,7 @@ namespace Umbraco.Cms.Web.BackOffice.Security
private readonly IIpResolver _ipResolver;
private readonly ISystemClock _systemClock;
private readonly UmbracoRequestPaths _umbracoRequestPaths;
private readonly IBasicAuthService _basicAuthService;
private readonly IOptionsMonitor<BasicAuthSettings> _optionsSnapshot;
/// <summary>
@@ -61,7 +62,7 @@ namespace Umbraco.Cms.Web.BackOffice.Security
IIpResolver ipResolver,
ISystemClock systemClock,
UmbracoRequestPaths umbracoRequestPaths,
IOptionsMonitor<BasicAuthSettings> optionsSnapshot)
IBasicAuthService basicAuthService)
{
_serviceProvider = serviceProvider;
_umbracoContextAccessor = umbracoContextAccessor;
@@ -74,7 +75,7 @@ namespace Umbraco.Cms.Web.BackOffice.Security
_ipResolver = ipResolver;
_systemClock = systemClock;
_umbracoRequestPaths = umbracoRequestPaths;
_optionsSnapshot = optionsSnapshot;
_basicAuthService = basicAuthService;
}
/// <inheritdoc />
@@ -119,7 +120,7 @@ namespace Umbraco.Cms.Web.BackOffice.Security
_umbracoContextAccessor,
_runtimeState,
_umbracoRequestPaths,
_optionsSnapshot
_basicAuthService
);
options.Events = new CookieAuthenticationEvents