[chore] 비밀번호 api revert

SMU-SATTO · Aug 29, 2024 · efd7e58 · efd7e58
1 parent cec7ecf
commit efd7e58
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/src/main/java/com/example/satto/domain/users/controller/UsersController.java b/src/main/java/com/example/satto/domain/users/controller/UsersController.java
@@ -126,9 +126,9 @@ public BaseResponse<?> publicAccount(@AuthenticationPrincipal Users user) {
 
     @Operation(summary = "비밀번호 재설정")
     @PatchMapping("account/pw")
-    public BaseResponse<?> resetPassword(@RequestBody UsersRequestDTO.UpdateUserPassword2DTO updateUserPassword2DTO, @AuthenticationPrincipal Users user) {
+    public BaseResponse<?> resetPassword(@RequestBody UsersRequestDTO.UpdateUserPasswordDTO updateUserPasswordDTO, @AuthenticationPrincipal Users user) {
         Long userId = user.getUserId();
-        usersService.resetPassword(updateUserPassword2DTO, userId);
+        usersService.resetPassword2(updateUserPasswordDTO, userId);
         return BaseResponse.onSuccess("비밀번호 재설정 완료");
     }
 

diff --git a/src/main/java/com/example/satto/domain/users/service/Impl/UsersServiceImpl.java b/src/main/java/com/example/satto/domain/users/service/Impl/UsersServiceImpl.java
@@ -241,6 +241,7 @@ public List<Map<String, String>> searchUserByName(String name) {
     public Long findId(String email) {
         Long userId = usersRepository.findIdByEmail(email);
         return userId;
+    }
 
     @Transactional
     @Override
@@ -276,17 +277,12 @@ public void deleteProfileImage(String studentId) {
         usersRepository.save(user);
     }
 
-    @Override
-    public void resetPassword(UsersRequestDTO.UpdateUserPassword2DTO updateUserPassword2DTO, Long userId) {
+
+    public void resetPassword2 (UsersRequestDTO.UpdateUserPasswordDTO updateUserPasswordDTO, Long userId) {
         Users user = usersRepository.findById(userId)
                 .orElseThrow(() -> new UsersHandler(ErrorStatus._NOT_FOUND_USER));
-        if (updateUserPassword2DTO.getPassword1().equals(updateUserPassword2DTO.getPassword2())) {
-            user.setPassword(passwordEncoder.encode(updateUserPassword2DTO.getPassword1()));
+            user.setPassword(passwordEncoder.encode(updateUserPasswordDTO.getPassword()));
             usersRepository.save(user);
-        } else {
-            throw new UsersHandler(ErrorStatus._INVALID_PW);
-        }
-
     }
 
     private String extractKeyFromUrl(String url) {

diff --git a/src/main/java/com/example/satto/domain/users/service/UsersService.java b/src/main/java/com/example/satto/domain/users/service/UsersService.java
@@ -58,5 +58,5 @@ public interface UsersService {
 
     void deleteProfileImage(String studentId);
 
-    void resetPassword(UsersRequestDTO.UpdateUserPassword2DTO updateUserPassword2DTO, Long userId);
+    void resetPassword2(UsersRequestDTO.UpdateUserPasswordDTO updateUserPasswordDTO, Long userId);
 }