chore: (VL-8777) fix did retrieve v2.7.5

Author: michaelavoyan

.gitignore

@@ -28,6 +28,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
+/example/ios/VclReactNativeExample.xcworkspace
 
 # Android/IJ
 #

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:7.2.2"
+    classpath "com.android.tools.build:gradle:8.8.2"
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
@@ -92,9 +92,9 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
 //--------- Must: be added:
-  implementation "io.velocitycareerlabs:vcl:2.7.3"
-  implementation 'com.nimbusds:nimbus-jose-jwt:10.0.1'
-  implementation "androidx.security:security-crypto:1.1.0-alpha07"
+  implementation "io.velocitycareerlabs:vcl:2.7.5"
+  implementation 'com.nimbusds:nimbus-jose-jwt:10.3.1'
+  implementation "androidx.security:security-crypto:1.1.0-beta01"
 //-------------------------
 }
 

android/gradle.properties

@@ -1,4 +1,4 @@
-VclReactNative_kotlinVersion=1.9.24
+VclReactNative_kotlinVersion=1.9.25
 VclReactNative_minSdkVersion=24
 VclReactNative_targetSdkVersion=34
 VclReactNative_compileSdkVersion=34

android/src/main/java/io/velocitycareerlabs/reactnative/utlis/Converter.kt

@@ -410,6 +410,7 @@ object Converter {
         serviceCredentialAgentIssuersArr.pushMap(serviceCredentialAgentIssuerMap)
       }
       organizationMap.putArray("serviceCredentialAgentIssuers", serviceCredentialAgentIssuersArr)
+      organizationMap.putString("did", organization.did)
       organizationMap.putMap("payload", organization.payload.toReadableMap())
       organizationsWritableArray.pushMap(organizationMap)
     }
@@ -430,14 +431,17 @@ object Converter {
   fun mapToCredentialManifestDescriptor(
     credentialManifestDescriptorMap: ReadableMap
   ): VCLCredentialManifestDescriptor? {
-    credentialManifestDescriptorMap.getMapOpt("deepLink")?.let {
-      return mapToCredentialManifestDescriptorByDeepLink(credentialManifestDescriptorMap)
-    } ?: credentialManifestDescriptorMap.getMapOpt("service")?.let {
-      credentialManifestDescriptorMap.getArrayOpt("credentialIds")?.let {
-        return mapToCredentialManifestDescriptorRefresh(credentialManifestDescriptorMap)
-      } ?: return mapToCredentialManifestDescriptorByService(credentialManifestDescriptorMap)
+
+    val hasDeepLink = credentialManifestDescriptorMap.getMapOpt("deepLink") != null
+    val hasService = credentialManifestDescriptorMap.getMapOpt("service") != null
+    val hasCredentialIds = credentialManifestDescriptorMap.getArrayOpt("credentialIds") != null
+
+    return when {
+      hasDeepLink -> mapToCredentialManifestDescriptorByDeepLink(credentialManifestDescriptorMap)
+      hasService && hasCredentialIds -> mapToCredentialManifestDescriptorRefresh(credentialManifestDescriptorMap)
+      hasService -> mapToCredentialManifestDescriptorByService(credentialManifestDescriptorMap)
+      else -> null
     }
-    return null
   }
 
   fun mapToCredentialManifestDescriptorByDeepLink(
@@ -478,6 +482,7 @@ object Converter {
         credentialManifestDescriptorByServiceMap.getMapOpt("pushDelegate")
       ),
       didJwk = mapToDidJwk(credentialManifestDescriptorByServiceMap.getMapOpt("didJwk")),
+      did = credentialManifestDescriptorByServiceMap.getStringOpt("did") ?: "",
       remoteCryptoServicesToken = mapToToken(
         credentialManifestDescriptorByServiceMap.getMapOpt("remoteCryptoServicesToken")
       )
@@ -494,6 +499,7 @@ object Converter {
       credentialIds = credentialManifestDescriptorRefreshMap.getArrayOpt("credentialIds")
         ?.toArrayList()?.toList() as? List<String> ?: listOf(),
       didJwk = mapToDidJwk(credentialManifestDescriptorRefreshMap.getMapOpt("didJwk")),
+      did = credentialManifestDescriptorRefreshMap.getStringOpt("did") ?: "",
       remoteCryptoServicesToken = mapToToken(
         credentialManifestDescriptorRefreshMap.getMapOpt("remoteCryptoServicesToken")
       )

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

example/ios/Podfile.lock

@@ -1498,8 +1498,8 @@ PODS:
     - React-perflogger (= 0.75.5)
     - React-utils (= 0.75.5)
   - SocketRocket (0.7.0)
-  - VCL (2.7.3)
-  - velocitycareerlabs-vcl-react-native (2.7.3):
+  - VCL (2.7.5)
+  - velocitycareerlabs-vcl-react-native (2.7.5):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1519,7 +1519,7 @@ PODS:
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - VCL (= 2.7.3)
+    - VCL (= 2.7.5)
     - Yoga
   - Yoga (0.0.0)
 
@@ -1788,8 +1788,8 @@ SPEC CHECKSUMS:
   ReactCodegen: 43d3ebb0cb9c6ffc92a254d31749fd29d69844a2
   ReactCommon: ee80ae3d276a9f1daa059169405b97c600dcba45
   SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
-  VCL: e98d7108c62081906d3e408e4125085a0fedd039
-  velocitycareerlabs-vcl-react-native: cae0bae509d79df5ee24891c23d1e835a8c957ce
+  VCL: b3360eb175c61ad2c978f15cd6e948b6758bd005
+  velocitycareerlabs-vcl-react-native: e4947e18225aafd02df0de890530983dc3b37583
   Yoga: 1dd9dabb9df8fe08f12cd522eae04a2da0e252eb
 
 PODFILE CHECKSUM: dda665d1488c2a02df92eccd852bd6de0cd38761

example/src/App.tsx

@@ -30,6 +30,7 @@ import vcl, {
   type VCLGenerateOffersDescriptor,
   type VCLInitializationDescriptor,
   type VCLOffers,
+  type VCLOrganization,
   type VCLPresentationRequest,
   type VCLPresentationRequestDescriptor,
   type VCLPresentationSubmission,
@@ -252,21 +253,20 @@ export default () => {
         'VCL Organizations received:',
         JSON.stringify(organizations)
       );
-
-      const serviceCredentialAgentIssuer: VCLService = {
-        payload:
-          organizations.all[0]?.serviceCredentialAgentIssuers[0]?.payload ??
-          {},
-      };
-      await getCredentialManifestByService(serviceCredentialAgentIssuer);
+      await getCredentialManifestByService(organizations.all[0]!);
     } catch (error: any) {
       console.log('VCL Organizations search failed: ', JSON.stringify(error));
     }
   }
 
   const getCredentialManifestByService = async (
-    serviceCredentialAgentIssuer: VCLService
+    organization: VCLOrganization
   ) => {
+    const serviceCredentialAgentIssuer: VCLService = {
+      payload:
+        organization?.serviceCredentialAgentIssuers[0]?.payload ??
+        {},
+    };
     const credentialManifestDescriptorByOrganization: VCLCredentialManifestDescriptorByService =
       {
         service: serviceCredentialAgentIssuer,
@@ -276,6 +276,7 @@ export default () => {
           'EducationDegreeRegistrationV1.0',
         ],
         didJwk: didJwkRef.current,
+        did: organization.did,
       };
 
     try {
@@ -345,6 +346,7 @@ export default () => {
       {
         service,
         credentialIds: Constants.getCredentialIdsToRefresh(environment),
+        did: 'some did',
         didJwk: didJwkRef.current,
       };
 

ios/Utils/Converter.swift

@@ -371,6 +371,7 @@ func organizationsToDictionary(
       serviceCredentialAgentIssuersArr.append(serviceCredentialAgentIssuerMap)
     }
     organizationMap["serviceCredentialAgentIssuers"] = serviceCredentialAgentIssuersArr
+    organizationMap["did"] = organization.did
     organizationMap["payload"] = organization.payload
     organizationsArr.append(organizationMap)
   }
@@ -393,16 +394,20 @@ func dictionaryToPushDelegate(_ pushDelegateMap: [String: Any]?) -> VCLPushDeleg
 func dictionaryToCredentialManifestDescriptor(
     _ credentialManifestDescriptorDictionary: [String: Any]
 ) -> VCLCredentialManifestDescriptor? {
-  if (credentialManifestDescriptorDictionary["deepLink"] != nil) {
-    return dictionaryToCredentialManifestDescriptorByDeepLink(credentialManifestDescriptorDictionary)
-  } else if (credentialManifestDescriptorDictionary["service"] != nil) {
-    if(credentialManifestDescriptorDictionary["credentialIds"] != nil) {
-      return dictionaryToCredentialManifestDescriptorRefresh(credentialManifestDescriptorDictionary)
-    } else {
-      return dictionaryToCredentialManifestDescriptorByService(credentialManifestDescriptorDictionary)
+    let hasDeepLink = credentialManifestDescriptorDictionary["deepLink"] != nil
+    let hasService = credentialManifestDescriptorDictionary["service"] != nil
+    let hasCredentialIds = credentialManifestDescriptorDictionary["credentialIds"] != nil
+
+    switch (hasDeepLink, hasService, hasCredentialIds) {
+    case (true, _, _):
+        return dictionaryToCredentialManifestDescriptorByDeepLink(credentialManifestDescriptorDictionary)
+    case (false, true, true):
+        return dictionaryToCredentialManifestDescriptorRefresh(credentialManifestDescriptorDictionary)
+    case (false, true, false):
+        return dictionaryToCredentialManifestDescriptorByService(credentialManifestDescriptorDictionary)
+    default:
+        return nil
     }
-  }
-  return nil
 }
 
 func dictionaryToCredentialManifestDescriptorByDeepLink(
@@ -440,6 +445,7 @@ func dictionaryToCredentialManifestDescriptorByService(
       credentialManifestDescriptorByServiceDictionary["pushDelegate"] as? [String: Any]
     ),
     didJwk: dictionaryToDidJwk(credentialManifestDescriptorByServiceDictionary["didJwk"] as? [String: Any]),
+    did: credentialManifestDescriptorByServiceDictionary["did"] as? String ?? "",
     remoteCryptoServicesToken: dictionaryToToken(
       credentialManifestDescriptorByServiceDictionary["remoteCryptoServicesToken"] as? [String: Any]
     )
@@ -455,6 +461,7 @@ func dictionaryToCredentialManifestDescriptorRefresh(
     ),
     credentialIds: credentialManifestDescriptorRefreshDictionary["credentialIds"] as? [String] ?? [],
     didJwk: dictionaryToDidJwk(credentialManifestDescriptorRefreshDictionary["didJwk"] as? [String: Any]),
+    did: credentialManifestDescriptorRefreshDictionary["did"] as? String ?? "",
     remoteCryptoServicesToken: dictionaryToToken(
       credentialManifestDescriptorRefreshDictionary["remoteCryptoServicesToken"] as? [String: Any]
     )

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@velocitycareerlabs/vcl-react-native",
-  "version": "2.7.3",
+  "version": "2.7.5",
   "description": "Velocity Career Labs React Native SDK",
   "license": "Apache-2.0",
   "publishConfig": {

src/api/entities/VCLCredentialManifestDescriptorByService.ts

@@ -11,4 +11,5 @@ import type { VCLService } from './VCLService';
 export interface VCLCredentialManifestDescriptorByService
   extends VCLCredentialManifestDescriptor {
   service: VCLService;
+  did: string;
 }