Merge pull request #24 from YAPP-Github/BOOK-78-feature/#23

easyhooon · web-flow · commit 927a2e478e9a · 2025-07-03T16:48:36.000+09:00
feat: 로그아웃 API 연동
diff --git a/core/data/api/src/main/kotlin/com/ninecraft/booket/core/data/api/repository/AuthRepository.kt b/core/data/api/src/main/kotlin/com/ninecraft/booket/core/data/api/repository/AuthRepository.kt
@@ -4,4 +4,7 @@ import com.ninecraft.booket.core.model.LoginModel
 
 interface AuthRepository {
     suspend fun login(accessToken: String): Result<LoginModel>
+    suspend fun logout(): Result<Unit>
+    suspend fun saveTokens(accessToken: String, refreshToken: String)
+    suspend fun clearTokens()
 }
diff --git a/core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository/DefaultAuthRepository.kt b/core/data/impl/src/main/kotlin/com/ninecraft/booket/core/data/impl/repository/DefaultAuthRepository.kt
@@ -3,21 +3,40 @@ package com.ninecraft.booket.core.data.impl.repository
 import com.ninecraft.booket.core.common.utils.runSuspendCatching
 import com.ninecraft.booket.core.data.api.repository.AuthRepository
 import com.ninecraft.booket.core.data.impl.mapper.toModel
+import com.ninecraft.booket.core.datastore.api.datasource.TokenPreferencesDataSource
 import com.ninecraft.booket.core.network.request.LoginRequest
-import com.ninecraft.booket.core.network.service.BooketService
+import com.ninecraft.booket.core.network.service.AuthService
+import com.ninecraft.booket.core.network.service.NoAuthService
 import javax.inject.Inject
 
 private const val KAKAO_PROVIDER_TYPE = "KAKAO"
 
 internal class DefaultAuthRepository @Inject constructor(
-    private val service: BooketService,
+    private val noAuthService: NoAuthService,
+    private val authService: AuthService,
+    private val tokenDatasource: TokenPreferencesDataSource,
 ) : AuthRepository {
     override suspend fun login(accessToken: String) = runSuspendCatching {
-        service.login(
+        noAuthService.login(
             LoginRequest(
                 providerType = KAKAO_PROVIDER_TYPE,
                 oauthToken = accessToken,
             ),
         ).toModel()
     }
+
+    override suspend fun logout() = runSuspendCatching {
+        authService.logout()
+    }
+
+    override suspend fun saveTokens(accessToken: String, refreshToken: String) {
+        tokenDatasource.apply {
+            setAccessToken(accessToken)
+            setRefreshToken(refreshToken)
+        }
+    }
+
+    override suspend fun clearTokens() {
+        tokenDatasource.clearTokens()
+    }
 }
diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
@@ -29,6 +29,8 @@ android {
 
 dependencies {
     implementations(
+        projects.core.datastore.api,
+
         libs.logger,
     )
 }
diff --git a/core/network/src/main/kotlin/com/ninecraft/booket/core/network/TokenInterceptor.kt b/core/network/src/main/kotlin/com/ninecraft/booket/core/network/TokenInterceptor.kt
@@ -0,0 +1,22 @@
+package com.ninecraft.booket.core.network
+
+import com.ninecraft.booket.core.datastore.api.datasource.TokenPreferencesDataSource
+import kotlinx.coroutines.runBlocking
+import okhttp3.Interceptor
+import okhttp3.Response
+import javax.inject.Inject
+
+internal class TokenInterceptor @Inject constructor(
+    @Suppress("unused")
+    private val tokenDataSource: TokenPreferencesDataSource,
+) : Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val accessToken = runBlocking { tokenDataSource.getAccessToken() }
+
+        return chain.proceed(
+            chain.request().newBuilder()
+                .addHeader("Authorization", "Bearer $accessToken")
+                .build(),
+        )
+    }
+}
diff --git a/core/network/src/main/kotlin/com/ninecraft/booket/core/network/di/NetworkModule.kt b/core/network/src/main/kotlin/com/ninecraft/booket/core/network/di/NetworkModule.kt
@@ -1,6 +1,6 @@
 package com.ninecraft.booket.core.network.di
 
-import com.orhanobut.logger.Logger
+import android.util.Log
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -12,7 +12,11 @@ import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.kotlinx.serialization.asConverterFactory
 import com.ninecraft.booket.core.network.BuildConfig
-import com.ninecraft.booket.core.network.service.BooketService
+import com.ninecraft.booket.core.network.TokenInterceptor
+import com.ninecraft.booket.core.network.service.AuthService
+import com.ninecraft.booket.core.network.service.NoAuthService
+import com.orhanobut.logger.AndroidLogAdapter
+import com.orhanobut.logger.PrettyFormatStrategy
 import retrofit2.create
 import java.util.concurrent.TimeUnit
 import javax.inject.Singleton
@@ -34,9 +38,26 @@ internal object NetworkModule {
 
     @Singleton
     @Provides
-    internal fun provideHttpLoggingInterceptor(): HttpLoggingInterceptor {
+    internal fun provideNetworkLogAdapter(): AndroidLogAdapter {
+        val networkFormatStrategy = PrettyFormatStrategy.newBuilder()
+            .showThreadInfo(false) // 스레드 정보 제거
+            .methodCount(0) // 메서드 스택 제거
+            .methodOffset(0) // 오프셋 제거
+            .tag("NETWORK") // API 호출 전용 태그
+            .build()
+
+        return AndroidLogAdapter(networkFormatStrategy)
+    }
+
+    @Singleton
+    @Provides
+    internal fun provideHttpLoggingInterceptor(
+        networkLogAdapter: AndroidLogAdapter,
+    ): HttpLoggingInterceptor {
         return HttpLoggingInterceptor { message ->
-            Logger.d(message)
+            if (message.isNotBlank()) {
+                networkLogAdapter.log(Log.DEBUG, null, message)
+            }
         }.apply {
             level = if (BuildConfig.DEBUG) {
                 HttpLoggingInterceptor.Level.BODY
@@ -46,9 +67,26 @@ internal object NetworkModule {
         }
     }
 
+    @AuthOkHttpClient
+    @Singleton
+    @Provides
+    internal fun provideAuthOkHttpClient(
+        httpLoggingInterceptor: HttpLoggingInterceptor,
+        tokenInterceptor: TokenInterceptor,
+    ): OkHttpClient {
+        return OkHttpClient.Builder()
+            .connectTimeout(MaxTimeoutMillis, TimeUnit.MILLISECONDS)
+            .readTimeout(MaxTimeoutMillis, TimeUnit.MILLISECONDS)
+            .writeTimeout(MaxTimeoutMillis, TimeUnit.MILLISECONDS)
+            .addInterceptor(tokenInterceptor)
+            .addInterceptor(httpLoggingInterceptor)
+            .build()
+    }
+
+    @NoAuthOkHttpClient
     @Singleton
     @Provides
-    internal fun provideOkHttpClient(
+    internal fun provideNoAuthOkHttpClient(
         httpLoggingInterceptor: HttpLoggingInterceptor,
     ): OkHttpClient {
         return OkHttpClient.Builder()
@@ -59,10 +97,11 @@ internal object NetworkModule {
             .build()
     }
 
+    @AuthRetrofit
     @Singleton
     @Provides
-    internal fun provideRetrofit(
-        okHttpClient: OkHttpClient,
+    internal fun provideAuthRetrofit(
+        @AuthOkHttpClient okHttpClient: OkHttpClient,
     ): Retrofit {
         return Retrofit.Builder()
             .baseUrl(BuildConfig.SERVER_BASE_URL)
@@ -71,11 +110,32 @@ internal object NetworkModule {
             .build()
     }
 
+    @NoAuthRetrofit
+    @Singleton
+    @Provides
+    internal fun provideNoAuthRetrofit(
+        @NoAuthOkHttpClient okHttpClient: OkHttpClient,
+    ): Retrofit {
+        return Retrofit.Builder()
+            .baseUrl(BuildConfig.SERVER_BASE_URL)
+            .client(okHttpClient)
+            .addConverterFactory(jsonConverterFactory)
+            .build()
+    }
+
+    @Singleton
+    @Provides
+    internal fun provideAuthService(
+        @AuthRetrofit retrofit: Retrofit,
+    ): AuthService {
+        return retrofit.create()
+    }
+
     @Singleton
     @Provides
-    internal fun provideBooketService(
-        retrofit: Retrofit,
-    ): BooketService {
+    internal fun provideNoAuthService(
+        @NoAuthRetrofit retrofit: Retrofit,
+    ): NoAuthService {
         return retrofit.create()
     }
 }
diff --git a/core/network/src/main/kotlin/com/ninecraft/booket/core/network/di/RetrofitQualifier.kt b/core/network/src/main/kotlin/com/ninecraft/booket/core/network/di/RetrofitQualifier.kt
@@ -0,0 +1,19 @@
+package com.ninecraft.booket.core.network.di
+
+import javax.inject.Qualifier
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class AuthOkHttpClient
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class NoAuthOkHttpClient
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class AuthRetrofit
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class NoAuthRetrofit
diff --git a/core/network/src/main/kotlin/com/ninecraft/booket/core/network/service/AuthService.kt b/core/network/src/main/kotlin/com/ninecraft/booket/core/network/service/AuthService.kt
@@ -0,0 +1,8 @@
+package com.ninecraft.booket.core.network.service
+
+import retrofit2.http.POST
+
+interface AuthService {
+    @POST("api/v1/auth/signout")
+    suspend fun logout()
+}
diff --git a/core/network/src/main/kotlin/com/ninecraft/booket/core/network/service/NoAuthService.kt b/core/network/src/main/kotlin/com/ninecraft/booket/core/network/service/NoAuthService.kt
@@ -5,7 +5,7 @@ import com.ninecraft.booket.core.network.response.LoginResponse
 import retrofit2.http.Body
 import retrofit2.http.POST
 
-interface BooketService {
+interface NoAuthService {
     @POST("api/v1/auth/signin")
     suspend fun login(@Body loginRequest: LoginRequest): LoginResponse
 }
diff --git a/feature/library/build.gradle.kts b/feature/library/build.gradle.kts
@@ -16,6 +16,8 @@ ksp {
 
 dependencies {
     implementations(
+        projects.feature.login,
+
         libs.logger,
     )
 }
diff --git a/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/HandleLibrarySideEffects.kt b/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/HandleLibrarySideEffects.kt
@@ -0,0 +1,28 @@
+package com.ninecraft.booket.feature.library
+
+import android.widget.Toast
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.ui.platform.LocalContext
+
+@Composable
+internal fun HandleLibrarySideEffects(
+    state: LibraryScreen.State,
+    eventSink: (LibraryScreen.Event) -> Unit,
+) {
+    val context = LocalContext.current
+
+    LaunchedEffect(state.sideEffect) {
+        when (state.sideEffect) {
+            is LibraryScreen.SideEffect.ShowToast -> {
+                Toast.makeText(context, state.sideEffect.message, Toast.LENGTH_SHORT).show()
+            }
+
+            null -> {}
+        }
+
+        if (state.sideEffect != null) {
+            eventSink(LibraryScreen.Event.InitSideEffect)
+        }
+    }
+}
diff --git a/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryPresenter.kt b/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryPresenter.kt
@@ -1,25 +1,67 @@
 package com.ninecraft.booket.feature.library
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import com.ninecraft.booket.core.data.api.repository.AuthRepository
+import com.ninecraft.booket.feature.login.LoginScreen
+import com.orhanobut.logger.Logger
 import com.slack.circuit.codegen.annotations.CircuitInject
+import com.slack.circuit.retained.rememberRetained
 import com.slack.circuit.runtime.Navigator
 import com.slack.circuit.runtime.presenter.Presenter
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.components.ActivityRetainedComponent
+import kotlinx.coroutines.launch
 
-@Suppress("unused")
 class LibraryPresenter @AssistedInject constructor(
     @Assisted private val navigator: Navigator,
+    private val repository: AuthRepository,
 ) : Presenter<LibraryScreen.State> {
 
     @Composable
     override fun present(): LibraryScreen.State {
         val scope = rememberCoroutineScope()
+        var isLoading by rememberRetained { mutableStateOf(false) }
+        var sideEffect by rememberRetained { mutableStateOf<LibraryScreen.SideEffect?>(null) }
 
-        return LibraryScreen.State {}
+        fun handleEvent(event: LibraryScreen.Event) {
+            when (event) {
+                is LibraryScreen.Event.InitSideEffect -> {
+                    sideEffect = null
+                }
+
+                is LibraryScreen.Event.OnLogoutButtonClick -> {
+                    scope.launch {
+                        try {
+                            isLoading = true
+                            repository.logout()
+                                .onSuccess {
+                                    repository.clearTokens()
+                                    navigator.resetRoot(LoginScreen)
+                                }.onFailure { exception ->
+                                    exception.message?.let { Logger.e(it) }
+                                    sideEffect = exception.message?.let {
+                                        LibraryScreen.SideEffect.ShowToast(it)
+                                    }
+                                }
+                        } finally {
+                            isLoading = false
+                        }
+                    }
+                }
+            }
+        }
+
+        return LibraryScreen.State(
+            isLoading = isLoading,
+            sideEffect = sideEffect,
+            eventSink = ::handleEvent,
+        )
     }
 
     @CircuitInject(LibraryScreen::class, ActivityRetainedComponent::class)
diff --git a/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryScreen.kt b/feature/library/src/main/kotlin/com/ninecraft/booket/feature/library/LibraryScreen.kt
diff --git a/feature/library/src/main/res/values/strings.xml b/feature/library/src/main/res/values/strings.xml

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,7 @@ import com.ninecraft.booket.core.model.LoginModel`
`4`	`4`
`5`	`5`	`interface AuthRepository {`
`6`	`6`	`suspend fun login(accessToken: String): Result<LoginModel>`
	`7`	`+ suspend fun logout(): Result<Unit>`
	`8`	`+ suspend fun saveTokens(accessToken: String, refreshToken: String)`
	`9`	`+ suspend fun clearTokens()`
`7`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ android {`
`29`	`29`
`30`	`30`	`dependencies {`
`31`	`31`	`implementations(`
	`32`	`+ projects.core.datastore.api,`
	`33`	`+`
`32`	`34`	`libs.logger,`
`33`	`35`	`)`
`34`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import com.ninecraft.booket.core.network.response.LoginResponse`
`5`	`5`	`import retrofit2.http.Body`
`6`	`6`	`import retrofit2.http.POST`
`7`	`7`
`8`		`-interface BooketService {`
	`8`	`+interface NoAuthService {`
`9`	`9`	`@POST("api/v1/auth/signin")`
`10`	`10`	`suspend fun login(@Body loginRequest: LoginRequest): LoginResponse`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ ksp {`
`16`	`16`
`17`	`17`	`dependencies {`
`18`	`18`	`implementations(`
	`19`	`+ projects.feature.login,`
	`20`	`+`
`19`	`21`	`libs.logger,`
`20`	`22`	`)`
`21`	`23`	`}`