fix conflicts

minvws · Sep 28, 2021 · c86d66b · c86d66b
1 parent 649f7ed
commit c86d66b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/holder/build.gradle b/holder/build.gradle
@@ -40,6 +40,7 @@ android {
                 "{" +
                         "\"sha256/lR7gRvqDMW5nhsCMRPE7TKLq0tJkTWMxQ5HAzHCIfQ0=\"" +
                         "}"
+        buildConfigField "String", "CDN_API_URL", "\"https://holder-api-cdn.coronacheck.nl/v5/\""
         manifestPlaceholders = [appLabel: "@string/app_name", deepLinkHost: "coronacheck.nl", digidSchema: "coronacheck"]
 
         javaCompileOptions {
@@ -96,6 +97,7 @@ android {
                     "{" +
                             "\"sha256/lR7gRvqDMW5nhsCMRPE7TKLq0tJkTWMxQ5HAzHCIfQ0=\"" +
                             "}"
+            buildConfigField "String", "CDN_API_URL", "\"https://holder-api-cdn.acc.coronacheck.nl/v5/\""
             dimension "environment"
             versionNameSuffix "-acc"
             applicationIdSuffix ".acc"

diff --git a/holder/src/main/java/nl/rijksoverheid/ctr/holder/HolderApplication.kt b/holder/src/main/java/nl/rijksoverheid/ctr/holder/HolderApplication.kt
@@ -77,7 +77,7 @@ open class HolderApplication : SharedApplication(), Configuration.Provider {
                     BuildConfig.CERTIFICATE_PINS,
                 ),
                 sharedModule,
-                appConfigModule("holder", BuildConfig.VERSION_CODE),
+                appConfigModule(BuildConfig.CDN_API_URL,"holder", BuildConfig.VERSION_CODE),
                 introductionModule,
                 *getAdditionalModules().toTypedArray(),
                 designModule

diff --git a/holder/src/test/java/nl/rijksoverheid/ctr/holder/CertificatePinTest.kt b/holder/src/test/java/nl/rijksoverheid/ctr/holder/CertificatePinTest.kt
@@ -3,10 +3,19 @@ package nl.rijksoverheid.ctr.holder
 import com.squareup.moshi.Moshi
 import kotlinx.coroutines.runBlocking
 import nl.rijksoverheid.ctr.api.json.JsonObjectJsonAdapter
+import nl.rijksoverheid.ctr.appconfig.AppConfigViewModel
+import nl.rijksoverheid.ctr.appconfig.AppConfigViewModelImpl
 import nl.rijksoverheid.ctr.appconfig.api.AppConfigApi
+import nl.rijksoverheid.ctr.appconfig.appConfigModule
+import nl.rijksoverheid.ctr.appconfig.isVerifierApp
+import nl.rijksoverheid.ctr.appconfig.persistence.*
+import nl.rijksoverheid.ctr.appconfig.repositories.ConfigRepository
+import nl.rijksoverheid.ctr.appconfig.repositories.ConfigRepositoryImpl
+import nl.rijksoverheid.ctr.appconfig.usecases.*
 import okhttp3.CertificatePinner
 import okhttp3.CertificatePinner.Companion.sha256Hash
 import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
@@ -15,7 +24,10 @@ import okhttp3.tls.HeldCertificate
 import org.junit.Assert.assertThrows
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.koin.android.ext.koin.androidContext
+import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.context.loadKoinModules
+import org.koin.core.context.unloadKoinModules
 import org.koin.dsl.module
 import org.koin.test.AutoCloseKoinTest
 import org.koin.test.get
@@ -57,7 +69,8 @@ class CertificatePinTest: AutoCloseKoinTest() {
             setBody("{}")
         })
 
-        loadKoinModules(apiModule(server.url("/")))
+        unloadKoinModules(appConfigModule(BuildConfig.CDN_API_URL, "holder", BuildConfig.VERSION_CODE))
+        loadKoinModules(listOf(apiModule(server.url("/")), appConfigModule(server.url("/").toString(), "holder", BuildConfig.VERSION_CODE)))
 
         val configApi: AppConfigApi = get()
 
@@ -128,4 +141,4 @@ class CertificatePinTest: AutoCloseKoinTest() {
                 .add(JsonObjectJsonAdapter())
         }
     }
-}
+}