@velocitycareerlabs/vcl-react-native 1.5.1 → 1.5.2

package/android/build.gradle

@@ -131,5 +131,5 @@ dependencies {
 
   // VCL:
   implementation "com.nimbusds:nimbus-jose-jwt:9.29"
-  implementation "io.velocitycareerlabs:vcl:1.5.1"
+  implementation "io.velocitycareerlabs:vcl:1.5.2"
 }

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

@@ -135,7 +135,10 @@ object Converter {
   fun mapTopPresentationRequestDescriptor(presentationRequestDescriptorLinkMap: ReadableMap) =
     VCLPresentationRequestDescriptor(
       deepLink = mapToDeepLink(presentationRequestDescriptorLinkMap.getMapOpt("deepLink")),
-      serviceType = mapToServiceType(presentationRequestDescriptorLinkMap),
+      serviceType = mapToServiceType(
+        presentationRequestDescriptorLinkMap,
+        VCLServiceType.Inspector
+      ),
       pushDelegate = mapToPushDelegate(presentationRequestDescriptorLinkMap.getMapOpt("pushDelegate"))
     )
 
@@ -148,8 +151,13 @@ object Converter {
     return retVal
   }
 
-  fun mapToServiceType(serviceTypeMap: ReadableMap) =
-    VCLServiceType.fromString(serviceTypeMap.getStringOpt("serviceType") ?: "")
+  fun mapToServiceType(
+    serviceTypeMap: ReadableMap,
+    defaultServiceType: VCLServiceType
+  ) =
+    serviceTypeMap.getStringOpt("serviceType")?.let { serviceType ->
+      VCLServiceType.fromString(serviceType)
+    } ?: defaultServiceType
 
   fun mapToToken(tokenMap: ReadableMap?) =
     VCLToken(tokenMap?.getStringOpt("value") ?: "")
@@ -382,7 +390,10 @@ object Converter {
   ): VCLCredentialManifestDescriptorByDeepLink {
     return VCLCredentialManifestDescriptorByDeepLink(
       mapToDeepLink(credentialManifestDescriptorByDeepLinkMap.getMapOpt("deepLink")),
-      mapToServiceType(credentialManifestDescriptorByDeepLinkMap)
+      mapToServiceType(
+        credentialManifestDescriptorByDeepLinkMap,
+        VCLServiceType.Issuer
+      )
     )
   }
 
@@ -395,7 +406,10 @@ object Converter {
       service = mapToServiceCredentialAgentIssuer(
         credentialManifestDescriptorByServiceMap.getMapOpt("service")
       ),
-      serviceType = mapToServiceType(credentialManifestDescriptorByServiceMap),
+      serviceType = mapToServiceType(
+        credentialManifestDescriptorByServiceMap,
+        VCLServiceType.Issuer
+      ),
       credentialTypes =
       (credentialManifestDescriptorByServiceMap.getArrayOpt("credentialTypes")?.toArrayList()
         ?.toList() as? List<String>),
@@ -410,7 +424,10 @@ object Converter {
       service = mapToServiceCredentialAgentIssuer(
         credentialManifestDescriptorRefreshMap.getMapOpt("service")
       ),
-      serviceType = mapToServiceType(credentialManifestDescriptorRefreshMap),
+      serviceType = mapToServiceType(
+        credentialManifestDescriptorRefreshMap,
+        VCLServiceType.Issuer
+      ),
       credentialIds = credentialManifestDescriptorRefreshMap.getArrayOpt("credentialIds")
         ?.toArrayList()?.toList() as? List<String> ?: listOf()
     )

package/ios/Utils/Converter.swift

@@ -133,7 +133,10 @@ func dictionaryTopPresentationRequestDescriptor(
 ) -> VCLPresentationRequestDescriptor {
     return VCLPresentationRequestDescriptor(
         deepLink: dictionaryToDeepLink(presentationRequestDescriptorLinkDictionary["deepLink"] as? [String: Any]),
-        serviceType: dictionaryToServiceType(serviceTypeDictionary: presentationRequestDescriptorLinkDictionary),
+        serviceType: dictionaryToServiceType(
+            serviceTypeDictionary: presentationRequestDescriptorLinkDictionary,
+            defaultServiceType: VCLServiceType.Inspector
+        ),
         pushDelegate: dictionaryToPushDelegate(presentationRequestDescriptorLinkDictionary["pushDelegate"] as? [String: Any])
     )
 }
@@ -154,8 +157,14 @@ func tokenToDictionary(_ token: VCLToken) -> [String: Any] {
     return ["value": token.value]
 }
 
-func dictionaryToServiceType(serviceTypeDictionary: [String: Any]) -> VCLServiceType {
-    return VCLServiceType.fromString(value: serviceTypeDictionary["serviceType"] as? String ?? "")
+func dictionaryToServiceType(
+    serviceTypeDictionary: [String: Any],
+    defaultServiceType: VCLServiceType
+) -> VCLServiceType {
+    if let serviceType = serviceTypeDictionary["serviceType"] as? String {
+        return VCLServiceType.fromString(value: serviceType)
+    }
+    return defaultServiceType
 }
 
 func dictionaryToPresentationRequest(
@@ -355,7 +364,10 @@ func dictionaryToCredentialManifestDescriptorByDeepLink(
         deepLink: dictionaryToDeepLink(
             credentialManifestDescriptorByDeepLinkDictionary["deepLink"] as? [String : Any]
         ),
-        serviceType: dictionaryToServiceType(serviceTypeDictionary: credentialManifestDescriptorByDeepLinkDictionary)
+        serviceType: dictionaryToServiceType(
+            serviceTypeDictionary: credentialManifestDescriptorByDeepLinkDictionary,
+            defaultServiceType: VCLServiceType.Issuer
+        )
     )
 }
 
@@ -368,7 +380,10 @@ func dictionaryToCredentialManifestDescriptorByService(
         service: dictionaryToServiceCredentialAgentIssuer(
             credentialManifestDescriptorByServiceDictionary["service"] as? [String : Any]
         ),
-        serviceType: dictionaryToServiceType(serviceTypeDictionary: credentialManifestDescriptorByServiceDictionary),
+        serviceType: dictionaryToServiceType(
+            serviceTypeDictionary: credentialManifestDescriptorByServiceDictionary,
+            defaultServiceType: VCLServiceType.Issuer
+        ),
         credentialTypes: credentialManifestDescriptorByServiceDictionary["credentialTypes"] as? [String],
         pushDelegate: pushDelegate
     )
@@ -381,7 +396,10 @@ func dictionaryToCredentialManifestDescriptorRefresh(
         service: dictionaryToServiceCredentialAgentIssuer(
             credentialManifestDescriptorRefreshDictionary["service"] as? [String : Any]
         ),
-        serviceType: dictionaryToServiceType(serviceTypeDictionary: credentialManifestDescriptorRefreshDictionary),
+        serviceType: dictionaryToServiceType(
+            serviceTypeDictionary: credentialManifestDescriptorRefreshDictionary,
+            defaultServiceType: VCLServiceType.Issuer
+        ),
         credentialIds: credentialManifestDescriptorRefreshDictionary["credentialIds"] as? [String] ?? [String]()
     )
 }

package/lib/typescript/api/entities/VCLCredentialManifestDescriptor.d.ts

@@ -7,7 +7,7 @@
 import type { VCLPushDelegate } from './VCLPushDelegate';
 import type { VCLServiceType } from './VCLServiceType';
 export interface VCLCredentialManifestDescriptor {
-    serviceType: VCLServiceType;
+    serviceType?: VCLServiceType;
     credentialTypes?: string[];
     pushDelegate?: VCLPushDelegate;
 }

package/lib/typescript/api/entities/VCLPresentationRequestDescriptor.d.ts

@@ -9,6 +9,6 @@ import type { VCLPushDelegate } from './VCLPushDelegate';
 import type { VCLServiceType } from './VCLServiceType';
 export interface VCLPresentationRequestDescriptor {
     deepLink: VCLDeepLink;
-    serviceType: VCLServiceType;
+    serviceType?: VCLServiceType;
     pushDelegate?: VCLPushDelegate;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@velocitycareerlabs/vcl-react-native",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Velocity Career Labs React Native SDK",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/api/entities/VCLCredentialManifestDescriptor.ts

@@ -9,7 +9,7 @@ import type { VCLPushDelegate } from './VCLPushDelegate';
 import type { VCLServiceType } from './VCLServiceType';
 
 export interface VCLCredentialManifestDescriptor {
-  serviceType: VCLServiceType;
+  serviceType?: VCLServiceType;
   credentialTypes?: string[];
   pushDelegate?: VCLPushDelegate;
 }

package/src/api/entities/VCLPresentationRequestDescriptor.ts

@@ -11,6 +11,6 @@ import type { VCLServiceType } from './VCLServiceType';
 
 export interface VCLPresentationRequestDescriptor {
   deepLink: VCLDeepLink;
-  serviceType: VCLServiceType;
+  serviceType?: VCLServiceType;
   pushDelegate?: VCLPushDelegate;
 }

package/vcl-react-native.podspec

@@ -18,5 +18,5 @@ Pod::Spec.new do |s|
   s.swift_version = "5.0"
 
   s.dependency "React"
-  s.dependency "VCL", "1.5.1"
+  s.dependency "VCL", "1.5.2"
 end