Fix #24: filter logic updated with limited_disclosures parameter

EWC-consortium · May 28, 2024 · ca4b78a · ca4b78a
1 parent ee56ae7
commit ca4b78a
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 15 deletions.
diff --git a/...et-oidc-android/src/main/java/com/ewc/eudi_wallet_oidc_android/models/InputDescriptors.kt b/...et-oidc-android/src/main/java/com/ewc/eudi_wallet_oidc_android/models/InputDescriptors.kt
@@ -11,6 +11,7 @@ data class InputDescriptors(
 
 data class Constraints(
 
+    @SerializedName("limit_disclosure") var limitDisclosure: String? = null,
     @SerializedName("fields") var fields: ArrayList<Fields>? = null
 
 )

diff --git a/...idc-android/src/main/java/com/ewc/eudi_wallet_oidc_android/services/issue/IssueService.kt b/...idc-android/src/main/java/com/ewc/eudi_wallet_oidc_android/services/issue/IssueService.kt
@@ -435,24 +435,30 @@ class IssueService : IssueServiceInterface {
 
         when (credentialsSupported) {
             is JSONObject -> {
-                val credentialSupported = credentialsSupported.getJSONObject(type ?: "")
-                format = credentialSupported.getString("format")
+                try {
+                    val credentialSupported = credentialsSupported.getJSONObject(type ?: "")
+                    format = credentialSupported.getString("format")
+                } catch (e: Exception) {
+                }
             }
 
             is JSONArray -> {
-                for (i in 0 until credentialsSupported.length()) {
-                    val jsonObject: JSONObject = credentialsSupported.getJSONObject(i)
-
-                    // Get the "types" JSONArray
-                    val typesArray = jsonObject.getJSONArray("types")
-
-                    // Check if the string is present in the "types" array
-                    for (j in 0 until typesArray.length()) {
-                        if (typesArray.getString(j) == type) {
-                            format = jsonObject.getString("format")
-                            break
+                try {
+                    for (i in 0 until credentialsSupported.length()) {
+                        val jsonObject: JSONObject = credentialsSupported.getJSONObject(i)
+
+                        // Get the "types" JSONArray
+                        val typesArray = jsonObject.getJSONArray("types")
+
+                        // Check if the string is present in the "types" array
+                        for (j in 0 until typesArray.length()) {
+                            if (typesArray.getString(j) == type) {
+                                format = jsonObject.getString("format")
+                                break
+                            }
                         }
                     }
+                } catch (e: Exception) {
                 }
             }
 

diff --git a/...c/main/java/com/ewc/eudi_wallet_oidc_android/services/verification/VerificationService.kt b/...c/main/java/com/ewc/eudi_wallet_oidc_android/services/verification/VerificationService.kt
@@ -82,7 +82,7 @@ class VerificationService : VerificationServiceInterface {
                     )
 
                     return json
-                }else{
+                } else {
                     return null
                 }
             } else {
@@ -194,10 +194,25 @@ class VerificationService : VerificationServiceInterface {
      * Returns all the list of credentials matching for all input descriptors
      */
     override suspend fun filterCredentials(
-        credentialList: List<String?>,
+        allCredentialList: List<String?>,
         presentationDefinition: PresentationDefinition
     ): List<List<String>> {
         //list of credentials matched for all input descriptors
+
+        val credentialList: ArrayList<String?> = arrayListOf()
+        for (item in allCredentialList) {
+            if (presentationDefinition.inputDescriptors?.get(0)?.constraints?.limitDisclosure != null && item?.contains(
+                    "~"
+                ) == true
+            )
+                credentialList.add(item)
+            else if (presentationDefinition.inputDescriptors?.get(0)?.constraints?.limitDisclosure == null && item?.contains(
+                    "~"
+                ) != true
+            )
+                credentialList.add(item)
+        }
+
         val response: MutableList<MutableList<String>> = mutableListOf()
 
         var processedCredentials: List<String> = mutableListOf()
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,7 @@ data class InputDescriptors( @@
     data class Constraints(
+        @SerializedName("limit_disclosure") var limitDisclosure: String? = null,
         @SerializedName("fields") var fields: ArrayList<Fields>? = null
     )
@@ Expand Down @@