generated from pricelees/issue-pr-template
chore: /system/auth 패키지를 /auth로 이동
This commit is contained in:
parent
06977fb29c
commit
dd5fd15ce1
@ -1,4 +1,4 @@
|
|||||||
package roomescape.system.auth.infrastructure.jwt
|
package roomescape.auth.infrastructure.jwt
|
||||||
|
|
||||||
import io.jsonwebtoken.*
|
import io.jsonwebtoken.*
|
||||||
import org.springframework.beans.factory.annotation.Value
|
import org.springframework.beans.factory.annotation.Value
|
||||||
@ -1,12 +1,12 @@
|
|||||||
package roomescape.system.auth.service
|
package roomescape.auth.service
|
||||||
|
|
||||||
import org.springframework.stereotype.Service
|
import org.springframework.stereotype.Service
|
||||||
import roomescape.member.business.MemberService
|
import roomescape.member.business.MemberService
|
||||||
import roomescape.member.infrastructure.persistence.Member
|
import roomescape.member.infrastructure.persistence.Member
|
||||||
import roomescape.system.auth.infrastructure.jwt.JwtHandler
|
import roomescape.auth.infrastructure.jwt.JwtHandler
|
||||||
import roomescape.system.auth.web.LoginCheckResponse
|
import roomescape.auth.web.LoginCheckResponse
|
||||||
import roomescape.system.auth.web.LoginRequest
|
import roomescape.auth.web.LoginRequest
|
||||||
import roomescape.system.auth.web.TokenResponse
|
import roomescape.auth.web.TokenResponse
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
class AuthService(
|
class AuthService(
|
||||||
@ -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.Operation
|
||||||
import io.swagger.v3.oas.annotations.Parameter
|
import io.swagger.v3.oas.annotations.Parameter
|
||||||
@ -13,8 +13,8 @@ import jakarta.validation.Valid
|
|||||||
import org.springframework.http.HttpStatus
|
import org.springframework.http.HttpStatus
|
||||||
import org.springframework.web.bind.annotation.RequestBody
|
import org.springframework.web.bind.annotation.RequestBody
|
||||||
import org.springframework.web.bind.annotation.ResponseStatus
|
import org.springframework.web.bind.annotation.ResponseStatus
|
||||||
import roomescape.system.auth.web.support.LoginRequired
|
import roomescape.auth.web.support.LoginRequired
|
||||||
import roomescape.system.auth.web.support.MemberId
|
import roomescape.auth.web.support.MemberId
|
||||||
import roomescape.common.dto.response.ErrorResponse
|
import roomescape.common.dto.response.ErrorResponse
|
||||||
import roomescape.common.dto.response.RoomEscapeApiResponse
|
import roomescape.common.dto.response.RoomEscapeApiResponse
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package roomescape.system.auth.web
|
package roomescape.auth.web
|
||||||
|
|
||||||
import io.swagger.v3.oas.annotations.Parameter
|
import io.swagger.v3.oas.annotations.Parameter
|
||||||
import jakarta.servlet.http.Cookie
|
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.PostMapping
|
||||||
import org.springframework.web.bind.annotation.RequestBody
|
import org.springframework.web.bind.annotation.RequestBody
|
||||||
import org.springframework.web.bind.annotation.RestController
|
import org.springframework.web.bind.annotation.RestController
|
||||||
import roomescape.system.auth.service.AuthService
|
import roomescape.auth.service.AuthService
|
||||||
import roomescape.system.auth.web.support.*
|
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
|
import roomescape.common.dto.response.RoomEscapeApiResponse
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package roomescape.system.auth.web
|
package roomescape.auth.web
|
||||||
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema
|
import io.swagger.v3.oas.annotations.media.Schema
|
||||||
import jakarta.validation.constraints.Email
|
import jakarta.validation.constraints.Email
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package roomescape.system.auth.web.support
|
package roomescape.auth.web.support
|
||||||
|
|
||||||
@Target(AnnotationTarget.FUNCTION)
|
@Target(AnnotationTarget.FUNCTION)
|
||||||
@Retention(AnnotationRetention.RUNTIME)
|
@Retention(AnnotationRetention.RUNTIME)
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package roomescape.system.auth.web.support
|
package roomescape.auth.web.support
|
||||||
|
|
||||||
import jakarta.servlet.http.HttpServletRequest
|
import jakarta.servlet.http.HttpServletRequest
|
||||||
import jakarta.servlet.http.HttpServletResponse
|
import jakarta.servlet.http.HttpServletResponse
|
||||||
@ -8,7 +8,7 @@ import org.springframework.web.method.HandlerMethod
|
|||||||
import org.springframework.web.servlet.HandlerInterceptor
|
import org.springframework.web.servlet.HandlerInterceptor
|
||||||
import roomescape.member.business.MemberService
|
import roomescape.member.business.MemberService
|
||||||
import roomescape.member.infrastructure.persistence.Member
|
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.ErrorType
|
||||||
import roomescape.common.exception.RoomEscapeException
|
import roomescape.common.exception.RoomEscapeException
|
||||||
|
|
||||||
@ -1,9 +1,9 @@
|
|||||||
package roomescape.system.auth.web.support
|
package roomescape.auth.web.support
|
||||||
|
|
||||||
import jakarta.servlet.http.Cookie
|
import jakarta.servlet.http.Cookie
|
||||||
import jakarta.servlet.http.HttpServletRequest
|
import jakarta.servlet.http.HttpServletRequest
|
||||||
import jakarta.servlet.http.HttpServletResponse
|
import jakarta.servlet.http.HttpServletResponse
|
||||||
import roomescape.system.auth.web.TokenResponse
|
import roomescape.auth.web.TokenResponse
|
||||||
|
|
||||||
const val ACCESS_TOKEN_COOKIE_NAME = "accessToken"
|
const val ACCESS_TOKEN_COOKIE_NAME = "accessToken"
|
||||||
|
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package roomescape.system.auth.web.support
|
package roomescape.auth.web.support
|
||||||
|
|
||||||
import jakarta.servlet.http.HttpServletRequest
|
import jakarta.servlet.http.HttpServletRequest
|
||||||
import org.springframework.core.MethodParameter
|
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.context.request.NativeWebRequest
|
||||||
import org.springframework.web.method.support.HandlerMethodArgumentResolver
|
import org.springframework.web.method.support.HandlerMethodArgumentResolver
|
||||||
import org.springframework.web.method.support.ModelAndViewContainer
|
import org.springframework.web.method.support.ModelAndViewContainer
|
||||||
import roomescape.system.auth.infrastructure.jwt.JwtHandler
|
import roomescape.auth.infrastructure.jwt.JwtHandler
|
||||||
|
|
||||||
@Component
|
@Component
|
||||||
class MemberIdResolver(
|
class MemberIdResolver(
|
||||||
@ -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.InterceptorRegistry;
|
||||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||||
|
|
||||||
import roomescape.system.auth.web.support.AdminInterceptor;
|
import roomescape.auth.web.support.AdminInterceptor;
|
||||||
import roomescape.system.auth.web.support.LoginInterceptor;
|
import roomescape.auth.web.support.LoginInterceptor;
|
||||||
import roomescape.system.auth.web.support.MemberIdResolver;
|
import roomescape.auth.web.support.MemberIdResolver;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
public class WebMvcConfig implements WebMvcConfigurer {
|
public class WebMvcConfig implements WebMvcConfigurer {
|
||||||
|
|||||||
@ -6,7 +6,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses
|
|||||||
import io.swagger.v3.oas.annotations.tags.Tag
|
import io.swagger.v3.oas.annotations.tags.Tag
|
||||||
import org.springframework.http.HttpStatus
|
import org.springframework.http.HttpStatus
|
||||||
import org.springframework.web.bind.annotation.ResponseStatus
|
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
|
import roomescape.common.dto.response.RoomEscapeApiResponse
|
||||||
|
|
||||||
@Tag(name = "2. 회원 API", description = "회원 정보를 관리할 때 사용합니다.")
|
@Tag(name = "2. 회원 API", description = "회원 정보를 관리할 때 사용합니다.")
|
||||||
|
|||||||
@ -37,9 +37,9 @@ import roomescape.reservation.dto.response.ReservationResponse;
|
|||||||
import roomescape.reservation.dto.response.ReservationsResponse;
|
import roomescape.reservation.dto.response.ReservationsResponse;
|
||||||
import roomescape.reservation.service.ReservationService;
|
import roomescape.reservation.service.ReservationService;
|
||||||
import roomescape.reservation.service.ReservationWithPaymentService;
|
import roomescape.reservation.service.ReservationWithPaymentService;
|
||||||
import roomescape.system.auth.web.support.Admin;
|
import roomescape.auth.web.support.Admin;
|
||||||
import roomescape.system.auth.web.support.LoginRequired;
|
import roomescape.auth.web.support.LoginRequired;
|
||||||
import roomescape.system.auth.web.support.MemberId;
|
import roomescape.auth.web.support.MemberId;
|
||||||
import roomescape.common.dto.response.ErrorResponse;
|
import roomescape.common.dto.response.ErrorResponse;
|
||||||
import roomescape.common.dto.response.RoomEscapeApiResponse;
|
import roomescape.common.dto.response.RoomEscapeApiResponse;
|
||||||
import roomescape.common.exception.RoomEscapeException;
|
import roomescape.common.exception.RoomEscapeException;
|
||||||
|
|||||||
@ -28,8 +28,8 @@ import roomescape.reservation.dto.response.ReservationTimeInfosResponse;
|
|||||||
import roomescape.reservation.dto.response.ReservationTimeResponse;
|
import roomescape.reservation.dto.response.ReservationTimeResponse;
|
||||||
import roomescape.reservation.dto.response.ReservationTimesResponse;
|
import roomescape.reservation.dto.response.ReservationTimesResponse;
|
||||||
import roomescape.reservation.service.ReservationTimeService;
|
import roomescape.reservation.service.ReservationTimeService;
|
||||||
import roomescape.system.auth.web.support.Admin;
|
import roomescape.auth.web.support.Admin;
|
||||||
import roomescape.system.auth.web.support.LoginRequired;
|
import roomescape.auth.web.support.LoginRequired;
|
||||||
import roomescape.common.dto.response.ErrorResponse;
|
import roomescape.common.dto.response.ErrorResponse;
|
||||||
import roomescape.common.dto.response.RoomEscapeApiResponse;
|
import roomescape.common.dto.response.RoomEscapeApiResponse;
|
||||||
|
|
||||||
|
|||||||
@ -21,8 +21,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
|
|||||||
import jakarta.servlet.http.HttpServletResponse;
|
import jakarta.servlet.http.HttpServletResponse;
|
||||||
import jakarta.validation.Valid;
|
import jakarta.validation.Valid;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
import roomescape.system.auth.web.support.Admin;
|
import roomescape.auth.web.support.Admin;
|
||||||
import roomescape.system.auth.web.support.LoginRequired;
|
import roomescape.auth.web.support.LoginRequired;
|
||||||
import roomescape.common.dto.response.ErrorResponse;
|
import roomescape.common.dto.response.ErrorResponse;
|
||||||
import roomescape.common.dto.response.RoomEscapeApiResponse;
|
import roomescape.common.dto.response.RoomEscapeApiResponse;
|
||||||
import roomescape.theme.dto.ThemeRequest;
|
import roomescape.theme.dto.ThemeRequest;
|
||||||
|
|||||||
@ -4,8 +4,8 @@ import org.springframework.stereotype.Controller
|
|||||||
import org.springframework.web.bind.annotation.GetMapping
|
import org.springframework.web.bind.annotation.GetMapping
|
||||||
import org.springframework.web.bind.annotation.PathVariable
|
import org.springframework.web.bind.annotation.PathVariable
|
||||||
import org.springframework.web.bind.annotation.RequestMapping
|
import org.springframework.web.bind.annotation.RequestMapping
|
||||||
import roomescape.system.auth.web.support.Admin
|
import roomescape.auth.web.support.Admin
|
||||||
import roomescape.system.auth.web.support.LoginRequired
|
import roomescape.auth.web.support.LoginRequired
|
||||||
|
|
||||||
@Controller
|
@Controller
|
||||||
class AuthPageController {
|
class AuthPageController {
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
package roomescape.system.auth.business
|
package roomescape.auth.business
|
||||||
|
|
||||||
import io.kotest.assertions.assertSoftly
|
import io.kotest.assertions.assertSoftly
|
||||||
import io.kotest.assertions.throwables.shouldThrow
|
import io.kotest.assertions.throwables.shouldThrow
|
||||||
@ -12,8 +12,8 @@ import roomescape.util.MemberFixture
|
|||||||
import roomescape.member.business.MemberService
|
import roomescape.member.business.MemberService
|
||||||
import roomescape.member.infrastructure.persistence.Member
|
import roomescape.member.infrastructure.persistence.Member
|
||||||
import roomescape.member.infrastructure.persistence.MemberRepository
|
import roomescape.member.infrastructure.persistence.MemberRepository
|
||||||
import roomescape.system.auth.infrastructure.jwt.JwtHandler
|
import roomescape.auth.infrastructure.jwt.JwtHandler
|
||||||
import roomescape.system.auth.service.AuthService
|
import roomescape.auth.service.AuthService
|
||||||
import roomescape.common.exception.ErrorType
|
import roomescape.common.exception.ErrorType
|
||||||
import roomescape.common.exception.RoomEscapeException
|
import roomescape.common.exception.RoomEscapeException
|
||||||
|
|
||||||
@ -1,10 +1,11 @@
|
|||||||
package roomescape.system.auth.infrastructure.jwt
|
package roomescape.auth.infrastructure.jwt
|
||||||
|
|
||||||
import io.jsonwebtoken.Jwts
|
import io.jsonwebtoken.Jwts
|
||||||
import io.jsonwebtoken.SignatureAlgorithm
|
import io.jsonwebtoken.SignatureAlgorithm
|
||||||
import io.kotest.assertions.throwables.shouldThrow
|
import io.kotest.assertions.throwables.shouldThrow
|
||||||
import io.kotest.core.spec.style.FunSpec
|
import io.kotest.core.spec.style.FunSpec
|
||||||
import io.kotest.matchers.shouldBe
|
import io.kotest.matchers.shouldBe
|
||||||
|
import roomescape.auth.infrastructure.jwt.JwtHandler
|
||||||
import roomescape.util.JwtFixture
|
import roomescape.util.JwtFixture
|
||||||
import roomescape.common.exception.ErrorType
|
import roomescape.common.exception.ErrorType
|
||||||
import roomescape.common.exception.RoomEscapeException
|
import roomescape.common.exception.RoomEscapeException
|
||||||
@ -1,9 +1,10 @@
|
|||||||
package roomescape.system.auth.web
|
package roomescape.auth.web
|
||||||
|
|
||||||
import io.mockk.every
|
import io.mockk.every
|
||||||
import org.hamcrest.Matchers.containsString
|
import org.hamcrest.Matchers.containsString
|
||||||
import org.hamcrest.Matchers.`is`
|
import org.hamcrest.Matchers.`is`
|
||||||
import org.springframework.data.repository.findByIdOrNull
|
import org.springframework.data.repository.findByIdOrNull
|
||||||
|
import roomescape.auth.web.LoginRequest
|
||||||
import roomescape.util.MemberFixture
|
import roomescape.util.MemberFixture
|
||||||
import roomescape.util.RoomescapeApiTest
|
import roomescape.util.RoomescapeApiTest
|
||||||
import roomescape.common.exception.ErrorType
|
import roomescape.common.exception.ErrorType
|
||||||
@ -2,8 +2,8 @@ package roomescape.util
|
|||||||
|
|
||||||
import roomescape.member.infrastructure.persistence.Member
|
import roomescape.member.infrastructure.persistence.Member
|
||||||
import roomescape.member.infrastructure.persistence.Role
|
import roomescape.member.infrastructure.persistence.Role
|
||||||
import roomescape.system.auth.infrastructure.jwt.JwtHandler
|
import roomescape.auth.infrastructure.jwt.JwtHandler
|
||||||
import roomescape.system.auth.web.LoginRequest
|
import roomescape.auth.web.LoginRequest
|
||||||
import java.util.concurrent.atomic.AtomicLong
|
import java.util.concurrent.atomic.AtomicLong
|
||||||
|
|
||||||
object MemberFixture {
|
object MemberFixture {
|
||||||
|
|||||||
@ -14,7 +14,7 @@ import org.springframework.data.repository.findByIdOrNull
|
|||||||
import org.springframework.http.HttpStatus
|
import org.springframework.http.HttpStatus
|
||||||
import roomescape.member.infrastructure.persistence.Member
|
import roomescape.member.infrastructure.persistence.Member
|
||||||
import roomescape.member.infrastructure.persistence.MemberRepository
|
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.ErrorType
|
||||||
import roomescape.common.exception.RoomEscapeException
|
import roomescape.common.exception.RoomEscapeException
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user