Merge pull request #19 from YAPP-Github/refactor/#17-di-unification

wjdrjs00 · web-flow · commit a03e99d51e1c · 2025-07-06T19:43:52.000+09:00
[Refactor/#17] DI 생성 책임을 app 모듈로 이관
diff --git a/app/src/main/java/com/threegap/bitnagil/di/core/DataStoreModule.kt b/app/src/main/java/com/threegap/bitnagil/di/core/DataStoreModule.kt
@@ -0,0 +1,35 @@
+package com.threegap.bitnagil.di.core
+
+import android.content.Context
+import com.threegap.bitnagil.datastore.auth.crypto.TokenCrypto
+import com.threegap.bitnagil.datastore.auth.serializer.AuthTokenSerializer
+import com.threegap.bitnagil.datastore.auth.storage.AuthTokenDataStore
+import com.threegap.bitnagil.datastore.auth.storage.AuthTokenStorageFactory
+import com.threegap.bitnagil.security.crypto.Crypto
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object DataStoreModule {
+
+    @Singleton
+    @Provides
+    fun provideTokenCrypto(crypto: Crypto): TokenCrypto =
+        object : TokenCrypto {
+            override fun encrypt(bytes: ByteArray): ByteArray = crypto.encrypt(bytes)
+
+            override fun decrypt(bytes: ByteArray): ByteArray = crypto.decrypt(bytes)
+        }
+
+    @Provides
+    @Singleton
+    fun provideAuthTokenStorage(
+        @ApplicationContext context: Context,
+        serializer: AuthTokenSerializer,
+    ): AuthTokenDataStore = AuthTokenStorageFactory.create(context, serializer)
+}
diff --git a/app/src/main/java/com/threegap/bitnagil/di/core/NetworkModule.kt b/app/src/main/java/com/threegap/bitnagil/di/core/NetworkModule.kt
@@ -1,11 +1,14 @@
-package com.threegap.bitnagil.di
+package com.threegap.bitnagil.di.core
 
 import com.threegap.bitnagil.BuildConfig
+import com.threegap.bitnagil.datastore.auth.storage.AuthTokenDataStore
 import com.threegap.bitnagil.network.auth.AuthInterceptor
+import com.threegap.bitnagil.network.token.TokenProvider
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.flow.first
 import kotlinx.serialization.json.Json
 import okhttp3.Interceptor
 import okhttp3.MediaType.Companion.toMediaType
@@ -107,4 +110,11 @@ object NetworkModule {
         .addConverterFactory(converterFactory)
         .client(okHttpClient)
         .build()
+
+    @Provides
+    @Singleton
+    fun provideTokenStore(dataStore: AuthTokenDataStore): TokenProvider =
+        object : TokenProvider {
+            override suspend fun getToken(): String? = dataStore.tokenFlow.first().accessToken
+        }
 }
diff --git a/app/src/main/java/com/threegap/bitnagil/di/core/Qualifier.kt b/app/src/main/java/com/threegap/bitnagil/di/core/Qualifier.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.di
+package com.threegap.bitnagil.di.core
 
 import javax.inject.Qualifier
 
diff --git a/app/src/main/java/com/threegap/bitnagil/di/core/SecurityModule.kt b/app/src/main/java/com/threegap/bitnagil/di/core/SecurityModule.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.security.di
+package com.threegap.bitnagil.di.core
 
 import com.threegap.bitnagil.security.crypto.Crypto
 import com.threegap.bitnagil.security.crypto.SecureCrypto
@@ -13,6 +13,7 @@ import javax.inject.Singleton
 @Module
 @InstallIn(SingletonComponent::class)
 object SecurityModule {
+
     @Provides
     @Singleton
     fun provideKeyProvider(): KeyProvider = AndroidKeyProvider()
diff --git a/core/datastore/build.gradle.kts b/core/datastore/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.bitnagil.android.library)
-    alias(libs.plugins.bitnagil.android.hilt)
     alias(libs.plugins.kotlin.serialization)
 }
 
@@ -9,8 +8,6 @@ android {
 }
 
 dependencies {
-    implementation(projects.core.security)
-
     implementation(libs.androidx.datastore.preferences)
     implementation(libs.kotlinx.serialization.json)
 
diff --git a/core/datastore/src/main/java/com/threegap/bitnagil/datastore/auth/crypto/TokenCrypto.kt b/core/datastore/src/main/java/com/threegap/bitnagil/datastore/auth/crypto/TokenCrypto.kt
@@ -0,0 +1,6 @@
+package com.threegap.bitnagil.datastore.auth.crypto
+
+interface TokenCrypto {
+    fun encrypt(bytes: ByteArray): ByteArray
+    fun decrypt(bytes: ByteArray): ByteArray
+}
diff --git a/core/datastore/src/main/java/com/threegap/bitnagil/datastore/auth/model/AuthToken.kt b/core/datastore/src/main/java/com/threegap/bitnagil/datastore/auth/model/AuthToken.kt
@@ -1,4 +1,4 @@
-package com.threegap.bitnagil.datastore.model
+package com.threegap.bitnagil.datastore.auth.model
 
 import kotlinx.serialization.Serializable
 
diff --git a/core/datastore/src/main/java/com/threegap/bitnagil/datastore/auth/serializer/AuthTokenSerializer.kt b/core/datastore/src/main/java/com/threegap/bitnagil/datastore/auth/serializer/AuthTokenSerializer.kt
@@ -0,0 +1,6 @@
+package com.threegap.bitnagil.datastore.auth.serializer
+
+import androidx.datastore.core.Serializer
+import com.threegap.bitnagil.datastore.auth.model.AuthToken
+
+interface AuthTokenSerializer : Serializer<AuthToken>
diff --git a/core/datastore/src/main/java/com/threegap/bitnagil/datastore/auth/serializer/AuthTokenSerializerImpl.kt b/core/datastore/src/main/java/com/threegap/bitnagil/datastore/auth/serializer/AuthTokenSerializerImpl.kt
@@ -1,18 +1,18 @@
-package com.threegap.bitnagil.datastore.serializer
+package com.threegap.bitnagil.datastore.auth.serializer
 
-import com.threegap.bitnagil.datastore.model.AuthToken
-import com.threegap.bitnagil.security.crypto.Crypto
+import androidx.datastore.core.Serializer
+import com.threegap.bitnagil.datastore.auth.crypto.TokenCrypto
+import com.threegap.bitnagil.datastore.auth.model.AuthToken
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.Json
 import java.io.InputStream
 import java.io.OutputStream
 import java.util.Base64
-import javax.inject.Inject
 
-internal class AuthTokenSerializer @Inject constructor(
-    private val crypto: Crypto,
-) : TokenSerializer {
+class AuthTokenSerializerImpl(
+    private val crypto: TokenCrypto,
+) : Serializer<AuthToken> {
     override val defaultValue: AuthToken
         get() = AuthToken()
 
diff --git a/core/datastore/src/main/java/com/threegap/bitnagil/datastore/auth/storage/AuthTokenDataStore.kt b/core/datastore/src/main/java/com/threegap/bitnagil/datastore/auth/storage/AuthTokenDataStore.kt
@@ -1,6 +1,6 @@
-package com.threegap.bitnagil.datastore.storage
+package com.threegap.bitnagil.datastore.auth.storage
 
-import com.threegap.bitnagil.datastore.model.AuthToken
+import com.threegap.bitnagil.datastore.auth.model.AuthToken
 import kotlinx.coroutines.flow.Flow
 
 interface AuthTokenDataStore {
diff --git a/core/datastore/src/main/java/com/threegap/bitnagil/datastore/auth/storage/AuthTokenDataStoreImpl.kt b/core/datastore/src/main/java/com/threegap/bitnagil/datastore/auth/storage/AuthTokenDataStoreImpl.kt
@@ -1,12 +1,11 @@
-package com.threegap.bitnagil.datastore.storage
+package com.threegap.bitnagil.datastore.auth.storage
 
 import android.util.Log
 import androidx.datastore.core.DataStore
-import com.threegap.bitnagil.datastore.model.AuthToken
+import com.threegap.bitnagil.datastore.auth.model.AuthToken
 import kotlinx.coroutines.flow.Flow
-import javax.inject.Inject
 
-internal class AuthTokenDataStoreImpl @Inject constructor(
+class AuthTokenDataStoreImpl(
     private val dataStore: DataStore<AuthToken>,
 ) : AuthTokenDataStore {
     override val tokenFlow: Flow<AuthToken> = dataStore.data
diff --git a/core/datastore/src/main/java/com/threegap/bitnagil/datastore/auth/storage/AuthTokenStorageFactory.kt b/core/datastore/src/main/java/com/threegap/bitnagil/datastore/auth/storage/AuthTokenStorageFactory.kt
@@ -0,0 +1,20 @@
+package com.threegap.bitnagil.datastore.auth.storage
+
+import android.content.Context
+import androidx.datastore.core.DataStoreFactory
+import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler
+import androidx.datastore.dataStoreFile
+import com.threegap.bitnagil.datastore.auth.model.AuthToken
+import com.threegap.bitnagil.datastore.auth.serializer.AuthTokenSerializer
+
+object AuthTokenStorageFactory {
+    fun create(context: Context, serializer: AuthTokenSerializer): AuthTokenDataStore {
+        val dataStore = DataStoreFactory.create(
+            serializer = serializer,
+            produceFile = { context.dataStoreFile("auth-token.enc") },
+            corruptionHandler = ReplaceFileCorruptionHandler { AuthToken() },
+        )
+
+        return AuthTokenDataStoreImpl(dataStore)
+    }
+}
diff --git a/core/datastore/src/main/java/com/threegap/bitnagil/datastore/di/DataStoreModule.kt b/core/datastore/src/main/java/com/threegap/bitnagil/datastore/di/DataStoreModule.kt
diff --git a/core/datastore/src/main/java/com/threegap/bitnagil/datastore/serializer/TokenSerializer.kt b/core/datastore/src/main/java/com/threegap/bitnagil/datastore/serializer/TokenSerializer.kt
diff --git a/core/datastore/src/test/java/com/threegap/bitnagil/datastore/auth/serializer/AuthTokenSerializerImplTest.kt b/core/datastore/src/test/java/com/threegap/bitnagil/datastore/auth/serializer/AuthTokenSerializerImplTest.kt
@@ -1,7 +1,7 @@
-package com.threegap.bitnagil.datastore.serializer
+package com.threegap.bitnagil.datastore.auth.serializer
 
-import com.threegap.bitnagil.datastore.model.AuthToken
-import com.threegap.bitnagil.security.crypto.Crypto
+import com.threegap.bitnagil.datastore.auth.crypto.TokenCrypto
+import com.threegap.bitnagil.datastore.auth.model.AuthToken
 import kotlinx.coroutines.test.runTest
 import kotlinx.serialization.json.Json
 import org.junit.Assert.assertEquals
@@ -11,8 +11,8 @@ import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.util.Base64
 
-class AuthTokenSerializerTest {
-    private lateinit var serializer: AuthTokenSerializer
+class AuthTokenSerializerImplTest {
+    private lateinit var serializer: AuthTokenSerializerImpl
     private lateinit var crypto: FakeCrypto
     private lateinit var fakeToken: AuthToken
     private lateinit var encrypted: ByteArray
@@ -22,7 +22,7 @@ class AuthTokenSerializerTest {
         private val encryptResult: ByteArray,
         private val decryptResult: ByteArray,
         private val shouldFailDecrypt: Boolean = false,
-    ) : Crypto {
+    ) : TokenCrypto {
         override fun encrypt(bytes: ByteArray): ByteArray = encryptResult
 
         override fun decrypt(bytes: ByteArray): ByteArray {
@@ -43,7 +43,7 @@ class AuthTokenSerializerTest {
                 decryptResult = json.toByteArray(),
             )
 
-        serializer = AuthTokenSerializer(crypto)
+        serializer = AuthTokenSerializerImpl(crypto)
     }
 
     @Test
@@ -84,7 +84,7 @@ class AuthTokenSerializerTest {
                     decryptResult = byteArrayOf(),
                     shouldFailDecrypt = true,
                 )
-            val brokenSerializer = AuthTokenSerializer(brokenCrypto)
+            val brokenSerializer = AuthTokenSerializerImpl(brokenCrypto)
             val inputStream = ByteArrayInputStream(Base64.getEncoder().encode(encrypted))
 
             // when
diff --git a/core/datastore/src/test/java/com/threegap/bitnagil/datastore/auth/storage/AuthTokenDataStoreImplTest.kt b/core/datastore/src/test/java/com/threegap/bitnagil/datastore/auth/storage/AuthTokenDataStoreImplTest.kt
@@ -1,9 +1,9 @@
-package com.threegap.bitnagil.datastore.storage
+package com.threegap.bitnagil.datastore.auth.storage
 
 import androidx.datastore.core.DataStore
 import androidx.datastore.core.DataStoreFactory
 import androidx.datastore.core.Serializer
-import com.threegap.bitnagil.datastore.model.AuthToken
+import com.threegap.bitnagil.datastore.auth.model.AuthToken
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flowOf
diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.bitnagil.android.library)
-    alias(libs.plugins.bitnagil.android.hilt)
     alias(libs.plugins.kotlin.serialization)
 }
 
@@ -9,8 +8,6 @@ android {
 }
 
 dependencies {
-    implementation(projects.core.datastore)
-
     implementation(libs.kotlinx.serialization.json)
     implementation(platform(libs.retrofit.bom))
     implementation(libs.bundles.retrofit)
diff --git a/core/network/src/main/java/com/threegap/bitnagil/network/auth/AuthInterceptor.kt b/core/network/src/main/java/com/threegap/bitnagil/network/auth/AuthInterceptor.kt
@@ -1,18 +1,16 @@
 package com.threegap.bitnagil.network.auth
 
-import com.threegap.bitnagil.datastore.storage.AuthTokenDataStore
-import kotlinx.coroutines.flow.first
+import com.threegap.bitnagil.network.token.TokenProvider
 import kotlinx.coroutines.runBlocking
 import okhttp3.Interceptor
 import okhttp3.Response
-import javax.inject.Inject
 
-class AuthInterceptor @Inject constructor(
-    private val dataStore: AuthTokenDataStore,
+class AuthInterceptor(
+    private val tokenProvider: TokenProvider,
 ) : Interceptor {
     override fun intercept(chain: Interceptor.Chain): Response {
         val originalRequest = chain.request()
-        val token = runBlocking { dataStore.tokenFlow.first().accessToken }
+        val token = runBlocking { tokenProvider.getToken() }
         if (token.isNullOrBlank()) {
             return chain.proceed(originalRequest)
         }
diff --git a/core/network/src/main/java/com/threegap/bitnagil/network/auth/TokenAuthenticator.kt b/core/network/src/main/java/com/threegap/bitnagil/network/auth/TokenAuthenticator.kt
@@ -1,26 +1,19 @@
 package com.threegap.bitnagil.network.auth
 
-import com.threegap.bitnagil.datastore.storage.AuthTokenDataStore
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
 import okhttp3.Authenticator
 import okhttp3.Request
 import okhttp3.Response
 import okhttp3.Route
-import javax.inject.Inject
 
-class TokenAuthenticator @Inject constructor(
-    private val dataStore: AuthTokenDataStore,
-) : Authenticator {
+class TokenAuthenticator : Authenticator {
 
     override fun authenticate(route: Route?, response: Response): Request? {
         if (response.code != UNAUTHORIZED) return null
         if (responseCount(response) >= MAX_RETRY) return null
 
         // 재발급 api 연결 시 수정 예정입니다.(현재 코드는 임시)
-        val newAccessToken = runBlocking {
-            runCatching { dataStore.tokenFlow.first().refreshToken }.getOrNull()
-        } ?: return null
+        val newAccessToken = runBlocking {}
 
         return response.request.newBuilder()
             .header(AUTHORIZATION, "$BEARER $newAccessToken")
diff --git a/core/network/src/main/java/com/threegap/bitnagil/network/token/TokenProvider.kt b/core/network/src/main/java/com/threegap/bitnagil/network/token/TokenProvider.kt
@@ -0,0 +1,5 @@
+package com.threegap.bitnagil.network.token
+
+interface TokenProvider {
+    suspend fun getToken(): String?
+}
diff --git a/core/security/build.gradle.kts b/core/security/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.bitnagil.android.library)
-    alias(libs.plugins.bitnagil.android.hilt)
 }
 
 android {
diff --git a/core/security/src/main/java/com/threegap/bitnagil/security/crypto/SecureCrypto.kt b/core/security/src/main/java/com/threegap/bitnagil/security/crypto/SecureCrypto.kt
@@ -4,7 +4,7 @@ import com.threegap.bitnagil.security.keystore.KeyProvider
 import javax.crypto.Cipher
 import javax.crypto.spec.IvParameterSpec
 
-internal class SecureCrypto(
+class SecureCrypto(
     private val keyProvider: KeyProvider,
     private val transformation: String = "AES/CBC/PKCS7Padding",
 ) : Crypto {
diff --git a/core/security/src/main/java/com/threegap/bitnagil/security/keystore/AndroidKeyProvider.kt b/core/security/src/main/java/com/threegap/bitnagil/security/keystore/AndroidKeyProvider.kt
@@ -6,7 +6,7 @@ import java.security.KeyStore
 import javax.crypto.KeyGenerator
 import javax.crypto.SecretKey
 
-internal class AndroidKeyProvider : KeyProvider {
+class AndroidKeyProvider : KeyProvider {
     private val keyStore =
         KeyStore
             .getInstance("AndroidKeyStore")

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.threegap.bitnagil.di`
	`1`	`+package com.threegap.bitnagil.di.core`
`2`	`2`
`3`	`3`	`import javax.inject.Qualifier`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`plugins {`
`2`	`2`	`alias(libs.plugins.bitnagil.android.library)`
`3`		`- alias(libs.plugins.bitnagil.android.hilt)`
`4`	`3`	`alias(libs.plugins.kotlin.serialization)`
`5`	`4`	`}`
`6`	`5`
`@@ -9,8 +8,6 @@ android {`
`9`	`8`	`}`
`10`	`9`
`11`	`10`	`dependencies {`
`12`		`- implementation(projects.core.security)`
`13`		`-`
`14`	`11`	`implementation(libs.androidx.datastore.preferences)`
`15`	`12`	`implementation(libs.kotlinx.serialization.json)`
`16`	`13`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.threegap.bitnagil.datastore.model`
	`1`	`+package com.threegap.bitnagil.datastore.auth.model`
`2`	`2`
`3`	`3`	`import kotlinx.serialization.Serializable`
`4`	`4`