From 5885ccaa17fe5c68abd26410acc136fc78bd2caf Mon Sep 17 00:00:00 2001 From: "DESKTOP-E9DJS27\\etribe" Date: Thu, 12 Jun 2025 12:00:47 +0900 Subject: [PATCH] =?UTF-8?q?front=20API=20Response=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/response/ApiResponse.java | 35 +++++++++++++++++++ .../web/GetUserPasswordController.java | 13 ++++++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 front/src/main/java/app/module/front/config/application/response/ApiResponse.java diff --git a/front/src/main/java/app/module/front/config/application/response/ApiResponse.java b/front/src/main/java/app/module/front/config/application/response/ApiResponse.java new file mode 100644 index 00000000..88c4ff16 --- /dev/null +++ b/front/src/main/java/app/module/front/config/application/response/ApiResponse.java @@ -0,0 +1,35 @@ +package app.module.front.config.application.response; + +public class ApiResponse { + private String code; + private String message; + private T data; + + public ApiResponse(String code, String message, T data) { + this.code = code; + this.message = message; + this.data = data; + } + + public static ApiResponse success(T data) { + return new ApiResponse<>("SUCCESS", null, data); + } + public static ApiResponse success(String message) { + return new ApiResponse<>("SUCCESS", message, null); + } + + + public static ApiResponse failure(T data) { + return new ApiResponse<>("ERROR", null, data); + } + + public static ApiResponse failure(String message) { + return new ApiResponse<>("ERROR", message, null); + } + + + public static ApiResponse make(String errorCode, String message,T data) { + return new ApiResponse<>(errorCode, message, data); + } + +} \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/user/getUserPasswordUI/adapters/web/GetUserPasswordController.java b/front/src/main/java/app/module/front/usecase/info/user/getUserPasswordUI/adapters/web/GetUserPasswordController.java index 75d068f7..84951e9f 100644 --- a/front/src/main/java/app/module/front/usecase/info/user/getUserPasswordUI/adapters/web/GetUserPasswordController.java +++ b/front/src/main/java/app/module/front/usecase/info/user/getUserPasswordUI/adapters/web/GetUserPasswordController.java @@ -3,12 +3,16 @@ package app.module.front.usecase.info.user.getUserPasswordUI.adapters.web; import app.module.core.config.application.util.CommonUtil; import app.module.core.config.application.util.CoreUtil; import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn; +import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHousehold; import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd; +import app.module.front.config.application.response.ApiResponse; import app.module.front.usecase.info.user.getUserPasswordUI.adapters.web.model.GetUserPasswordReqVO; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.validation.BindingResult; @@ -19,6 +23,8 @@ import org.springframework.web.bind.annotation.PostMapping; @RequiredArgsConstructor class GetUserPasswordController { + @Autowired + private BCryptPasswordEncoder passwordEncoder; private final CoreUtil coreUtil; @@ -29,7 +35,12 @@ class GetUserPasswordController { if (bindingResult.hasErrors()) { return coreUtil.getErrorInfo(bindingResult); } + GetHousehold user = getHouseholdPortIn.operate(new GetHouseholdCmd(CommonUtil.getLoginUsername())).orElseThrow(); - return ResponseEntity.status(HttpStatus.OK).body(getHouseholdPortIn.operate(new GetHouseholdCmd(CommonUtil.getLoginUsername())).orElseThrow()); + if (!passwordEncoder.matches(reqVO.getPassword(), user.getPassword())) { + return ResponseEntity.status(HttpStatus.OK).body(ApiResponse.failure("INVALID_PASSWORD")); + } + + return ResponseEntity.status(HttpStatus.OK).body(ApiResponse.success(null)); } } \ No newline at end of file