Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ class DiagnosticsViewModelTest {
tslUrl = "https://www.example.com",
tslCerts = listOf("CERT0000111122224444"),
tsaUrl = "https://www.example.com",
ocspUrls = mapOf("issuer" to "https://www.example.com"),
ldapPersonUrl = "https://www.example.com",
ldapPersonUrls = listOf("https://www.example.com"),
ldapCorpUrl = "https://www.example.com",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ class MobileIdViewModelTest {
tslUrl = "https://www.example.com",
tslCerts = listOf("CERT0000111122224444"),
tsaUrl = "https://www.example.com",
ocspUrls = mapOf("issuer" to "https://www.example.com"),
ldapPersonUrl = "https://www.example.com",
ldapPersonUrls = listOf("https://www.example.com"),
ldapCorpUrl = "https://www.example.com",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ class SmartIdViewModelTest {
tslUrl = "https://www.example.com",
tslCerts = listOf("CERT0000111122224444"),
tsaUrl = "https://www.example.com",
ocspUrls = mapOf("issuer" to "https://www.example.com"),
ldapPersonUrl = "https://www.example.com",
ldapPersonUrls = listOf("https://www.example.com"),
ldapCorpUrl = "https://www.example.com",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ class ConfigurationViewModelTest {
"tslUrl",
emptyList(),
"tsaUrl",
emptyMap(),
"ldapPersonUrl",
ldapPersonUrls = listOf("ldapPersonUrl"),
"ldapCorpUrl",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,6 @@ class ConfigurationLoaderTest {
"eE/VmJs0niWtKlX4UURG0HAGjZIQ/pJejV+7GzknFMZmuiwJQe4yT4mw=",
),
tsaUrl = "https://www.example.com",
ocspUrls = mapOf("issuer" to "https://www.example.com"),
ldapPersonUrl = "https://www.example.com",
ldapPersonUrls = listOf("https://www.example.com"),
ldapCorpUrl = "https://www.example.com",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ class ConfigurationRepositoryTest {
"eE/VmJs0niWtKlX4UURG0HAGjZIQ/pJejV+7GzknFMZmuiwJQe4yT4mw=\n",
),
tsaUrl = "https://www.example.com",
ocspUrls = mapOf("issuer" to "https://www.example.com"),
ldapPersonUrl = "https://www.example.com",
ldapPersonUrls = listOf("https://www.example.com"),
ldapCorpUrl = "https://www.example.com",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ data class ConfigurationProvider(
@SerializedName("TSL-URL") val tslUrl: String,
@SerializedName("TSL-CERTS") val tslCerts: List<String>,
@SerializedName("TSA-URL") val tsaUrl: String,
@SerializedName("OCSP-URL-ISSUER") val ocspUrls: Map<String, String>,
@SerializedName("LDAP-PERSON-URL") val ldapPersonUrl: String,
@SerializedName("LDAP-PERSON-URLS") val ldapPersonUrls: List<String>,
@SerializedName("LDAP-CORP-URL") val ldapCorpUrl: String,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ class CryptoContainerTest {
tslUrl = "https://www.example.com",
tslCerts = listOf("CER00001", "CER00002"),
tsaUrl = "https://www.example.com",
ocspUrls = mapOf("issuer" to "https://www.example.com"),
ldapPersonUrl = "https://www.example.com",
ldapPersonUrls = listOf("https://www.example.com"),
ldapCorpUrl = "https://www.example.com",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ class InitializationTest {
tslUrl = "https://www.example.com",
tslCerts = listOf(),
tsaUrl = "https://www.example.com",
ocspUrls = mapOf("issuer" to "https://www.example.com"),
ldapPersonUrl = "https://www.example.com",
ldapPersonUrls = listOf("https://www.example.com"),
ldapCorpUrl = "https://www.example.com",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ import ee.ria.DigiDoc.utilsLib.logging.LoggingUtil.Companion.debugLog
import ee.ria.DigiDoc.utilsLib.logging.LoggingUtil.Companion.errorLog
import ee.ria.libdigidocpp.Conf
import ee.ria.libdigidocpp.DigiDocConf
import ee.ria.libdigidocpp.StringMap
import ee.ria.libdigidocpp.digidoc
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers.IO
Expand Down Expand Up @@ -192,7 +191,6 @@ class Initialization
overrideTSLUrl(configurationProvider.tslUrl)
overrideTSLCert(configurationProvider.tslCerts)
overrideSivaUrl(configurationProvider.sivaUrl)
overrideOCSPUrls(configurationProvider.ocspUrls)
overrideTSCerts(configurationProvider.certBundle)
overrideTSUrl(configurationProvider.tsaUrl)
overrideVerifyServiceCert(configurationProvider.certBundle)
Expand Down Expand Up @@ -421,14 +419,6 @@ class Initialization
}
}

private fun overrideOCSPUrls(ocspUrls: Map<String, String>) {
val stringMap = StringMap()
for ((key, value) in ocspUrls) {
stringMap[key] = value
}
DigiDocConf.instance().setOCSPUrls(stringMap)
}

private fun loadConfiguration(context: Context) {
configurationRepository.getConfiguration()?.let { overrideConfiguration(context, it) }
CoroutineScope(Main).launch {
Expand Down
Loading