diff --git a/src/main/java/io/company/localhost/controller/common/UserController.java b/src/main/java/io/company/localhost/controller/common/UserController.java index 037b46e..7f2c324 100644 --- a/src/main/java/io/company/localhost/controller/common/UserController.java +++ b/src/main/java/io/company/localhost/controller/common/UserController.java @@ -204,38 +204,39 @@ public class UserController { */ @PatchMapping("/pwNew") public ApiResponse updatePassword(@ReqMap MapDto map) { + System.out.println(map); boolean isPwNew = netmemberservice.updatePassword(map); return ApiResponse.ok(isPwNew); } -// // security 인증 체크 -// @GetMapping("userInfo") -// public ApiResponse getUserInfo(@AuthenticationPrincipal MemberVo memberVo) { -// SecurityContextHolderStrategy contextHolderStrategy = SecurityContextHolder.getContextHolderStrategy(); -// log.info(">> contextHolderStrategy : {}", contextHolderStrategy); -// SecurityContext context = contextHolderStrategy.getContext(); -// log.info(">> context : {}", context); -// Authentication authentication = context.getAuthentication(); -// log.info(">> authentication : {}", authentication); -// log.info(">> memberVo : {}", memberVo); -// -// MemberVo user = AuthUtil.getUser(); -// log.info(">> AuthUtil : {}", user); -// -// return ApiResponse.ok(memberVo); -// } - + // security 인증 체크 @GetMapping("userInfo") - public ApiResponse getUserInfo2(@AuthenticationPrincipal MemberVo memberVo) { - Long memberId = AuthUtil.getUser().getId(); + public ApiResponse getUserInfo(@AuthenticationPrincipal MemberVo memberVo) { + SecurityContextHolderStrategy contextHolderStrategy = SecurityContextHolder.getContextHolderStrategy(); + log.info(">> contextHolderStrategy : {}", contextHolderStrategy); + SecurityContext context = contextHolderStrategy.getContext(); + log.info(">> context : {}", context); + Authentication authentication = context.getAuthentication(); + log.info(">> authentication : {}", authentication); + log.info(">> memberVo : {}", memberVo); - log.info("🧩 memberId from AuthUtil: {}", memberId); + MemberVo user = AuthUtil.getUser(); + log.info(">> AuthUtil : {}", user); - MemberVo user = netmemberservice.getUserInfoById(memberId); - log.info("📦 User from DB: {}", user); - - return ApiResponse.ok(user); + return ApiResponse.ok(memberVo); } + +// @GetMapping("userInfo2") +// public ApiResponse getUserInfo2(@AuthenticationPrincipal MemberVo memberVo) { +// Long memberId = AuthUtil.getUser().getId(); +// +// log.info("🧩 memberId from AuthUtil: {}", memberId); +// +// MemberVo user = netmemberservice.getUserInfoById(memberId); +// log.info("📦 User from DB: {}", user); +// +// return ApiResponse.ok(user); +// } // 유저 세션 체크