BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update code

Browse Source
This commit is contained in:
harish
2024-08-27 12:40:49 +05:30
parent 83e7c898bd
commit 38d806dc39
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/gepafin/tendermanagement/dao/UserDao.java
View File

@@ -181,6 +181,10 @@ public class UserDao {
log.info("Password reset attempt for non-existent user: {}", resetPasswordReq.getEmail()); log.info("Password reset attempt for non-existent user: {}", resetPasswordReq.getEmail());
throw new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG)); throw new ResourceNotFoundException(Status.NOT_FOUND, Translator.toLocale(GepafinConstant.USER_NOT_FOUND_MSG));
} }
if (!resetPasswordReq.getNewPassword().equals(resetPasswordReq.getConfirmPassword())) {
log.info("User creation failed: Passwords do not match for email {}", user.getEmail());
throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.PASSWORD_DOESNT_MATCH));
}
String dbToken = user.getResetPasswordToken(); String dbToken = user.getResetPasswordToken();
if (dbToken == null || !dbToken.equals(resetPasswordReq.getToken())) { if (dbToken == null || !dbToken.equals(resetPasswordReq.getToken())) {

2
src/main/java/net/gepafin/tendermanagement/model/request/ResetPasswordReq.java
View File

@@ -7,5 +7,7 @@ public class ResetPasswordReq {
private String email; private String email;
private String token; private String token;
private String newPassword; private String newPassword;
private String confirmPassword;
} }

5
src/main/java/net/gepafin/tendermanagement/web/rest/api/UserApi.java
View File

@@ -104,7 +104,7 @@ public interface UserApi {
method = RequestMethod.POST) method = RequestMethod.POST)
ResponseEntity<Response<JWTToken>> login( ResponseEntity<Response<JWTToken>> login(
@Parameter(description = "Login request object", required = true) @Valid @RequestBody LoginReq loginReq); @Parameter(description = "Login request object", required = true) @Valid @RequestBody LoginReq loginReq);
@Operation(summary = "Api to initiate password reset", @Operation(summary = "Api to initiate password reset request",
responses = { responses = {
@ApiResponse(responseCode = "200", description = "OK"), @ApiResponse(responseCode = "200", description = "OK"),
@ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
@@ -155,7 +155,7 @@ public interface UserApi {
ResponseEntity<Response<Void>> logoutUser( ResponseEntity<Response<Void>> logoutUser(
@Parameter(description = "The request object is not needed for logout", required = false) HttpServletRequest request, @Parameter(description = "The request object is not needed for logout", required = false) HttpServletRequest request,
@Parameter(description = "The response object is not needed for logout", required = false) HttpServletResponse response); @Parameter(description = "The response object is not needed for logout", required = false) HttpServletResponse response);
@Operation(summary = "API to update user active/deactive status", @Operation(summary = "Api to update user active/deactive status",
responses = { responses = {
@ApiResponse(responseCode = "200", description = "OK"), @ApiResponse(responseCode = "200", description = "OK"),
@ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
@@ -168,6 +168,7 @@ public interface UserApi {
@RequestMapping(value = "/{userId}/status", @RequestMapping(value = "/{userId}/status",
produces = {"application/json"}, produces = {"application/json"},
method = RequestMethod.PUT) method = RequestMethod.PUT)
@PreAuthorize("hasRole('ROLE_SUPER_ADMIN')")
default ResponseEntity<Response<UserResponseBean>> updateUserStatus( default ResponseEntity<Response<UserResponseBean>> updateUserStatus(
@Parameter(description = "The user id", required = true) @PathVariable("userId") Long userId, @Parameter(description = "The user id", required = true) @PathVariable("userId") Long userId,
@Parameter(description = "status", required = true)@RequestParam(value = "status", required = true) UserStatusEnum status) { @Parameter(description = "status", required = true)@RequestParam(value = "status", required = true) UserStatusEnum status) {