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

merge v10 to v11

Browse Source
This commit is contained in:
Bjarke Berg
2022-08-18 14:38:28 +02:00
parent c4aa718763 ac4fb6acf1
commit e9f9b8aee1
4076 changed files with 320268 additions and 303657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Web.Common/Security/BackofficeSecurity.cs
View File

@@ -36,10 +36,10 @@ public class BackOfficeSecurity : IBackOfficeSecurity
// Check again
if (_currentUser == null)
{
Attempt<int?> id = GetUserId();
if (id.Success && id.Result is not null)
Attempt<int> id = GetUserId();
if (id.Success)
{
_currentUser = id.Success ? _userService.GetUserById(id.Result.Value) : null;
_currentUser = id.Success ? _userService.GetUserById(id.Result) : null;
}
}
}
@@ -50,10 +50,12 @@ public class BackOfficeSecurity : IBackOfficeSecurity
}
/// <inheritdoc />
public Attempt<int?> GetUserId()
public Attempt<int> GetUserId()
{
ClaimsIdentity? identity = _httpContextAccessor.HttpContext?.GetCurrentIdentity();
return identity == null ? Attempt.Fail<int?>() : Attempt.Succeed(identity.GetId());
var id = identity?.GetId();
return id.HasValue is false ? Attempt.Fail<int>() : Attempt.Succeed(id.Value);
}
/// <inheritdoc />

2
src/Umbraco.Web.Common/Security/UmbracoSignInManager.cs
View File

@@ -86,7 +86,7 @@ public abstract class UmbracoSignInManager<TUser> : SignInManager<TUser>
var providerKey = auth.Principal.FindFirstValue(ClaimTypes.NameIdentifier);
var provider = items[UmbracoSignInMgrLoginProviderKey];
if (providerKey == null || provider is not null)
if (providerKey == null || provider == null)
{
return null;
}