diff --git a/src/main/java/org/cotato/csquiz/api/admin/dto/MemberEnrollInfoResponse.java b/src/main/java/org/cotato/csquiz/api/admin/dto/MemberEnrollInfoResponse.java index 052342e9..0e091223 100644 --- a/src/main/java/org/cotato/csquiz/api/admin/dto/MemberEnrollInfoResponse.java +++ b/src/main/java/org/cotato/csquiz/api/admin/dto/MemberEnrollInfoResponse.java @@ -6,7 +6,7 @@ public record MemberEnrollInfoResponse( Long memberId, - String memberName, + String name, MemberPosition position, Integer generationNumber, MemberRole role diff --git a/src/main/java/org/cotato/csquiz/api/admin/dto/MemberInfoResponse.java b/src/main/java/org/cotato/csquiz/api/admin/dto/MemberInfoResponse.java index 20eb94b8..b4b922ab 100644 --- a/src/main/java/org/cotato/csquiz/api/admin/dto/MemberInfoResponse.java +++ b/src/main/java/org/cotato/csquiz/api/admin/dto/MemberInfoResponse.java @@ -5,7 +5,7 @@ public record MemberInfoResponse( Long memberId, - String memberName, + String name, String backFourNumber, MemberRole role ) { diff --git a/src/main/java/org/cotato/csquiz/api/member/controller/MemberController.java b/src/main/java/org/cotato/csquiz/api/member/controller/MemberController.java index 3e9e846f..5943ef0b 100644 --- a/src/main/java/org/cotato/csquiz/api/member/controller/MemberController.java +++ b/src/main/java/org/cotato/csquiz/api/member/controller/MemberController.java @@ -12,8 +12,8 @@ import org.cotato.csquiz.common.config.jwt.JwtTokenProvider; import org.cotato.csquiz.common.error.exception.ImageException; import org.cotato.csquiz.domain.auth.service.MemberService; -import org.springframework.context.annotation.Description; import org.springframework.http.ResponseEntity; +import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; @@ -35,27 +35,22 @@ public class MemberController { @GetMapping("/info") public ResponseEntity findMemberInfo( - @RequestHeader("Authorization") String authorizationHeader) { - String accessToken = jwtTokenProvider.getBearer(authorizationHeader); - Long memberId = jwtTokenProvider.getMemberId(accessToken); + @AuthenticationPrincipal Long memberId) { return ResponseEntity.ok().body(memberService.findMemberInfo(memberId)); } @PatchMapping("/update/password") - public ResponseEntity updatePassword(@RequestHeader("Authorization") String authorizationHeader, + public ResponseEntity updatePassword(@AuthenticationPrincipal Long memberId, @RequestBody @Valid UpdatePasswordRequest request) { - String accessToken = jwtTokenProvider.getBearer(authorizationHeader); - Long memberId = jwtTokenProvider.getMemberId(accessToken); memberService.updatePassword(memberId, request.password()); return ResponseEntity.noContent().build(); } @Operation(summary = "멤버 전화번호 수정 API") @PatchMapping("/phone-number") - public ResponseEntity updatePhoneNumber(@RequestHeader("Authorization") String authorizationHeader, + public ResponseEntity updatePhoneNumber(@AuthenticationPrincipal Long memberId, @RequestBody @Valid UpdatePhoneNumberRequest request) { - String accessToken = jwtTokenProvider.getBearer(authorizationHeader); - memberService.updatePhoneNumber(accessToken, request.phoneNumber()); + memberService.updatePhoneNumber(memberId, request.phoneNumber()); return ResponseEntity.noContent().build(); } diff --git a/src/main/java/org/cotato/csquiz/api/member/dto/MemberInfo.java b/src/main/java/org/cotato/csquiz/api/member/dto/MemberInfo.java index 3a2c4dad..b7f4399c 100644 --- a/src/main/java/org/cotato/csquiz/api/member/dto/MemberInfo.java +++ b/src/main/java/org/cotato/csquiz/api/member/dto/MemberInfo.java @@ -9,7 +9,7 @@ public record MemberInfo( String name, String email, String backFourNumber, - MemberRole memberRole, + MemberRole role, MemberPosition position ) { public static MemberInfo of(Member findMember, String backFourNumber) { diff --git a/src/main/java/org/cotato/csquiz/api/member/dto/MemberMyPageInfoResponse.java b/src/main/java/org/cotato/csquiz/api/member/dto/MemberMyPageInfoResponse.java index 56edc6a2..4c1034fa 100644 --- a/src/main/java/org/cotato/csquiz/api/member/dto/MemberMyPageInfoResponse.java +++ b/src/main/java/org/cotato/csquiz/api/member/dto/MemberMyPageInfoResponse.java @@ -8,7 +8,7 @@ public record MemberMyPageInfoResponse( String email, String name, Integer generationNumber, - MemberPosition memberPosition, + MemberPosition position, String phoneNumber, String profileImage ) { diff --git a/src/main/java/org/cotato/csquiz/domain/auth/service/MemberService.java b/src/main/java/org/cotato/csquiz/domain/auth/service/MemberService.java index 92a94400..5dbf5db3 100644 --- a/src/main/java/org/cotato/csquiz/domain/auth/service/MemberService.java +++ b/src/main/java/org/cotato/csquiz/domain/auth/service/MemberService.java @@ -7,13 +7,12 @@ import org.cotato.csquiz.api.admin.dto.MemberInfoResponse; import org.cotato.csquiz.api.member.dto.MemberInfo; import org.cotato.csquiz.api.member.dto.MemberMyPageInfoResponse; -import org.cotato.csquiz.common.s3.S3Uploader; -import org.cotato.csquiz.api.member.dto.UpdatePhoneNumberRequest; import org.cotato.csquiz.common.config.jwt.JwtTokenProvider; import org.cotato.csquiz.common.entity.S3Info; import org.cotato.csquiz.common.error.ErrorCode; import org.cotato.csquiz.common.error.exception.AppException; import org.cotato.csquiz.common.error.exception.ImageException; +import org.cotato.csquiz.common.s3.S3Uploader; import org.cotato.csquiz.domain.auth.entity.Member; import org.cotato.csquiz.domain.auth.enums.MemberRoleGroup; import org.cotato.csquiz.domain.auth.repository.MemberRepository; @@ -71,8 +70,7 @@ private void validateIsSameBefore(String originPassword, String newPassword) { } @Transactional - public void updatePhoneNumber(String accessToken, String phoneNumber) { - Long memberId = jwtTokenProvider.getMemberId(accessToken); + public void updatePhoneNumber(Long memberId, String phoneNumber) { Member findMember = memberRepository.findById(memberId) .orElseThrow(() -> new EntityNotFoundException("해당 회원을 찾을 수 없습니다."));