lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-19 17:51:45 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

8541 password history (#8542)

Browse Source 
* Added password history management to back office user password edit and made it working via IUserEventHandler calls.

* Added "password" parameter to "ChangedPassword" call.
This commit is contained in:
Andrea Piovanelli
2022-03-18 12:26:19 +01:00
committed by GitHub
parent f2a8450d90
commit ffb56e684c
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Orchard.Web/Modules/Orchard.Users/Drivers/UserPartPasswordDriver.cs
View File

@@ -5,6 +5,7 @@ using Orchard.ContentManagement.Drivers;
using Orchard.Environment.Extensions; using Orchard.Environment.Extensions;
using Orchard.Localization; using Orchard.Localization;
using Orchard.Security; using Orchard.Security;
using Orchard.Users.Events;
using Orchard.Users.Models; using Orchard.Users.Models;
using Orchard.Users.Services; using Orchard.Users.Services;
using Orchard.Users.ViewModels; using Orchard.Users.ViewModels;
@@ -15,15 +16,18 @@ namespace Orchard.Users.Drivers {
public class UserPartPasswordDriver : ContentPartDriver<UserPart> { public class UserPartPasswordDriver : ContentPartDriver<UserPart> {
private readonly IMembershipService _membershipService; private readonly IMembershipService _membershipService;
private readonly IUserService _userService; private readonly IUserService _userService;
private readonly IUserEventHandler _userEventHandler;
public Localizer T { get; set; } public Localizer T { get; set; }
public UserPartPasswordDriver( public UserPartPasswordDriver(
MembershipService membershipService, MembershipService membershipService,
IUserService userService) { IUserService userService,
IUserEventHandler userEventHandler) {
_membershipService = membershipService; _membershipService = membershipService;
_userService = userService; _userService = userService;
_userEventHandler = userEventHandler;
T = NullLocalizer.Instance; T = NullLocalizer.Instance;
} }
@@ -37,21 +41,30 @@ namespace Orchard.Users.Drivers {
protected override DriverResult Editor(UserPart part, IUpdateModel updater, dynamic shapeHelper) { protected override DriverResult Editor(UserPart part, IUpdateModel updater, dynamic shapeHelper) {
var editModel = new UserEditPasswordViewModel { User = part }; var editModel = new UserEditPasswordViewModel { User = part };
var canUpdatePassword = true;
if (updater != null) { if (updater != null) {
if (updater.TryUpdateModel(editModel, Prefix, null, null)) { if (updater.TryUpdateModel(editModel, Prefix, null, null)) {
if (!(string.IsNullOrEmpty(editModel.Password) && string.IsNullOrEmpty(editModel.ConfirmPassword))) { if (!(string.IsNullOrEmpty(editModel.Password) && string.IsNullOrEmpty(editModel.ConfirmPassword))) {
if (string.IsNullOrEmpty(editModel.Password) || string.IsNullOrEmpty(editModel.ConfirmPassword)) { if (string.IsNullOrEmpty(editModel.Password) || string.IsNullOrEmpty(editModel.ConfirmPassword)) {
updater.AddModelError("MissingPassword", T("Password or Confirm Password field is empty.")); updater.AddModelError("MissingPassword", T("Password or Confirm Password field is empty."));
canUpdatePassword = false;
} else { } else {
if (editModel.Password != editModel.ConfirmPassword) { if (editModel.Password != editModel.ConfirmPassword) {
updater.AddModelError("ConfirmPassword", T("Password confirmation must match.")); updater.AddModelError("ConfirmPassword", T("Password confirmation must match."));
} canUpdatePassword = false;
var actUser = _membershipService.GetUser(part.UserName); }
_membershipService.SetPassword(actUser, editModel.Password);
} }
IDictionary<string, LocalizedString> validationErrors; IDictionary<string, LocalizedString> validationErrors;
if (!_userService.PasswordMeetsPolicies(editModel.Password, part, out validationErrors)) { if (!_userService.PasswordMeetsPolicies(editModel.Password, part, out validationErrors)) {
updater.AddModelErrors(validationErrors); updater.AddModelErrors(validationErrors);
canUpdatePassword = false;
}
if (canUpdatePassword) {
var actUser = _membershipService.GetUser(part.UserName);
// I need to store current password in a variable to save it in the PasswordHistoryRepository.
_userEventHandler.ChangingPassword(actUser, editModel.Password);
_membershipService.SetPassword(actUser, editModel.Password);
_userEventHandler.ChangedPassword(actUser, editModel.Password);
} }
} }
} }