From dd5fd15ce17cceb0798912c46301a934ae3ca94f Mon Sep 17 00:00:00 2001 From: pricelees Date: Mon, 14 Jul 2025 10:16:21 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20/system/auth=20=ED=8C=A8=ED=82=A4?= =?UTF-8?q?=EC=A7=80=EB=A5=BC=20/auth=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{system => }/auth/infrastructure/jwt/JwtHandler.kt | 2 +- .../{system => }/auth/service/AuthService.kt | 10 +++++----- .../java/roomescape/{system => }/auth/web/AuthAPI.kt | 6 +++--- .../roomescape/{system => }/auth/web/AuthController.kt | 10 +++++++--- .../java/roomescape/{system => }/auth/web/AuthDTO.kt | 2 +- .../{system => }/auth/web/support/AuthAnnotations.kt | 2 +- .../{system => }/auth/web/support/AuthInterceptors.kt | 4 ++-- .../{system => }/auth/web/support/CookieUtils.kt | 4 ++-- .../{system => }/auth/web/support/MemberIdResolver.kt | 4 ++-- .../java/roomescape/common/config/WebMvcConfig.java | 6 +++--- src/main/java/roomescape/member/web/MemberAPI.kt | 2 +- .../reservation/controller/ReservationController.java | 6 +++--- .../controller/ReservationTimeController.java | 4 ++-- .../roomescape/theme/controller/ThemeController.java | 4 ++-- src/main/java/roomescape/view/PageController.kt | 4 ++-- .../{system => }/auth/business/AuthServiceTest.kt | 6 +++--- .../auth/infrastructure/jwt/JwtHandlerTest.kt | 3 ++- .../{system => }/auth/web/AuthControllerTest.kt | 3 ++- src/test/java/roomescape/util/Fixtures.kt | 4 ++-- src/test/java/roomescape/util/RoomescapeApiTest.kt | 2 +- 20 files changed, 47 insertions(+), 41 deletions(-) rename src/main/java/roomescape/{system => }/auth/infrastructure/jwt/JwtHandler.kt (97%) rename src/main/java/roomescape/{system => }/auth/service/AuthService.kt (75%) rename src/main/java/roomescape/{system => }/auth/web/AuthAPI.kt (95%) rename src/main/java/roomescape/{system => }/auth/web/AuthController.kt (84%) rename src/main/java/roomescape/{system => }/auth/web/AuthDTO.kt (96%) rename src/main/java/roomescape/{system => }/auth/web/support/AuthAnnotations.kt (87%) rename src/main/java/roomescape/{system => }/auth/web/support/AuthInterceptors.kt (96%) rename src/main/java/roomescape/{system => }/auth/web/support/CookieUtils.kt (88%) rename src/main/java/roomescape/{system => }/auth/web/support/MemberIdResolver.kt (91%) rename src/test/java/roomescape/{system => }/auth/business/AuthServiceTest.kt (95%) rename src/test/java/roomescape/{system => }/auth/infrastructure/jwt/JwtHandlerTest.kt (96%) rename src/test/java/roomescape/{system => }/auth/web/AuthControllerTest.kt (98%) diff --git a/src/main/java/roomescape/system/auth/infrastructure/jwt/JwtHandler.kt b/src/main/java/roomescape/auth/infrastructure/jwt/JwtHandler.kt similarity index 97% rename from src/main/java/roomescape/system/auth/infrastructure/jwt/JwtHandler.kt rename to src/main/java/roomescape/auth/infrastructure/jwt/JwtHandler.kt index bf81b3d2..34f5ea44 100644 --- a/src/main/java/roomescape/system/auth/infrastructure/jwt/JwtHandler.kt +++ b/src/main/java/roomescape/auth/infrastructure/jwt/JwtHandler.kt @@ -1,4 +1,4 @@ -package roomescape.system.auth.infrastructure.jwt +package roomescape.auth.infrastructure.jwt import io.jsonwebtoken.* import org.springframework.beans.factory.annotation.Value diff --git a/src/main/java/roomescape/system/auth/service/AuthService.kt b/src/main/java/roomescape/auth/service/AuthService.kt similarity index 75% rename from src/main/java/roomescape/system/auth/service/AuthService.kt rename to src/main/java/roomescape/auth/service/AuthService.kt index b6394130..a5f50636 100644 --- a/src/main/java/roomescape/system/auth/service/AuthService.kt +++ b/src/main/java/roomescape/auth/service/AuthService.kt @@ -1,12 +1,12 @@ -package roomescape.system.auth.service +package roomescape.auth.service import org.springframework.stereotype.Service import roomescape.member.business.MemberService import roomescape.member.infrastructure.persistence.Member -import roomescape.system.auth.infrastructure.jwt.JwtHandler -import roomescape.system.auth.web.LoginCheckResponse -import roomescape.system.auth.web.LoginRequest -import roomescape.system.auth.web.TokenResponse +import roomescape.auth.infrastructure.jwt.JwtHandler +import roomescape.auth.web.LoginCheckResponse +import roomescape.auth.web.LoginRequest +import roomescape.auth.web.TokenResponse @Service class AuthService( diff --git a/src/main/java/roomescape/system/auth/web/AuthAPI.kt b/src/main/java/roomescape/auth/web/AuthAPI.kt similarity index 95% rename from src/main/java/roomescape/system/auth/web/AuthAPI.kt rename to src/main/java/roomescape/auth/web/AuthAPI.kt index 1d54450d..12abbce9 100644 --- a/src/main/java/roomescape/system/auth/web/AuthAPI.kt +++ b/src/main/java/roomescape/auth/web/AuthAPI.kt @@ -1,4 +1,4 @@ -package roomescape.system.auth.web +package roomescape.auth.web import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.Parameter @@ -13,8 +13,8 @@ import jakarta.validation.Valid import org.springframework.http.HttpStatus import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.ResponseStatus -import roomescape.system.auth.web.support.LoginRequired -import roomescape.system.auth.web.support.MemberId +import roomescape.auth.web.support.LoginRequired +import roomescape.auth.web.support.MemberId import roomescape.common.dto.response.ErrorResponse import roomescape.common.dto.response.RoomEscapeApiResponse diff --git a/src/main/java/roomescape/system/auth/web/AuthController.kt b/src/main/java/roomescape/auth/web/AuthController.kt similarity index 84% rename from src/main/java/roomescape/system/auth/web/AuthController.kt rename to src/main/java/roomescape/auth/web/AuthController.kt index ae0f2419..d3dfbf9d 100644 --- a/src/main/java/roomescape/system/auth/web/AuthController.kt +++ b/src/main/java/roomescape/auth/web/AuthController.kt @@ -1,4 +1,4 @@ -package roomescape.system.auth.web +package roomescape.auth.web import io.swagger.v3.oas.annotations.Parameter import jakarta.servlet.http.Cookie @@ -9,8 +9,12 @@ import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.RestController -import roomescape.system.auth.service.AuthService -import roomescape.system.auth.web.support.* +import roomescape.auth.service.AuthService +import roomescape.auth.web.support.MemberId +import roomescape.auth.web.support.accessTokenCookie +import roomescape.auth.web.support.addAccessTokenCookie +import roomescape.auth.web.support.expire +import roomescape.auth.web.support.toCookie import roomescape.common.dto.response.RoomEscapeApiResponse @RestController diff --git a/src/main/java/roomescape/system/auth/web/AuthDTO.kt b/src/main/java/roomescape/auth/web/AuthDTO.kt similarity index 96% rename from src/main/java/roomescape/system/auth/web/AuthDTO.kt rename to src/main/java/roomescape/auth/web/AuthDTO.kt index 05ef0b32..15a87d24 100644 --- a/src/main/java/roomescape/system/auth/web/AuthDTO.kt +++ b/src/main/java/roomescape/auth/web/AuthDTO.kt @@ -1,4 +1,4 @@ -package roomescape.system.auth.web +package roomescape.auth.web import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.Email diff --git a/src/main/java/roomescape/system/auth/web/support/AuthAnnotations.kt b/src/main/java/roomescape/auth/web/support/AuthAnnotations.kt similarity index 87% rename from src/main/java/roomescape/system/auth/web/support/AuthAnnotations.kt rename to src/main/java/roomescape/auth/web/support/AuthAnnotations.kt index 77bb3090..3f98cdf1 100644 --- a/src/main/java/roomescape/system/auth/web/support/AuthAnnotations.kt +++ b/src/main/java/roomescape/auth/web/support/AuthAnnotations.kt @@ -1,4 +1,4 @@ -package roomescape.system.auth.web.support +package roomescape.auth.web.support @Target(AnnotationTarget.FUNCTION) @Retention(AnnotationRetention.RUNTIME) diff --git a/src/main/java/roomescape/system/auth/web/support/AuthInterceptors.kt b/src/main/java/roomescape/auth/web/support/AuthInterceptors.kt similarity index 96% rename from src/main/java/roomescape/system/auth/web/support/AuthInterceptors.kt rename to src/main/java/roomescape/auth/web/support/AuthInterceptors.kt index 326aed85..d51f819f 100644 --- a/src/main/java/roomescape/system/auth/web/support/AuthInterceptors.kt +++ b/src/main/java/roomescape/auth/web/support/AuthInterceptors.kt @@ -1,4 +1,4 @@ -package roomescape.system.auth.web.support +package roomescape.auth.web.support import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletResponse @@ -8,7 +8,7 @@ import org.springframework.web.method.HandlerMethod import org.springframework.web.servlet.HandlerInterceptor import roomescape.member.business.MemberService import roomescape.member.infrastructure.persistence.Member -import roomescape.system.auth.infrastructure.jwt.JwtHandler +import roomescape.auth.infrastructure.jwt.JwtHandler import roomescape.common.exception.ErrorType import roomescape.common.exception.RoomEscapeException diff --git a/src/main/java/roomescape/system/auth/web/support/CookieUtils.kt b/src/main/java/roomescape/auth/web/support/CookieUtils.kt similarity index 88% rename from src/main/java/roomescape/system/auth/web/support/CookieUtils.kt rename to src/main/java/roomescape/auth/web/support/CookieUtils.kt index 77d33b44..bedcaf11 100644 --- a/src/main/java/roomescape/system/auth/web/support/CookieUtils.kt +++ b/src/main/java/roomescape/auth/web/support/CookieUtils.kt @@ -1,9 +1,9 @@ -package roomescape.system.auth.web.support +package roomescape.auth.web.support import jakarta.servlet.http.Cookie import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletResponse -import roomescape.system.auth.web.TokenResponse +import roomescape.auth.web.TokenResponse const val ACCESS_TOKEN_COOKIE_NAME = "accessToken" diff --git a/src/main/java/roomescape/system/auth/web/support/MemberIdResolver.kt b/src/main/java/roomescape/auth/web/support/MemberIdResolver.kt similarity index 91% rename from src/main/java/roomescape/system/auth/web/support/MemberIdResolver.kt rename to src/main/java/roomescape/auth/web/support/MemberIdResolver.kt index a22d5fc5..dfd07804 100644 --- a/src/main/java/roomescape/system/auth/web/support/MemberIdResolver.kt +++ b/src/main/java/roomescape/auth/web/support/MemberIdResolver.kt @@ -1,4 +1,4 @@ -package roomescape.system.auth.web.support +package roomescape.auth.web.support import jakarta.servlet.http.HttpServletRequest import org.springframework.core.MethodParameter @@ -7,7 +7,7 @@ import org.springframework.web.bind.support.WebDataBinderFactory import org.springframework.web.context.request.NativeWebRequest import org.springframework.web.method.support.HandlerMethodArgumentResolver import org.springframework.web.method.support.ModelAndViewContainer -import roomescape.system.auth.infrastructure.jwt.JwtHandler +import roomescape.auth.infrastructure.jwt.JwtHandler @Component class MemberIdResolver( diff --git a/src/main/java/roomescape/common/config/WebMvcConfig.java b/src/main/java/roomescape/common/config/WebMvcConfig.java index 53083a1a..4d50a4c1 100644 --- a/src/main/java/roomescape/common/config/WebMvcConfig.java +++ b/src/main/java/roomescape/common/config/WebMvcConfig.java @@ -7,9 +7,9 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import roomescape.system.auth.web.support.AdminInterceptor; -import roomescape.system.auth.web.support.LoginInterceptor; -import roomescape.system.auth.web.support.MemberIdResolver; +import roomescape.auth.web.support.AdminInterceptor; +import roomescape.auth.web.support.LoginInterceptor; +import roomescape.auth.web.support.MemberIdResolver; @Configuration public class WebMvcConfig implements WebMvcConfigurer { diff --git a/src/main/java/roomescape/member/web/MemberAPI.kt b/src/main/java/roomescape/member/web/MemberAPI.kt index 8da8ce30..020b1ec2 100644 --- a/src/main/java/roomescape/member/web/MemberAPI.kt +++ b/src/main/java/roomescape/member/web/MemberAPI.kt @@ -6,7 +6,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses import io.swagger.v3.oas.annotations.tags.Tag import org.springframework.http.HttpStatus import org.springframework.web.bind.annotation.ResponseStatus -import roomescape.system.auth.web.support.Admin +import roomescape.auth.web.support.Admin import roomescape.common.dto.response.RoomEscapeApiResponse @Tag(name = "2. 회원 API", description = "회원 정보를 관리할 때 사용합니다.") diff --git a/src/main/java/roomescape/reservation/controller/ReservationController.java b/src/main/java/roomescape/reservation/controller/ReservationController.java index 9e72bbaf..4abb15f6 100644 --- a/src/main/java/roomescape/reservation/controller/ReservationController.java +++ b/src/main/java/roomescape/reservation/controller/ReservationController.java @@ -37,9 +37,9 @@ import roomescape.reservation.dto.response.ReservationResponse; import roomescape.reservation.dto.response.ReservationsResponse; import roomescape.reservation.service.ReservationService; import roomescape.reservation.service.ReservationWithPaymentService; -import roomescape.system.auth.web.support.Admin; -import roomescape.system.auth.web.support.LoginRequired; -import roomescape.system.auth.web.support.MemberId; +import roomescape.auth.web.support.Admin; +import roomescape.auth.web.support.LoginRequired; +import roomescape.auth.web.support.MemberId; import roomescape.common.dto.response.ErrorResponse; import roomescape.common.dto.response.RoomEscapeApiResponse; import roomescape.common.exception.RoomEscapeException; diff --git a/src/main/java/roomescape/reservation/controller/ReservationTimeController.java b/src/main/java/roomescape/reservation/controller/ReservationTimeController.java index 796cd287..b8b6dae4 100644 --- a/src/main/java/roomescape/reservation/controller/ReservationTimeController.java +++ b/src/main/java/roomescape/reservation/controller/ReservationTimeController.java @@ -28,8 +28,8 @@ import roomescape.reservation.dto.response.ReservationTimeInfosResponse; import roomescape.reservation.dto.response.ReservationTimeResponse; import roomescape.reservation.dto.response.ReservationTimesResponse; import roomescape.reservation.service.ReservationTimeService; -import roomescape.system.auth.web.support.Admin; -import roomescape.system.auth.web.support.LoginRequired; +import roomescape.auth.web.support.Admin; +import roomescape.auth.web.support.LoginRequired; import roomescape.common.dto.response.ErrorResponse; import roomescape.common.dto.response.RoomEscapeApiResponse; diff --git a/src/main/java/roomescape/theme/controller/ThemeController.java b/src/main/java/roomescape/theme/controller/ThemeController.java index f3a26aea..3a6507b6 100644 --- a/src/main/java/roomescape/theme/controller/ThemeController.java +++ b/src/main/java/roomescape/theme/controller/ThemeController.java @@ -21,8 +21,8 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; -import roomescape.system.auth.web.support.Admin; -import roomescape.system.auth.web.support.LoginRequired; +import roomescape.auth.web.support.Admin; +import roomescape.auth.web.support.LoginRequired; import roomescape.common.dto.response.ErrorResponse; import roomescape.common.dto.response.RoomEscapeApiResponse; import roomescape.theme.dto.ThemeRequest; diff --git a/src/main/java/roomescape/view/PageController.kt b/src/main/java/roomescape/view/PageController.kt index e1f3bed3..10425b88 100644 --- a/src/main/java/roomescape/view/PageController.kt +++ b/src/main/java/roomescape/view/PageController.kt @@ -4,8 +4,8 @@ import org.springframework.stereotype.Controller import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.PathVariable import org.springframework.web.bind.annotation.RequestMapping -import roomescape.system.auth.web.support.Admin -import roomescape.system.auth.web.support.LoginRequired +import roomescape.auth.web.support.Admin +import roomescape.auth.web.support.LoginRequired @Controller class AuthPageController { diff --git a/src/test/java/roomescape/system/auth/business/AuthServiceTest.kt b/src/test/java/roomescape/auth/business/AuthServiceTest.kt similarity index 95% rename from src/test/java/roomescape/system/auth/business/AuthServiceTest.kt rename to src/test/java/roomescape/auth/business/AuthServiceTest.kt index 65631864..afe2b6f1 100644 --- a/src/test/java/roomescape/system/auth/business/AuthServiceTest.kt +++ b/src/test/java/roomescape/auth/business/AuthServiceTest.kt @@ -1,4 +1,4 @@ -package roomescape.system.auth.business +package roomescape.auth.business import io.kotest.assertions.assertSoftly import io.kotest.assertions.throwables.shouldThrow @@ -12,8 +12,8 @@ import roomescape.util.MemberFixture import roomescape.member.business.MemberService import roomescape.member.infrastructure.persistence.Member import roomescape.member.infrastructure.persistence.MemberRepository -import roomescape.system.auth.infrastructure.jwt.JwtHandler -import roomescape.system.auth.service.AuthService +import roomescape.auth.infrastructure.jwt.JwtHandler +import roomescape.auth.service.AuthService import roomescape.common.exception.ErrorType import roomescape.common.exception.RoomEscapeException diff --git a/src/test/java/roomescape/system/auth/infrastructure/jwt/JwtHandlerTest.kt b/src/test/java/roomescape/auth/infrastructure/jwt/JwtHandlerTest.kt similarity index 96% rename from src/test/java/roomescape/system/auth/infrastructure/jwt/JwtHandlerTest.kt rename to src/test/java/roomescape/auth/infrastructure/jwt/JwtHandlerTest.kt index 548852f4..d12cd0ca 100644 --- a/src/test/java/roomescape/system/auth/infrastructure/jwt/JwtHandlerTest.kt +++ b/src/test/java/roomescape/auth/infrastructure/jwt/JwtHandlerTest.kt @@ -1,10 +1,11 @@ -package roomescape.system.auth.infrastructure.jwt +package roomescape.auth.infrastructure.jwt import io.jsonwebtoken.Jwts import io.jsonwebtoken.SignatureAlgorithm import io.kotest.assertions.throwables.shouldThrow import io.kotest.core.spec.style.FunSpec import io.kotest.matchers.shouldBe +import roomescape.auth.infrastructure.jwt.JwtHandler import roomescape.util.JwtFixture import roomescape.common.exception.ErrorType import roomescape.common.exception.RoomEscapeException diff --git a/src/test/java/roomescape/system/auth/web/AuthControllerTest.kt b/src/test/java/roomescape/auth/web/AuthControllerTest.kt similarity index 98% rename from src/test/java/roomescape/system/auth/web/AuthControllerTest.kt rename to src/test/java/roomescape/auth/web/AuthControllerTest.kt index 0069c8ae..e0e8722c 100644 --- a/src/test/java/roomescape/system/auth/web/AuthControllerTest.kt +++ b/src/test/java/roomescape/auth/web/AuthControllerTest.kt @@ -1,9 +1,10 @@ -package roomescape.system.auth.web +package roomescape.auth.web import io.mockk.every import org.hamcrest.Matchers.containsString import org.hamcrest.Matchers.`is` import org.springframework.data.repository.findByIdOrNull +import roomescape.auth.web.LoginRequest import roomescape.util.MemberFixture import roomescape.util.RoomescapeApiTest import roomescape.common.exception.ErrorType diff --git a/src/test/java/roomescape/util/Fixtures.kt b/src/test/java/roomescape/util/Fixtures.kt index d1133986..d03b6fe5 100644 --- a/src/test/java/roomescape/util/Fixtures.kt +++ b/src/test/java/roomescape/util/Fixtures.kt @@ -2,8 +2,8 @@ package roomescape.util import roomescape.member.infrastructure.persistence.Member import roomescape.member.infrastructure.persistence.Role -import roomescape.system.auth.infrastructure.jwt.JwtHandler -import roomescape.system.auth.web.LoginRequest +import roomescape.auth.infrastructure.jwt.JwtHandler +import roomescape.auth.web.LoginRequest import java.util.concurrent.atomic.AtomicLong object MemberFixture { diff --git a/src/test/java/roomescape/util/RoomescapeApiTest.kt b/src/test/java/roomescape/util/RoomescapeApiTest.kt index 6bb02b5d..676c3dab 100644 --- a/src/test/java/roomescape/util/RoomescapeApiTest.kt +++ b/src/test/java/roomescape/util/RoomescapeApiTest.kt @@ -14,7 +14,7 @@ import org.springframework.data.repository.findByIdOrNull import org.springframework.http.HttpStatus import roomescape.member.infrastructure.persistence.Member import roomescape.member.infrastructure.persistence.MemberRepository -import roomescape.system.auth.infrastructure.jwt.JwtHandler +import roomescape.auth.infrastructure.jwt.JwtHandler import roomescape.common.exception.ErrorType import roomescape.common.exception.RoomEscapeException