LiRuochen_WorkFlow/MaxKey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changeUserPassword fix

Browse Source
This commit is contained in:
shimingxy
2019-12-08 19:13:29 +08:00
parent 1182fc3534
commit 78629720f7
5 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SafeController.java
View File

@@ -46,10 +46,11 @@ public class SafeController {
@RequestParam("newPassword") String newPassword,
@RequestParam("confirmPassword") String confirmPassword) {
changeUserPassword(oldPassword,newPassword,confirmPassword);
return new Message(WebContext.getI18nValue(OPERATEMESSAGE.UPDATE_ERROR),MessageType.error);
if(changeUserPassword(oldPassword,newPassword,confirmPassword)) {
return new Message(WebContext.getI18nValue(OPERATEMESSAGE.UPDATE_SUCCESS),MessageType.success);
}else {
return new Message(WebContext.getI18nValue(OPERATEMESSAGE.UPDATE_ERROR),MessageType.error);
}
}
@RequestMapping(value="/changeExpiredPassword")
@@ -91,9 +92,11 @@ public class SafeController {
String newPassword,
String confirmPassword){
UserInfo userInfo =WebContext.getUserInfo();
_logger.debug("decipherable : "+userInfo.getDecipherable());
_logger.debug("decipherable : "+PasswordReciprocal.getInstance().rawPassword(userInfo.getUsername(), userInfo.getPassword()));
if(newPassword.equals(confirmPassword)){
if(oldPassword==null ||
userInfo.getPassword().equals(passwordEncoder.encode(PasswordReciprocal.getInstance().rawPassword(userInfo.getUsername(),oldPassword)))){
passwordEncoder.matches(PasswordReciprocal.getInstance().rawPassword(userInfo.getUsername(),oldPassword), userInfo.getPassword())){
userInfo.setPassword(newPassword);
userInfoService.changePassword(userInfo);
//TODO syncProvisioningService.changePassword(userInfo);