wulkanowy/sdk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add local mapping fallback if there is no data in overriden maps

Browse source
This commit is contained in:
Mikołaj Pich 2024-05-22 08:45:54 +02:00
parent 905a74524b
commit 00de384ca2
No known key found for this signature in database
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/ApiEndpoints.kt
View file

@ -659,6 +659,7 @@ internal val ApiEndpointsVTokenSchemeMap = mapOf(
),
"24.04.0007.58773" to mapOf(
"uonetplus-wiadomosciplus" to "{UUID}-{appCustomerDb}-{appVersion}-{apiKey}",
"uonetplus-uczenplus" to "{UUID}-{appCustomerDb}-{appVersion}-{apiKey}",
),
"24.04.0008.58830" to mapOf(
"uonetplus-wiadomosciplus" to "{UUID}-{appCustomerDb}-{appCustomerDbSig}-{appVersion}-{apiKey}",

6
sdk-scrapper/src/main/kotlin/io/github/wulkanowy/sdk/scrapper/Utils.kt
View file

@ -224,7 +224,7 @@ internal fun String.md5(): String {
internal fun HttpUrl.mapModuleUrl(moduleHost: String, appVersion: String?): HttpUrl {
val pathSegmentIndex = getPathIndexByModuleHost(moduleHost)
val pathKey = pathSegments.getOrNull(pathSegmentIndex)
val mappedPath = Scrapper.endpointsMap[appVersion]
val mappedPath = (Scrapper.endpointsMap[appVersion] ?: ApiEndpointsMap[appVersion])
?.get(moduleHost)
?.get(pathKey?.substringBefore(".mvc"))
@ -316,7 +316,7 @@ internal fun Request.Builder.attachVToken(moduleHost: String, url: HttpUrl, head
internal fun HttpUrl.getMatchedVToken(moduleHost: String, headers: ModuleHeaders?): String? {
val pathSegmentIndex = getPathIndexByModuleHost(moduleHost)
val pathKey = pathSegments.getOrNull(pathSegmentIndex)
val mappedUuid = Scrapper.vTokenMap[headers?.appVersion]
val mappedUuid = (Scrapper.vTokenMap[headers?.appVersion] ?: ApiEndpointsVTokenMap[headers?.appVersion])
?.get(moduleHost)
?.get(pathKey)
?: return null
@ -329,7 +329,7 @@ private val vTokenSchemeKeysRegex = "\\{([^{}]+)\\}".toRegex()
private fun getVToken(uuid: String, headers: ModuleHeaders?, moduleHost: String): String? {
if (uuid.isBlank()) return null
val schemeToSubstitute = Scrapper.vTokenSchemeMap[headers?.appVersion]
val schemeToSubstitute = (Scrapper.vTokenSchemeMap[headers?.appVersion] ?: ApiEndpointsVTokenSchemeMap[headers?.appVersion])
?.get(moduleHost)
?: "{UUID}-{appCustomerDb}-{appCustomerDbSig}-{appVersion}-{apiKey}"