🩹 네이밍 수정

YAPP-Github · Apr 2, 2023 · cf54566 · cf54566
1 parent 421262a
commit cf54566
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/src/main/java/yapp/allround3/auth/jwt/JwtAuthenticationFilter.java b/src/main/java/yapp/allround3/auth/jwt/JwtAuthenticationFilter.java
@@ -1,7 +1,5 @@
 package yapp.allround3.auth.jwt;
 
-import java.io.IOException;
-
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.filter.OncePerRequestFilter;
@@ -21,10 +19,10 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
 	protected void doFilterInternal(
 		HttpServletRequest request,
 		HttpServletResponse response,
-		FilterChain filterChain) {
-
+		FilterChain filterChain
+	) {
 		try {
-			String accessToken = JwtHeaderUtil.getAccessToken(request);
+			String accessToken = JwtHeaderUtil.getAppToken(request);
 			AuthToken token = tokenProvider.convertAuthToken(accessToken);
 
 			Authentication authentication = tokenProvider.getAuthentication(token);

diff --git a/src/main/java/yapp/allround3/auth/jwt/JwtHeaderUtil.java b/src/main/java/yapp/allround3/auth/jwt/JwtHeaderUtil.java
@@ -17,7 +17,7 @@ public static String getCode(HttpServletRequest request) {
 			.orElseThrow(() -> new CustomException("The header does not contain code"));
 	}
 
-	public static String getAccessToken(HttpServletRequest request) {
+	public static String getAppToken(HttpServletRequest request) {
 		String headerValue = request.getHeader(HEADER_AUTHORIZATION);
 
 		if (headerValue == null || !headerValue.startsWith(TOKEN_PREFIX)) {

diff --git a/src/main/java/yapp/allround3/common/interceptor/AuthenticationInterceptor.java b/src/main/java/yapp/allround3/common/interceptor/AuthenticationInterceptor.java
@@ -40,7 +40,7 @@ public boolean preHandle(
 		}
 
 		try {
-			String appToken = JwtHeaderUtil.getAccessToken(request);
+			String appToken = JwtHeaderUtil.getAppToken(request);
 			Member member = jwtService.getMemberFromAppToken(appToken);
 
 			request.setAttribute("memberId", member.getId());

diff --git a/src/main/java/yapp/allround3/participant/domain/Participant.java b/src/main/java/yapp/allround3/participant/domain/Participant.java
@@ -78,7 +78,7 @@ public void drop() {
     @Override
     public String toString() {
         return "Participant{" +
-            "id=" + id +
+            "oauthId=" + id +
             ", project=" + project.getId() +
             ", member=" + member.getId() +
             ", leader=" + leader +

diff --git a/src/main/java/yapp/allround3/project/controller/ProjectController.java b/src/main/java/yapp/allround3/project/controller/ProjectController.java
@@ -83,7 +83,7 @@ public CustomResponse<List<ProjectResponse>> findProjectsByMember(
                             .findParticipantsByProject(project).stream()
                             .map(ParticipantDto::of)
                             .toList();
-                    //추후 내 task 조회를 위해 나의 해당 프로젝트 참여자 id 필드 추가
+                    //추후 내 task 조회를 위해 나의 해당 프로젝트 참여자 oauthId 필드 추가
                     Long myParticipantId = projectService.findMyParticipantId(member, project);
                     return ProjectResponse.of(project, myParticipantId, participantDtos);
                 }).toList();

diff --git a/src/main/java/yapp/allround3/task/domain/Task.java b/src/main/java/yapp/allround3/task/domain/Task.java
@@ -91,7 +91,7 @@ public void subtractFeedbackRequiredPersonnel(){
     @Override
     public String toString() {
         return "Task{" +
-                "id=" + id +
+                "oauthId=" + id +
                 ", startDate=" + startDate +
                 ", dueDate=" + dueDate +
                 ", title='" + title + '\'' +