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

ensures the last login date, etc... are updated with external logins

Browse Source
This commit is contained in:
Shannon
2021-07-26 13:12:29 -06:00
parent b939da3668
commit 27fc159e28
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -408,7 +408,9 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
if (ViewData.FromBase64CookieData<BackOfficeExternalLoginProviderErrors>(_httpContextAccessor.HttpContext, ViewDataExtensions.TokenExternalSignInError, _jsonSerializer) || if (ViewData.FromBase64CookieData<BackOfficeExternalLoginProviderErrors>(_httpContextAccessor.HttpContext, ViewDataExtensions.TokenExternalSignInError, _jsonSerializer) ||
ViewData.FromTempData(TempData, ViewDataExtensions.TokenExternalSignInError) || ViewData.FromTempData(TempData, ViewDataExtensions.TokenExternalSignInError) ||
ViewData.FromTempData(TempData, ViewDataExtensions.TokenPasswordResetCode)) ViewData.FromTempData(TempData, ViewDataExtensions.TokenPasswordResetCode))
{
return defaultResponse(); return defaultResponse();
}
//First check if there's external login info, if there's not proceed as normal //First check if there's external login info, if there's not proceed as normal
var loginInfo = await _signInManager.GetExternalLoginInfoAsync(); var loginInfo = await _signInManager.GetExternalLoginInfoAsync();
@@ -442,12 +444,12 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
var errors = new List<string>(); var errors = new List<string>();
if (result == Microsoft.AspNetCore.Identity.SignInResult.Success) if (result == SignInResult.Success)
{ {
// Update any authentication tokens if succeeded // Update any authentication tokens if succeeded
await _signInManager.UpdateExternalAuthenticationTokensAsync(loginInfo); await _signInManager.UpdateExternalAuthenticationTokensAsync(loginInfo);
} }
else if (result == Microsoft.AspNetCore.Identity.SignInResult.TwoFactorRequired) else if (result == SignInResult.TwoFactorRequired)
{ {
var attemptedUser = await _userManager.FindByLoginAsync(loginInfo.LoginProvider, loginInfo.ProviderKey); var attemptedUser = await _userManager.FindByLoginAsync(loginInfo.LoginProvider, loginInfo.ProviderKey);

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

@@ -198,6 +198,9 @@ namespace Umbraco.Cms.Web.Common.Security
// code taken from aspnetcore: https://github.com/dotnet/aspnetcore/blob/master/src/Identity/Core/src/SignInManager.cs // code taken from aspnetcore: https://github.com/dotnet/aspnetcore/blob/master/src/Identity/Core/src/SignInManager.cs
// we also override to set the current HttpContext principal since this isn't done by default // we also override to set the current HttpContext principal since this isn't done by default
// we also need to call our handle login to ensure all date/events are set
await HandleSignIn(user, user.UserName, SignInResult.Success);
var userPrincipal = await CreateUserPrincipalAsync(user); var userPrincipal = await CreateUserPrincipalAsync(user);
foreach (var claim in additionalClaims) foreach (var claim in additionalClaims)
{ {