회원 정보 수정, 삭제 리팩토링

src/main/java/balancetalk/global/jwt/JwtAuthenticationFilter.java

@@ -35,4 +35,6 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
         }
         chain.doFilter(request, response);
     }
+
+
 }

src/main/java/balancetalk/global/jwt/JwtTokenProvider.java

@@ -84,12 +84,28 @@ public Authentication getAuthentication(String token) {
     // http 헤더로부터 bearer 토큰 가져옴
     public String resolveToken(HttpServletRequest request) {
         String bearerToken = request.getHeader("Authorization");
-        if (bearerToken != null && bearerToken.startsWith("bearer ")) {
+        if (bearerToken != null && bearerToken.startsWith("Bearer ")) {
             return bearerToken.substring(7); // 실제 토큰만 추출
         }
         return null;
      }
 
+    public String getPayload(String token) {
+        return tokenToJws(token).getBody().getSubject();
+    }
+
+    public Jws<Claims> tokenToJws(final String token) {
+        try {
+            return Jwts.parserBuilder().setSigningKey(secretKey).build().parseClaimsJws(token);
+        } catch (final IllegalArgumentException | MalformedJwtException e) {
+            throw new IllegalArgumentException("Token이 null이거나 Token 파싱 오류");
+        } catch (final SignatureException e) {
+            throw new IllegalArgumentException("토큰의 시크릿 키가 일치하지 않습니다.");
+        } catch (final ExpiredJwtException e) {
+            throw new IllegalArgumentException("만료된 토큰 입니다.");
+        }
+    }
+
     // 토큰 유효성, 만료일자 확인
     public boolean validateToken(String token) {
         try {

src/main/java/balancetalk/global/jwt/JwtUtils.java

@@ -0,0 +1,6 @@
+package balancetalk.global.jwt;
+
+public class JwtUtils {
+
+    // TODO: static으로 메서드 선언 & member 조회 까지
+}

src/main/java/balancetalk/module/file/application/FileService.java

@@ -71,14 +71,17 @@ public ResponseEntity<Resource> downloadFile(Long fileId) {
             if (contentType == null) {
                 contentType = "application/octet-stream";
             }
+
+            return ResponseEntity.ok()
+                    .contentType(MediaType.parseMediaType(contentType))
+                    .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + file.getOriginalName() + "\"")
+                    .body(resource);
+
         } catch (IOException e) {
             throw new BalanceTalkException(FILE_DOWNLOAD_FAILED);
         }
 
-        return ResponseEntity.ok()
-                .contentType(MediaType.parseMediaType(contentType))
-                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + file.getUploadName() + "\"")
-                .body(resource);
+
     }
 
     private FileType convertMimeTypeToFileType(String mimeType) {

src/main/java/balancetalk/module/member/application/MemberService.java

@@ -3,10 +3,10 @@
 import balancetalk.global.exception.BalanceTalkException;
 import balancetalk.global.exception.ErrorCode;
 import balancetalk.global.jwt.JwtTokenProvider;
-import balancetalk.global.redis.application.RedisService;
 import balancetalk.module.member.domain.Member;
 import balancetalk.module.member.domain.MemberRepository;
 import balancetalk.module.member.dto.*;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -48,23 +48,21 @@ public LoginSuccessDto login(final LoginDto loginDto) {
             Authentication authentication = authenticationManager.authenticate(
                     new UsernamePasswordAuthenticationToken(loginDto.getEmail(), loginDto.getPassword())
             );
-
+            TokenDto tokenDto = new TokenDto("Bearer", jwtTokenProvider.createAccessToken(authentication), jwtTokenProvider.createRefreshToken(authentication));
             return LoginSuccessDto.builder()
                     .email(member.getEmail())
                     .password(member.getPassword())
                     .role(member.getRole())
-                    .accessToken(jwtTokenProvider.createAccessToken(authentication))
-                    .refreshToken(jwtTokenProvider.createRefreshToken(authentication))
+                    .tokenDto(tokenDto)
                     .build();
         } catch (BadCredentialsException e) {
             throw new BadCredentialsException("credential 오류!!");
         }
     }
 
     @Transactional(readOnly = true)
-    public MemberResponseDto findById(Long id) {
-        Member member = memberRepository.findById(id)
-                .orElseThrow(() -> new BalanceTalkException(ErrorCode.NOT_FOUND_MEMBER));
+    public MemberResponseDto findMember(HttpServletRequest request) {
+        Member member = extractMember(request);
         return MemberResponseDto.fromEntity(member);
     }
 
@@ -77,31 +75,35 @@ public List<MemberResponseDto> findAll() {
     }
 
     @Transactional
-    public void updateNickname(Long memberId, final NicknameUpdate nicknameUpdate) {
-        Member member = memberRepository.findById(memberId)
-                .orElseThrow(() -> new BalanceTalkException(ErrorCode.NOT_FOUND_MEMBER));
+    public void updateNickname(final NicknameUpdate nicknameUpdate, HttpServletRequest request) {
+        Member member = extractMember(request);
         member.updateNickname(nicknameUpdate.getNickname());
     }
 
     @Transactional
-    public void updatePassword(Long memberId, final PasswordUpdate passwordUpdate) {
-        Member member = memberRepository.findById(memberId)
-                .orElseThrow(() -> new BalanceTalkException(ErrorCode.NOT_FOUND_MEMBER));
-        member.updatePassword(passwordUpdate.getPassword());
+    public void updatePassword(final PasswordUpdate passwordUpdate, HttpServletRequest request) {
+        Member member = extractMember(request);
+        member.updatePassword(passwordEncoder.encode(passwordUpdate.getPassword()));
     }
 
     @Transactional
-    public void delete(Long memberId, final LoginDto loginDto) {
-        Member member = memberRepository.findById(memberId)
-                .orElseThrow(() -> new BalanceTalkException(ErrorCode.NOT_FOUND_MEMBER));
-
+    public void delete(final LoginDto loginDto, HttpServletRequest request) {
+        Member member = extractMember(request);
         if (!member.getEmail().equals(loginDto.getEmail())) {
             throw new BalanceTalkException(ErrorCode.FORBIDDEN_MEMBER_DELETE);
         }
-        if (!member.getPassword().equals(loginDto.getPassword())) {
-            throw new BalanceTalkException(ErrorCode.INCORRECT_PASSWORD);
+
+        if (!passwordEncoder.matches(loginDto.getPassword(), member.getPassword())) {
+            throw new BalanceTalkException(ErrorCode.MISMATCHED_EMAIL_OR_PASSWORD);
         }
+        memberRepository.deleteByEmail(member.getEmail());
+    }
 
-        memberRepository.deleteById(memberId);
+    private Member extractMember(HttpServletRequest request) {
+        String token = jwtTokenProvider.resolveToken(request);
+        String email = jwtTokenProvider.getPayload(token);
+        Member member = memberRepository.findByEmail(email)
+                .orElseThrow(() -> new BalanceTalkException(ErrorCode.NOT_FOUND_MEMBER));
+        return member;
     }
 }

src/main/java/balancetalk/module/member/domain/MemberRepository.java

@@ -4,4 +4,5 @@
 import java.util.Optional;
 public interface MemberRepository extends JpaRepository<Member, Long> {
     Optional<Member> findByEmail(String username);
+    void deleteByEmail(String email);
 }

src/main/java/balancetalk/module/member/dto/LoginSuccessDto.java

@@ -20,7 +20,6 @@ public class LoginSuccessDto {
     @Schema(description = "회원 역할", example = "USER")
     private Role role;
 
-    private String accessToken;
+    private TokenDto tokenDto;
 
-    private String refreshToken;
 }

src/main/java/balancetalk/module/member/dto/MemberResponseDto.java

@@ -13,6 +13,9 @@
 @AllArgsConstructor
 public class MemberResponseDto {
 
+    @Schema(description = "회원 id", example = "1")
+    private Long id;
+
     @Schema(description = "회원 닉네임", example = "닉네임")
     private String nickname;
     @Schema(description = "회원 프로필", example = "../")
@@ -28,6 +31,7 @@ public class MemberResponseDto {
 
     public static MemberResponseDto fromEntity(Member member) {
         return MemberResponseDto.builder()
+                .id(member.getId())
                 .nickname(member.getNickname())
                 //.profilePhoto(file.getPath())
                 .createdAt(member.getCreatedAt())

src/main/java/balancetalk/module/member/dto/TokenDto.java

@@ -0,0 +1,15 @@
+package balancetalk.module.member.dto;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TokenDto {
+    private String grantType;
+    private String accessToken;
+    private String refreshToken;
+}

src/main/java/balancetalk/module/member/presentation/MemberController.java

@@ -1,24 +1,26 @@
 package balancetalk.module.member.presentation;
 
+import balancetalk.global.jwt.JwtTokenProvider;
 import balancetalk.module.member.application.MemberService;
 import balancetalk.module.member.dto.*;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
+@Slf4j
 @RestController
 @RequiredArgsConstructor
 @Tag(name = "member", description = "회원 API")
 @RequestMapping("/members")
 public class MemberController {
 
     private final MemberService memberService;
-
     @ResponseStatus(HttpStatus.CREATED)
     @PostMapping("/join")
     @Operation(summary = "회원 가입", description = "닉네임, 이메일, 비밀번호를 입력하여 회원 가입을 한다.")
@@ -37,40 +39,41 @@ public LoginSuccessDto login(@Valid @RequestBody LoginDto loginDto) {
     }
 
     @ResponseStatus(HttpStatus.OK)
-    @GetMapping("/{memberId}")
-    @Operation(summary = "단일 회원 조회", description = "해당 id값과 일치하는 회원 정보를 조회한다.")
-    public MemberResponseDto findMemberInfo(@PathVariable("memberId") Long memberId) {
-        return memberService.findById(memberId);
+    @GetMapping("/find")
+    @Operation(summary = "단일 회원 조회", description = "해당 jwt 토큰 값과 일치하는 회원 정보를 조회한다.")
+    public MemberResponseDto findMemberInfo(HttpServletRequest request) {
+        return memberService.findMember(request);
     }
 
     @ResponseStatus(HttpStatus.OK)
-    @GetMapping
+    @GetMapping("/findAll")
     @Operation(summary = "전체 회원 조회", description = "모든 회원 정보를 조회한다.")
     public List<MemberResponseDto> findAllMemberInfo() {
         return memberService.findAll();
     }
 
     @ResponseStatus(HttpStatus.OK)
-    @PutMapping("/nickname/{memberId}")
+    @PutMapping("/update/nickname")
     @Operation(summary = "회원 닉네임 수정", description = "회원 닉네임을 수정한다.")
-    public String updateNickname(@PathVariable("memberId") Long memberId, @Valid @RequestBody NicknameUpdate nicknameUpdate) {
-        memberService.updateNickname(memberId, nicknameUpdate);
+    public String updateNickname(@Valid @RequestBody NicknameUpdate nicknameUpdate, HttpServletRequest request) {
+        memberService.updateNickname(nicknameUpdate, request);
         return "회원 닉네임이 변경되었습니다.";
     }
 
     @ResponseStatus(HttpStatus.OK)
-    @PutMapping("/{memberId}")
+    @PutMapping("/update/password")
     @Operation(summary = "회원 비밀번호 수정", description = "회원 패스워드를 수정한다.")
-    public String updatePassword(@PathVariable("memberId") Long memberId, @Valid @RequestBody PasswordUpdate passwordUpdate) {
-        memberService.updatePassword(memberId, passwordUpdate);
+    public String updatePassword(@Valid @RequestBody PasswordUpdate passwordUpdate, HttpServletRequest request) {
+        memberService.updatePassword(passwordUpdate, request);
         return "회원 비밀번호가 변경되었습니다.";
     }
 
     @ResponseStatus(HttpStatus.OK)
-    @DeleteMapping("/{memberId}")
+    @DeleteMapping("/delete")
     @Operation(summary = "회원 삭제", description = "해당 id값과 일치하는 회원 정보를 삭제한다.")
-    public String deleteMember(@PathVariable("memberId") Long memberId, @Valid @RequestBody LoginDto loginDto) {
-        memberService.delete(memberId, loginDto);
+    public String deleteMember(@Valid @RequestBody LoginDto loginDto, HttpServletRequest request) {
+        memberService.delete(loginDto, request);
         return "회원 탈퇴가 정상적으로 처리되었습니다.";
     }
+
 }