From abb8a4916afdad76adc9a0e60b4eab84a4456003 Mon Sep 17 00:00:00 2001
From: dyhj625 <dyhj625@local-host.co.kr>
Date: Fri, 4 Apr 2025 14:07:44 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9C=A0=EC=A0=80=EC=9D=B8=ED=8F=AC=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/common/UserController.java     | 49 ++++++++++---------
 1 file changed, 25 insertions(+), 24 deletions(-)

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<Boolean> updatePassword(@ReqMap MapDto map) {
+		System.out.println(map);
 		boolean isPwNew = netmemberservice.updatePassword(map);
 		return ApiResponse.ok(isPwNew);
 	}
 
-//	// security 인증 체크
-//	@GetMapping("userInfo")
-//	public ApiResponse<MemberVo> 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<MemberVo> getUserInfo2(@AuthenticationPrincipal MemberVo memberVo) {
-		Long memberId = AuthUtil.getUser().getId();
+	public ApiResponse<MemberVo> 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<MemberVo> 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);
+//	}
 
 
 	// 유저 세션 체크