Fix zkp

TICESoftware · Aug 16, 2024 · e89bf37 · e89bf37
1 parent 3a226c7
commit e89bf37
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/wallet-core/src/main/java/eu/europa/ec/eudi/wallet/transfer/openid4vp/OpenId4vpManager.kt b/wallet-core/src/main/java/eu/europa/ec/eudi/wallet/transfer/openid4vp/OpenId4vpManager.kt
@@ -204,8 +204,9 @@ class OpenId4vpManager(
                     is Resolution.Success -> {
                         logger?.d(TAG, "Resolution.Success")
                         val requestId = Uri.parse(openid4VPURI).run {
-                            getQueryParameter(queryParameterNames.elementAt(1))!!.toUri().toString()
+                            getQueryParameter(queryParameterNames.elementAt(1))?.toUri()?.pathSegments?.get(2)
                         }
+
                         resolution.requestObject
                             .also { resolvedRequestObject = it }
                             .let { handleRequestObject(it, requestId) }
@@ -218,7 +219,7 @@ class OpenId4vpManager(
         }
     }
 
-    private fun handleRequestObject(requestObject: ResolvedRequestObject, requestId: String) {
+    private fun handleRequestObject(requestObject: ResolvedRequestObject, requestId: String?) {
         when (requestObject) {
             is ResolvedRequestObject.OpenId4VPAuthorization -> {
                 logger?.d(TAG, "OpenId4VPAuthorization Request received")

diff --git a/wallet-core/src/main/java/eu/europa/ec/eudi/wallet/zkp/network/ZKPClient.kt b/wallet-core/src/main/java/eu/europa/ec/eudi/wallet/zkp/network/ZKPClient.kt
@@ -31,8 +31,9 @@ class ZKPClient(
         requestData: ChallengeRequestData
     ): ECPublicKey? {
         val response = service.requestZkp(
-            zkpRequestId, ZkpRequest(
-                "eu.europa.ec.eudiw.pid.1",
+            zkpRequestId,
+            ZkpRequest(
+                "eu.europa.ec.eudi.pid.1",
                 requestData.digest,
                 requestData.r,
                 "secp256r1-sha256",