Merge c86d66b into ec76313

minvws · Sep 28, 2021 · a065ebd · a065ebd
2 parents ec76313 + c86d66b
commit a065ebd
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 9 deletions.
diff --git a/appconfig/src/main/java/nl/rijksoverheid/ctr/appconfig/AppConfigModule.kt b/appconfig/src/main/java/nl/rijksoverheid/ctr/appconfig/AppConfigModule.kt
@@ -14,6 +14,8 @@ 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.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import org.koin.android.ext.koin.androidContext
 import org.koin.androidx.viewmodel.dsl.viewModel
@@ -26,7 +28,7 @@ import retrofit2.Retrofit
  * @param path Path for the config api, for example "holder" to fetch the config from <baseurl>/holder/config
  * @param versionCode version code
  */
-fun appConfigModule(path: String, versionCode: Int) = module {
+fun appConfigModule(cdnUrl: String, path: String, versionCode: Int) = module {
     factory<ConfigRepository> { ConfigRepositoryImpl(get()) }
     factory<AppConfigUseCase> { AppConfigUseCaseImpl(get(), get(), get(), get()) }
     factory<AppStatusUseCase> {
@@ -62,7 +64,7 @@ fun appConfigModule(path: String, versionCode: Int) = module {
     single {
         val okHttpClient = get<OkHttpClient>(OkHttpClient::class).newBuilder().build()
         val retrofit = get<Retrofit>(Retrofit::class)
-        val baseUrl = retrofit.baseUrl().newBuilder().addPathSegments("$path/").build()
+        val baseUrl = cdnUrl.toHttpUrl().newBuilder().addPathSegments("$path/").build()
         retrofit.newBuilder().baseUrl(baseUrl).client(okHttpClient).build()
             .create(AppConfigApi::class.java)
     }
@@ -82,4 +84,4 @@ fun appConfigModule(path: String, versionCode: Int) = module {
 }
 
 fun isVerifierApp(applicationContext: Context): Boolean =
-    applicationContext.packageName.contains("verifier")
+    applicationContext.packageName.contains("verifier")
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())
         }
     }
-}
+}
diff --git a/verifier/build.gradle b/verifier/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 def appVersionCode = System.getenv("GITHUB_RUN_NUMBER") != null ? System.getenv("GITHUB_RUN_NUMBER").toInteger() : 1000000
-version = "2.3.1"
+version = "2.3.2"
 archivesBaseName = "verifier-v${version}-${appVersionCode}"
 
 android {
@@ -37,6 +37,7 @@ android {
                 "{" +
                         "\"sha256/lR7gRvqDMW5nhsCMRPE7TKLq0tJkTWMxQ5HAzHCIfQ0=\"" +
                         "}"
+        buildConfigField "String", "CDN_API_URL", "\"https://verifier-api-cdn.coronacheck.nl/v5/\""
     }
 
     signingConfigs {
@@ -83,6 +84,7 @@ android {
                     "{" +
                             "\"sha256/lR7gRvqDMW5nhsCMRPE7TKLq0tJkTWMxQ5HAzHCIfQ0=\"" +
                             "}"
+            buildConfigField "String", "CDN_API_URL", "\"https://verifier-api-cdn.acc.coronacheck.nl/v5/\""
             apply plugin: 'com.google.gms.google-services'
             apply plugin: 'com.google.firebase.crashlytics'
         }
@@ -138,4 +140,3 @@ dependencies {
 
     debugImplementation "androidx.fragment:fragment-testing:$fragment_version"
 }
-
diff --git a/verifier/src/main/java/nl/rijksoverheid/ctr/verifier/VerifierApplication.kt b/verifier/src/main/java/nl/rijksoverheid/ctr/verifier/VerifierApplication.kt
@@ -44,7 +44,7 @@ open class VerifierApplication : SharedApplication() {
                 verifierModule("verifier"),
                 verifierIntroductionModule,
                 sharedModule,
-                appConfigModule("verifier", BuildConfig.VERSION_CODE),
+                appConfigModule(BuildConfig.CDN_API_URL, "verifier", BuildConfig.VERSION_CODE),
                 introductionModule,
                 *getAdditionalModules().toTypedArray(),
                 designModule,