From 7c589a54b4dc4d0b7d83dd3a3b61097464ec0200 Mon Sep 17 00:00:00 2001 From: "DESKTOP-E9DJS27\\etribe" Date: Thu, 12 Jun 2025 14:08:20 +0900 Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EB=B9=84?= =?UTF-8?q?=EB=B0=80=EB=B2=88=ED=98=B8=20=ED=99=95=EC=9D=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/response/ApiResponse.java | 3 + .../web/GetUserPasswordController.java | 9 +- .../web/model/GetUserPasswordReqVO.java | 12 +- .../adapters/web/GetUserUIController.java | 10 +- .../templates/info/user/password.html | 44 ++- .../resources/templates/info/user/user.html | 336 ++++++++++++------ 6 files changed, 273 insertions(+), 141 deletions(-) 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 index 88c4ff16..1aa39567 100644 --- 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 @@ -1,5 +1,8 @@ package app.module.front.config.application.response; +import lombok.Data; + +@Data public class ApiResponse { private String code; private String message; 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 84951e9f..e227eb3d 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 @@ -18,6 +18,9 @@ import org.springframework.ui.Model; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + @Controller @RequiredArgsConstructor @@ -31,16 +34,16 @@ class GetUserPasswordController { private final GetHouseholdPortIn getHouseholdPortIn; @PostMapping(path = "/api/front/info/user/password/auth") - ResponseEntity operate(@Valid GetUserPasswordReqVO reqVO, BindingResult bindingResult){ + ResponseEntity operate(@RequestBody @Valid GetUserPasswordReqVO reqVO, BindingResult bindingResult){ if (bindingResult.hasErrors()) { return coreUtil.getErrorInfo(bindingResult); } GetHousehold user = 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.ok(ApiResponse.failure("INVALID_PASSWORD")); } - return ResponseEntity.status(HttpStatus.OK).body(ApiResponse.success(null)); + return ResponseEntity.ok(ApiResponse.success(null)); } } \ No newline at end of file diff --git a/front/src/main/java/app/module/front/usecase/info/user/getUserPasswordUI/adapters/web/model/GetUserPasswordReqVO.java b/front/src/main/java/app/module/front/usecase/info/user/getUserPasswordUI/adapters/web/model/GetUserPasswordReqVO.java index f33a9422..23349ab8 100644 --- a/front/src/main/java/app/module/front/usecase/info/user/getUserPasswordUI/adapters/web/model/GetUserPasswordReqVO.java +++ b/front/src/main/java/app/module/front/usecase/info/user/getUserPasswordUI/adapters/web/model/GetUserPasswordReqVO.java @@ -2,18 +2,14 @@ package app.module.front.usecase.info.user.getUserPasswordUI.adapters.web.model; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; +import lombok.*; -@Getter -@Setter +@Data +@NoArgsConstructor // 기본 생성자 자동 추가 @AllArgsConstructor -@EqualsAndHashCode public class GetUserPasswordReqVO { @NotNull(message = "비밀번호는 필수 입력값입니다.") - @Pattern(regexp = "\\d{6}", message = "비밀번호는 숫자 6자리여야 합니다.") + @Pattern(regexp = "\\d{4}", message = "비밀번호는 숫자 4자리여야 합니다.") private String password; } diff --git a/front/src/main/java/app/module/front/usecase/info/user/getUserUI/adapters/web/GetUserUIController.java b/front/src/main/java/app/module/front/usecase/info/user/getUserUI/adapters/web/GetUserUIController.java index 4387924e..3a270e5a 100644 --- a/front/src/main/java/app/module/front/usecase/info/user/getUserUI/adapters/web/GetUserUIController.java +++ b/front/src/main/java/app/module/front/usecase/info/user/getUserUI/adapters/web/GetUserUIController.java @@ -3,10 +3,13 @@ package app.module.front.usecase.info.user.getUserUI.adapters.web; import app.module.core.config.application.util.CommonUtil; import app.module.core.usecase.household.getHousehold.ports.GetHouseholdPortIn; import app.module.core.usecase.household.getHousehold.ports.application.domain.GetHouseholdCmd; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; @Controller @RequiredArgsConstructor @@ -15,7 +18,12 @@ class GetUserUIController { private final GetHouseholdPortIn getHouseholdPortIn; @GetMapping(path = "/info/user") - String operate(Model model) { + String operate(Model model, HttpServletRequest request) { + + String referer = request.getHeader("Referer"); + if (referer == null || !referer.contains("/info/user/password")) { + return "redirect:/"; // 요청 처리 중단 + } model.addAttribute("userInfo", getHouseholdPortIn.operate(new GetHouseholdCmd(CommonUtil.getLoginUsername())).orElseThrow()); diff --git a/front/src/main/resources/templates/info/user/password.html b/front/src/main/resources/templates/info/user/password.html index 8d290db1..c1345fd3 100644 --- a/front/src/main/resources/templates/info/user/password.html +++ b/front/src/main/resources/templates/info/user/password.html @@ -16,24 +16,22 @@
- -
-
- +
+
+ +
+
+ +
-
- +
+
+ +
-
-
-
- -
-
+
@@ -44,8 +42,9 @@ - + \ No newline at end of file