Feature/boolti 347 웹뷰 브릿지 연결 (공연 등록)

data/src/main/java/com/nexters/boolti/data/datasource/AuthTokenDataSource.kt

@@ -0,0 +1,23 @@
+package com.nexters.boolti.data.datasource
+
+import javax.inject.Inject
+
+internal class AuthTokenDataSource @Inject constructor(
+    private val authDataSource: AuthDataSource,
+    private val tokenDataSource: TokenDataSource,
+) {
+    suspend fun getNewAccessToken(): String? {
+        val response = authDataSource.refresh()
+        val newToken = response.getOrNull()
+        return newToken?.let {
+            tokenDataSource.saveTokens(
+                accessToken = it.accessToken,
+                refreshToken = it.refreshToken,
+            )
+            it.accessToken
+        } ?: run {
+            authDataSource.logout()
+            null
+        }
+    }
+}

data/src/main/java/com/nexters/boolti/data/di/DataSourceModule.kt

@@ -3,6 +3,7 @@ package com.nexters.boolti.data.di
 import android.content.Context
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import com.nexters.boolti.data.datasource.AuthDataSource
+import com.nexters.boolti.data.datasource.AuthTokenDataSource
 import com.nexters.boolti.data.datasource.PolicyDataSource
 import com.nexters.boolti.data.datasource.RemoteConfigDataSource
 import com.nexters.boolti.data.datasource.TokenDataSource
@@ -33,6 +34,16 @@ internal object DataSourceModule {
     @Provides
     fun provideTokenDataSource(@ApplicationContext context: Context): TokenDataSource = TokenDataSource(context)
 
+    @Singleton
+    @Provides
+    fun provideAuthTokenDataSource(
+        authDataSource: AuthDataSource,
+        tokenDataSource: TokenDataSource,
+    ): AuthTokenDataSource = AuthTokenDataSource(
+        authDataSource = authDataSource,
+        tokenDataSource = tokenDataSource,
+    )
+
     @Singleton
     @Provides
     fun providePolicyDataSource(@ApplicationContext context: Context): PolicyDataSource = PolicyDataSource(context)

data/src/main/java/com/nexters/boolti/data/di/NetworkModule.kt

@@ -2,7 +2,7 @@ package com.nexters.boolti.data.di
 
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import com.nexters.boolti.data.BuildConfig
-import com.nexters.boolti.data.datasource.AuthDataSource
+import com.nexters.boolti.data.datasource.AuthTokenDataSource
 import com.nexters.boolti.data.datasource.TokenDataSource
 import com.nexters.boolti.data.network.AuthAuthenticator
 import com.nexters.boolti.data.network.AuthInterceptor
@@ -114,7 +114,8 @@ internal object NetworkModule {
 
     @Singleton
     @Provides
-    fun provideTicketingService(@Named("auth") retrofit: Retrofit): TicketingService = retrofit.create()
+    fun provideTicketingService(@Named("auth") retrofit: Retrofit): TicketingService =
+        retrofit.create()
 
     @Singleton
     @Provides
@@ -126,28 +127,34 @@ internal object NetworkModule {
 
     @Singleton
     @Provides
-    fun provideReservationService(@Named("auth") retrofit: Retrofit): ReservationService = retrofit.create()
+    fun provideReservationService(@Named("auth") retrofit: Retrofit): ReservationService =
+        retrofit.create()
 
     @Singleton
     @Provides
     fun provideHostService(@Named("auth") retrofit: Retrofit): HostService = retrofit.create()
 
     @Singleton
     @Provides
-    fun provideAuthFileService(@Named("auth") retrofit: Retrofit): AuthFileService = retrofit.create()
+    fun provideAuthFileService(@Named("auth") retrofit: Retrofit): AuthFileService =
+        retrofit.create()
 
     @Singleton
     @Provides
     fun provideFileService(@Named("non-auth") retrofit: Retrofit): FileService = retrofit.create()
 
     @Singleton
     @Provides
-    fun provideMemberService(@Named("non-auth") retrofit: Retrofit): MemberService = retrofit.create()
+    fun provideMemberService(@Named("non-auth") retrofit: Retrofit): MemberService =
+        retrofit.create()
 
     @Singleton
     @Provides
     @Named("auth")
-    fun provideAuthOkHttpClient(interceptor: AuthInterceptor, authenticator: AuthAuthenticator): OkHttpClient {
+    fun provideAuthOkHttpClient(
+        interceptor: AuthInterceptor,
+        authenticator: AuthAuthenticator
+    ): OkHttpClient {
         val loggingInterceptor = HttpLoggingInterceptor().apply {
             level = if (BuildConfig.DEBUG) {
                 HttpLoggingInterceptor.Level.BODY
@@ -202,12 +209,12 @@ internal object NetworkModule {
 
     @Singleton
     @Provides
-    fun provideAuthInterceptor(tokenDataSource: TokenDataSource): AuthInterceptor = AuthInterceptor(tokenDataSource)
+    fun provideAuthInterceptor(tokenDataSource: TokenDataSource): AuthInterceptor =
+        AuthInterceptor(tokenDataSource)
 
     @Singleton
     @Provides
     fun provideAuthenticator(
-        tokenDataSource: TokenDataSource,
-        authDataSource: AuthDataSource,
-    ): AuthAuthenticator = AuthAuthenticator(tokenDataSource, authDataSource)
+        authTokenDataSource: AuthTokenDataSource
+    ): AuthAuthenticator = AuthAuthenticator(authTokenDataSource)
 }

data/src/main/java/com/nexters/boolti/data/network/AuthAuthenticator.kt

@@ -1,7 +1,6 @@
 package com.nexters.boolti.data.network
 
-import com.nexters.boolti.data.datasource.AuthDataSource
-import com.nexters.boolti.data.datasource.TokenDataSource
+import com.nexters.boolti.data.datasource.AuthTokenDataSource
 import kotlinx.coroutines.runBlocking
 import okhttp3.Authenticator
 import okhttp3.Request
@@ -10,27 +9,11 @@ import okhttp3.Route
 import javax.inject.Inject
 
 internal class AuthAuthenticator @Inject constructor(
-    private val tokenDataSource: TokenDataSource,
-    private val authDataSource: AuthDataSource,
+    private val authTokenDataSource: AuthTokenDataSource,
 ) : Authenticator {
     override fun authenticate(route: Route?, response: Response): Request? {
-        val accessToken = runBlocking { getNewAccessToken() } ?: return null
+        val accessToken = runBlocking { authTokenDataSource.getNewAccessToken() } ?: return null
 
         return response.request.newBuilder().header("Authorization", "Bearer $accessToken").build()
     }
-
-    private suspend fun getNewAccessToken(): String? {
-        val response = authDataSource.refresh()
-        val newToken = response.getOrNull()
-        return newToken?.let {
-            tokenDataSource.saveTokens(
-                accessToken = it.accessToken,
-                refreshToken = it.refreshToken,
-            )
-            it.accessToken
-        } ?: run {
-            authDataSource.logout()
-            null
-        }
-    }
 }

data/src/main/java/com/nexters/boolti/data/repository/AuthRepositoryImpl.kt

@@ -1,13 +1,15 @@
 package com.nexters.boolti.data.repository
 
 import com.nexters.boolti.data.datasource.AuthDataSource
+import com.nexters.boolti.data.datasource.AuthTokenDataSource
 import com.nexters.boolti.data.datasource.DeviceTokenDataSource
 import com.nexters.boolti.data.datasource.SignUpDataSource
 import com.nexters.boolti.data.datasource.TokenDataSource
 import com.nexters.boolti.data.datasource.UserDataSource
 import com.nexters.boolti.data.network.response.LoginResponse
+import com.nexters.boolti.domain.model.AccessToken
 import com.nexters.boolti.domain.model.LoginUserState
-import com.nexters.boolti.domain.model.TokenPair
+import com.nexters.boolti.domain.model.TokenPairs
 import com.nexters.boolti.domain.model.User
 import com.nexters.boolti.domain.repository.AuthRepository
 import com.nexters.boolti.domain.request.EditProfileRequest
@@ -23,6 +25,7 @@ import javax.inject.Inject
 internal class AuthRepositoryImpl @Inject constructor(
     private val authDataSource: AuthDataSource,
     private val tokenDataSource: TokenDataSource,
+    private val authTokenDataSource: AuthTokenDataSource,
     private val signUpDataSource: SignUpDataSource,
     private val userDateSource: UserDataSource,
     private val deviceTokenDataSource: DeviceTokenDataSource,
@@ -72,7 +75,13 @@ internal class AuthRepositoryImpl @Inject constructor(
             .onSuccess { authDataSource.updateUser(it) }
             .mapCatching {}
 
-    override fun getTokens(): Flow<TokenPair> = authDataSource.getTokens().map {
-        TokenPair(it.first, it.second)
+    override fun getTokens(): Flow<TokenPairs> = authDataSource.getTokens().map {
+        TokenPairs(it.first, it.second)
+    }
+
+    override fun refreshToken(): Flow<AccessToken> = flow {
+        authTokenDataSource.getNewAccessToken()?.let {
+            emit(AccessToken(it))
+        }
     }
 }

domain/src/main/java/com/nexters/boolti/domain/model/TokenPair.kt → domain/src/main/java/com/nexters/boolti/domain/model/TokenPairs.kt

@@ -1,8 +1,14 @@
 package com.nexters.boolti.domain.model
 
-data class TokenPair(
+data class TokenPairs(
     val accessToken: String,
     val refreshToken: String,
 ) {
     val isLoggedIn: Boolean = accessToken.isNotBlank() && refreshToken.isNotBlank()
 }
+
+@JvmInline
+value class AccessToken(val token: String)
+
+@JvmInline
+value class RefreshToken(val token: String)

domain/src/main/java/com/nexters/boolti/domain/repository/AuthRepository.kt

@@ -1,7 +1,8 @@
 package com.nexters.boolti.domain.repository
 
+import com.nexters.boolti.domain.model.AccessToken
 import com.nexters.boolti.domain.model.LoginUserState
-import com.nexters.boolti.domain.model.TokenPair
+import com.nexters.boolti.domain.model.TokenPairs
 import com.nexters.boolti.domain.model.User
 import com.nexters.boolti.domain.request.EditProfileRequest
 import com.nexters.boolti.domain.request.LoginRequest
@@ -30,5 +31,7 @@ interface AuthRepository {
 
     suspend fun editProfile(editProfileRequest: EditProfileRequest): Result<Unit>
 
-    fun getTokens(): Flow<TokenPair>
+    fun getTokens(): Flow<TokenPairs>
+    fun refreshToken(): Flow<AccessToken>
 }
+

presentation/build.gradle.kts

@@ -4,6 +4,7 @@ plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.hilt)
+    alias(libs.plugins.kotlin.serialization)
     id("kotlin-kapt")
     id("kotlin-parcelize")
 }
@@ -82,6 +83,8 @@ dependencies {
     implementation(libs.zoomable)
     kapt(libs.hilt.compiler)
 
+    implementation(libs.kotlinx.serialization.json)
+
     implementation(libs.lottie)
     implementation(libs.bundles.coil)
     api(libs.kakao.login)

presentation/src/main/java/com/nexters/boolti/presentation/component/BtWebView.kt

@@ -4,12 +4,19 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.net.Uri
 import android.util.AttributeSet
+import android.webkit.ConsoleMessage
+import android.webkit.JavascriptInterface
 import android.webkit.ValueCallback
 import android.webkit.WebChromeClient
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import com.nexters.boolti.presentation.util.bridge.BridgeDto
+import com.nexters.boolti.presentation.util.bridge.BridgeManager
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.json.Json
+import timber.log.Timber
 
 class BtWebView @JvmOverloads constructor(
     context: Context,
@@ -53,6 +60,38 @@ class BtWebView @JvmOverloads constructor(
             onProgressChanged = { _progress.value = it },
         )
     }
+
+    suspend fun setBridgeManager(bridgeManager: BridgeManager) {
+        addJavascriptInterface(
+            object {
+                @JavascriptInterface
+                fun postMessage(message: String) {
+                    Timber.tag("webview_bridge").d("(WEB -> APP) $message 수신")
+                    try {
+                        // JSON 메시지 파싱
+                        val dto = Json.decodeFromString(BridgeDto.serializer(), message)
+                        bridgeManager.handleIncomingData(dto)
+                    } catch (e: SerializationException) {
+                        Timber.tag("webview_bridge")
+                            .e(e, "(WEB -> APP) 유효하지 않은 JSON 포맷: $message")
+                    } catch (e: IllegalArgumentException) {
+                        Timber.tag("webview_bridge")
+                            .e(e, "(WEB -> APP) BridgeDto 타입으로 파싱 실패: $message")
+                    } catch (e: Exception) {
+                        Timber.tag("webview_bridge")
+                            .e(e, "(WEB -> APP) 알 수 없는 에러")
+                        e.printStackTrace() // 에러 처리
+                    }
+                }
+            },
+            bridgeManager.bridgeName,
+        )
+        bridgeManager.dataToSendWeb.collect {
+            evaluateJavascript(it) { result ->
+                Timber.tag("webview_bridge").d("(APP -> WEB)\n\t$it\n전송 결과:\n\t$result")
+            }
+        }
+    }
 }
 
 class BtWebViewClient : WebViewClient()
@@ -79,4 +118,10 @@ class BtWebChromeClient(
 
         return true
     }
+
+    override fun onConsoleMessage(message: ConsoleMessage?): Boolean {
+        Timber.tag("webview_console Message bridge")
+            .d("${message?.message()} -- From line ${message?.lineNumber()} of ${message?.sourceId()}")
+        return true
+    }
 }

presentation/src/main/java/com/nexters/boolti/presentation/screen/Main.kt

@@ -298,6 +298,8 @@ fun MainNavigation(modifier: Modifier, onClickQrScan: (showId: String, showName:
         addShowRegistration(
             modifier = modifier,
             popBackStack = navController::popBackStack,
+            navigateTo = navController::navigateTo,
+            navigateToHome = navController::navigateToHome,
         )
     }
 }

presentation/src/main/java/com/nexters/boolti/presentation/screen/my/MyScreen.kt

@@ -1,6 +1,5 @@
 package com.nexters.boolti.presentation.screen.my
 
-import android.widget.Toast
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -78,10 +77,7 @@ fun MyScreen(
         onClickHeaderButton = if (user != null) navigateToProfile else requireLogin,
         onClickAccountSetting = if (user != null) onClickAccountSetting else requireLogin,
         onClickReservations = if (user != null) navigateToReservations else requireLogin,
-        onClickRegisterShow = {
-            uriHandler.openUri(url)
-            Toast.makeText(context, "공연 등록을 위해 웹으로 이동합니다", Toast.LENGTH_LONG).show()
-        },// navigateToShowRegistration, // TODO 추후 인앱 공연 등록 반영 시 주석 해제
+        onClickRegisterShow = if (user != null) navigateToShowRegistration else requireLogin,
         onClickQrScan = if (user != null) onClickQrScan else requireLogin,
     )
 }

presentation/src/main/java/com/nexters/boolti/presentation/screen/showregistration/ShowRegistrationNavigation.kt

@@ -8,13 +8,17 @@ import com.nexters.boolti.presentation.screen.MainDestination
 fun NavGraphBuilder.addShowRegistration(
     modifier: Modifier = Modifier,
     popBackStack: () -> Unit,
+    navigateTo: (route: String) -> Unit,
+    navigateToHome: () -> Unit,
 ) {
     composable(
         route = MainDestination.ShowRegistration.route,
     ) {
         ShowRegistrationScreen(
             modifier = modifier,
             onClickBack = popBackStack,
+            navigateTo = navigateTo,
+            navigateToHome = navigateToHome,
         )
     }
 }