Merge pull request velocitycareerlabs#197 from velocitycareerlabs/VL-…

…7648 chore: v2.4.5 - add verified profile to presentation request
samr874 · Apr 11, 2024 · 81102d5 · 81102d5
2 parents 3c80f26 + be7f08e
commit 81102d5
Show file tree

Hide file tree

Showing 16 changed files with 371 additions and 115 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -93,6 +93,6 @@ dependencies {
 
   // VCL:
   implementation "com.nimbusds:nimbus-jose-jwt:9.37.3"
-  implementation "io.velocitycareerlabs:vcl:2.4.4"
+  implementation "io.velocitycareerlabs:vcl:2.4.5"
 }
 
diff --git a/android/src/main/java/io/velocitycareerlabs/reactnative/utlis/Converter.kt b/android/src/main/java/io/velocitycareerlabs/reactnative/utlis/Converter.kt
@@ -186,7 +186,7 @@ object Converter {
   fun deepLinkToMap(deepLink: VCLDeepLink?): ReadableMap? {
     deepLink?.value?.let {
       val retVal = Arguments.createMap()
-      retVal.putString("value", deepLink?.value)
+      retVal.putString("value", deepLink.value)
       return retVal
     }
     return null
@@ -216,7 +216,7 @@ object Converter {
     presentationRequestMap: ReadableMap?
   ) = VCLPresentationRequest(
     jwt = mapToJwt(presentationRequestMap?.getMapOpt("jwt")),
-    publicJwk = mapToPublicJwk(presentationRequestMap?.getMapOpt("publicJwk")),
+    verifiedProfile = mapToVerifiedProfile(presentationRequestMap?.getMapOpt("verifiedProfile")),
     deepLink = mapToDeepLink(presentationRequestMap?.getMapOpt("deepLink")) ?: VCLDeepLink(""),
     pushDelegate = mapToPushDelegate(presentationRequestMap?.getMapOpt("pushDelegate")),
     didJwk = mapToDidJwk(presentationRequestMap?.getMapOpt("didJwk")),
@@ -230,9 +230,7 @@ object Converter {
     val jwtMap = Arguments.createMap()
     jwtMap.putString("encodedJwt", presentationRequest.jwt.encodedJwt)
     presentationRequestMap.putMap("jwt", jwtMap)
-    val jwkMap = Arguments.createMap()
-    jwkMap.putString("valueStr", presentationRequest.publicJwk.valueStr)
-    presentationRequestMap.putMap("publicJwk", jwkMap)
+    presentationRequestMap.putMap("verifiedProfile", verifiedProfileToMap(presentationRequest.verifiedProfile))
     presentationRequestMap.putString("iss", presentationRequest.iss)
     presentationRequestMap.putString("exchangeId", presentationRequest.exchangeId)
     presentationRequestMap.putString(
@@ -702,6 +700,12 @@ object Converter {
     return verifiedProfileMap
   }
 
+  fun mapToVerifiedProfile(
+    verifiedProfileMap: ReadableMap?
+  ): VCLVerifiedProfile {
+    return VCLVerifiedProfile(payload = verifiedProfileMap?.getMapOpt("payload")?.toJsonObject() ?: JSONObject("{}"))
+  }
+
   fun mapToJwtDescriptor(
     jwtDescriptorDictionary: ReadableMap
   ) = VCLJwtDescriptor(

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1054,12 +1054,12 @@ PODS:
     - React-logger (= 0.73.6)
     - React-perflogger (= 0.73.6)
   - SocketRocket (0.6.1)
-  - VCL (2.4.4)
-  - velocitycareerlabs-vcl-react-native (2.4.4):
+  - VCL (2.4.5)
+  - velocitycareerlabs-vcl-react-native (2.4.5):
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
-    - VCL (= 2.4.4)
+    - VCL (= 2.4.5)
   - Yoga (1.14.0)
 
 DEPENDENCIES:
@@ -1276,8 +1276,8 @@ SPEC CHECKSUMS:
   React-utils: d16c1d2251c088ad817996621947d0ac8167b46c
   ReactCommon: 2aa35648354bd4c4665b9a5084a7d37097b89c10
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
-  VCL: f6e7a7405597ba3fdb16eecd183931e7605ff774
-  velocitycareerlabs-vcl-react-native: 8a51df815522d7a5e2293fedddf4c17ef8bea12b
+  VCL: 1fa98c349e0e1291d5f327909bbcd1711baff153
+  velocitycareerlabs-vcl-react-native: 5364eb5f474ed7292435d06f5edd3792b139ec5a
   Yoga: 805bf71192903b20fc14babe48080582fee65a80
 
 PODFILE CHECKSUM: b019a9f171e06cc915918d81c74115c30ea1b65c