* Getting new netcore PublicAccessChecker in place * Adds full test coverage for PublicAccessChecker * remove PublicAccessComposer * adjust namespaces, ensure RoleManager works, separate public access controller, reduce content controller * Implements the required methods on IMemberManager, removes old migrated code * Updates routing to be able to re-route, Fixes middleware ordering ensuring endpoints are last, refactors pipeline options, adds public access middleware, ensures public access follows all hops * adds note * adds note * Cleans up ext methods, ensures that members identity is added on both front-end and back ends. updates how UmbracoApplicationBuilder works in that it explicitly starts endpoints at the time of calling. * Changes name to IUmbracoEndpointBuilder * adds note * Fixing tests, fixing error describers so there's 2x one for back office, one for members, fixes TryConvertTo, fixes login redirect * fixing build * Updates user manager to correctly validate password hashing and injects the IBackOfficeUserPasswordChecker * Merges PR * Fixes up build and notes * Implements security stamp and email confirmed for members, cleans up a bunch of repo/service level member groups stuff, shares user store code between members and users and fixes the user identity object so we arent' tracking both groups and roles. * Security stamp for members is now working * Fixes keepalive, fixes PublicAccessMiddleware to not throw, updates startup code to be more clear and removes magic that registers middleware. * adds note * removes unused filter, fixes build * fixes WebPath and tests * Looks up entities in one query * remove usings * Fix test, remove stylesheet * Set status code before we write to response to avoid error * Ensures that users and members are validated when logging in. Shares more code between users and members. * merge changes * oops * Fixes RepositoryCacheKeys to ensure the keys are normalized * oops didn't mean to commit this * Fix casing issues with caching, stop boxing value types for all cache operations, stop re-creating string keys in DefaultRepositoryCachePolicy * oops didn't mean to comit this * bah, far out this keeps getting recommitted. sorry Co-authored-by: Bjarke Berg <mail@bergmania.dk>
608 lines
24 KiB
C#
608 lines
24 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.ComponentModel;
|
|
using System.Data;
|
|
using System.Linq;
|
|
using System.Security.Claims;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.AspNetCore.Identity;
|
|
using Umbraco.Cms.Core.Mapping;
|
|
using Umbraco.Cms.Core.Models;
|
|
using Umbraco.Cms.Core.Scoping;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Extensions;
|
|
|
|
namespace Umbraco.Cms.Core.Security
|
|
{
|
|
/// <summary>
|
|
/// A custom user store that uses Umbraco member data
|
|
/// </summary>
|
|
public class MemberUserStore : UmbracoUserStore<MemberIdentityUser, UmbracoIdentityRole>
|
|
{
|
|
private const string genericIdentityErrorCode = "IdentityErrorUserStore";
|
|
private readonly IMemberService _memberService;
|
|
private readonly UmbracoMapper _mapper;
|
|
private readonly IScopeProvider _scopeProvider;
|
|
|
|
/// <summary>
|
|
/// Initializes a new instance of the <see cref="MemberUserStore"/> class for the members identity store
|
|
/// </summary>
|
|
/// <param name="memberService">The member service</param>
|
|
/// <param name="mapper">The mapper for properties</param>
|
|
/// <param name="scopeProvider">The scope provider</param>
|
|
/// <param name="describer">The error describer</param>
|
|
public MemberUserStore(
|
|
IMemberService memberService,
|
|
UmbracoMapper mapper,
|
|
IScopeProvider scopeProvider,
|
|
IdentityErrorDescriber describer)
|
|
: base(describer)
|
|
{
|
|
_memberService = memberService ?? throw new ArgumentNullException(nameof(memberService));
|
|
_mapper = mapper ?? throw new ArgumentNullException(nameof(mapper));
|
|
_scopeProvider = scopeProvider ?? throw new ArgumentNullException(nameof(scopeProvider));
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public override Task<IdentityResult> CreateAsync(MemberIdentityUser user, CancellationToken cancellationToken = default)
|
|
{
|
|
try
|
|
{
|
|
cancellationToken.ThrowIfCancellationRequested();
|
|
ThrowIfDisposed();
|
|
if (user == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(user));
|
|
}
|
|
|
|
using IScope scope = _scopeProvider.CreateScope(autoComplete: true);
|
|
|
|
// create member
|
|
IMember memberEntity = _memberService.CreateMember(
|
|
user.UserName,
|
|
user.Email,
|
|
user.Name.IsNullOrWhiteSpace() ? user.UserName : user.Name,
|
|
user.MemberTypeAlias.IsNullOrWhiteSpace() ? Constants.Security.DefaultMemberTypeAlias : user.MemberTypeAlias);
|
|
|
|
UpdateMemberProperties(memberEntity, user);
|
|
|
|
// create the member
|
|
_memberService.Save(memberEntity);
|
|
|
|
if (!memberEntity.HasIdentity)
|
|
{
|
|
throw new DataException("Could not create the member, check logs for details");
|
|
}
|
|
|
|
// re-assign id
|
|
user.Id = UserIdToString(memberEntity.Id);
|
|
user.Key = memberEntity.Key;
|
|
|
|
// [from backofficeuser] we have to remember whether Logins property is dirty, since the UpdateMemberProperties will reset it.
|
|
// var isLoginsPropertyDirty = user.IsPropertyDirty(nameof(MembersIdentityUser.Logins));
|
|
// TODO: confirm re externallogins implementation
|
|
//if (isLoginsPropertyDirty)
|
|
//{
|
|
// _externalLoginService.Save(
|
|
// user.Id,
|
|
// user.Logins.Select(x => new ExternalLogin(
|
|
// x.LoginProvider,
|
|
// x.ProviderKey,
|
|
// x.UserData)));
|
|
//}
|
|
|
|
|
|
return Task.FromResult(IdentityResult.Success);
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
return Task.FromResult(IdentityResult.Failed(new IdentityError { Code = genericIdentityErrorCode, Description = ex.Message }));
|
|
}
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public override Task<IdentityResult> UpdateAsync(MemberIdentityUser user, CancellationToken cancellationToken = default)
|
|
{
|
|
try
|
|
{
|
|
cancellationToken.ThrowIfCancellationRequested();
|
|
ThrowIfDisposed();
|
|
if (user == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(user));
|
|
}
|
|
|
|
Attempt<int> asInt = user.Id.TryConvertTo<int>();
|
|
if (asInt == false)
|
|
{
|
|
//TODO: should this be thrown, or an identity result?
|
|
throw new InvalidOperationException("The user id must be an integer to work with Umbraco");
|
|
}
|
|
|
|
using IScope scope = _scopeProvider.CreateScope(autoComplete: true);
|
|
|
|
IMember found = _memberService.GetById(asInt.Result);
|
|
if (found != null)
|
|
{
|
|
// we have to remember whether Logins property is dirty, since the UpdateMemberProperties will reset it.
|
|
var isLoginsPropertyDirty = user.IsPropertyDirty(nameof(MemberIdentityUser.Logins));
|
|
|
|
if (UpdateMemberProperties(found, user))
|
|
{
|
|
_memberService.Save(found);
|
|
}
|
|
|
|
// TODO: when to implement external login service?
|
|
|
|
//if (isLoginsPropertyDirty)
|
|
//{
|
|
// _externalLoginService.Save(
|
|
// found.Id,
|
|
// user.Logins.Select(x => new ExternalLogin(
|
|
// x.LoginProvider,
|
|
// x.ProviderKey,
|
|
// x.UserData)));
|
|
//}
|
|
}
|
|
|
|
return Task.FromResult(IdentityResult.Success);
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
return Task.FromResult(IdentityResult.Failed(new IdentityError { Code = genericIdentityErrorCode, Description = ex.Message }));
|
|
}
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public override Task<IdentityResult> DeleteAsync(MemberIdentityUser user, CancellationToken cancellationToken = default)
|
|
{
|
|
try
|
|
{
|
|
cancellationToken.ThrowIfCancellationRequested();
|
|
ThrowIfDisposed();
|
|
if (user == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(user));
|
|
}
|
|
|
|
IMember found = _memberService.GetById(UserIdToInt(user.Id));
|
|
if (found != null)
|
|
{
|
|
_memberService.Delete(found);
|
|
}
|
|
|
|
// TODO: when to implement external login service?
|
|
//_externalLoginService.DeleteUserLogins(UserIdToInt(user.Id));
|
|
|
|
return Task.FromResult(IdentityResult.Success);
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
return Task.FromResult(IdentityResult.Failed(new IdentityError { Code = genericIdentityErrorCode, Description = ex.Message }));
|
|
}
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
protected override Task<MemberIdentityUser> FindUserAsync(string userId, CancellationToken cancellationToken)
|
|
{
|
|
cancellationToken.ThrowIfCancellationRequested();
|
|
ThrowIfDisposed();
|
|
|
|
if (string.IsNullOrWhiteSpace(userId))
|
|
{
|
|
throw new ArgumentNullException(nameof(userId));
|
|
}
|
|
|
|
IMember user = _memberService.GetById(UserIdToInt(userId));
|
|
if (user == null)
|
|
{
|
|
return Task.FromResult((MemberIdentityUser)null);
|
|
}
|
|
|
|
return Task.FromResult(AssignLoginsCallback(_mapper.Map<MemberIdentityUser>(user)));
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public override Task<MemberIdentityUser> FindByNameAsync(string userName, CancellationToken cancellationToken = default)
|
|
{
|
|
cancellationToken.ThrowIfCancellationRequested();
|
|
ThrowIfDisposed();
|
|
IMember user = _memberService.GetByUsername(userName);
|
|
if (user == null)
|
|
{
|
|
return Task.FromResult((MemberIdentityUser)null);
|
|
}
|
|
|
|
MemberIdentityUser result = AssignLoginsCallback(_mapper.Map<MemberIdentityUser>(user));
|
|
|
|
return Task.FromResult(result);
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public override Task<MemberIdentityUser> FindByEmailAsync(string email, CancellationToken cancellationToken = default)
|
|
{
|
|
cancellationToken.ThrowIfCancellationRequested();
|
|
ThrowIfDisposed();
|
|
IMember member = _memberService.GetByEmail(email);
|
|
MemberIdentityUser result = member == null
|
|
? null
|
|
: _mapper.Map<MemberIdentityUser>(member);
|
|
|
|
return Task.FromResult(AssignLoginsCallback(result));
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public override Task AddLoginAsync(MemberIdentityUser user, UserLoginInfo login, CancellationToken cancellationToken = default)
|
|
{
|
|
cancellationToken.ThrowIfCancellationRequested();
|
|
ThrowIfDisposed();
|
|
if (user == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(user));
|
|
}
|
|
|
|
if (login == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(login));
|
|
}
|
|
|
|
if (string.IsNullOrWhiteSpace(login.LoginProvider))
|
|
{
|
|
throw new ArgumentNullException(nameof(login.LoginProvider));
|
|
}
|
|
|
|
if (string.IsNullOrWhiteSpace(login.ProviderKey))
|
|
{
|
|
throw new ArgumentNullException(nameof(login.ProviderKey));
|
|
}
|
|
|
|
ICollection<IIdentityUserLogin> logins = user.Logins;
|
|
var instance = new IdentityUserLogin(
|
|
login.LoginProvider,
|
|
login.ProviderKey,
|
|
user.Id.ToString());
|
|
|
|
IdentityUserLogin userLogin = instance;
|
|
logins.Add(userLogin);
|
|
|
|
return Task.CompletedTask;
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public override Task RemoveLoginAsync(MemberIdentityUser user, string loginProvider, string providerKey, CancellationToken cancellationToken = default)
|
|
{
|
|
cancellationToken.ThrowIfCancellationRequested();
|
|
ThrowIfDisposed();
|
|
if (user == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(user));
|
|
}
|
|
|
|
if (string.IsNullOrWhiteSpace(loginProvider))
|
|
{
|
|
throw new ArgumentNullException(nameof(loginProvider));
|
|
}
|
|
|
|
if (string.IsNullOrWhiteSpace(providerKey))
|
|
{
|
|
throw new ArgumentNullException(nameof(providerKey));
|
|
}
|
|
|
|
IIdentityUserLogin userLogin = user.Logins.SingleOrDefault(l => l.LoginProvider == loginProvider && l.ProviderKey == providerKey);
|
|
if (userLogin != null)
|
|
{
|
|
user.Logins.Remove(userLogin);
|
|
}
|
|
|
|
return Task.CompletedTask;
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public override Task<IList<UserLoginInfo>> GetLoginsAsync(MemberIdentityUser user, CancellationToken cancellationToken = default)
|
|
{
|
|
cancellationToken.ThrowIfCancellationRequested();
|
|
ThrowIfDisposed();
|
|
if (user == null)
|
|
{
|
|
throw new ArgumentNullException(nameof(user));
|
|
}
|
|
|
|
return Task.FromResult((IList<UserLoginInfo>)user.Logins.Select(l => new UserLoginInfo(l.LoginProvider, l.ProviderKey, l.LoginProvider)).ToList());
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
protected override async Task<IdentityUserLogin<string>> FindUserLoginAsync(string userId, string loginProvider, string providerKey, CancellationToken cancellationToken)
|
|
{
|
|
cancellationToken.ThrowIfCancellationRequested();
|
|
ThrowIfDisposed();
|
|
|
|
if (string.IsNullOrWhiteSpace(loginProvider))
|
|
{
|
|
throw new ArgumentNullException(nameof(loginProvider));
|
|
}
|
|
|
|
if (string.IsNullOrWhiteSpace(providerKey))
|
|
{
|
|
throw new ArgumentNullException(nameof(providerKey));
|
|
}
|
|
|
|
MemberIdentityUser user = await FindUserAsync(userId, cancellationToken);
|
|
if (user == null)
|
|
{
|
|
return await Task.FromResult((IdentityUserLogin<string>)null);
|
|
}
|
|
|
|
IList<UserLoginInfo> logins = await GetLoginsAsync(user, cancellationToken);
|
|
UserLoginInfo found = logins.FirstOrDefault(x => x.ProviderKey == providerKey && x.LoginProvider == loginProvider);
|
|
if (found == null)
|
|
{
|
|
return await Task.FromResult((IdentityUserLogin<string>)null);
|
|
}
|
|
|
|
return new IdentityUserLogin<string>
|
|
{
|
|
LoginProvider = found.LoginProvider,
|
|
ProviderKey = found.ProviderKey,
|
|
// TODO: We don't store this value so it will be null
|
|
ProviderDisplayName = found.ProviderDisplayName,
|
|
UserId = user.Id
|
|
};
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
protected override Task<IdentityUserLogin<string>> FindUserLoginAsync(string loginProvider, string providerKey, CancellationToken cancellationToken)
|
|
{
|
|
cancellationToken.ThrowIfCancellationRequested();
|
|
ThrowIfDisposed();
|
|
|
|
if (string.IsNullOrWhiteSpace(loginProvider))
|
|
{
|
|
throw new ArgumentNullException(nameof(loginProvider));
|
|
}
|
|
|
|
if (string.IsNullOrWhiteSpace(providerKey))
|
|
{
|
|
throw new ArgumentNullException(nameof(providerKey));
|
|
}
|
|
|
|
var logins = new List<IIdentityUserLogin>();
|
|
|
|
// TODO: external login needed
|
|
//_externalLoginService.Find(loginProvider, providerKey).ToList();
|
|
if (logins.Count == 0)
|
|
{
|
|
return Task.FromResult((IdentityUserLogin<string>)null);
|
|
}
|
|
|
|
IIdentityUserLogin found = logins[0];
|
|
return Task.FromResult(new IdentityUserLogin<string>
|
|
{
|
|
LoginProvider = found.LoginProvider,
|
|
ProviderKey = found.ProviderKey,
|
|
// TODO: We don't store this value so it will be null
|
|
ProviderDisplayName = null,
|
|
UserId = found.UserId
|
|
});
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets a list of role names the specified user belongs to.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// This lazy loads the roles for the member
|
|
/// </remarks>
|
|
public override Task<IList<string>> GetRolesAsync(MemberIdentityUser user, CancellationToken cancellationToken = default)
|
|
{
|
|
EnsureRoles(user);
|
|
return base.GetRolesAsync(user, cancellationToken);
|
|
}
|
|
|
|
private void EnsureRoles(MemberIdentityUser user)
|
|
{
|
|
if (user.Roles.Count == 0)
|
|
{
|
|
// if there are no roles, they either haven't been loaded since we don't eagerly
|
|
// load for members, or they just have no roles.
|
|
IEnumerable<string> currentRoles = _memberService.GetAllRoles(user.UserName);
|
|
ICollection<IdentityUserRole<string>> roles = currentRoles.Select(role => new IdentityUserRole<string>
|
|
{
|
|
RoleId = role,
|
|
UserId = user.Id
|
|
}).ToList();
|
|
|
|
user.Roles = roles;
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns true if a user is in the role
|
|
/// </summary>
|
|
public override Task<bool> IsInRoleAsync(MemberIdentityUser user, string roleName, CancellationToken cancellationToken = default)
|
|
{
|
|
EnsureRoles(user);
|
|
|
|
return base.IsInRoleAsync(user, roleName, cancellationToken);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Lists all users of a given role.
|
|
/// </summary>
|
|
public override Task<IList<MemberIdentityUser>> GetUsersInRoleAsync(string roleName, CancellationToken cancellationToken = default)
|
|
{
|
|
cancellationToken.ThrowIfCancellationRequested();
|
|
ThrowIfDisposed();
|
|
|
|
if (string.IsNullOrWhiteSpace(roleName))
|
|
{
|
|
throw new ArgumentNullException(nameof(roleName));
|
|
}
|
|
|
|
IEnumerable<IMember> members = _memberService.GetMembersByMemberType(roleName);
|
|
|
|
IList<MemberIdentityUser> membersIdentityUsers = members.Select(x => _mapper.Map<MemberIdentityUser>(x)).ToList();
|
|
|
|
return Task.FromResult(membersIdentityUsers);
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
protected override Task<UmbracoIdentityRole> FindRoleAsync(string roleName, CancellationToken cancellationToken)
|
|
{
|
|
if (string.IsNullOrWhiteSpace(roleName))
|
|
{
|
|
throw new ArgumentNullException(nameof(roleName));
|
|
}
|
|
|
|
IMemberGroup group = _memberService.GetAllRoles().SingleOrDefault(x => x.Name == roleName);
|
|
if (group == null)
|
|
{
|
|
return Task.FromResult((UmbracoIdentityRole)null);
|
|
}
|
|
|
|
return Task.FromResult(new UmbracoIdentityRole(group.Name)
|
|
{
|
|
//TODO: what should the alias be?
|
|
Id = group.Id.ToString()
|
|
});
|
|
}
|
|
|
|
/// <inheritdoc/>
|
|
protected override async Task<IdentityUserRole<string>> FindUserRoleAsync(string userId, string roleId, CancellationToken cancellationToken)
|
|
{
|
|
MemberIdentityUser user = await FindUserAsync(userId, cancellationToken);
|
|
if (user == null)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
IdentityUserRole<string> found = user.Roles.FirstOrDefault(x => x.RoleId.InvariantEquals(roleId));
|
|
return found;
|
|
}
|
|
|
|
private MemberIdentityUser AssignLoginsCallback(MemberIdentityUser user)
|
|
{
|
|
if (user != null)
|
|
{
|
|
//TODO: implement
|
|
//user.SetLoginsCallback(new Lazy<IEnumerable<IIdentityUserLogin>>(() => _externalLoginService.GetAll(UserIdToInt(user.Id))));
|
|
}
|
|
|
|
return user;
|
|
}
|
|
|
|
private bool UpdateMemberProperties(IMember member, MemberIdentityUser identityUser)
|
|
{
|
|
var anythingChanged = false;
|
|
|
|
// don't assign anything if nothing has changed as this will trigger the track changes of the model
|
|
if (identityUser.IsPropertyDirty(nameof(MemberIdentityUser.LastLoginDateUtc))
|
|
|| (member.LastLoginDate != default && identityUser.LastLoginDateUtc.HasValue == false)
|
|
|| (identityUser.LastLoginDateUtc.HasValue && member.LastLoginDate.ToUniversalTime() != identityUser.LastLoginDateUtc.Value))
|
|
{
|
|
anythingChanged = true;
|
|
|
|
// if the LastLoginDate is being set to MinValue, don't convert it ToLocalTime
|
|
DateTime dt = identityUser.LastLoginDateUtc == DateTime.MinValue ? DateTime.MinValue : identityUser.LastLoginDateUtc.Value.ToLocalTime();
|
|
member.LastLoginDate = dt;
|
|
}
|
|
|
|
if (identityUser.IsPropertyDirty(nameof(MemberIdentityUser.LastPasswordChangeDateUtc))
|
|
|| (member.LastPasswordChangeDate != default && identityUser.LastPasswordChangeDateUtc.HasValue == false)
|
|
|| (identityUser.LastPasswordChangeDateUtc.HasValue && member.LastPasswordChangeDate.ToUniversalTime() != identityUser.LastPasswordChangeDateUtc.Value))
|
|
{
|
|
anythingChanged = true;
|
|
member.LastPasswordChangeDate = identityUser.LastPasswordChangeDateUtc.Value.ToLocalTime();
|
|
}
|
|
|
|
if (identityUser.IsPropertyDirty(nameof(MemberIdentityUser.Comments))
|
|
&& member.Comments != identityUser.Comments && identityUser.Comments.IsNullOrWhiteSpace() == false)
|
|
{
|
|
anythingChanged = true;
|
|
member.Comments = identityUser.Comments;
|
|
}
|
|
|
|
if (identityUser.IsPropertyDirty(nameof(MemberIdentityUser.EmailConfirmed))
|
|
|| (member.EmailConfirmedDate.HasValue && member.EmailConfirmedDate.Value != default && identityUser.EmailConfirmed == false)
|
|
|| ((member.EmailConfirmedDate.HasValue == false || member.EmailConfirmedDate.Value == default) && identityUser.EmailConfirmed))
|
|
{
|
|
anythingChanged = true;
|
|
member.EmailConfirmedDate = identityUser.EmailConfirmed ? (DateTime?)DateTime.Now : null;
|
|
}
|
|
|
|
if (identityUser.IsPropertyDirty(nameof(MemberIdentityUser.Name))
|
|
&& member.Name != identityUser.Name && identityUser.Name.IsNullOrWhiteSpace() == false)
|
|
{
|
|
anythingChanged = true;
|
|
member.Name = identityUser.Name;
|
|
}
|
|
|
|
if (identityUser.IsPropertyDirty(nameof(MemberIdentityUser.Email))
|
|
&& member.Email != identityUser.Email && identityUser.Email.IsNullOrWhiteSpace() == false)
|
|
{
|
|
anythingChanged = true;
|
|
member.Email = identityUser.Email;
|
|
}
|
|
|
|
if (identityUser.IsPropertyDirty(nameof(MemberIdentityUser.AccessFailedCount))
|
|
&& member.FailedPasswordAttempts != identityUser.AccessFailedCount)
|
|
{
|
|
anythingChanged = true;
|
|
member.FailedPasswordAttempts = identityUser.AccessFailedCount;
|
|
}
|
|
|
|
if (member.IsLockedOut != identityUser.IsLockedOut)
|
|
{
|
|
anythingChanged = true;
|
|
member.IsLockedOut = identityUser.IsLockedOut;
|
|
|
|
if (member.IsLockedOut)
|
|
{
|
|
// need to set the last lockout date
|
|
member.LastLockoutDate = DateTime.Now;
|
|
}
|
|
}
|
|
|
|
if (member.IsApproved != identityUser.IsApproved)
|
|
{
|
|
anythingChanged = true;
|
|
member.IsApproved = identityUser.IsApproved;
|
|
}
|
|
|
|
if (identityUser.IsPropertyDirty(nameof(MemberIdentityUser.UserName))
|
|
&& member.Username != identityUser.UserName && identityUser.UserName.IsNullOrWhiteSpace() == false)
|
|
{
|
|
anythingChanged = true;
|
|
member.Username = identityUser.UserName;
|
|
}
|
|
|
|
if (identityUser.IsPropertyDirty(nameof(MemberIdentityUser.PasswordHash))
|
|
&& member.RawPasswordValue != identityUser.PasswordHash && identityUser.PasswordHash.IsNullOrWhiteSpace() == false)
|
|
{
|
|
anythingChanged = true;
|
|
member.RawPasswordValue = identityUser.PasswordHash;
|
|
member.PasswordConfiguration = identityUser.PasswordConfig;
|
|
}
|
|
|
|
if (member.SecurityStamp != identityUser.SecurityStamp)
|
|
{
|
|
anythingChanged = true;
|
|
member.SecurityStamp = identityUser.SecurityStamp;
|
|
}
|
|
|
|
if (identityUser.IsPropertyDirty(nameof(MemberIdentityUser.Roles)))
|
|
{
|
|
anythingChanged = true;
|
|
|
|
var identityUserRoles = identityUser.Roles.Select(x => x.RoleId).ToArray();
|
|
_memberService.ReplaceRoles(new[] { member.Id }, identityUserRoles);
|
|
}
|
|
|
|
// reset all changes
|
|
identityUser.ResetDirtyProperties(false);
|
|
|
|
return anythingChanged;
|
|
}
|
|
|
|
}
|
|
}
|