Fix custom URL override issue (#30)

* Fix custom URL override issue

* Bump versions

* Format

Author: z4kn4fein

gradle.properties

@@ -1,5 +1,5 @@
 group=com.configcat
-version=3.0.0
+version=3.0.1
 
 ktor_version=2.0.3
 kotlinx_serialization_version=1.4.1

src/commonMain/kotlin/com/configcat/Constants.kt

@@ -20,7 +20,7 @@ internal interface Closeable {
 }
 
 internal object Constants {
-    const val version: String = "3.0.0"
+    const val version: String = "3.0.1"
     const val configFileName: String = "config_v6.json"
     const val serializationFormatVersion: String = "v2"
     const val globalCdnUrl = "https://cdn-global.configcat.com"

src/commonMain/kotlin/com/configcat/fetch/ConfigFetcher.kt

@@ -31,32 +31,31 @@ internal class ConfigFetcher constructor(
     )
 
     suspend fun fetch(eTag: String): FetchResponse {
-        val currentUrl = baseUrl.value
-        val response = fetchHTTPWithPreferenceHandling(currentUrl, eTag)
-        val newUrl = response.entry.config.preferences?.baseUrl ?: currentUrl
-        baseUrl.update { newUrl }
-        return response
+        return fetchHTTPWithPreferenceHandling(eTag)
     }
 
     override fun close() {
         if (!closed.compareAndSet(expect = false, update = true)) return
         httpClient.close()
     }
 
-    private suspend fun fetchHTTPWithPreferenceHandling(baseUrl: String, eTag: String): FetchResponse {
-        var currentBaseUrl = baseUrl
+    private suspend fun fetchHTTPWithPreferenceHandling(eTag: String): FetchResponse {
         repeat(3) {
-            val response = fetchHTTP(currentBaseUrl, eTag)
+            val response = fetchHTTP(baseUrl.value, eTag)
             val preferences = response.entry.config.preferences
             if (!response.isFetched ||
                 response.entry.isEmpty() ||
                 preferences == null ||
-                preferences.baseUrl == currentBaseUrl
+                preferences.baseUrl == baseUrl.value
             ) {
                 return response
             }
-            if (isUrlCustom && preferences.redirect != RedirectMode.FORCE_REDIRECT.ordinal) return response
-            currentBaseUrl = preferences.baseUrl
+            if (isUrlCustom && preferences.redirect != RedirectMode.FORCE_REDIRECT.ordinal) {
+                return response
+            }
+
+            baseUrl.update { preferences.baseUrl }
+
             if (preferences.redirect == RedirectMode.NO_REDIRECT.ordinal) {
                 return response
             } else if (preferences.redirect == RedirectMode.SHOULD_REDIRECT.ordinal) {

src/commonTest/kotlin/com/configcat/DataGovernanceTests.kt

@@ -138,6 +138,10 @@ class DataGovernanceTests {
 
         assertEquals(1, mockEngine.requestHistory.size)
         assertTrue(mockEngine.requestHistory[0].url.toString().startsWith(customCdnUrl))
+
+        fetcher.fetch("")
+        assertEquals(2, mockEngine.requestHistory.size)
+        assertTrue(mockEngine.requestHistory[1].url.toString().startsWith(customCdnUrl))
     }
 
     @Test