Fix #3: Discovery service, param has to contain the whole url

app/src/main/java/com/ewc/eudiwalletoidcandroid/MainViewModel.kt

@@ -54,11 +54,11 @@ class MainViewModel : ViewModel() {
 
             // Discovery
             issuerConfig =
-                DiscoveryService().getIssuerConfig(offerCredential?.credentialIssuer)
+                DiscoveryService().getIssuerConfig("${offerCredential?.credentialIssuer}/.well-known/openid-credential-issuer")
 
             authConfig =
                 DiscoveryService().getAuthConfig(
-                    issuerConfig?.authorizationServer ?: issuerConfig?.issuer
+                    "${issuerConfig?.authorizationServer ?: issuerConfig?.issuer}/.well-known/openid-configuration"
                 )
 
             // Generating code verifier

eudi-wallet-oidc-android/src/main/java/com/ewc/eudi_wallet_oidc_android/services/discovery/DiscoveryService.kt

@@ -19,7 +19,7 @@ class DiscoveryService : DiscoveryServiceInterface {
             UrlUtils.validateUri(credentialIssuerWellKnownURI)
             val response =
                 ApiManager.api.getService()
-                    ?.fetchIssuerConfig("$credentialIssuerWellKnownURI/.well-known/openid-credential-issuer")
+                    ?.fetchIssuerConfig("$credentialIssuerWellKnownURI")
             return if (response?.isSuccessful == true) {
                 response.body()
             } else {
@@ -37,19 +37,19 @@ class DiscoveryService : DiscoveryServiceInterface {
      * @return AuthorisationServerWellKnownConfiguration
      */
     override suspend fun getAuthConfig(authorisationServerWellKnownURI: String?): AuthorisationServerWellKnownConfiguration? {
-        if (authorisationServerWellKnownURI.isNullOrBlank() || !UrlUtils.isValidUrl(
-                authorisationServerWellKnownURI ?: ""
-            )
-        )
-            return null
+        try {
+            UrlUtils.validateUri(authorisationServerWellKnownURI)
 
-        val response =
-            ApiManager.api.getService()
-                ?.fetchAuthConfig("$authorisationServerWellKnownURI/.well-known/openid-configuration")
-        return if (response?.isSuccessful == true) {
-            response.body()
-        } else {
-            null
+            val response =
+                ApiManager.api.getService()
+                    ?.fetchAuthConfig("$authorisationServerWellKnownURI")
+            return if (response?.isSuccessful == true) {
+                response.body()
+            } else {
+                null
+            }
+        } catch (exc: UriValidationFailed) {
+            return null
         }
     }
 }

eudi-wallet-oidc-android/src/test/java/com/ewc/eudi_wallet_oidc_android/DiscoveryServiceTest.kt

@@ -0,0 +1,38 @@
+package com.ewc.eudi_wallet_oidc_android
+
+import com.ewc.eudi_wallet_oidc_android.services.UriValidationFailed
+import com.ewc.eudi_wallet_oidc_android.services.UrlUtils
+import com.ewc.eudi_wallet_oidc_android.services.discovery.DiscoveryService
+import com.ewc.eudi_wallet_oidc_android.services.issue.IssueService
+import kotlinx.coroutines.runBlocking
+import org.junit.Assert
+import org.junit.Test
+
+class DiscoveryServiceTest {
+
+    private val discoveryService = DiscoveryService()
+
+    @Test
+    fun issuerConfigUrlIsNull() {
+        val result = runBlocking { discoveryService.getIssuerConfig(null)}
+        Assert.assertNull(result)
+    }
+
+    @Test
+    fun issuerConfigUrlIsNotValid() {
+        val result = runBlocking { discoveryService.getIssuerConfig("://abc")}
+        Assert.assertNull(result)
+    }
+
+    @Test
+    fun authConfigUrlIsNull() {
+        val result = runBlocking { discoveryService.getAuthConfig(null)}
+        Assert.assertNull(result)
+    }
+
+    @Test
+    fun authConfigUrlIsNotValid() {
+        val result = runBlocking { discoveryService.getAuthConfig("://abc")}
+        Assert.assertNull(result)
+    }
+}