Merge pull request #10 from TeamTroublePainter/feature/DRAW-390

DRAW-390 구글 로그인

adapter/oauth/build.gradle.kts

@@ -10,6 +10,7 @@ dependencies {
 
     implementation("org.springframework.boot:spring-boot-starter:${Versions.SPRING_BOOT}")
     implementation("org.springframework.cloud:spring-cloud-starter-openfeign:${Versions.OPEN_FEIGN}")
+    implementation("com.google.api-client:google-api-client:${Versions.GOOGLE_API_CLIENT}")
 }
 
 tasks {

adapter/oauth/src/main/kotlin/com/xorker/draw/oauth/OAuthAdapter.kt

@@ -3,15 +3,18 @@ package com.xorker.draw.oauth
 import com.xorker.draw.auth.AuthRepository
 import com.xorker.draw.auth.AuthType
 import com.xorker.draw.oauth.apple.AppleAuthService
+import com.xorker.draw.oauth.google.GoogleAuthService
 import org.springframework.stereotype.Component
 
 @Component
 internal class OAuthAdapter(
     private val appleAuthService: AppleAuthService,
+    private val googleAuthService: GoogleAuthService,
 ) : AuthRepository {
     override fun getPlatformUserId(authType: AuthType, token: String): String {
         return when (authType) {
             AuthType.APPLE_ID_TOKEN -> appleAuthService.getPlatformUserId(token)
+            AuthType.GOOGLE_ID_TOKEN -> googleAuthService.getPlatformUserId(token)
         }
     }
 

adapter/oauth/src/main/kotlin/com/xorker/draw/oauth/google/GoogleApiConfiguration.kt

@@ -0,0 +1,8 @@
+package com.xorker.draw.oauth.google
+
+import org.springframework.boot.context.properties.EnableConfigurationProperties
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+@EnableConfigurationProperties(GoogleApiProperties::class)
+class GoogleApiConfiguration

adapter/oauth/src/main/kotlin/com/xorker/draw/oauth/google/GoogleApiProperties.kt

@@ -0,0 +1,8 @@
+package com.xorker.draw.oauth.google
+
+import org.springframework.boot.context.properties.ConfigurationProperties
+
+@ConfigurationProperties("oauth.google")
+data class GoogleApiProperties(
+    val clientId: String,
+)

adapter/oauth/src/main/kotlin/com/xorker/draw/oauth/google/GoogleAuthService.kt

@@ -0,0 +1,27 @@
+package com.xorker.draw.oauth.google
+
+import com.google.api.client.googleapis.auth.oauth2.GoogleIdTokenVerifier
+import com.google.api.client.http.javanet.NetHttpTransport
+import com.google.api.client.json.gson.GsonFactory
+import com.xorker.draw.exception.OAuthFailureException
+import java.security.GeneralSecurityException
+import org.springframework.stereotype.Component
+
+@Component
+internal class GoogleAuthService(
+    googleApiProperties: GoogleApiProperties,
+) {
+    private val idTokenVerifier =
+        GoogleIdTokenVerifier.Builder(NetHttpTransport(), GsonFactory.getDefaultInstance())
+            .setAudience(listOf(googleApiProperties.clientId))
+            .build()
+
+    fun getPlatformUserId(token: String): String {
+        try {
+            val idToken = idTokenVerifier.verify(token)
+            return idToken?.payload?.subject ?: throw OAuthFailureException
+        } catch (e: GeneralSecurityException) {
+            throw OAuthFailureException
+        }
+    }
+}

adapter/oauth/src/main/resources/application-oauth.yml

@@ -2,3 +2,5 @@ oauth:
     apple:
         iss: https://appleid.apple.com
         client-id: ${APPLE_CLIENT_ID}
+    google:
+        client-id: ${GOOGLE_CLIENT_ID}

adapter/rdb/src/main/kotlin/com/xorker/draw/user/UserAdapter.kt

@@ -13,19 +13,19 @@ internal class UserAdapter(
     private val userJpaRepository: UserJpaRepository,
     private val authUserJpaRepository: AuthUserJpaRepository,
 ) : UserRepository {
-    override fun getUser(platform: AuthPlatform, platformUserId: String): User? =
+    override fun getUser(platform: AuthPlatform, platformUserId: String): UserInfo? =
         authUserJpaRepository.find(platform, platformUserId)?.user?.toDomain()
 
-    override fun getUser(userId: UserId): User? =
+    override fun getUser(userId: UserId): UserInfo? =
         userJpaRepository.findByIdOrNull(userId.value)?.toDomain()
 
-    override fun createUser(platform: AuthPlatform, platformUserId: String, userName: String): User {
+    override fun createUser(platform: AuthPlatform, platformUserId: String, userName: String): UserInfo {
         val user = UserJpaEntity()
         val authUser = authUserJpaRepository.save(AuthUserJpaEntity.of(platform, platformUserId, user))
         return authUser.user.toDomain()
     }
 
-    override fun createUser(userName: String): User {
+    override fun createUser(userName: String?): UserInfo {
         val user = UserJpaEntity.of(userName)
         val savedUser = userJpaRepository.save(user)
         return savedUser.toDomain()

adapter/rdb/src/main/kotlin/com/xorker/draw/user/UserJpaEntity.kt

@@ -1,7 +1,6 @@
 package com.xorker.draw.user
 
 import com.xorker.draw.BaseJpaEntity
-import com.xorker.draw.exception.InvalidUserStatusException
 import jakarta.persistence.Column
 import jakarta.persistence.Entity
 import jakarta.persistence.GeneratedValue
@@ -35,7 +34,7 @@ internal class UserJpaEntity : BaseJpaEntity() {
         internal fun of(id: Long): UserJpaEntity =
             UserJpaEntity().apply { this.id = id }
 
-        internal fun of(name: String): UserJpaEntity =
+        internal fun of(name: String?): UserJpaEntity =
             UserJpaEntity().apply { this.name = name }
 
         internal fun from(user: User): UserJpaEntity =
@@ -54,7 +53,7 @@ internal class UserJpaEntity : BaseJpaEntity() {
     }
 }
 
-internal fun UserJpaEntity.toDomain(): User = User(
+internal fun UserJpaEntity.toDomain(): UserInfo = UserInfo(
     id = UserId(this.id),
-    name = this.name ?: throw InvalidUserStatusException,
+    name = this.name,
 )

buildSrc/src/main/kotlin/Versions.kt

@@ -15,4 +15,5 @@ object Versions {
     const val MICROMETER = "1.12.9"
     const val SENTRY = "7.0.0"
     const val FIREBASE = "9.3.0"
+    const val GOOGLE_API_CLIENT = "1.32.1"
 }

core/src/main/kotlin/com/xorker/draw/auth/AuthService.kt

@@ -3,8 +3,8 @@ package com.xorker.draw.auth
 import com.xorker.draw.auth.token.AccessTokenRepository
 import com.xorker.draw.auth.token.RefreshTokenRepository
 import com.xorker.draw.auth.token.Token
-import com.xorker.draw.user.User
 import com.xorker.draw.user.UserId
+import com.xorker.draw.user.UserInfo
 import com.xorker.draw.user.UserRepository
 import java.time.Duration
 import java.time.Period
@@ -28,7 +28,7 @@ internal class AuthService(
     }
 
     override fun anonymousSignIn(): Token {
-        val user = userRepository.createUser(""); // TODO 이름 정책 정해지면 변경 예정
+        val user = userRepository.createUser(null); // TODO 이름 정책 정해지면 변경 예정
 
         return createToken(user.id, Period.ofYears(100))
     }
@@ -45,7 +45,7 @@ internal class AuthService(
         userRepository.withdrawal(userId)
     }
 
-    private fun createUser(authType: AuthType, platformUserId: String): User {
+    private fun createUser(authType: AuthType, platformUserId: String): UserInfo {
         val userName = authRepository.getPlatformUserName(authType, platformUserId)
 
         return userRepository.createUser(authType.authPlatform, platformUserId, userName)

domain/src/main/kotlin/com/xorker/draw/auth/AuthPlatform.kt

@@ -1,6 +1,8 @@
-package com.xorker.draw.auth
-
-enum class AuthPlatform(description: String) {
-    APPLE("애플"),
-    ;
-}
+package com.xorker.draw.auth
+
+enum class AuthPlatform(description: String) {
+    APPLE("애플"),
+    GOOGLE("구글"),
+
+    ;
+}

domain/src/main/kotlin/com/xorker/draw/auth/AuthType.kt

@@ -2,4 +2,5 @@ package com.xorker.draw.auth
 
 enum class AuthType(val authPlatform: AuthPlatform) {
     APPLE_ID_TOKEN(AuthPlatform.APPLE),
+    GOOGLE_ID_TOKEN(AuthPlatform.GOOGLE),
 }

domain/src/main/kotlin/com/xorker/draw/user/User.kt

@@ -7,3 +7,8 @@ data class User(
     val id: UserId,
     val name: String,
 )
+
+data class UserInfo(
+    val id: UserId,
+    val name: String?,
+)

domain/src/main/kotlin/com/xorker/draw/user/UserRepository.kt

@@ -3,13 +3,13 @@ package com.xorker.draw.user
 import com.xorker.draw.auth.AuthPlatform
 
 interface UserRepository {
-    fun getUser(platform: AuthPlatform, platformUserId: String): User?
+    fun getUser(platform: AuthPlatform, platformUserId: String): UserInfo?
 
-    fun getUser(userId: UserId): User?
+    fun getUser(userId: UserId): UserInfo?
 
-    fun createUser(platform: AuthPlatform, platformUserId: String, userName: String): User
+    fun createUser(platform: AuthPlatform, platformUserId: String, userName: String): UserInfo
 
-    fun createUser(userName: String): User
+    fun createUser(userName: String?): UserInfo
 
     fun withdrawal(userId: UserId)
 }