FatttSnake/Pinnacle-OA
1
0
Fork 0
mirror of https://github.com/FatttSnake/Pinnacle-OA.git synced 2026-04-05 23:11:24 +08:00
Code Packages Releases Activity

Added old password verify

Browse Source
This commit is contained in:
Fat Snake
2023-06-04 21:29:27 +08:00
parent edaa54d1e7
commit b4478c1334
7 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/UserController.java
View File

@@ -44,15 +44,15 @@ public class UserController {
@PutMapping("/passwd")
@Operation(summary = "修改密码")
public ResponseResult<?> modifyPasswd(String password) {
if (password == null) {
public ResponseResult<?> modifyPasswd(String oldPasswd, String newPassword) {
if (oldPasswd == null || newPassword == null) {
throw new DataValidationFailedException();
}
password = password.trim();
if (password.isBlank() || password.length() < 8 || password.length() > 64) {
newPassword = newPassword.trim();
if (oldPasswd.isBlank() || oldPasswd.length() < 8 || oldPasswd.length() > 64 || newPassword.isBlank() || newPassword.length() < 8 || newPassword.length() > 64) {
throw new DataValidationFailedException();
}
if (userService.modifyPasswd(password)) {
if (userService.modifyPasswd(oldPasswd, newPassword)) {
return ResponseResult.databaseUpdateSuccess(null);
} else {
return ResponseResult.build(ResponseCode.DATABASE_UPDATE_ERROR, "error", null);

1
Pinnacle/src/main/java/com/cfive/pinnacle/entity/common/ResponseCode.java
View File

@@ -8,6 +8,7 @@ public class ResponseCode {
public static final int SYSTEM_OK = 20000;
public static final int LOGIN_SUCCESS = 20010;
public static final int LOGIN_USERNAME_PASSWORD_ERROR = 20011;
public static final int OLD_PASSWORD_NOT_MATCH = 20012;
public static final int LOGOUT_SUCCESS = 20015;
public static final int LOGOUT_FAILED = 20016;
public static final int TOKEN_IS_ILLEGAL = 20017;

23
Pinnacle/src/main/java/com/cfive/pinnacle/exception/OldPasswordNotMatchException.java Normal file
View File

@@ -0,0 +1,23 @@
package com.cfive.pinnacle.exception;
public class OldPasswordNotMatchException extends RuntimeException {
public OldPasswordNotMatchException() {
super("Old password not match");
}
public OldPasswordNotMatchException(String message) {
super(message);
}
public OldPasswordNotMatchException(String message, Throwable cause) {
super(message, cause);
}
public OldPasswordNotMatchException(Throwable cause) {
super(cause);
}
public OldPasswordNotMatchException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
super(message, cause, enableSuppression, writableStackTrace);
}
}

4
Pinnacle/src/main/java/com/cfive/pinnacle/handler/CustomExceptionHandler.java
View File

@@ -5,6 +5,7 @@ import com.auth0.jwt.exceptions.TokenExpiredException;
import com.cfive.pinnacle.entity.common.ResponseCode;
import com.cfive.pinnacle.entity.common.ResponseResult;
import com.cfive.pinnacle.exception.DataValidationFailedException;
import com.cfive.pinnacle.exception.OldPasswordNotMatchException;
import com.cfive.pinnacle.exception.TokenHasExpiredException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.dao.DataIntegrityViolationException;
@@ -53,6 +54,9 @@ public class CustomExceptionHandler {
if (e instanceof UncategorizedSQLException) {
return ResponseResult.build(ResponseCode.DATABASE_EXECUTE_ERROR, "error", null);
}
if (e instanceof OldPasswordNotMatchException) {
return ResponseResult.build(ResponseCode.OLD_PASSWORD_NOT_MATCH, e.getMessage(), null);
}
log.debug(e.getMessage(), e);

2
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IUserService.java
View File

@@ -18,7 +18,7 @@ public interface IUserService extends IService<User> {
User getInfo();
boolean modifyPasswd(String passwd);
boolean modifyPasswd(String oldPasswd, String newPasswd);
List<User> getAffairUser();

9
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java
View File

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
import com.cfive.pinnacle.entity.permission.*;
import com.cfive.pinnacle.exception.OldPasswordNotMatchException;
import com.cfive.pinnacle.mapper.permission.*;
import com.cfive.pinnacle.service.permission.IUserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -76,8 +77,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
}
@Override
public boolean modifyPasswd(String passwd) {
String encryptedPassword = passwordEncoder.encode(passwd);
public boolean modifyPasswd(String oldPasswd, String newPasswd) {
if (!passwordEncoder.matches(oldPasswd, userMapper.getOneWithPowerByUsername(WebUtil.getLoginUser().getUsername()).getPasswd())) {
throw new OldPasswordNotMatchException();
}
String encryptedPassword = passwordEncoder.encode(newPasswd);
User user = new User().setId(WebUtil.getLoginUser().getUser().getId()).setPasswd(encryptedPassword);
return userMapper.updateById(user) == 1;
}

2
ui/src/constants/Common.constants.ts
View File

@@ -15,6 +15,7 @@ const SIZE_ICON_XL = '64px'
const SYSTEM_OK = 20000
const LOGIN_SUCCESS = 20010
const LOGIN_USERNAME_PASSWORD_ERROR = 20011
const OLD_PASSWORD_NOT_MATCH = 20012
const LOGOUT_SUCCESS = 20015
const LOGOUT_FAILED = 20016
const TOKEN_IS_ILLEGAL = 20017
@@ -57,6 +58,7 @@ export {
SYSTEM_OK,
LOGIN_SUCCESS,
LOGIN_USERNAME_PASSWORD_ERROR,
OLD_PASSWORD_NOT_MATCH,
LOGOUT_SUCCESS,
LOGOUT_FAILED,
TOKEN_IS_ILLEGAL,