[NDGL-17] refactor: 네트워크 구조 수정

mj010504 · mj010504 · commit daaecf170f39 · 2026-02-01T19:57:01.000+09:00
diff --git a/build-logic/src/main/kotlin/NDGLDataPlugin.kt b/build-logic/src/main/kotlin/NDGLDataPlugin.kt
@@ -4,11 +4,14 @@ import convention.configureKotlinAndroid
 import convention.configureTimber
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.dependencies
+import util.libs
 
 class NDGLDataPlugin : Plugin<Project> {
     override fun apply(target: Project): Unit = with(target) {
         with(pluginManager) {
             apply("com.android.library")
+            apply("org.jetbrains.kotlin.plugin.serialization")
         }
 
         configureKotlinAndroid()
@@ -19,5 +22,12 @@ class NDGLDataPlugin : Plugin<Project> {
         if (path != ":data:core") {
             dependencies.add("implementation", project(":data:core"))
         }
+
+        dependencies {
+            "implementation"(libs.findLibrary("retrofit").get())
+            "implementation"(libs.findLibrary("retrofit-kotlinx-serialization-json").get())
+            "implementation"(libs.findLibrary("kotlinx-serialization-json").get())
+            "implementation"(libs.findLibrary("okhttp").get())
+        }
     }
 }
diff --git a/build-logic/src/main/kotlin/NDGLFeaturePlugin.kt b/build-logic/src/main/kotlin/NDGLFeaturePlugin.kt
@@ -1,6 +1,4 @@
-import convention.configureComposeAndroid
 import convention.configureCoroutineAndroid
-import convention.configureFirebase
 import convention.configureHiltAndroid
 import org.gradle.api.Plugin
 import org.gradle.api.Project
diff --git a/data/auth/build.gradle.kts b/data/auth/build.gradle.kts
@@ -7,5 +7,5 @@ android {
 }
 
 dependencies {
-    implementation(project(":data:core"))
+    implementation(libs.androidx.datastore)
 }
diff --git a/data/auth/src/main/java/com/yapp/ndgl/data/auth/api/AuthApi.kt b/data/auth/src/main/java/com/yapp/ndgl/data/auth/api/AuthApi.kt
@@ -1,14 +1,13 @@
-package com.yapp.ndgl.data.core.api
+package com.yapp.ndgl.data.auth.api
 
+import com.yapp.ndgl.data.auth.model.AuthResponse
+import com.yapp.ndgl.data.auth.model.CreateUserRequest
+import com.yapp.ndgl.data.auth.model.LoginRequest
 import com.yapp.ndgl.data.core.model.BaseResponse
-import com.yapp.ndgl.data.core.model.auth.AuthResponse
-import com.yapp.ndgl.data.core.model.auth.CreateUserRequest
-import com.yapp.ndgl.data.core.model.auth.LoginRequest
 import retrofit2.http.Body
 import retrofit2.http.POST
 
-interface NDGLApi {
-    // Auth
+interface AuthApi {
     @POST("/api/v1/auth/users")
     suspend fun createUser(
         @Body request: CreateUserRequest,
diff --git a/data/auth/src/main/java/com/yapp/ndgl/data/auth/di/AuthModule.kt b/data/auth/src/main/java/com/yapp/ndgl/data/auth/di/AuthModule.kt
@@ -0,0 +1,19 @@
+package com.yapp.ndgl.data.auth.di
+
+import com.yapp.ndgl.data.auth.token.TokenManagerImpl
+import com.yapp.ndgl.data.core.token.TokenManager
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class AuthModule {
+    @Binds
+    @Singleton
+    abstract fun bindTokenManager(
+        impl: TokenManagerImpl,
+    ): TokenManager
+}
diff --git a/data/auth/src/main/java/com/yapp/ndgl/data/auth/di/AuthNetworkModule.kt b/data/auth/src/main/java/com/yapp/ndgl/data/auth/di/AuthNetworkModule.kt
@@ -0,0 +1,34 @@
+package com.yapp.ndgl.data.auth.di
+
+import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import com.yapp.ndgl.data.auth.api.AuthApi
+import com.yapp.ndgl.data.core.adapter.NDGLCallAdapterFactory
+import com.yapp.ndgl.data.core.di.AuthClient
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.serialization.json.Json
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object AuthNetworkModule {
+    @Provides
+    @Singleton
+    fun provideAuthApi(
+        json: Json,
+        baseUrl: String,
+        @AuthClient okHttpClient: OkHttpClient,
+        callAdapterFactory: NDGLCallAdapterFactory,
+    ): AuthApi = Retrofit.Builder()
+        .baseUrl(baseUrl)
+        .client(okHttpClient)
+        .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
+        .addCallAdapterFactory(callAdapterFactory)
+        .build()
+        .create(AuthApi::class.java)
+}
diff --git a/data/auth/src/main/java/com/yapp/ndgl/data/auth/local/LocalAuthDataSource.kt b/data/auth/src/main/java/com/yapp/ndgl/data/auth/local/LocalAuthDataSource.kt
@@ -1,10 +1,10 @@
-package com.yapp.ndgl.data.core.local.datasource
+package com.yapp.ndgl.data.auth.local
 
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
-import com.yapp.ndgl.data.core.local.util.handleException
+import com.yapp.ndgl.data.auth.local.util.handleException
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
diff --git a/data/auth/src/main/java/com/yapp/ndgl/data/auth/local/di/DataStoreModule.kt b/data/auth/src/main/java/com/yapp/ndgl/data/auth/local/di/DataStoreModule.kt
@@ -1,4 +1,4 @@
-package com.yapp.ndgl.data.core.local.di
+package com.yapp.ndgl.data.auth.local.di
 
 import android.content.Context
 import androidx.datastore.core.DataStore
diff --git a/data/auth/src/main/java/com/yapp/ndgl/data/auth/local/util/DataStoreUtil.kt b/data/auth/src/main/java/com/yapp/ndgl/data/auth/local/util/DataStoreUtil.kt
@@ -1,4 +1,4 @@
-package com.yapp.ndgl.data.core.local.util
+package com.yapp.ndgl.data.auth.local.util
 
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.emptyPreferences
diff --git a/data/auth/src/main/java/com/yapp/ndgl/data/auth/model/AuthResponse.kt b/data/auth/src/main/java/com/yapp/ndgl/data/auth/model/AuthResponse.kt
@@ -1,4 +1,4 @@
-package com.yapp.ndgl.data.core.model.auth
+package com.yapp.ndgl.data.auth.model
 
 import kotlinx.serialization.Serializable
 
diff --git a/data/auth/src/main/java/com/yapp/ndgl/data/auth/model/CreateUserRequest.kt b/data/auth/src/main/java/com/yapp/ndgl/data/auth/model/CreateUserRequest.kt
@@ -1,4 +1,4 @@
-package com.yapp.ndgl.data.core.model.auth
+package com.yapp.ndgl.data.auth.model
 
 import kotlinx.serialization.Serializable
 
diff --git a/data/auth/src/main/java/com/yapp/ndgl/data/auth/model/LoginRequest.kt b/data/auth/src/main/java/com/yapp/ndgl/data/auth/model/LoginRequest.kt
@@ -1,4 +1,4 @@
-package com.yapp.ndgl.data.core.model.auth
+package com.yapp.ndgl.data.auth.model
 
 import kotlinx.serialization.Serializable
 
diff --git a/data/auth/src/main/java/com/yapp/ndgl/data/auth/token/TokenManagerImpl.kt b/data/auth/src/main/java/com/yapp/ndgl/data/auth/token/TokenManagerImpl.kt
@@ -0,0 +1,43 @@
+package com.yapp.ndgl.data.auth.token
+
+import com.yapp.ndgl.data.auth.api.AuthApi
+import com.yapp.ndgl.data.auth.local.LocalAuthDataSource
+import com.yapp.ndgl.data.auth.model.LoginRequest
+import com.yapp.ndgl.data.core.model.getData
+import com.yapp.ndgl.data.core.token.TokenManager
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class TokenManagerImpl @Inject constructor(
+    private val localAuthDataSource: LocalAuthDataSource,
+    private val authApi: AuthApi,
+) : TokenManager {
+
+    override suspend fun getAccessToken(): String {
+        return localAuthDataSource.getAccessToken()
+    }
+
+    override suspend fun getUuid(): String {
+        return localAuthDataSource.getUuid()
+    }
+
+    override suspend fun setAccessToken(accessToken: String) {
+        localAuthDataSource.setAccessToken(accessToken)
+    }
+
+    override suspend fun setUuid(uuid: String) {
+        localAuthDataSource.setUuid(uuid)
+    }
+
+    override suspend fun refreshToken(): String {
+        val uuid = getUuid()
+        check(uuid.isNotEmpty()) { "UUID is empty" }
+
+        val response = authApi.login(LoginRequest(uuid)).getData()
+        setAccessToken(response.accessToken)
+        setUuid(response.uuid)
+
+        return response.accessToken
+    }
+}
diff --git a/data/core/build.gradle.kts b/data/core/build.gradle.kts
@@ -3,7 +3,6 @@ import kotlin.apply
 
 plugins {
     id("ndgl.data")
-    alias(libs.plugins.kotlin.serialization)
 }
 
 android {
@@ -23,10 +22,5 @@ android {
 }
 
 dependencies {
-    implementation(libs.androidx.datastore)
-    implementation(libs.retrofit)
-    implementation(libs.retrofit.kotlinx.serialization.json)
-    implementation(libs.kotlinx.serialization.json)
-    implementation(libs.okhttp)
     implementation(libs.okhttp.logging.interceptor)
 }
diff --git a/data/core/src/main/java/com/yapp/ndgl/data/core/authenticator/NDGLAuthenticator.kt b/data/core/src/main/java/com/yapp/ndgl/data/core/authenticator/NDGLAuthenticator.kt
@@ -1,9 +1,6 @@
 package com.yapp.ndgl.data.core.authenticator
 
-import com.yapp.ndgl.data.core.api.NDGLApi
-import com.yapp.ndgl.data.core.local.datasource.LocalAuthDataSource
-import com.yapp.ndgl.data.core.model.auth.LoginRequest
-import com.yapp.ndgl.data.core.model.getData
+import com.yapp.ndgl.data.core.token.TokenManager
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -13,11 +10,9 @@ import okhttp3.Response
 import okhttp3.Route
 import timber.log.Timber
 import javax.inject.Inject
-import javax.inject.Provider
 
 class NDGLAuthenticator @Inject constructor(
-    private val localAuthDataSource: LocalAuthDataSource,
-    private val ndglApi: Provider<NDGLApi>,
+    private val tokenManager: TokenManager,
 ) : Authenticator {
     private val mutex = Mutex()
 
@@ -28,31 +23,15 @@ class NDGLAuthenticator @Inject constructor(
             return null
         }
 
-        if (originRequest.url.encodedPath.contains("/api/v1/auth/login")) {
-            runBlocking {
-                localAuthDataSource.clearSession()
-            }
-
-            return null
-        }
-
         val retryCount = originRequest.header(RETRY_HEADER)?.toIntOrNull() ?: 0
         if (retryCount >= MAX_RETRY_COUNT) {
             return null
         }
 
-        val authResponse = runBlocking {
+        val newAccessToken = runBlocking {
             mutex.withLock {
                 try {
-                    val uuid = localAuthDataSource.getUuid()
-                    if (uuid.isNullOrEmpty()) {
-                        return@withLock null
-                    }
-
-                    val response = ndglApi.get().login(LoginRequest(uuid)).getData()
-                    localAuthDataSource.setAccessToken(response.accessToken)
-                    localAuthDataSource.setUuid(response.uuid)
-                    response
+                    tokenManager.refreshToken()
                 } catch (e: Exception) {
                     Timber.e(e, "Failed to refresh token")
                     null
@@ -62,7 +41,7 @@ class NDGLAuthenticator @Inject constructor(
 
         val newRequest = originRequest.newBuilder()
             .header(RETRY_HEADER, (retryCount + 1).toString())
-            .header("Authorization", "Bearer ${authResponse.accessToken}")
+            .header("Authorization", "Bearer $newAccessToken")
             .build()
 
         return newRequest
diff --git a/data/core/src/main/java/com/yapp/ndgl/data/core/di/NetworkModule.kt b/data/core/src/main/java/com/yapp/ndgl/data/core/di/NetworkModule.kt
@@ -1,20 +1,16 @@
 package com.yapp.ndgl.data.core.di
 
-import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import com.yapp.ndgl.data.core.BuildConfig
-import com.yapp.ndgl.data.core.adapter.NDGLCallAdapterFactory
-import com.yapp.ndgl.data.core.api.NDGLApi
 import com.yapp.ndgl.data.core.authenticator.NDGLAuthenticator
 import com.yapp.ndgl.data.core.interceptor.NDGLInterceptor
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import kotlinx.serialization.json.Json
-import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
-import retrofit2.Retrofit
+import javax.inject.Qualifier
 import javax.inject.Singleton
 
 @Module
@@ -26,6 +22,10 @@ object NetworkModule {
         ignoreUnknownKeys = true
     }
 
+    @Singleton
+    @Provides
+    fun provideBaseUrl(): String = BuildConfig.NDGL_BASE_URL
+
     @Singleton
     @Provides
     fun provideDefaultOkHttpClient(
@@ -45,17 +45,22 @@ object NetworkModule {
         return builder.build()
     }
 
+    @AuthClient
     @Singleton
     @Provides
-    fun provideNDGLApi(
-        json: Json,
-        okHttpClient: OkHttpClient,
-        callAdapterFactory: NDGLCallAdapterFactory,
-    ): NDGLApi = Retrofit.Builder()
-        .client(okHttpClient)
-        .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
-        .addCallAdapterFactory(callAdapterFactory)
-        .baseUrl(BuildConfig.NDGL_BASE_URL)
-        .build()
-        .create(NDGLApi::class.java)
+    fun provideAuthOkHttpClient(): OkHttpClient {
+        val builder = OkHttpClient.Builder()
+
+        if (BuildConfig.DEBUG) {
+            val loggingInterceptor = HttpLoggingInterceptor()
+            loggingInterceptor.level = HttpLoggingInterceptor.Level.BODY
+            builder.addInterceptor(loggingInterceptor)
+        }
+
+        return builder.build()
+    }
 }
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class AuthClient
diff --git a/data/core/src/main/java/com/yapp/ndgl/data/core/interceptor/NDGLInterceptor.kt b/data/core/src/main/java/com/yapp/ndgl/data/core/interceptor/NDGLInterceptor.kt
@@ -1,14 +1,14 @@
 package com.yapp.ndgl.data.core.interceptor
 
-import com.yapp.ndgl.data.core.local.datasource.LocalAuthDataSource
+import com.yapp.ndgl.data.core.token.TokenManager
 import kotlinx.coroutines.runBlocking
 import okhttp3.Interceptor
 import okhttp3.Request
 import okhttp3.Response
 import javax.inject.Inject
 
 class NDGLInterceptor @Inject constructor(
-    private val localAuthDataSource: LocalAuthDataSource,
+    private val tokenManager: TokenManager,
 ) : Interceptor {
     override fun intercept(chain: Interceptor.Chain): Response {
         val originRequest = chain.request()
@@ -17,7 +17,7 @@ class NDGLInterceptor @Inject constructor(
         if (isAccessTokenUsed(originRequest)) {
             requestBuilder.addHeader(
                 "Authorization",
-                "Bearer ${runBlocking { localAuthDataSource.getAccessToken() }}",
+                "Bearer ${runBlocking { tokenManager.getAccessToken() }}",
             )
         }
 
diff --git a/data/core/src/main/java/com/yapp/ndgl/data/core/token/TokenManager.kt b/data/core/src/main/java/com/yapp/ndgl/data/core/token/TokenManager.kt
@@ -0,0 +1,9 @@
+package com.yapp.ndgl.data.core.token
+
+interface TokenManager {
+    suspend fun getAccessToken(): String
+    suspend fun getUuid(): String
+    suspend fun setAccessToken(accessToken: String)
+    suspend fun setUuid(uuid: String)
+    suspend fun refreshToken(): String
+}

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ android {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`dependencies {`
`10`		`- implementation(project(":data:core"))`
	`10`	`+ implementation(libs.androidx.datastore)`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.yapp.ndgl.data.core.local.di`
	`1`	`+package com.yapp.ndgl.data.auth.local.di`
`2`	`2`
`3`	`3`	`import android.content.Context`
`4`	`4`	`import androidx.datastore.core.DataStore`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.yapp.ndgl.data.core.model.auth`
	`1`	`+package com.yapp.ndgl.data.auth.model`
`2`	`2`
`3`	`3`	`import kotlinx.serialization.Serializable`
`4`	`4`