@velocitycareerlabs/vcl-react-native 2.7.3 → 2.7.5

package/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"
 //-------------------------
 }
 

package/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

package/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")
       )

package/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/lib/typescript/src/api/entities/VCLCredentialManifestDescriptorByService.d.ts

@@ -8,5 +8,6 @@ import type { VCLCredentialManifestDescriptor } from './VCLCredentialManifestDes
 import type { VCLService } from './VCLService';
 export interface VCLCredentialManifestDescriptorByService extends VCLCredentialManifestDescriptor {
     service: VCLService;
+    did: string;
 }
 //# sourceMappingURL=VCLCredentialManifestDescriptorByService.d.ts.map

package/lib/typescript/src/api/entities/VCLCredentialManifestDescriptorByService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VCLCredentialManifestDescriptorByService.d.ts","sourceRoot":"","sources":["../../../../../src/api/entities/VCLCredentialManifestDescriptorByService.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,mCAAmC,CAAC;AACzF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,wCACf,SAAQ,+BAA+B;IACvC,OAAO,EAAE,UAAU,CAAC;CACrB"}
+{"version":3,"file":"VCLCredentialManifestDescriptorByService.d.ts","sourceRoot":"","sources":["../../../../../src/api/entities/VCLCredentialManifestDescriptorByService.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,mCAAmC,CAAC;AACzF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,wCACf,SAAQ,+BAA+B;IACvC,OAAO,EAAE,UAAU,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;CACb"}

package/lib/typescript/src/api/entities/VCLCredentialManifestDescriptorRefresh.d.ts

@@ -8,6 +8,7 @@ import type { VCLCredentialManifestDescriptor } from './VCLCredentialManifestDes
 import type { VCLService } from './VCLService';
 export interface VCLCredentialManifestDescriptorRefresh extends VCLCredentialManifestDescriptor {
     service: VCLService;
+    did: string;
     credentialIds: string[];
 }
 //# sourceMappingURL=VCLCredentialManifestDescriptorRefresh.d.ts.map

package/lib/typescript/src/api/entities/VCLCredentialManifestDescriptorRefresh.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VCLCredentialManifestDescriptorRefresh.d.ts","sourceRoot":"","sources":["../../../../../src/api/entities/VCLCredentialManifestDescriptorRefresh.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,mCAAmC,CAAC;AACzF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,sCACf,SAAQ,+BAA+B;IACvC,OAAO,EAAE,UAAU,CAAC;IACpB,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB"}
+{"version":3,"file":"VCLCredentialManifestDescriptorRefresh.d.ts","sourceRoot":"","sources":["../../../../../src/api/entities/VCLCredentialManifestDescriptorRefresh.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,mCAAmC,CAAC;AACzF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,sCACf,SAAQ,+BAA+B;IACvC,OAAO,EAAE,UAAU,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB"}

package/lib/typescript/src/api/entities/VCLOrganization.d.ts

@@ -9,5 +9,6 @@ import type { VCLService } from './VCLService';
 export interface VCLOrganization {
     payload: Dictionary<any>;
     serviceCredentialAgentIssuers: VCLService[];
+    did: string;
 }
 //# sourceMappingURL=VCLOrganization.d.ts.map

package/lib/typescript/src/api/entities/VCLOrganization.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VCLOrganization.d.ts","sourceRoot":"","sources":["../../../../../src/api/entities/VCLOrganization.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;IACzB,6BAA6B,EAAE,UAAU,EAAE,CAAC;CAC7C"}
+{"version":3,"file":"VCLOrganization.d.ts","sourceRoot":"","sources":["../../../../../src/api/entities/VCLOrganization.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;IACzB,6BAA6B,EAAE,UAAU,EAAE,CAAC;IAC5C,GAAG,EAAE,MAAM,CAAC;CACb"}

package/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": {
@@ -65,9 +65,11 @@
     "@babel/preset-typescript": "7.26.0",
     "@commitlint/config-conventional": "^19.1.0",
     "@evilmartians/lefthook": "^1.5.0",
-    "@react-native/babel-preset": "^0.77.0",
+    "@react-native/babel-preset": "0.75.5",
     "@react-native/community-cli-plugin": "^0.77.0",
-    "@react-native/eslint-config": "^0.74.75",
+    "@react-native/eslint-config": "0.75.5",
+    "@react-native/metro-config": "0.75.5",
+    "@react-native/typescript-config": "0.75.5",
     "@release-it/conventional-changelog": "^8.0.1",
     "@types/jest": "^29.5.14",
     "@types/react": "^18.3.12",
@@ -94,7 +96,7 @@
     "jest": "^29.7.0",
     "prettier": "^3.0.3",
     "react": "18.3.1",
-    "react-native": "0.73.10",
+    "react-native": "0.75.5",
     "react-native-builder-bob": "^0.40.6",
     "release-it": "^15.0.0",
     "turbo": "^1.10.7",

package/src/api/entities/VCLCredentialManifestDescriptorByService.ts

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

package/src/api/entities/VCLCredentialManifestDescriptorRefresh.ts

@@ -11,5 +11,6 @@ import type { VCLService } from './VCLService';
 export interface VCLCredentialManifestDescriptorRefresh
   extends VCLCredentialManifestDescriptor {
   service: VCLService;
+  did: string;
   credentialIds: string[];
 }

package/src/api/entities/VCLOrganization.ts

@@ -11,4 +11,5 @@ import type { VCLService } from './VCLService';
 export interface VCLOrganization {
   payload: Dictionary<any>;
   serviceCredentialAgentIssuers: VCLService[];
+  did: string;
 }

package/velocitycareerlabs-vcl-react-native.podspec

@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
-  s.dependency "VCL", "2.7.3"
+  s.dependency "VCL", "2.7.5"
 
 # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
 # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.