Rename: security 패키지 구조 개선

joyewon0705 · joyewon0705 · commit b8e86553761e · 2025-09-27T21:15:16.000+09:00
diff --git a/src/main/java/com/back/domain/chat/room/controller/RoomChatApiController.java b/src/main/java/com/back/domain/chat/room/controller/RoomChatApiController.java
@@ -3,7 +3,7 @@
 import com.back.domain.chat.room.dto.RoomChatPageResponse;
 import com.back.domain.chat.room.service.RoomChatService;
 import com.back.global.common.dto.RsData;
-import com.back.global.security.CustomUserDetails;
+import com.back.global.security.user.CustomUserDetails;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/com/back/domain/chat/room/controller/RoomChatWebSocketController.java b/src/main/java/com/back/domain/chat/room/controller/RoomChatWebSocketController.java
@@ -2,7 +2,7 @@
 
 import com.back.domain.studyroom.entity.RoomChatMessage;
 import com.back.domain.chat.room.dto.RoomChatMessageDto;
-import com.back.global.security.CustomUserDetails;
+import com.back.global.security.user.CustomUserDetails;
 import com.back.global.websocket.dto.WebSocketErrorResponse;
 import com.back.domain.chat.room.service.RoomChatService;
 import io.swagger.v3.oas.annotations.tags.Tag;
diff --git a/src/main/java/com/back/domain/chat/room/service/RoomChatService.java b/src/main/java/com/back/domain/chat/room/service/RoomChatService.java
@@ -10,7 +10,7 @@
 import com.back.domain.chat.room.dto.RoomChatPageResponse;
 import com.back.global.exception.CustomException;
 import com.back.global.exception.ErrorCode;
-import com.back.global.security.CurrentUser;
+import com.back.global.security.user.CurrentUser;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
diff --git a/src/main/java/com/back/domain/study/plan/controller/StudyPlanController.java b/src/main/java/com/back/domain/study/plan/controller/StudyPlanController.java
@@ -6,7 +6,7 @@
 import com.back.domain.study.plan.entity.ApplyScope;
 import com.back.domain.study.plan.service.StudyPlanService;
 import com.back.global.common.dto.RsData;
-import com.back.global.security.CustomUserDetails;
+import com.back.global.security.user.CustomUserDetails;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/com/back/domain/studyroom/controller/RoomController.java b/src/main/java/com/back/domain/studyroom/controller/RoomController.java
@@ -5,7 +5,7 @@
 import com.back.domain.studyroom.entity.RoomMember;
 import com.back.domain.studyroom.service.RoomService;
 import com.back.global.common.dto.RsData;
-import com.back.global.security.CurrentUser;
+import com.back.global.security.user.CurrentUser;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
diff --git a/src/main/java/com/back/domain/user/controller/UserController.java b/src/main/java/com/back/domain/user/controller/UserController.java
@@ -4,7 +4,7 @@
 import com.back.domain.user.dto.UserDetailResponse;
 import com.back.domain.user.service.UserService;
 import com.back.global.common.dto.RsData;
-import com.back.global.security.CustomUserDetails;
+import com.back.global.security.user.CustomUserDetails;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/com/back/domain/user/controller/UserControllerDocs.java b/src/main/java/com/back/domain/user/controller/UserControllerDocs.java
@@ -3,7 +3,7 @@
 import com.back.domain.user.dto.UpdateUserProfileRequest;
 import com.back.domain.user.dto.UserDetailResponse;
 import com.back.global.common.dto.RsData;
-import com.back.global.security.CustomUserDetails;
+import com.back.global.security.user.CustomUserDetails;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.ExampleObject;
diff --git a/src/main/java/com/back/domain/user/service/AuthService.java b/src/main/java/com/back/domain/user/service/AuthService.java
@@ -13,7 +13,7 @@
 import com.back.domain.user.repository.UserTokenRepository;
 import com.back.global.exception.CustomException;
 import com.back.global.exception.ErrorCode;
-import com.back.global.security.JwtTokenProvider;
+import com.back.global.security.jwt.JwtTokenProvider;
 import com.back.global.util.CookieUtil;
 import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
diff --git a/src/main/java/com/back/global/config/WebSocketConfig.java b/src/main/java/com/back/global/config/WebSocketConfig.java
@@ -1,7 +1,7 @@
 package com.back.global.config;
 
-import com.back.global.security.CustomUserDetails;
-import com.back.global.security.JwtTokenProvider;
+import com.back.global.security.user.CustomUserDetails;
+import com.back.global.security.jwt.JwtTokenProvider;
 import com.back.global.websocket.service.WebSocketSessionManager;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/main/java/com/back/global/security/SecurityConfig.java b/src/main/java/com/back/global/security/SecurityConfig.java
@@ -1,6 +1,10 @@
 package com.back.global.security;
 
+import com.back.global.security.jwt.JwtAccessDeniedHandler;
+import com.back.global.security.jwt.JwtAuthenticationEntryPoint;
+import com.back.global.security.jwt.JwtAuthenticationFilter;
 import com.back.global.security.oauth.CustomOAuth2UserService;
+import com.back.global.security.oauth.OAuth2LoginSuccessHandler;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/com/back/global/security/jwt/JwtAccessDeniedHandler.java b/src/main/java/com/back/global/security/jwt/JwtAccessDeniedHandler.java
@@ -1,4 +1,4 @@
-package com.back.global.security;
+package com.back.global.security.jwt;
 
 import com.back.global.common.dto.RsData;
 import com.back.global.exception.ErrorCode;
diff --git a/src/main/java/com/back/global/security/jwt/JwtAuthenticationEntryPoint.java b/src/main/java/com/back/global/security/jwt/JwtAuthenticationEntryPoint.java
@@ -1,7 +1,6 @@
-package com.back.global.security;
+package com.back.global.security.jwt;
 
 import com.back.global.common.dto.RsData;
-import com.back.global.exception.CustomException;
 import com.back.global.exception.ErrorCode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
diff --git a/src/main/java/com/back/global/security/jwt/JwtAuthenticationFilter.java b/src/main/java/com/back/global/security/jwt/JwtAuthenticationFilter.java
@@ -1,4 +1,4 @@
-package com.back.global.security;
+package com.back.global.security.jwt;
 
 import com.back.global.exception.CustomException;
 import jakarta.servlet.FilterChain;
diff --git a/src/main/java/com/back/global/security/jwt/JwtTokenProvider.java b/src/main/java/com/back/global/security/jwt/JwtTokenProvider.java
@@ -1,8 +1,9 @@
-package com.back.global.security;
+package com.back.global.security.jwt;
 
 import com.back.domain.user.entity.Role;
 import com.back.global.exception.CustomException;
 import com.back.global.exception.ErrorCode;
+import com.back.global.security.user.CustomUserDetails;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.JwtException;
diff --git a/src/main/java/com/back/global/security/oauth/CustomOAuth2UserService.java b/src/main/java/com/back/global/security/oauth/CustomOAuth2UserService.java
@@ -6,7 +6,7 @@
 import com.back.domain.user.repository.UserRepository;
 import com.back.global.exception.CustomException;
 import com.back.global.exception.ErrorCode;
-import com.back.global.security.CustomUserDetails;
+import com.back.global.security.user.CustomUserDetails;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;
 import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest;
diff --git a/src/main/java/com/back/global/security/oauth/OAuth2LoginSuccessHandler.java b/src/main/java/com/back/global/security/oauth/OAuth2LoginSuccessHandler.java
@@ -1,4 +1,4 @@
-package com.back.global.security;
+package com.back.global.security.oauth;
 
 import com.back.domain.user.dto.LoginResponse;
 import com.back.domain.user.dto.UserResponse;
@@ -9,6 +9,7 @@
 import com.back.global.common.dto.RsData;
 import com.back.global.exception.CustomException;
 import com.back.global.exception.ErrorCode;
+import com.back.global.security.jwt.JwtTokenProvider;
 import com.back.global.util.CookieUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
diff --git a/src/main/java/com/back/global/security/user/CurrentUser.java b/src/main/java/com/back/global/security/user/CurrentUser.java
@@ -1,4 +1,4 @@
-package com.back.global.security;
+package com.back.global.security.user;
 
 import com.back.domain.user.entity.Role;
 import com.back.domain.user.entity.User;
diff --git a/src/main/java/com/back/global/security/user/CustomUserDetails.java b/src/main/java/com/back/global/security/user/CustomUserDetails.java
@@ -1,4 +1,4 @@
-package com.back.global.security;
+package com.back.global.security.user;
 
 import com.back.domain.user.entity.Role;
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/back/global/websocket/event/WebSocketEventListener.java b/src/main/java/com/back/global/websocket/event/WebSocketEventListener.java
@@ -1,7 +1,7 @@
 package com.back.global.websocket.event;
 
 import com.back.global.exception.CustomException;
-import com.back.global.security.CustomUserDetails;
+import com.back.global.security.user.CustomUserDetails;
 import com.back.global.websocket.service.WebSocketSessionManager;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/src/test/java/com/back/domain/chat/room/controller/RoomChatApiControllerTest.java b/src/test/java/com/back/domain/chat/room/controller/RoomChatApiControllerTest.java
@@ -2,8 +2,8 @@
 
 import com.back.domain.chat.room.dto.RoomChatPageResponse;
 import com.back.domain.chat.room.service.RoomChatService;
-import com.back.global.security.CustomUserDetails;
-import com.back.global.security.JwtTokenProvider;
+import com.back.global.security.user.CustomUserDetails;
+import com.back.global.security.jwt.JwtTokenProvider;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/com/back/domain/chat/room/controller/RoomChatWebSocketControllerTest.java b/src/test/java/com/back/domain/chat/room/controller/RoomChatWebSocketControllerTest.java
@@ -5,7 +5,7 @@
 import com.back.domain.studyroom.entity.RoomChatMessage;
 import com.back.domain.user.entity.User;
 import com.back.domain.user.entity.UserProfile;
-import com.back.global.security.CustomUserDetails;
+import com.back.global.security.user.CustomUserDetails;
 import com.back.global.websocket.dto.WebSocketErrorResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
diff --git a/src/test/java/com/back/domain/studyroom/controller/RoomControllerTest.java b/src/test/java/com/back/domain/studyroom/controller/RoomControllerTest.java
@@ -8,7 +8,7 @@
 import com.back.domain.user.entity.UserProfile;
 import com.back.domain.user.entity.UserStatus;
 import com.back.global.common.dto.RsData;
-import com.back.global.security.CurrentUser;
+import com.back.global.security.user.CurrentUser;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/back/fixture/TestController.java b/src/test/java/com/back/fixture/TestController.java
@@ -1,6 +1,6 @@
 package com.back.fixture;
 
-import com.back.global.security.CustomUserDetails;
+import com.back.global.security.user.CustomUserDetails;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/src/test/java/com/back/global/security/JwtSecurityIntegrationTest.java b/src/test/java/com/back/global/security/JwtSecurityIntegrationTest.java
@@ -1,5 +1,6 @@
 package com.back.global.security;
 
+import com.back.global.security.jwt.JwtTokenProvider;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
