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

Skip for backoffice requests + Handle potential missing backoffice signin manager

Browse Source
This commit is contained in:
Bjarke Berg
2021-08-06 12:29:05 +02:00
parent 7859798e8b
commit 641546d427
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Umbraco.Web.Website/Middleware/BasicAuthenticationMiddleware.cs
View File

@@ -29,7 +29,7 @@ namespace Umbraco.Cms.Web.Common.Middleware
/// <inheritdoc />
public async Task InvokeAsync(HttpContext context, RequestDelegate next)
{
if (_runtimeState.Level < RuntimeLevel.Run || !_basicAuthService.IsBasicAuthEnabled())
if (_runtimeState.Level < RuntimeLevel.Run || context.Request.IsBackOfficeRequest() || !_basicAuthService.IsBasicAuthEnabled())
{
await next(context);
return;
@@ -52,14 +52,21 @@ namespace Umbraco.Cms.Web.Common.Middleware
if (context.TryGetBasicAuthCredentials(out var username, out var password))
{
IBackOfficeSignInManager backOfficeSignInManager =
context.RequestServices.GetRequiredService<IBackOfficeSignInManager>();
context.RequestServices.GetService<IBackOfficeSignInManager>();
SignInResult signInResult =
await backOfficeSignInManager.PasswordSignInAsync(username, password, false, true);
if (signInResult.Succeeded)
if (backOfficeSignInManager is not null)
{
await next.Invoke(context);
SignInResult signInResult =
await backOfficeSignInManager.PasswordSignInAsync(username, password, false, true);
if (signInResult.Succeeded)
{
await next.Invoke(context);
}
else
{
SetUnauthorizedHeader(context);
}
}
else
{