Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the detected vct when parsing the input detector for claim descriptions #785

Merged
merged 1 commit into from
Nov 20, 2024
Merged

Fix the detected vct when parsing the input detector for claim descriptions #785

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions ...java/com/android/identity_credential/wallet/presentation/OpenID4VPPresentationActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,8 @@ class OpenID4VPPresentationActivity : FragmentActivity() {
inputDescriptor: JsonObject
): Pair<String, List<String>> {
val requestedClaims = mutableListOf<String>()
val vct = EUPersonalID.EUPID_VCT // TODO: extract from `inputDescriptor`
// Set the default vct if we don't detect it below.
var vct = EUPersonalID.EUPID_VCT

val constraints = inputDescriptor["constraints"]!!.jsonObject
val fields = constraints["fields"]!!.jsonArray
Expand All @@ -453,6 +454,11 @@ class OpenID4VPPresentationActivity : FragmentActivity() {
val parsed = parsePathItem(path)
val claimName = parsed.second
requestedClaims.add(claimName)

if (path == "\"\$.vct\"") {
val filter = fieldObj["filter"]!!.jsonObject
vct = filter["const"]!!.toString().run { substring(1, this.length - 1) }
}
}
return Pair(vct, requestedClaims)
}
Expand Down Expand Up @@ -490,18 +496,10 @@ class OpenID4VPPresentationActivity : FragmentActivity() {
inputDescriptorObj["id"]!!.toString().run { substring(1, this.length - 1) }
} else {
try {
var vct = ""
val constraints = inputDescriptorObj["constraints"]!!.jsonObject
for (field in constraints["fields"]!!.jsonArray) {
if (field.jsonObject["path"]!!.jsonArray[0].toString() == "\"\$.vct\"") {
val vctField = field.jsonObject
val filter = vctField["filter"]!!.jsonObject
vct = filter["const"]!!.toString().run { substring(1, this.length - 1) }
}
}
val (vct, _) = parseInputDescriptorForVc(inputDescriptorObj)
vct
} catch (e: NullPointerException) {
Logger.d(TAG, "Error: Could not find const filter field: ${e.message}")
Logger.d(TAG, "Error: Expected input descriptor field is missing: ${e.message}")
""
}
}
Expand Down