fix: merge issues

wireapp · Feb 21, 2024 · 9ec9a54 · 9ec9a54
1 parent 348cba2
commit 9ec9a54
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 15 deletions.
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/GlobalKaliumScope.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/GlobalKaliumScope.kt
@@ -100,6 +100,7 @@ class GlobalKaliumScope internal constructor(
         UnboundNetworkContainerCommon(
             networkStateObserver,
             userAgent,
+            ignoreSSLCertificates = kaliumConfigs.ignoreSSLCertificatesForUnboundCalls,
             kaliumConfigs.certPinningConfig,
             kaliumConfigs.kaliumMockEngine?.mockEngine
         )

diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
@@ -1680,8 +1680,6 @@ class UserSessionScope internal constructor(
             messages.sendConfirmation,
             renamedConversationHandler,
             qualifiedIdMapper,
-            globalScope.serverConfigRepository,
-            team.isSelfATeamMember,
             authenticationScope.serverConfigRepository,
             userStorage,
             userPropertyRepository,

diff --git a/...rc/commonTest/kotlin/com/wire/kalium/logic/feature/client/ObserveNewClientsUseCaseTest.kt b/...rc/commonTest/kotlin/com/wire/kalium/logic/feature/client/ObserveNewClientsUseCaseTest.kt
@@ -100,7 +100,7 @@ class ObserveNewClientsUseCaseTest {
             )
 
             verify(arrangement.observeValidAccounts)
-                .function(arrangement.observeValidAccounts::invoke)
+                .suspendFunction(arrangement.observeValidAccounts::invoke)
                 .wasInvoked(exactly = once)
 
             awaitComplete()
@@ -211,7 +211,7 @@ class ObserveNewClientsUseCaseTest {
 
         init {
             given(observeValidAccounts)
-                .function(observeValidAccounts::invoke)
+                .suspendFunction(observeValidAccounts::invoke)
                 .whenInvoked()
                 .thenReturn(flowOf(listOf()))
 
@@ -250,13 +250,13 @@ class ObserveNewClientsUseCaseTest {
 
         fun withValidAccounts(result: List<Pair<SelfUser, Team?>>) = apply {
             given(observeValidAccounts)
-                .function(observeValidAccounts::invoke)
+                .suspendFunction(observeValidAccounts::invoke)
                 .whenInvoked()
                 .thenReturn(flowOf(result))
         }
         fun withValidAccountsFlow(flowResult: Flow<List<Pair<SelfUser, Team?>>>) = apply {
             given(observeValidAccounts)
-                .function(observeValidAccounts::invoke)
+                .suspendFunction(observeValidAccounts::invoke)
                 .whenInvoked()
                 .thenReturn(flowResult)
         }

diff --git a/...kotlin/com/wire/kalium/logic/feature/featureConfig/ObserveIsAppLockEditableUseCaseTest.kt b/...kotlin/com/wire/kalium/logic/feature/featureConfig/ObserveIsAppLockEditableUseCaseTest.kt
@@ -116,7 +116,7 @@ class ObserveIsAppLockEditableUseCaseTest {
         fun arrange() = this to useCase
         fun withAllValidSessionsFlow(result: Flow<List<AccountInfo>>) = apply {
             given(sessionRepository)
-                .function(sessionRepository::allValidSessionsFlow)
+                .suspendFunction(sessionRepository::allValidSessionsFlow)
                 .whenInvoked()
                 .thenReturn(result.map { Either.Right(it) })
         }

diff --git a/logic/src/jvmMain/kotlin/com/wire/kalium/logic/feature/UserSessionScopeProviderImpl.kt b/logic/src/jvmMain/kotlin/com/wire/kalium/logic/feature/UserSessionScopeProviderImpl.kt
@@ -35,7 +35,6 @@ import com.wire.kalium.logic.feature.call.GlobalCallManager
 import com.wire.kalium.logic.featureFlags.KaliumConfigs
 import com.wire.kalium.logic.sync.UserSessionWorkSchedulerImpl
 import com.wire.kalium.network.NetworkStateObserver
-import com.wire.kalium.network.NetworkStateObserver
 import com.wire.kalium.persistence.db.GlobalDatabaseProvider
 import com.wire.kalium.persistence.kmmSettings.GlobalPrefProvider
 import java.io.File

diff --git a/...lium/network/api/v6/unauthenticated/networkContainer/UnauthenticatedNetworkContainerV6.kt b/...lium/network/api/v6/unauthenticated/networkContainer/UnauthenticatedNetworkContainerV6.kt
@@ -27,6 +27,10 @@ import com.wire.kalium.network.api.base.unauthenticated.VerificationCodeApi
 import com.wire.kalium.network.api.base.unauthenticated.appVersioning.AppVersioningApi
 import com.wire.kalium.network.api.base.unauthenticated.appVersioning.AppVersioningApiImpl
 import com.wire.kalium.network.api.base.unauthenticated.register.RegisterApi
+import com.wire.kalium.network.api.base.unbound.configuration.ServerConfigApi
+import com.wire.kalium.network.api.base.unbound.configuration.ServerConfigApiImpl
+import com.wire.kalium.network.api.base.unbound.versioning.VersionApi
+import com.wire.kalium.network.api.base.unbound.versioning.VersionApiImpl
 import com.wire.kalium.network.api.v6.unauthenticated.DomainLookupApiV6
 import com.wire.kalium.network.api.v6.unauthenticated.LoginApiV6
 import com.wire.kalium.network.api.v6.unauthenticated.RegisterApiV6
@@ -50,7 +54,8 @@ class UnauthenticatedNetworkContainerV6 internal constructor(
         serverConfigDTOApiProxy = backendLinks.links.apiProxy,
         proxyCredentials = proxyCredentials,
         certificatePinning = certificatePinning
-    )
+    ),
+    private val developmentApiEnabled: Boolean
 ) : UnauthenticatedNetworkContainer,
     UnauthenticatedNetworkClientProvider by UnauthenticatedNetworkClientProviderImpl(
         networkStateObserver,
@@ -60,6 +65,10 @@ class UnauthenticatedNetworkContainerV6 internal constructor(
     override val loginApi: LoginApi get() = LoginApiV6(unauthenticatedNetworkClient)
     override val verificationCodeApi: VerificationCodeApi get() = VerificationCodeApiV6(unauthenticatedNetworkClient)
     override val domainLookupApi: DomainLookupApi get() = DomainLookupApiV6(unauthenticatedNetworkClient)
+    override val remoteVersion: VersionApi
+        get() = VersionApiImpl(unauthenticatedNetworkClient, developmentApiEnabled = developmentApiEnabled)
+    override val serverConfigApi: ServerConfigApi
+        get() = ServerConfigApiImpl(unauthenticatedNetworkClient)
     override val registerApi: RegisterApi get() = RegisterApiV6(unauthenticatedNetworkClient)
     override val sso: SSOLoginApi get() = SSOLoginApiV6(unauthenticatedNetworkClient)
     override val appVersioningApi: AppVersioningApi get() = AppVersioningApiImpl(unauthenticatedNetworkClient)

diff --git a/...onMain/kotlin/com/wire/kalium/network/networkContainer/UnauthenticatedNetworkContainer.kt b/...onMain/kotlin/com/wire/kalium/network/networkContainer/UnauthenticatedNetworkContainer.kt
@@ -99,7 +99,7 @@ interface UnauthenticatedNetworkContainer {
                     serverConfigDTO,
                     proxyCredentials = proxyCredentials,
                     certificatePinning = certificatePinning,
-                    mockEngine
+                    mockEngine = mockEngine,
                 )
 
                 4 -> UnauthenticatedNetworkContainerV4(
@@ -108,24 +108,25 @@ interface UnauthenticatedNetworkContainer {
                     serverConfigDTO,
                     proxyCredentials = proxyCredentials,
                     certificatePinning = certificatePinning,
-                    mockEngine
-                )
+                    mockEngine = mockEngine,
+                    )
 
                 5 -> UnauthenticatedNetworkContainerV5(
                     developmentApiEnabled,
                     networkStateObserver,
                     serverConfigDTO,
                     proxyCredentials = proxyCredentials,
                     certificatePinning = certificatePinning,
-                    mockEngine
+                    mockEngine = mockEngine,
                 )
 
                 6 -> UnauthenticatedNetworkContainerV6(
                     networkStateObserver,
                     serverConfigDTO,
                     proxyCredentials = proxyCredentials,
                     certificatePinning = certificatePinning,
-                    mockEngine
+                    mockEngine = mockEngine,
+                    developmentApiEnabled = developmentApiEnabled
                 )
 
                 else -> error("Unsupported version: ${serverConfigDTO.metaData.commonApiVersion.version}")

diff --git a/...src/commonMain/kotlin/com/wire/kalium/network/networkContainer/UnboundNetworkContainer.kt b/...src/commonMain/kotlin/com/wire/kalium/network/networkContainer/UnboundNetworkContainer.kt
@@ -84,7 +84,9 @@ class UnboundNetworkContainerCommon(
         userAgent = userAgent,
         engine = mockEngine ?: defaultHttpEngine(
             ignoreSSLCertificates = ignoreSSLCertificates,
-            certificatePinning = certificatePinning
+            certificatePinning = certificatePinning,
+            proxyCredentials = null,
+            serverConfigDTOApiProxy = null
         )
     ),
     UnboundClearTextTrafficNetworkClientProvider by UnboundClearTextTrafficNetworkClientProviderImpl(