From 301ac29c98d563c5a703f8b5a0d29c4319611144 Mon Sep 17 00:00:00 2001
From: hou27 <ataj125@gmail.com>
Date: Sun, 19 Jun 2022 15:44:37 +0900
Subject: [PATCH] Change variable name from username to userPrincipal

---
 src/main/java/demo/api/jwt/JwtTokenProvider.java         | 8 ++++----
 src/test/java/demo/api/auth/service/AuthServiceTest.java | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/demo/api/jwt/JwtTokenProvider.java b/src/main/java/demo/api/jwt/JwtTokenProvider.java
index 1ac13b4..fd5f29f 100644
--- a/src/main/java/demo/api/jwt/JwtTokenProvider.java
+++ b/src/main/java/demo/api/jwt/JwtTokenProvider.java
@@ -79,8 +79,8 @@ public class JwtTokenProvider {
    * @return
    */
   public Authentication getAuthenticationByAccessToken(String access_token) {
-    String username = Jwts.parser().setSigningKey(access_token_secret_key).parseClaimsJws(access_token).getBody().getSubject();
-    UserDetails userDetails = userDetailsService.loadUserByUsername(username);
+    String userPrincipal = Jwts.parser().setSigningKey(access_token_secret_key).parseClaimsJws(access_token).getBody().getSubject();
+    UserDetails userDetails = userDetailsService.loadUserByUsername(userPrincipal);
     
     return new UsernamePasswordAuthenticationToken(userDetails, "", userDetails.getAuthorities());
   }
@@ -91,8 +91,8 @@ public class JwtTokenProvider {
    * @return
    */
   public Authentication getAuthenticationByRefreshToken(String refresh_token) {
-    String username = Jwts.parser().setSigningKey(refresh_token_secret_key).parseClaimsJws(refresh_token).getBody().getSubject();
-    UserDetails userDetails = userDetailsService.loadUserByUsername(username);
+    String userPrincipal = Jwts.parser().setSigningKey(refresh_token_secret_key).parseClaimsJws(refresh_token).getBody().getSubject();
+    UserDetails userDetails = userDetailsService.loadUserByUsername(userPrincipal);
 
     return new UsernamePasswordAuthenticationToken(userDetails, "", userDetails.getAuthorities());
   }
diff --git a/src/test/java/demo/api/auth/service/AuthServiceTest.java b/src/test/java/demo/api/auth/service/AuthServiceTest.java
index a1d649a..4c94031 100644
--- a/src/test/java/demo/api/auth/service/AuthServiceTest.java
+++ b/src/test/java/demo/api/auth/service/AuthServiceTest.java
@@ -74,6 +74,8 @@ class AuthServiceTest {
 //    assertThat(newUser.getPassword()).isNotEqualTo(PASSWORD);
   }
 
+
+
   private SignUpReq createSignUpRequest() {
     return SignUpReq.builder()
         .email(EMAIL)