feat: apple login

build.gradle

@@ -87,6 +87,12 @@ dependencies {
     // datadog
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'io.micrometer:micrometer-registry-datadog'
+
+    // JWT for Apple Sign In
+    implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+    implementation 'org.bouncycastle:bcpkix-jdk15on:1.70'
 }
 
 // Kotlin 컴파일 옵션 설정

src/main/kotlin/upbrella/be/config/AuthConfig.kt

@@ -25,6 +25,7 @@ class AuthConfig(
                 "/users/login/**",
                 "/users/oauth/login/**",
                 "/users/join/**",
+                "/auth/apple/**",
                 "/stores/**",
                 "/index.html",
                 "/error/**",

src/main/kotlin/upbrella/be/config/ProductionCorsConfig.kt

@@ -16,6 +16,7 @@ class ProductionCorsConfig : WebMvcConfigurer {
                 "https://upbrella.co.kr",
                 "https://www.upbrella.co.kr",
                 "https://api.upbrella.co.kr",
+                "https://appleid.apple.com",
                 "http://localhost:3000",
                 "http://www.localhost:3000"
             )

src/main/kotlin/upbrella/be/config/SessionCookieConfig.kt

@@ -0,0 +1,23 @@
+package upbrella.be.config
+
+import org.springframework.boot.web.servlet.ServletContextInitializer
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Profile
+import javax.servlet.SessionCookieConfig
+
+@Configuration
+@Profile("prod")
+class SessionCookieConfig {
+
+    @Bean
+    fun servletContextInitializer(): ServletContextInitializer {
+        return ServletContextInitializer { servletContext ->
+            val sessionCookieConfig: SessionCookieConfig = servletContext.sessionCookieConfig
+            sessionCookieConfig.setSecure(true)
+            sessionCookieConfig.setHttpOnly(true)
+            sessionCookieConfig.setDomain("upbrella.co.kr")
+            sessionCookieConfig.setPath("/")
+        }
+    }
+}

src/main/kotlin/upbrella/be/user/controller/UserController.kt

@@ -4,11 +4,13 @@ import org.slf4j.LoggerFactory
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
 import org.springframework.web.client.HttpClientErrorException
+import org.springframework.web.servlet.view.RedirectView
 import upbrella.be.rent.service.RentService
 import upbrella.be.user.dto.request.JoinRequest
 import upbrella.be.user.dto.request.LoginCodeRequest
 import upbrella.be.user.dto.request.UpdateBankAccountRequest
 import upbrella.be.user.dto.response.*
+import upbrella.be.user.dto.token.AppleOauthInfo
 import upbrella.be.user.dto.token.KakaoOauthInfo
 import upbrella.be.user.dto.token.OauthToken
 import upbrella.be.user.exception.InvalidLoginCodeException
@@ -26,6 +28,7 @@ class UserController(
     private val oauthLoginService: OauthLoginService,
     private val userService: UserService,
     private val kakaoOauthInfo: KakaoOauthInfo,
+    private val appleOauthInfo: AppleOauthInfo,
     private val rentService: RentService,
     private val blackListService: BlackListService,
 ) {
@@ -86,16 +89,69 @@ class UserController(
             ))
     }
 
+    @PostMapping("/auth/apple")
+    fun appleLoginCallback(
+        session: HttpSession,
+        @RequestParam code: String,
+        @RequestParam(required = false) state: String?,
+        @RequestParam(required = false) id_token: String?,
+        @RequestParam(required = false) user: String?
+    ): RedirectView {
+        log.info("Apple login callback received - code: ${code.take(10)}...")
+
+        val appleOauthToken: OauthToken
+
+        try {
+            appleOauthToken = oauthLoginService.getOauthToken(code, appleOauthInfo)!!
+        } catch (e: HttpClientErrorException) {
+            log.error("Apple login failed", e)
+            return RedirectView("https://upbrella.co.kr/login?error=apple_login_failed")
+        } catch (e: Exception) {
+            log.error("Unexpected error during Apple login", e)
+            return RedirectView("https://upbrella.co.kr/login?error=server_error")
+        }
+
+        // id_token이 없으면 에러
+        if (appleOauthToken.idToken.isNullOrEmpty()) {
+            log.error("Apple ID token is null or empty")
+            return RedirectView("https://upbrella.co.kr/login?error=no_id_token")
+        }
+
+        try {
+            val appleLoggedInUser = oauthLoginService.processAppleLogin(appleOauthToken.idToken!!)
+            session.setAttribute("appleUser", appleLoggedInUser)
+
+            log.info("Apple social login success - redirecting to frontend")
+            return RedirectView("https://upbrella.co.kr/login?apple=success")
+        } catch (e: Exception) {
+            log.error("Apple ID token validation failed", e)
+            return RedirectView("https://upbrella.co.kr/login?error=token_validation_failed")
+        }
+    }
+
     @PostMapping("/users/login")
     fun upbrellaLogin(session: HttpSession): ResponseEntity<CustomResponse<Unit>> {
-        if (session.getAttribute("kakaoUser") == null) {
-            throw NotSocialLoginedException("[ERROR] 카카오 로그인을 먼저 해주세요.")
+        val kakaoUser = session.getAttribute("kakaoUser") as? KakaoLoginResponse
+        val appleUser = session.getAttribute("appleUser") as? AppleLoginResponse
+
+        if (kakaoUser == null && appleUser == null) {
+            throw NotSocialLoginedException("[ERROR] 소셜 로그인을 먼저 해주세요.")
         }
 
-        val kakaoUser = session.getAttribute("kakaoUser") as KakaoLoginResponse
-        val loggedInUser = userService.login(kakaoUser.id!!)
+        val loggedInUser = when {
+            kakaoUser != null -> {
+                val user = userService.login(kakaoUser.id!!)
+                session.removeAttribute("kakaoUser")
+                user
+            }
+            appleUser != null -> {
+                val user = userService.loginApple(appleUser.sub!!)
+                session.removeAttribute("appleUser")
+                user
+            }
+            else -> throw NotSocialLoginedException("[ERROR] 소셜 로그인을 먼저 해주세요.")
+        }
 
-        session.removeAttribute("kakaoUser")
         session.setAttribute("user", loggedInUser)
 
         log.info("UUL 로그인 성공")
@@ -125,17 +181,30 @@ class UserController(
 
     @PostMapping("/users/join")
     fun kakaoJoin(session: HttpSession, @RequestBody @Valid joinRequest: JoinRequest): ResponseEntity<CustomResponse<Unit>> {
-        val kakaoUser = session.getAttribute("kakaoUser") as KakaoLoginResponse?
+        val kakaoUser = session.getAttribute("kakaoUser") as? KakaoLoginResponse
+        val appleUser = session.getAttribute("appleUser") as? AppleLoginResponse
 
         if (session.getAttribute("user") != null) {
             throw LoginedMemberException("[ERROR] 이미 로그인된 상태입니다.")
         }
-        if (kakaoUser == null) {
-            throw NotSocialLoginedException("[ERROR] 카카오 로그인을 먼저 해주세요.")
+        if (kakaoUser == null && appleUser == null) {
+            throw NotSocialLoginedException("[ERROR] 소셜 로그인을 먼저 해주세요.")
+        }
+
+        val loggedInUser = when {
+            kakaoUser != null -> {
+                val user = userService.join(kakaoUser, joinRequest)
+                session.removeAttribute("kakaoUser")
+                user
+            }
+            appleUser != null -> {
+                val user = userService.joinApple(appleUser, joinRequest)
+                session.removeAttribute("appleUser")
+                user
+            }
+            else -> throw NotSocialLoginedException("[ERROR] 소셜 로그인을 먼저 해주세요.")
         }
 
-        val loggedInUser = userService.join(kakaoUser, joinRequest)
-        session.removeAttribute("kakaoId")
         session.setAttribute("user", loggedInUser)
 
         log.info("UNU 회원가입 성공")
@@ -144,7 +213,7 @@ class UserController(
             .body(CustomResponse(
                 "success",
                 200,
-                "카카오 회원가입 성공",
+                "소셜 회원가입 성공",
                 null
             ))
     }

src/main/kotlin/upbrella/be/user/dto/response/AppleLoginResponse.kt

@@ -0,0 +1,14 @@
+package upbrella.be.user.dto.response
+
+import com.fasterxml.jackson.annotation.JsonProperty
+
+data class AppleLoginResponse(
+    @JsonProperty("sub")
+    val sub: String?, // Apple user identifier
+
+    @JsonProperty("email")
+    val email: String?,
+
+    @JsonProperty("email_verified")
+    val emailVerified: Boolean?
+)

src/main/kotlin/upbrella/be/user/dto/token/AppleOauthInfo.kt

@@ -0,0 +1,92 @@
+package upbrella.be.user.dto.token
+
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.context.annotation.Profile
+import org.springframework.stereotype.Component
+import upbrella.be.util.AppleJwtGenerator
+import javax.annotation.PostConstruct
+
+interface AppleOauthInfo {
+    val clientId: String
+    val redirectUri: String
+    val loginUri: String
+    val clientSecret: String
+}
+
+@Component
+@Profile("dev", "test")
+class DevAppleOauthInfo(
+    @Value("\${APPLE_CLIENT_ID_DEV}")
+    override val clientId: String,
+
+    @Value("\${APPLE_TEAM_ID_DEV}")
+    private val teamId: String,
+
+    @Value("\${APPLE_KEY_ID_DEV}")
+    private val keyId: String,
+
+    @Value("\${APPLE_P8_KEY_PATH_DEV}")
+    private val p8KeyPath: String,
+
+    @Value("\${APPLE_REDIRECT_URI_DEV}")
+    override val redirectUri: String,
+
+    @Value("\${APPLE_LOGIN_URI_DEV}")
+    override val loginUri: String,
+
+    private val appleJwtGenerator: AppleJwtGenerator
+) : AppleOauthInfo {
+    private var _clientSecret: String = ""
+
+    override val clientSecret: String
+        get() = _clientSecret
+
+    @PostConstruct
+    fun init() {
+        _clientSecret = appleJwtGenerator.generateClientSecret(
+            teamId = teamId,
+            keyId = keyId,
+            clientId = clientId,
+            p8KeyPath = p8KeyPath
+        )
+    }
+}
+
+@Component
+@Profile("prod")
+class ProdAppleOauthInfo(
+    @Value("\${APPLE_CLIENT_ID_PROD}")
+    override val clientId: String,
+
+    @Value("\${APPLE_TEAM_ID_PROD}")
+    private val teamId: String,
+
+    @Value("\${APPLE_KEY_ID_PROD}")
+    private val keyId: String,
+
+    @Value("\${APPLE_P8_KEY_PATH_PROD}")
+    private val p8KeyPath: String,
+
+    @Value("\${APPLE_REDIRECT_URI_PROD}")
+    override val redirectUri: String,
+
+    @Value("\${APPLE_LOGIN_URI_PROD}")
+    override val loginUri: String,
+
+    private val appleJwtGenerator: AppleJwtGenerator
+) : AppleOauthInfo {
+    private var _clientSecret: String = ""
+
+    override val clientSecret: String
+        get() = _clientSecret
+
+    @PostConstruct
+    fun init() {
+        _clientSecret = appleJwtGenerator.generateClientSecret(
+            teamId = teamId,
+            keyId = keyId,
+            clientId = clientId,
+            p8KeyPath = p8KeyPath
+        )
+    }
+}

src/main/kotlin/upbrella/be/user/dto/token/OauthToken.kt

@@ -8,5 +8,6 @@ data class OauthToken(
     val accessToken: String = "",
     val refreshToken: String = "",
     val tokenType: String = "",
-    val expiresIn: Long = 0
+    val expiresIn: Long = 0,
+    val idToken: String? = null // Apple OAuth에서 사용
 )

src/main/kotlin/upbrella/be/user/entity/User.kt

@@ -1,6 +1,7 @@
 package upbrella.be.user.entity
 
 import upbrella.be.user.dto.request.JoinRequest
+import upbrella.be.user.dto.response.AppleLoginResponse
 import upbrella.be.user.dto.response.KakaoLoginResponse
 import upbrella.be.util.AesEncryptor
 import upbrella.be.util.BaseTimeEntity
@@ -15,6 +16,7 @@ class User(
     var name: String,
     var phoneNumber: String,
     var email: String,
+    var provider: String = "KAKAO", // KAKAO or APPLE
     var adminStatus: Boolean = false,
     var bank: String? = null,
     var accountNumber: String? = null,
@@ -34,6 +36,23 @@ class User(
                 name = joinRequest.name,
                 phoneNumber = joinRequest.phoneNumber,
                 email = kakaoUser.kakaoAccount?.email ?: "",
+                provider = "KAKAO",
+                bank = aesEncryptor.encrypt(joinRequest.bank),
+                accountNumber = aesEncryptor.encrypt(joinRequest.accountNumber)
+            )
+        }
+
+        fun createNewAppleUser(
+            appleUser: AppleLoginResponse,
+            joinRequest: JoinRequest,
+            aesEncryptor: AesEncryptor
+        ): User {
+            return User(
+                socialId = appleUser.sub.hashCode().toLong(),
+                name = joinRequest.name,
+                phoneNumber = joinRequest.phoneNumber,
+                email = appleUser.email ?: "",
+                provider = "APPLE",
                 bank = aesEncryptor.encrypt(joinRequest.bank),
                 accountNumber = aesEncryptor.encrypt(joinRequest.accountNumber)
             )