[Won't Merge]Unit test fix

demo-app/build.gradle.kts

@@ -292,6 +292,9 @@ dependencies {
 
     implementation(libs.audioswitch)
 
+    // Logging
+    implementation(libs.okhttp.logging)
+
     // Also Leak Canary added in the previous block
 
     // Instrumentation tests

demo-app/src/main/kotlin/io/getstream/video/android/data/services/stream/StreamService.kt

@@ -17,11 +17,14 @@
 package io.getstream.video.android.data.services.stream
 
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import io.getstream.log.streamLog
 import io.getstream.video.android.model.User
 import io.getstream.video.android.models.UserCredentials
 import io.getstream.video.android.models.builtInCredentials
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.create
 import retrofit2.http.GET
@@ -38,10 +41,19 @@ fun interface StreamService {
         private const val BASE_URL = "https://pronto.getstream.io/"
 
         private val json = Json { ignoreUnknownKeys = true }
-
+        private val okHttpClient = OkHttpClient.Builder()
+            .addInterceptor(
+                HttpLoggingInterceptor {
+                    streamLog(tag = "Video:Http") { it }
+                }.apply {
+                    level = HttpLoggingInterceptor.Level.BODY
+                },
+            )
+            .build()
         private val retrofit = Retrofit.Builder()
             .baseUrl(BASE_URL)
             .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
+            .client(okHttpClient)
             .build()
 
         private val serviceInstance = retrofit.create<StreamService>()

demo-app/src/main/kotlin/io/getstream/video/android/util/StreamVideoInitHelper.kt

@@ -61,6 +61,7 @@ import io.getstream.video.android.util.config.AppConfig
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.runBlocking
 
 public enum class InitializedState {
     NOT_STARTED, RUNNING, FINISHED, FAILED
@@ -197,7 +198,18 @@ object StreamVideoInitHelper {
 
         chatClient.connectUser(
             user = chatUser,
-            token = token,
+            tokenProvider = object : io.getstream.chat.android.client.token.TokenProvider {
+                override fun loadToken(): String {
+                    return runBlocking {
+                        val email = user.custom?.get("email")
+                        val authData = StreamService.instance.getAuthData(
+                            environment = AppConfig.currentEnvironment.value!!.env,
+                            userId = email,
+                        )
+                        authData.token
+                    }
+                }
+            },
         ).enqueue()
     }
 
@@ -303,10 +315,12 @@ object StreamVideoInitHelper {
             ),
             tokenProvider = object : TokenProvider {
                 override suspend fun loadToken(): String {
-                    val email = user.custom?.get("email")
+                    val userEmail = user.custom?.get("email")
+                    val userId = user.id
+                    val userIdForTokenRenewal = if (userEmail.isNullOrEmpty()) userId else userEmail
                     val authData = StreamService.instance.getAuthData(
                         environment = AppConfig.currentEnvironment.value!!.env,
-                        userId = email,
+                        userId = userIdForTokenRenewal,
                     )
                     return authData.token
                 }

stream-video-android-core/api/stream-video-android-core.api

@@ -13118,9 +13118,17 @@ public abstract interface class io/getstream/video/android/core/socket/common/to
 	public abstract fun loadToken (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
+public final class io/getstream/video/android/core/socket/common/token/TokenRepository {
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;)V
+	public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getToken ()Ljava/lang/String;
+	public final fun updateToken (Ljava/lang/String;)V
+}
+
 public class io/getstream/video/android/core/socket/coordinator/CoordinatorSocketConnection : io/getstream/video/android/core/socket/common/SocketListener, io/getstream/video/android/core/socket/common/SocketActions {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Lio/getstream/video/android/model/User;Ljava/lang/String;Lokhttp3/OkHttpClient;Lio/getstream/video/android/core/internal/network/NetworkStateProvider;Lkotlinx/coroutines/CoroutineScope;Landroidx/lifecycle/Lifecycle;Lio/getstream/video/android/core/socket/common/token/TokenProvider;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Lio/getstream/video/android/model/User;Ljava/lang/String;Lokhttp3/OkHttpClient;Lio/getstream/video/android/core/internal/network/NetworkStateProvider;Lkotlinx/coroutines/CoroutineScope;Landroidx/lifecycle/Lifecycle;Lio/getstream/video/android/core/socket/common/token/TokenProvider;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Lio/getstream/video/android/model/User;Ljava/lang/String;Lokhttp3/OkHttpClient;Lio/getstream/video/android/core/internal/network/NetworkStateProvider;Lkotlinx/coroutines/CoroutineScope;Landroidx/lifecycle/Lifecycle;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/socket/common/token/TokenRepository;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Lio/getstream/video/android/model/User;Ljava/lang/String;Lokhttp3/OkHttpClient;Lio/getstream/video/android/core/internal/network/NetworkStateProvider;Lkotlinx/coroutines/CoroutineScope;Landroidx/lifecycle/Lifecycle;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/socket/common/token/TokenRepository;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun connect (Lio/getstream/video/android/model/User;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public synthetic fun connect (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun connectionId ()Lkotlinx/coroutines/flow/StateFlow;
@@ -13327,8 +13335,8 @@ public final class io/getstream/video/android/core/socket/coordinator/state/Vide
 
 public final class io/getstream/video/android/core/socket/sfu/SfuSocketConnection : io/getstream/video/android/core/socket/common/SocketListener, io/getstream/video/android/core/socket/common/SocketActions {
 	public static final field Companion Lio/getstream/video/android/core/socket/sfu/SfuSocketConnection$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Lokhttp3/OkHttpClient;Lio/getstream/video/android/core/internal/network/NetworkStateProvider;Lkotlinx/coroutines/CoroutineScope;Landroidx/lifecycle/Lifecycle;Lio/getstream/video/android/core/socket/common/token/TokenProvider;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Lokhttp3/OkHttpClient;Lio/getstream/video/android/core/internal/network/NetworkStateProvider;Lkotlinx/coroutines/CoroutineScope;Landroidx/lifecycle/Lifecycle;Lio/getstream/video/android/core/socket/common/token/TokenProvider;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Lokhttp3/OkHttpClient;Lio/getstream/video/android/core/internal/network/NetworkStateProvider;Lkotlinx/coroutines/CoroutineScope;Landroidx/lifecycle/Lifecycle;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/socket/common/token/TokenRepository;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Lokhttp3/OkHttpClient;Lio/getstream/video/android/core/internal/network/NetworkStateProvider;Lkotlinx/coroutines/CoroutineScope;Landroidx/lifecycle/Lifecycle;Lio/getstream/video/android/core/socket/common/token/TokenProvider;Lio/getstream/video/android/core/socket/common/token/TokenRepository;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public synthetic fun connect (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun connect (Lstream/video/sfu/event/JoinRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public fun connectionId ()Lkotlinx/coroutines/flow/StateFlow;

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/StreamVideoBuilder.kt

@@ -37,8 +37,9 @@ import io.getstream.video.android.core.permission.android.DefaultStreamPermissio
 import io.getstream.video.android.core.permission.android.StreamPermissionCheck
 import io.getstream.video.android.core.socket.common.scope.ClientScope
 import io.getstream.video.android.core.socket.common.scope.UserScope
-import io.getstream.video.android.core.socket.common.token.ConstantTokenProvider
+import io.getstream.video.android.core.socket.common.token.RepositoryTokenProvider
 import io.getstream.video.android.core.socket.common.token.TokenProvider
+import io.getstream.video.android.core.socket.common.token.TokenRepository
 import io.getstream.video.android.core.sounds.RingingCallVibrationConfig
 import io.getstream.video.android.core.sounds.Sounds
 import io.getstream.video.android.core.sounds.defaultResourcesRingingConfig
@@ -95,6 +96,7 @@ import java.net.ConnectException
  * @see ClientState.connection
  *
  */
+
 public class StreamVideoBuilder @JvmOverloads constructor(
     context: Context,
     private val apiKey: ApiKey,
@@ -106,7 +108,7 @@ public class StreamVideoBuilder @JvmOverloads constructor(
         object : TokenProvider {
             override suspend fun loadToken(): String = legacy.invoke(null)
         }
-    } ?: ConstantTokenProvider(token),
+    } ?: RepositoryTokenProvider(tokenRepository),
     private val loggingLevel: LoggingLevel = LoggingLevel(),
     private val notificationConfig: NotificationConfig = NotificationConfig(),
     private val ringNotification: ((call: Call) -> Notification?)? = null,
@@ -214,7 +216,7 @@ public class StreamVideoBuilder @JvmOverloads constructor(
 
         // Android JSR-310 backport backport
         AndroidThreeTen.init(context)
-
+        tokenRepository.updateToken(token)
         // This connection module class exposes the connections to the various retrofit APIs.
         val coordinatorConnectionModule = CoordinatorConnectionModule(
             context = context,
@@ -225,9 +227,9 @@ public class StreamVideoBuilder @JvmOverloads constructor(
             loggingLevel = loggingLevel,
             user = user,
             apiKey = apiKey,
-            userToken = token,
             tokenProvider = tokenProvider,
             lifecycle = lifecycle,
+            tokenRepository = tokenRepository,
         )
 
         val deviceTokenStorage = DeviceTokenStorage(context)
@@ -272,6 +274,7 @@ public class StreamVideoBuilder @JvmOverloads constructor(
             vibrationConfig = vibrationConfig,
             enableStereoForSubscriber = enableStereoForSubscriber,
             telecomConfig = telecomConfig,
+            tokenRepository = tokenRepository,
         )
 
         if (user.type == UserType.Guest) {
@@ -348,6 +351,11 @@ public class StreamVideoBuilder @JvmOverloads constructor(
     }
 }
 
+/**
+ * Refactor Later
+ */
+internal val tokenRepository = TokenRepository("")
+
 sealed class GEO {
     /** Run calls over our global edge network, this is the default and right for most applications */
     object GlobalEdgeNetwork : GEO()

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/StreamVideoClient.kt

@@ -107,8 +107,9 @@ import io.getstream.video.android.core.permission.android.DefaultStreamPermissio
 import io.getstream.video.android.core.permission.android.StreamPermissionCheck
 import io.getstream.video.android.core.socket.ErrorResponse
 import io.getstream.video.android.core.socket.common.scope.ClientScope
-import io.getstream.video.android.core.socket.common.token.ConstantTokenProvider
+import io.getstream.video.android.core.socket.common.token.RepositoryTokenProvider
 import io.getstream.video.android.core.socket.common.token.TokenProvider
+import io.getstream.video.android.core.socket.common.token.TokenRepository
 import io.getstream.video.android.core.socket.coordinator.state.VideoSocketState
 import io.getstream.video.android.core.sounds.CallSoundAndVibrationPlayer
 import io.getstream.video.android.core.sounds.RingingCallVibrationConfig
@@ -161,7 +162,8 @@ internal class StreamVideoClient internal constructor(
     internal var token: String,
     private val lifecycle: Lifecycle,
     internal val coordinatorConnectionModule: CoordinatorConnectionModule,
-    internal val tokenProvider: TokenProvider = ConstantTokenProvider(token),
+    internal val tokenRepository: TokenRepository,
+    internal val tokenProvider: TokenProvider = RepositoryTokenProvider(tokenRepository),
     internal val streamNotificationManager: StreamNotificationManager,
     internal val enableCallNotificationUpdates: Boolean,
     internal val callServiceConfigRegistry: CallServiceConfigRegistry = CallServiceConfigRegistry(),
@@ -273,6 +275,7 @@ internal class StreamVideoClient internal constructor(
             // Retry once with a new token if the token is expired
             if (e.isAuthError()) {
                 val newToken = tokenProvider.loadToken()
+                tokenRepository.updateToken(newToken)
                 token = newToken
                 coordinatorConnectionModule.updateToken(newToken)
                 apiCall()

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/call/RtcSession.kt

@@ -78,6 +78,7 @@ import io.getstream.video.android.core.model.VideoTrack
 import io.getstream.video.android.core.model.toPeerType
 import io.getstream.video.android.core.socket.common.VideoParser
 import io.getstream.video.android.core.socket.common.parser2.MoshiVideoParser
+import io.getstream.video.android.core.socket.common.token.TokenRepository
 import io.getstream.video.android.core.socket.sfu.state.SfuSocketState
 import io.getstream.video.android.core.toJson
 import io.getstream.video.android.core.trace.PeerConnectionTraceKey
@@ -236,12 +237,12 @@ public class RtcSession internal constructor(
             apiUrl = sfuUrl,
             wssUrl = sfuWsUrl,
             connectionTimeoutInMs = 2000L,
-            userToken = sfuToken,
             lifecycle = lifecycle,
             onSignalingLost = { error ->
                 call.debug.fastReconnect()
             },
             tracer = sfuTracer,
+            tokenRepository = TokenRepository(sfuToken),
         )
     },
 ) {

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/internal/module/ConnectionModuleDeclaration.kt

@@ -76,11 +76,6 @@ internal interface ConnectionModuleDeclaration<Api, SocketConnection, Http : OkH
      */
     val loggingLevel: LoggingLevel get() = LoggingLevel()
 
-    /**
-     * The user token.
-     */
-    val userToken: Token
-
     /**
      * The lifecycle of the application.
      */

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/internal/module/CoordinatorAuthInterceptor.kt

@@ -16,6 +16,7 @@
 
 package io.getstream.video.android.core.internal.module
 
+import io.getstream.video.android.core.socket.common.token.TokenRepository
 import okhttp3.Interceptor
 import okhttp3.Response
 import java.io.IOException
@@ -25,7 +26,7 @@ import java.io.IOException
  */
 internal class CoordinatorAuthInterceptor(
     var apiKey: String,
-    var token: String,
+    val tokenRepository: TokenRepository,
     var authType: String = "jwt",
 ) : Interceptor {
 
@@ -43,7 +44,7 @@ internal class CoordinatorAuthInterceptor(
 
         val updated = original.newBuilder()
             .url(updatedUrl)
-            .addHeader(HEADER_AUTHORIZATION, token)
+            .addHeader(HEADER_AUTHORIZATION, tokenRepository.getToken())
             .header(STREAM_AUTH_TYPE, authType)
             .build()
 

stream-video-android-core/src/main/kotlin/io/getstream/video/android/core/internal/module/CoordinatorConnectionModule.kt

@@ -21,17 +21,19 @@ import android.net.ConnectivityManager
 import androidx.lifecycle.Lifecycle
 import io.getstream.android.video.generated.apis.ProductvideoApi
 import io.getstream.android.video.generated.infrastructure.Serializer
-import io.getstream.log.streamLog
 import io.getstream.video.android.core.header.HeadersUtil
 import io.getstream.video.android.core.internal.network.NetworkStateProvider
 import io.getstream.video.android.core.logging.LoggingLevel
+import io.getstream.video.android.core.socket.common.scope.UserScope
 import io.getstream.video.android.core.socket.common.token.TokenProvider
+import io.getstream.video.android.core.socket.common.token.TokenRepository
 import io.getstream.video.android.core.socket.coordinator.CoordinatorSocketConnection
 import io.getstream.video.android.core.trace.Tracer
 import io.getstream.video.android.model.ApiKey
 import io.getstream.video.android.model.User
 import io.getstream.video.android.model.UserToken
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
@@ -47,19 +49,19 @@ internal class CoordinatorConnectionModule(
     context: Context,
     tokenProvider: TokenProvider,
     user: User,
+    val tokenRepository: TokenRepository,
     override val scope: CoroutineScope,
     // Common API
     override val apiUrl: String,
     override val wssUrl: String,
     override val connectionTimeoutInMs: Long,
     override val loggingLevel: LoggingLevel = LoggingLevel(),
     override val apiKey: ApiKey,
-    override val userToken: UserToken,
     override val lifecycle: Lifecycle,
     override val tracer: Tracer = Tracer("coordinator"),
 ) : ConnectionModuleDeclaration<ProductvideoApi, CoordinatorSocketConnection, OkHttpClient, UserToken> {
     // Internals
-    private val authInterceptor = CoordinatorAuthInterceptor(apiKey, userToken)
+    private val authInterceptor = CoordinatorAuthInterceptor(apiKey, tokenRepository)
     private val retrofit: Retrofit by lazy {
         Retrofit.Builder().baseUrl(apiUrl)
             .addConverterFactory(ScalarsConverterFactory.create())
@@ -73,8 +75,8 @@ internal class CoordinatorConnectionModule(
         HeadersInterceptor(HeadersUtil()),
     )
         .addInterceptor(authInterceptor).addInterceptor(
-            HttpLoggingInterceptor {
-                streamLog(tag = "Video:Http") { it }
+            HttpLoggingInterceptor { message ->
+                println(message)
             }.apply {
                 level = loggingLevel.httpLoggingLevel.level
             },
@@ -96,17 +98,17 @@ internal class CoordinatorConnectionModule(
         apiKey = apiKey,
         url = wssUrl,
         user = user,
-        token = userToken,
+        token = tokenRepository.getToken(),
         httpClient = http,
         networkStateProvider = networkStateProvider,
-        scope = scope,
+        scope = UserScope(context = scope.coroutineContext + Dispatchers.IO.limitedParallelism(1)),
         lifecycle = lifecycle,
         tokenProvider = tokenProvider,
+        tokenRepository = tokenRepository,
     )
 
     override fun updateToken(token: UserToken) {
-        socketConnection.updateToken(token)
-        authInterceptor.token = token
+        tokenRepository.updateToken(token)
     }
 
     override fun updateAuthType(authType: String) {