Merge pull request #10 from YAPP-Github/feature/NDGL-17

mj010504 · web-flow · commit d65d89d03e16 · 2026-02-01T20:24:05.000+09:00
[NDGL-17] 네트워크 구조 설정
diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml
@@ -30,6 +30,9 @@ jobs:
     - name: Set up local.properties
       run: echo "${{ secrets.LOCAL_PROPERTIES }}" > local.properties
 
+    - name: Set up google-services.json
+      run: echo '${{ secrets.GOOGLE_SERVICES }}' | base64 -d > app/google-services.json
+
     - name: Code style checks
       run: ./gradlew ktlintCheck detekt
 
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,10 +1,16 @@
 plugins {
     id("ndgl.application")
+    alias(libs.plugins.google.services)
+    alias(libs.plugins.firebase.crashlytics)
 }
 
 android {
     namespace = Configuration.APPLICATION_ID
 
+    buildFeatures {
+        buildConfig = true
+    }
+
     buildTypes {
         release {
             isMinifyEnabled = true
diff --git a/app/src/main/java/com/yapp/ndgl/NDGLApplication.kt b/app/src/main/java/com/yapp/ndgl/NDGLApplication.kt
@@ -2,6 +2,15 @@ package com.yapp.ndgl
 
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
+import timber.log.Timber
 
 @HiltAndroidApp
-class NDGLApplication : Application()
+class NDGLApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+
+        if (BuildConfig.DEBUG) {
+            Timber.plant(Timber.DebugTree())
+        }
+    }
+}
diff --git a/build-logic/src/main/kotlin/NDGLAndroidLibraryPlugin.kt b/build-logic/src/main/kotlin/NDGLAndroidLibraryPlugin.kt
@@ -1,6 +1,7 @@
 import convention.configureComposeAndroid
 import convention.configureFirebase
 import convention.configureKotlinAndroid
+import convention.configureTimber
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
@@ -16,6 +17,7 @@ class NDGLAndroidLibraryPlugin : Plugin<Project> {
         configureKotlinAndroid()
         configureFirebase()
         configureComposeAndroid()
+        configureTimber()
 
         dependencies {
             "implementation"(libs.findLibrary("kotlinx-immutable").get())
diff --git a/build-logic/src/main/kotlin/NDGLDataPlugin.kt b/build-logic/src/main/kotlin/NDGLDataPlugin.kt
@@ -1,17 +1,33 @@
 import convention.configureCoroutineAndroid
 import convention.configureHiltAndroid
 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()
         configureHiltAndroid()
         configureCoroutineAndroid()
+        configureTimber()
+
+        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/core/util/src/main/java/com/yapp/ndgl/core/util/ResultUtil.kt b/core/util/src/main/java/com/yapp/ndgl/core/util/ResultUtil.kt
@@ -0,0 +1,13 @@
+package com.yapp.ndgl.core.util
+
+import kotlin.coroutines.cancellation.CancellationException
+
+suspend inline fun <T, R> T.suspendRunCatching(crossinline block: suspend T.() -> R): Result<R> {
+    return try {
+        Result.success(block())
+    } catch (e: CancellationException) {
+        throw e
+    } catch (t: Throwable) {
+        Result.failure(t)
+    }
+}
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
@@ -0,0 +1,20 @@
+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 retrofit2.http.Body
+import retrofit2.http.POST
+
+interface AuthApi {
+    @POST("/api/v1/auth/users")
+    suspend fun createUser(
+        @Body request: CreateUserRequest,
+    ): BaseResponse<AuthResponse>
+
+    @POST("/api/v1/auth/login")
+    suspend fun login(
+        @Body request: LoginRequest,
+    ): BaseResponse<AuthResponse>
+}
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
@@ -0,0 +1,57 @@
+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.auth.local.util.handleException
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class LocalAuthDataSource @Inject constructor(
+    private val dataStore: DataStore<Preferences>,
+) {
+    private val accessToken: Flow<String> = dataStore.data
+        .handleException()
+        .map { preferences ->
+            preferences[ACCESS_TOKEN_KEY] ?: ""
+        }
+
+    private val uuid: Flow<String> = dataStore.data
+        .handleException()
+        .map { preferences ->
+            preferences[UUID_KEY] ?: ""
+        }
+
+    suspend fun getAccessToken(): String = accessToken.first()
+
+    suspend fun getUuid(): String = uuid.first()
+
+    suspend fun setAccessToken(token: String) {
+        dataStore.edit { preferences ->
+            preferences[ACCESS_TOKEN_KEY] = token
+        }
+    }
+
+    suspend fun setUuid(uuid: String) {
+        dataStore.edit { preferences ->
+            preferences[UUID_KEY] = uuid
+        }
+    }
+
+    suspend fun clearSession() {
+        dataStore.edit { preferences ->
+            preferences.remove(ACCESS_TOKEN_KEY)
+            preferences.remove(UUID_KEY)
+        }
+    }
+
+    private companion object {
+        private val ACCESS_TOKEN_KEY = stringPreferencesKey("access_token")
+        private val UUID_KEY = stringPreferencesKey("uuid")
+    }
+}
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
@@ -0,0 +1,28 @@
+package com.yapp.ndgl.data.auth.local.di
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.preferencesDataStore
+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 {
+
+    private const val TOKEN_PREFERENCES = "token_preferences"
+    private val Context.tokenDataStore: DataStore<Preferences> by preferencesDataStore(name = TOKEN_PREFERENCES)
+
+    @Provides
+    @Singleton
+    fun provideTokenDataStore(
+        @ApplicationContext context: Context,
+    ): DataStore<Preferences> {
+        return context.tokenDataStore
+    }
+}
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
@@ -0,0 +1,16 @@
+package com.yapp.ndgl.data.auth.local.util
+
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.emptyPreferences
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import java.io.IOException
+
+internal fun Flow<Preferences>.handleException(): Flow<Preferences> =
+    this.catch { exception ->
+        if (exception is IOException) {
+            emit(emptyPreferences())
+        } else {
+            throw exception
+        }
+    }
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
@@ -0,0 +1,10 @@
+package com.yapp.ndgl.data.auth.model
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class AuthResponse(
+    val uuid: String,
+    val accessToken: String,
+    val nickname: String,
+)
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
@@ -0,0 +1,12 @@
+package com.yapp.ndgl.data.auth.model
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CreateUserRequest(
+    val fcmToken: String,
+    val deviceModel: String,
+    val deviceOs: String,
+    val deviceOsVersion: String,
+    val appVersion: String,
+)
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
@@ -0,0 +1,8 @@
+package com.yapp.ndgl.data.auth.model
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class LoginRequest(
+    val uuid: String,
+)
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
@@ -1,7 +1,26 @@
+import java.util.Properties
+import kotlin.apply
+
 plugins {
     id("ndgl.data")
 }
 
 android {
     namespace = "com.yapp.ndgl.data.core"
+
+    defaultConfig {
+        val localProperties = Properties().apply {
+            load(rootProject.file("local.properties").bufferedReader())
+        }
+
+        buildConfigField("String", "NDGL_BASE_URL", "\"${localProperties["NDGL_BASE_URL"]}\"")
+    }
+
+    buildFeatures {
+        buildConfig = true
+    }
+}
+
+dependencies {
+    implementation(libs.okhttp.logging.interceptor)
 }
diff --git a/data/core/src/main/java/com/yapp/ndgl/data/core/adapter/NDGLCallAdapterFactory.kt b/data/core/src/main/java/com/yapp/ndgl/data/core/adapter/NDGLCallAdapterFactory.kt
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
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
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
diff --git a/data/core/src/main/java/com/yapp/ndgl/data/core/model/BaseResponse.kt b/data/core/src/main/java/com/yapp/ndgl/data/core/model/BaseResponse.kt
diff --git a/data/core/src/main/java/com/yapp/ndgl/data/core/model/error/ErrorResponse.kt b/data/core/src/main/java/com/yapp/ndgl/data/core/model/error/ErrorResponse.kt
diff --git a/data/core/src/main/java/com/yapp/ndgl/data/core/model/error/HttpResponseException.kt b/data/core/src/main/java/com/yapp/ndgl/data/core/model/error/HttpResponseException.kt
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
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml

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`	`}`