@velocitycareerlabs/vcl-react-native 1.3.0 → 1.3.1

package/android/build.gradle

@@ -131,5 +131,5 @@ dependencies {
 
   // VCL:
   implementation "com.nimbusds:nimbus-jose-jwt:9.25.6"
-  implementation "io.velocitycareerlabs:vcl:1.3.0"
+  implementation "io.velocitycareerlabs:vcl:1.3.1"
 }

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

@@ -261,21 +261,6 @@ object Converter {
       mapToSubmissionResult(exchangeDescriptorMap.getMapOpt("submissionResult"))
     )
 
-  fun stringToServiceType(
-    serviceType: String?
-  ): VCLServiceType? =
-    when (serviceType) {
-      "Issuer" -> VCLServiceType.Issuer
-      "Inspector" -> VCLServiceType.Inspector
-      "CredentialAgentOperator" -> VCLServiceType.CredentialAgentOperator
-      "NodeOperator" -> VCLServiceType.NodeOperator
-      "TrustRoot" -> VCLServiceType.TrustRoot
-      "NotaryIssuer" -> VCLServiceType.NotaryIssuer
-      "IdentityIssuer" -> VCLServiceType.IdentityIssuer
-      "HolderAppProvider" -> VCLServiceType.HolderAppProvider
-      else -> null
-    }
-
   fun mapToOrganizationsSearchDescriptor(
     organizationsDescriptorMap: ReadableMap
   ) = VCLOrganizationsSearchDescriptor(
@@ -294,8 +279,7 @@ object Converter {
     serviceTypesArr?.let {
       serviceTypesList = mutableListOf()
       for (i in 0 until it.size()) {
-        val serviceType = stringToServiceType(it.getStringOpt(i))
-        serviceType?.let { st -> serviceTypesList?.add(st) }
+        serviceTypesList?.add(VCLServiceType.fromString(it.getStringOpt(i) ?: ""))
       }
     }
     val credentialTypesArr = filterMap?.getArrayOpt("credentialTypes")
@@ -550,9 +534,9 @@ object Converter {
   fun mapToVerifiedProfileDescriptor(verifiedProfileDescriptor: ReadableMap) =
     VCLVerifiedProfileDescriptor(
       did = verifiedProfileDescriptor.getStringOpt("did") ?: "",
-      serviceType = VCLServiceType.fromString(
-        verifiedProfileDescriptor.getStringOpt("serviceType") ?: ""
-      ))
+      serviceType = verifiedProfileDescriptor.getStringOpt("serviceType")?.let {
+        VCLServiceType.fromString(it)
+      })
 
   fun verifiedProfileToMap(
     verifiedProfile: VCLVerifiedProfile

package/ios/Utils/Converter.swift

@@ -249,36 +249,6 @@ func dictionaryToExchangeDescriptor(
     )
 }
 
-func stringToServiceType(
-    _ serviceTypeStr: String?
-) -> VCLServiceType? {
-    var serviceType: VCLServiceType? = nil
-    guard (serviceTypeStr != nil) else {
-        return nil
-    }
-    switch serviceTypeStr {
-    case "Issuer":
-        serviceType = .Issuer
-    case "Inspector":
-        serviceType = .Inspector
-    case "CredentialAgentOperator":
-        serviceType = .CredentialAgentOperator
-    case "NodeOperator":
-        serviceType = .NodeOperator
-    case "TrustRoot":
-        serviceType = .TrustRoot
-    case "NotaryIssuer":
-        serviceType = .NotaryIssuer
-    case "IdentityIssuer":
-        serviceType = .IdentityIssuer
-    case "HolderAppProvider":
-        serviceType = .HolderAppProvider
-    default:
-        serviceType = nil
-    }
-    return serviceType
-}
-
 func dictionayToOrganizationsSearchDescriptor(
     _ organizationsDescriptorDictionary: [String: Any]
 ) -> VCLOrganizationsSearchDescriptor {
@@ -298,10 +268,7 @@ func dictionaryToFilter(
     if let serviceTypesArr = (filterDictionary?["serviceTypes"] as? [String]) {
         serviceTypesList = [VCLServiceType]()
         for serviceTypeStr in serviceTypesArr {
-            let serviceType = stringToServiceType(serviceTypeStr)
-            if let st = serviceType {
-                serviceTypesList?.append(st)
-            }
+            serviceTypesList?.append(VCLServiceType.fromString(value: serviceTypeStr))
         }
     }
     var credentialTypesList: [String]? = nil
@@ -528,11 +495,13 @@ func readableMapToCredentialTypesUIFormSchemaDescriptor(
 func dictionaryToVerifiedProfileDescriptor(
     _ verifiedProfileDescriptor: [String: Any]
 ) -> VCLVerifiedProfileDescriptor {
-    return VCLVerifiedProfileDescriptor(
-        did: (verifiedProfileDescriptor["did"] as? String) ?? "",
-        serviceType: VCLServiceType.fromString(
-            value: verifiedProfileDescriptor["serviceType"] as? String ?? ""
-        ))
+    if let serviceTypeStr = verifiedProfileDescriptor["serviceType"] as? String {
+        return VCLVerifiedProfileDescriptor(
+            did: (verifiedProfileDescriptor["did"] as? String) ?? "",
+            serviceType: VCLServiceType.fromString(value: serviceTypeStr)
+        )
+    }
+    return VCLVerifiedProfileDescriptor(did: (verifiedProfileDescriptor["did"] as? String) ?? "")
 }
 
 func verifiedProfileToDictionary(

package/lib/commonjs/api/entities/VCLServiceType.js

@@ -18,6 +18,7 @@ exports.VCLServiceType = VCLServiceType;
   VCLServiceType["Issuer"] = "Issuer";
   VCLServiceType["Inspector"] = "Inspector";
   VCLServiceType["TrustRoot"] = "TrustRoot";
+  VCLServiceType["CareerIssuer"] = "CareerIssuer";
   VCLServiceType["NodeOperator"] = "NodeOperator";
   VCLServiceType["NotaryIssuer"] = "NotaryIssuer";
   VCLServiceType["IdentityIssuer"] = "IdentityIssuer";

package/lib/commonjs/api/entities/VCLServiceType.js.map

@@ -1 +1 @@
-{"version":3,"sources":["VCLServiceType.ts"],"names":["VCLServiceType"],"mappings":";;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;IAEYA,c;;;WAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;GAAAA,c,8BAAAA,c","sourcesContent":["/**\n * Created by Michael Avoyan.\n *\n * Copyright 2022 Velocity Career Labs inc.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nexport enum VCLServiceType {\n  Issuer = 'Issuer',\n  Inspector = 'Inspector',\n  TrustRoot = 'TrustRoot',\n  NodeOperator = 'NodeOperator',\n  NotaryIssuer = 'NotaryIssuer',\n  IdentityIssuer = 'IdentityIssuer',\n  HolderAppProvider = 'HolderAppProvider',\n  CredentialAgentOperator = 'CredentialAgentOperator',\n  Undefined = 'Undefined',\n}\n"]}
+{"version":3,"sources":["VCLServiceType.ts"],"names":["VCLServiceType"],"mappings":";;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;IAEYA,c;;;WAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;GAAAA,c,8BAAAA,c","sourcesContent":["/**\n * Created by Michael Avoyan.\n *\n * Copyright 2022 Velocity Career Labs inc.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nexport enum VCLServiceType {\n  Issuer = 'Issuer',\n  Inspector = 'Inspector',\n  TrustRoot = 'TrustRoot',\n  CareerIssuer = 'CareerIssuer',\n  NodeOperator = 'NodeOperator',\n  NotaryIssuer = 'NotaryIssuer',\n  IdentityIssuer = 'IdentityIssuer',\n  HolderAppProvider = 'HolderAppProvider',\n  CredentialAgentOperator = 'CredentialAgentOperator',\n  Undefined = 'Undefined',\n}\n"]}

package/lib/module/api/entities/VCLServiceType.js

@@ -10,6 +10,7 @@ export let VCLServiceType;
   VCLServiceType["Issuer"] = "Issuer";
   VCLServiceType["Inspector"] = "Inspector";
   VCLServiceType["TrustRoot"] = "TrustRoot";
+  VCLServiceType["CareerIssuer"] = "CareerIssuer";
   VCLServiceType["NodeOperator"] = "NodeOperator";
   VCLServiceType["NotaryIssuer"] = "NotaryIssuer";
   VCLServiceType["IdentityIssuer"] = "IdentityIssuer";

package/lib/module/api/entities/VCLServiceType.js.map

@@ -1 +1 @@
-{"version":3,"sources":["VCLServiceType.ts"],"names":["VCLServiceType"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AAEA,WAAYA,cAAZ;;WAAYA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;GAAAA,c,KAAAA,c","sourcesContent":["/**\n * Created by Michael Avoyan.\n *\n * Copyright 2022 Velocity Career Labs inc.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nexport enum VCLServiceType {\n  Issuer = 'Issuer',\n  Inspector = 'Inspector',\n  TrustRoot = 'TrustRoot',\n  NodeOperator = 'NodeOperator',\n  NotaryIssuer = 'NotaryIssuer',\n  IdentityIssuer = 'IdentityIssuer',\n  HolderAppProvider = 'HolderAppProvider',\n  CredentialAgentOperator = 'CredentialAgentOperator',\n  Undefined = 'Undefined',\n}\n"]}
+{"version":3,"sources":["VCLServiceType.ts"],"names":["VCLServiceType"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AAEA,WAAYA,cAAZ;;WAAYA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;AAAAA,EAAAA,c;GAAAA,c,KAAAA,c","sourcesContent":["/**\n * Created by Michael Avoyan.\n *\n * Copyright 2022 Velocity Career Labs inc.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nexport enum VCLServiceType {\n  Issuer = 'Issuer',\n  Inspector = 'Inspector',\n  TrustRoot = 'TrustRoot',\n  CareerIssuer = 'CareerIssuer',\n  NodeOperator = 'NodeOperator',\n  NotaryIssuer = 'NotaryIssuer',\n  IdentityIssuer = 'IdentityIssuer',\n  HolderAppProvider = 'HolderAppProvider',\n  CredentialAgentOperator = 'CredentialAgentOperator',\n  Undefined = 'Undefined',\n}\n"]}

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

@@ -8,6 +8,7 @@ export declare enum VCLServiceType {
     Issuer = "Issuer",
     Inspector = "Inspector",
     TrustRoot = "TrustRoot",
+    CareerIssuer = "CareerIssuer",
     NodeOperator = "NodeOperator",
     NotaryIssuer = "NotaryIssuer",
     IdentityIssuer = "IdentityIssuer",

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

@@ -7,5 +7,5 @@
 import type { VCLServiceType } from './VCLServiceType';
 export interface VCLVerifiedProfileDescriptor {
     did: string;
-    serviceType: VCLServiceType;
+    serviceType?: VCLServiceType;
 }

package/package.json

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

package/src/api/entities/VCLServiceType.ts

@@ -9,6 +9,7 @@ export enum VCLServiceType {
   Issuer = 'Issuer',
   Inspector = 'Inspector',
   TrustRoot = 'TrustRoot',
+  CareerIssuer = 'CareerIssuer',
   NodeOperator = 'NodeOperator',
   NotaryIssuer = 'NotaryIssuer',
   IdentityIssuer = 'IdentityIssuer',

package/src/api/entities/VCLVerifiedProfileDescriptor.ts

@@ -9,5 +9,5 @@ import type { VCLServiceType } from './VCLServiceType';
 
 export interface VCLVerifiedProfileDescriptor {
   did: string;
-  serviceType: VCLServiceType;
+  serviceType?: VCLServiceType;
 }

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.3.0"
+  s.dependency "VCL", "1.3.1"
 end