From 1b4fba9ebded6e6babb6eb607aacf453ca474d22 Mon Sep 17 00:00:00 2001
From: MS <ms@taler.net>
Date: Tue, 7 Jun 2022 21:24:26 +0200
Subject: cashier: adapt URLs to euFin Sandbox

---
 cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt | 6 ++++--
 cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt  | 5 ++---
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'cashier/src/main/java/net/taler/cashier/config')

diff --git a/cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt b/cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt
index e6ac249..6bee259 100644
--- a/cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt
+++ b/cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt
@@ -38,7 +38,8 @@ import net.taler.cashier.R
 import net.taler.cashier.databinding.FragmentConfigBinding
 import net.taler.common.exhaustive
 
-private const val URL_BANK_TEST = "https://bank.test.taler.net"
+// NOTE: HTTP should eventually be disabled.
+private const val URL_BANK_TEST = "http://10.0.2.2:8080/sandbox/demobanks/default"
 private const val URL_BANK_TEST_REGISTER = "$URL_BANK_TEST/accounts/register"
 
 class ConfigFragment : Fragment() {
@@ -116,7 +117,8 @@ class ConfigFragment : Fragment() {
     }
 
     private fun checkConfig(config: Config): Boolean {
-        if (!config.bankUrl.startsWith("https://")) {
+        if (!config.bankUrl.startsWith("https://") &&
+            !config.bankUrl.startsWith("http://")) {
             ui.urlView.error = getString(R.string.config_bank_url_error)
             ui.urlView.requestFocus()
             return false
diff --git a/cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt b/cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt
index 2fde37d..d850d27 100644
--- a/cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt
+++ b/cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt
@@ -112,9 +112,8 @@ class ConfigManager(
             mConfigResult.postValue(result)
         }
     }
-
     private suspend fun checkConfig(config: Config) = withContext(Dispatchers.IO) {
-        val url = "${config.bankUrl}/config"
+        val url = "${config.bankUrl}/integration-api/config"
         Log.d(TAG, "Checking config: $url")
         val configResponse = response {
             httpClient.get(url).body<ConfigResponse>()
@@ -125,7 +124,7 @@ class ConfigManager(
             // we need to check an endpoint that requires authentication as well
             // to see if the credentials are valid
             val balanceResponse = response {
-                val authUrl = "${config.bankUrl}/accounts/${config.username}"
+                val authUrl = "${config.bankUrl}/access-api/accounts/${config.username}"
                 Log.d(TAG, "Checking auth: $authUrl")
                 httpClient.get(authUrl) {
                     header(Authorization, config.basicAuth)
-- 
cgit v1.2.3