@velocitycareerlabs/vcl-react-native 2.10.0-rc → 2.10.0-rc.2

package/README.md

@@ -45,6 +45,21 @@ yarn add @velocitycareerlabs/vcl-react-native
 npm install @velocitycareerlabs/vcl-react-native --save
 ```
 
+### Native SDK versions
+By default, the package pins native iOS and Android SDK versions through
+`vclNativeSdkVersions` in its `package.json`, falling back to the React Native
+package version if no native pin is present.
+
+```json
+{
+  "version": "2.10.0",
+  "vclNativeSdkVersions": {
+    "ios": "2.10.0-rc",
+    "android": "2.10.0-rc"
+  }
+}
+```
+
 ### Usage
 To start using the VCL SDK, you’ll need to create its object and initialize it in Velocity Network™:
 ```js
@@ -66,7 +81,7 @@ vcl.initialize(initializationDescriptor).then(
 );
 ```
 
-SDK `2.10.0-rc` uses native taxonomy error codes by default. To temporarily
+SDK `2.10.0` uses native taxonomy error codes by default. To temporarily
 preserve legacy native error-code mappings during migration, initialize with:
 ```js
 const initializationDescriptor: VCLInitializationDescriptor = {

package/VclReactNative.podspec

@@ -2,6 +2,13 @@ require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
+def first_present_value(*values)
+  values.find { |value| !value.nil? && !value.to_s.strip.empty? }
+end
+
+vcl_native_sdk_versions = package["vclNativeSdkVersions"] || {}
+vcl_ios_sdk_version = first_present_value(vcl_native_sdk_versions["ios"], package["version"])
+
 Pod::Spec.new do |s|
   s.name         = "VclReactNative"
   s.version      = package["version"]
@@ -18,7 +25,7 @@ Pod::Spec.new do |s|
 
   s.swift_version = "5.0"
 
-  s.dependency "VCL", "2.10.0-rc"
+  s.dependency "VCL", vcl_ios_sdk_version
 
   install_modules_dependencies(s)
 end

package/android/build.gradle

@@ -21,6 +21,16 @@ apply plugin: "kotlin-android"
 
 apply plugin: "com.facebook.react"
 
+def packageJson = new groovy.json.JsonSlurper().parse(file("$projectDir/../package.json"))
+def vclNativeSdkVersions = packageJson.vclNativeSdkVersions instanceof Map ? packageJson.vclNativeSdkVersions : [:]
+def firstPresentValue = { values ->
+  return values.find { value -> value != null && value.toString().trim() }
+}
+def vclSdkVersion = firstPresentValue([
+  vclNativeSdkVersions.android,
+  packageJson.version,
+])
+
 def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["VclReactNative_" + name]).toInteger()
 }
@@ -76,7 +86,7 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
 //--------- Must: be added:
-  implementation "io.velocitycareerlabs:vcl:2.10.0-rc"
+  implementation "io.velocitycareerlabs:vcl:$vclSdkVersion"
   implementation 'com.nimbusds:nimbus-jose-jwt:10.5'
   implementation "androidx.security:security-crypto:1.1.0"
 //-------------------------

package/ios/Utils/Converter.swift

@@ -504,7 +504,7 @@ func credentialManifestToDictionary(
 func dictionaryToCredentialManifest(
     _ credentialManifestDictionary: [String: Any]?
 ) -> VCLCredentialManifest {
-  let jwt = VCLJwt(encodedJwt: (credentialManifestDictionary?["jwt"] as? [String: Any])?["encodedJwt"] as? String ?? "")
+  let jwt = jwtFromEncodedJwt((credentialManifestDictionary?["jwt"] as? [String: Any])?["encodedJwt"] as? String ?? "")
   let vendorOriginContext = credentialManifestDictionary?["vendorOriginContext"] as? String
   let verifiedProfileDictionary = credentialManifestDictionary?["verifiedProfile"] as? [String: Any]
   let deepLink = dictionaryToDeepLink(credentialManifestDictionary?["deepLink"] as? [String: Any])
@@ -591,7 +591,11 @@ func credentialTypesFormSchemaToDictionary(
 func dictionaryToJwt(
     _ jwtDictionary: [String: Any]?
 ) -> VCLJwt {
-  return VCLJwt(encodedJwt: jwtDictionary?["encodedJwt"] as? String ?? "")
+  return jwtFromEncodedJwt(jwtDictionary?["encodedJwt"] as? String ?? "")
+}
+
+func jwtFromEncodedJwt(_ encodedJwt: String) -> VCLJwt {
+  return (try? VCLJwt(encodedJwt: encodedJwt)) ?? VCLJwt(header: nil, payload: nil, signature: nil, encodedJwt: encodedJwt)
 }
 
 func jwtToDictionary(_ jwt: VCLJwt) -> [String: Any?] {

package/package.json

@@ -1,6 +1,10 @@
 {
   "name": "@velocitycareerlabs/vcl-react-native",
-  "version": "2.10.0-rc",
+  "version": "2.10.0-rc.2",
+  "vclNativeSdkVersions": {
+    "ios": "2.10.0-rc",
+    "android": "2.10.0-rc"
+  },
   "description": "Velocity Career Labs React Native SDK",
   "license": "Apache-2.0",
   "publishConfig": {