@velocitycareerlabs/vcl-react-native 1.14.5 → 1.14.7

package/android/build.gradle

@@ -131,5 +131,5 @@ dependencies {
 
   // VCL:
   implementation "com.nimbusds:nimbus-jose-jwt:9.31"
-  implementation "io.velocitycareerlabs:vcl:1.14.5"
+  implementation "io.velocitycareerlabs:vcl:1.14.6"
 }

package/android/src/main/java/io/velocitycareerlabs/reactnative/GlobalConfig.kt

@@ -0,0 +1,20 @@
+/**
+ * Created by Michael Avoyan on 08/08/2023.
+ *
+ * Copyright 2022 Velocity Career Labs inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.velocitycareerlabs.reactnative
+
+import io.velocitycareerlabs.api.VCLEnvironment
+
+internal object GlobalConfig {
+
+  var CurrentEnvironment = VCLEnvironment.Prod
+
+  var IsDebugOn = false //BuildConfig.DEBUG
+
+  const val LogTagPrefix = "VCL RN Android "
+  val IsLoggerOn get() = CurrentEnvironment != VCLEnvironment.Prod || IsDebugOn
+}

package/android/src/main/java/io/velocitycareerlabs/reactnative/VclReactNativeModule.kt

@@ -35,11 +35,13 @@ import io.velocitycareerlabs.reactnative.utlis.Converter.mapToVerifiedProfileDes
 import io.velocitycareerlabs.reactnative.utlis.Converter.verifiedProfileToMap
 import io.velocitycareerlabs.api.VCLProvider
 import io.velocitycareerlabs.api.entities.VCLError
+import io.velocitycareerlabs.api.entities.VCLInitializationDescriptor
 import io.velocitycareerlabs.reactnative.extensions.toThrowable
 import io.velocitycareerlabs.reactnative.utlis.Converter.didJwkToMap
 import io.velocitycareerlabs.reactnative.utlis.Converter.mapToDidJwk
 import io.velocitycareerlabs.reactnative.utlis.Converter.mapToInitializationDescriptor
 import io.velocitycareerlabs.reactnative.utlis.Converter.mapToJwtDescriptor
+import io.velocitycareerlabs.reactnative.utlis.VCLLog
 import java.lang.Exception
 
 /**
@@ -47,6 +49,8 @@ import java.lang.Exception
  */
 class VclReactNativeModule(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
 
+  val TAG = "VclReactNativeModule"
+
   companion object {
     const val ModuleName = "VclReactNative"
   }
@@ -57,17 +61,26 @@ class VclReactNativeModule(private val reactContext: ReactApplicationContext) :
     return ModuleName
   }
 
+  private fun initGlobalConfigurations(
+    initializationDescriptor: VCLInitializationDescriptor
+  ) {
+    GlobalConfig.CurrentEnvironment = initializationDescriptor.environment
+    GlobalConfig.IsDebugOn = initializationDescriptor.isDebugOn
+  }
+
   @ReactMethod
   fun initialize(
-    initializationDescriptor: ReadableMap,
+    initializationDescriptorMap: ReadableMap,
     promise: Promise
   ) {
     try {
+      val initializationDescriptor = mapToInitializationDescriptor(
+        initializationDescriptorMap
+      )
+      initGlobalConfigurations(initializationDescriptor)
       vcl.initialize(
         context = reactContext.applicationContext,
-        initializationDescriptor = mapToInitializationDescriptor(
-          initializationDescriptor
-        ),
+        initializationDescriptor = initializationDescriptor,
         successHandler = {
           promise.resolve("VCL initialization succeed!")
         },
@@ -192,7 +205,9 @@ class VclReactNativeModule(private val reactContext: ReactApplicationContext) :
     promise: Promise
   ) {
     try {
+      VCLLog.d(TAG, "credentialManifestDescriptorMap map: $credentialManifestDescriptorMap")
       mapToCredentialManifestDescriptor(credentialManifestDescriptorMap)?.let { credentialManifestDescriptor ->
+        VCLLog.d(TAG, "credentialManifestDescriptor VCL entity: ${credentialManifestDescriptor.toPropsString()}")
         vcl.getCredentialManifest(credentialManifestDescriptor,
           {
             promise.resolve(credentialManifestToMap(it))

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

@@ -15,9 +15,6 @@ import org.json.JSONArray
 import org.json.JSONObject
 import java.lang.Exception
 
-/**
- * Created by Michael Avoyan on 04/07/2021.
- */
 object Converter {
 
   fun mapToInitializationDescriptor(
@@ -32,8 +29,9 @@ object Converter {
       xVnfProtocolVersion = mapToXVnfProtocolVersion(
         (initializationDescriptorMap.getStringOpt("xVnfProtocolVersion"))
       ),
-      cacheSequence = initializationDescriptorMap.getIntOpt("cacheSequence") ?: 0
-    )
+      cacheSequence = initializationDescriptorMap.getIntOpt("cacheSequence") ?: 0,
+      isDebugOn = initializationDescriptorMap.getBooleanOpt("isDebugOn") ?: false
+  )
 
   private fun mapToEnvironment(environment: String?) =
     when(environment) {

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

@@ -0,0 +1,128 @@
+/**
+ * Created by Michael Avoyan on 08/08/2023.
+ *
+ * Copyright 2022 Velocity Career Labs inc.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.velocitycareerlabs.reactnative.utlis
+
+import android.util.Log
+import io.velocitycareerlabs.reactnative.GlobalConfig
+
+internal object VCLLog {
+  /**
+   * Send a [.VERBOSE] log message.
+   * @param tag Used to identify the source of a log message.  It usually identifies
+   * the class or activity where the log call occurs.
+   * @param msg The message you would like logged.
+   */
+  fun v(tag: String?, msg: String): Int {
+    return if (GlobalConfig.IsLoggerOn) Log.v(GlobalConfig.LogTagPrefix +tag, msg) else -1
+  }
+
+  /**
+   * Send a [.VERBOSE] log message and log the exception.
+   * @param tag Used to identify the source of a log message.  It usually identifies
+   * the class or activity where the log call occurs.
+   * @param msg The message you would like logged.
+   * @param tr An exception to log
+   */
+  fun v(tag: String?, msg: String?, tr: Throwable?): Int {
+    return if (GlobalConfig.IsLoggerOn) Log.v(GlobalConfig.LogTagPrefix +tag, msg, tr) else -1
+  }
+
+  /**
+   * Send a [.DEBUG] log message.
+   * @param tag Used to identify the source of a log message.  It usually identifies
+   * the class or activity where the log call occurs.
+   * @param msg The message you would like logged.
+   */
+  fun d(tag: String?, msg: String): Int {
+    return if (GlobalConfig.IsLoggerOn) Log.d(GlobalConfig.LogTagPrefix +tag, msg) else -1
+  }
+
+  /**
+   * Send a [.DEBUG] log message and log the exception.
+   * @param tag Used to identify the source of a log message.  It usually identifies
+   * the class or activity where the log call occurs.
+   * @param msg The message you would like logged.
+   * @param tr An exception to log
+   */
+  fun d(tag: String?, msg: String?, tr: Throwable?): Int {
+    return if (GlobalConfig.IsLoggerOn) Log.d(GlobalConfig.LogTagPrefix +tag, msg, tr) else -1
+  }
+
+  /**
+   * Send an [.INFO] log message.
+   * @param tag Used to identify the source of a log message.  It usually identifies
+   * the class or activity where the log call occurs.
+   * @param msg The message you would like logged.
+   */
+  fun i(tag: String?, msg: String): Int {
+    return if (GlobalConfig.IsLoggerOn) Log.i(GlobalConfig.LogTagPrefix +tag, msg) else -1
+  }
+
+  /**
+   * Send a [.INFO] log message and log the exception.
+   * @param tag Used to identify the source of a log message.  It usually identifies
+   * the class or activity where the log call occurs.
+   * @param msg The message you would like logged.
+   * @param tr An exception to log
+   */
+  fun i(tag: String?, msg: String?, tr: Throwable?): Int {
+    return if (GlobalConfig.IsLoggerOn) Log.i(GlobalConfig.LogTagPrefix +tag, msg, tr) else -1
+  }
+
+  /**
+   * Send a [.WARN] log message.
+   * @param tag Used to identify the source of a log message.  It usually identifies
+   * the class or activity where the log call occurs.
+   * @param msg The message you would like logged.
+   */
+  fun w(tag: String?, msg: String): Int {
+    return if (GlobalConfig.IsLoggerOn) Log.w(GlobalConfig.LogTagPrefix +tag, msg) else -1
+  }
+
+  /**
+   * Send a [.WARN] log message and log the exception.
+   * @param tag Used to identify the source of a log message.  It usually identifies
+   * the class or activity where the log call occurs.
+   * @param msg The message you would like logged.
+   * @param tr An exception to log
+   */
+  fun w(tag: String?, msg: String?, tr: Throwable?): Int {
+    return if (GlobalConfig.IsLoggerOn) Log.w(GlobalConfig.LogTagPrefix +tag, msg, tr) else -1
+  }
+
+  /*
+   * Send a {@link #WARN} log message and log the exception.
+   * @param tag Used to identify the source of a log message.  It usually identifies
+   *        the class or activity where the log call occurs.
+   * @param tr An exception to log
+   */
+  fun w(tag: String?, tr: Throwable?): Int {
+    return if (GlobalConfig.IsLoggerOn) Log.w(GlobalConfig.LogTagPrefix +tag, tr) else -1
+  }
+
+  /**
+   * Send an [.ERROR] log message.
+   * @param tag Used to identify the source of a log message.  It usually identifies
+   * the class or activity where the log call occurs.
+   * @param msg The message you would like logged.
+   */
+  fun e(tag: String?, msg: String): Int {
+    return if (GlobalConfig.IsLoggerOn) Log.e(GlobalConfig.LogTagPrefix +tag, msg) else -1
+  }
+
+  /**
+   * Send a [.ERROR] log message and log the exception.
+   * @param tag Used to identify the source of a log message.  It usually identifies
+   * the class or activity where the log call occurs.
+   * @param msg The message you would like logged.
+   * @param tr An exception to log
+   */
+  fun e(tag: String?, msg: String?, tr: Throwable?): Int {
+    return if (GlobalConfig.IsLoggerOn) Log.e(GlobalConfig.LogTagPrefix +tag, msg, tr) else -1
+  }
+}

package/ios/Utils/Converter.swift

@@ -24,7 +24,8 @@ func dictionaryToInitializationDescriptor(
         xVnfProtocolVersion: dictionaryToXVnfProtocolVersion (
             initializationDescriptorDictionary["xVnfProtocolVersion"] as? String
         ),
-        cacheSequence: initializationDescriptorDictionary["cacheSequence"] as? Int ?? 0
+        cacheSequence: initializationDescriptorDictionary["cacheSequence"] as? Int ?? 0,
+        isDebugOn: initializationDescriptorDictionary["isDebugOn"] as? Bool ?? false
     )
 }
 

package/ios/Utils/VCLLog.swift

@@ -0,0 +1,42 @@
+//
+//  VCLLog.swift
+//  vcl-react-native
+//
+//  Created by Michael Avoyan on 08/08/2023.
+//
+//  Copyright 2022 Velocity Career Labs inc.
+//  SPDX-License-Identifier: Apache-2.0
+
+import Foundation
+
+struct VCLLog {
+
+    enum LogLevel: String {
+            case error = "⛔️"
+            case warning = "⚠️"
+            case debug = "💬"
+        }
+    static func d(_ info: String, level: LogLevel = .debug, file: String = #file, function: String = #function, line: Int = #line) {
+        if GlobalConfig.IsLoggerOn {
+            print("\(level.rawValue), \((file as NSString).lastPathComponent), \(line), \(function), \(GlobalConfig.LogTagPrefix + info)")
+        }
+    }
+
+    static func w(_ warning: String, level: LogLevel = .warning, file: String = #file, function: String = #function, line: Int = #line) {
+        if GlobalConfig.IsLoggerOn {
+            print("\(level.rawValue), \((file as NSString).lastPathComponent), \(line), \(function), \(GlobalConfig.LogTagPrefix + warning)")
+        }
+    }
+
+    static func e(_ error: Error, level: LogLevel = .error, file: String = #file, function: String = #function, line: Int = #line) {
+        if GlobalConfig.IsLoggerOn {
+            VCLLog.e("\(error)", level: level, file: file, function: function, line: line)
+        }
+    }
+
+    static func e(_ error: String, level: LogLevel = .error, file: String = #file, function: String = #function, line: Int = #line) {
+        if GlobalConfig.IsLoggerOn {
+            print("\(level.rawValue), \((file as NSString).lastPathComponent), \(line), \(function), \(GlobalConfig.LogTagPrefix + error)")
+        }
+    }
+}

package/ios/VclReactNative.swift

@@ -11,13 +11,22 @@ class VclReactNative: NSObject {
     
     private let vcl = VCLProvider.vclInstance()
     
+    private func initGlobalConfigurations(
+          _ initializationDescriptor: VCLInitializationDescriptor
+    ) {
+        GlobalConfig.CurrentEnvironment = initializationDescriptor.environment
+        GlobalConfig.IsDebugOn = initializationDescriptor.isDebugOn
+    }
+    
     @objc(initialize:withResolver:withRejecter:)
     func initialize(
         initializationDescriptorDictionary: [String: Any],
         resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock
     ) {
+        let initializationDescriptor = dictionaryToInitializationDescriptor(initializationDescriptorDictionary)
+        initGlobalConfigurations(initializationDescriptor)
         vcl.initialize(
-            initializationDescriptor: dictionaryToInitializationDescriptor(initializationDescriptorDictionary),
+            initializationDescriptor: initializationDescriptor,
             successHandler: {
                 resolve("VCL initialization succeed!")
             },
@@ -132,15 +141,17 @@ class VclReactNative: NSObject {
         credentialManifestDescriptorDictionary: [String: Any],
         resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock
     ) {
+        VCLLog.d("credentialManifestDescriptorDictionary dictionary: \(credentialManifestDescriptorDictionary)")
         if let credentialManifestDescriptor = dictionaryToCredentialManifestDescriptor(credentialManifestDescriptorDictionary) {
-        vcl.getCredentialManifest(
-            credentialManifestDescriptor: credentialManifestDescriptor,
-            successHandler: {
-                resolve(credentialManifestToDictionary($0))
-            },
-            errorHandler: {
-                reject(nil, $0.toDictionary().toJsonString(), $0)
-            })
+            VCLLog.d("credentialManifestDescriptor VCL entity: \(credentialManifestDescriptor.toPropsString())")
+            vcl.getCredentialManifest(
+                credentialManifestDescriptor: credentialManifestDescriptor,
+                successHandler: {
+                    resolve(credentialManifestToDictionary($0))
+                },
+                errorHandler: {
+                    reject(nil, $0.toDictionary().toJsonString(), $0)
+                })
         } else {
             reject(nil, "Unexpected Credential Credential Manifest Descriptor: \(credentialManifestDescriptorDictionary)", nil)
         }

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

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["VCLInitializationDescriptor.ts"],"sourcesContent":["/**\n * Created by Michael Avoyan.\n *\n * Copyright 2022 Velocity Career Labs inc.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport type { VCLEnvironment } from '../VCLEnvironment';\nimport type { VCLKeyServiceType } from '../VCLKeyServiceType';\nimport type { VCLXVnfProtocolVersion } from '../VCLXVnfProtocolVersion';\n\nexport interface VCLInitializationDescriptor {\n  environment?: VCLEnvironment;\n  keyServiceType?: VCLKeyServiceType;\n  xVnfProtocolVersion?: VCLXVnfProtocolVersion;\n  cacheSequence?: number;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["VCLInitializationDescriptor.ts"],"sourcesContent":["/**\n * Created by Michael Avoyan.\n *\n * Copyright 2022 Velocity Career Labs inc.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport type { VCLEnvironment } from '../VCLEnvironment';\nimport type { VCLKeyServiceType } from '../VCLKeyServiceType';\nimport type { VCLXVnfProtocolVersion } from '../VCLXVnfProtocolVersion';\n\nexport interface VCLInitializationDescriptor {\n  environment?: VCLEnvironment;\n  keyServiceType?: VCLKeyServiceType;\n  xVnfProtocolVersion?: VCLXVnfProtocolVersion;\n  cacheSequence?: number;\n  isDebugOn?: boolean;\n}\n"],"mappings":""}

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

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["VCLInitializationDescriptor.ts"],"sourcesContent":["/**\n * Created by Michael Avoyan.\n *\n * Copyright 2022 Velocity Career Labs inc.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport type { VCLEnvironment } from '../VCLEnvironment';\nimport type { VCLKeyServiceType } from '../VCLKeyServiceType';\nimport type { VCLXVnfProtocolVersion } from '../VCLXVnfProtocolVersion';\n\nexport interface VCLInitializationDescriptor {\n  environment?: VCLEnvironment;\n  keyServiceType?: VCLKeyServiceType;\n  xVnfProtocolVersion?: VCLXVnfProtocolVersion;\n  cacheSequence?: number;\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["VCLInitializationDescriptor.ts"],"sourcesContent":["/**\n * Created by Michael Avoyan.\n *\n * Copyright 2022 Velocity Career Labs inc.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport type { VCLEnvironment } from '../VCLEnvironment';\nimport type { VCLKeyServiceType } from '../VCLKeyServiceType';\nimport type { VCLXVnfProtocolVersion } from '../VCLXVnfProtocolVersion';\n\nexport interface VCLInitializationDescriptor {\n  environment?: VCLEnvironment;\n  keyServiceType?: VCLKeyServiceType;\n  xVnfProtocolVersion?: VCLXVnfProtocolVersion;\n  cacheSequence?: number;\n  isDebugOn?: boolean;\n}\n"],"mappings":""}

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

@@ -12,4 +12,5 @@ export interface VCLInitializationDescriptor {
     keyServiceType?: VCLKeyServiceType;
     xVnfProtocolVersion?: VCLXVnfProtocolVersion;
     cacheSequence?: number;
+    isDebugOn?: boolean;
 }

package/package.json

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

package/src/api/entities/VCLInitializationDescriptor.ts

@@ -14,4 +14,5 @@ export interface VCLInitializationDescriptor {
   keyServiceType?: VCLKeyServiceType;
   xVnfProtocolVersion?: VCLXVnfProtocolVersion;
   cacheSequence?: number;
+  isDebugOn?: boolean;
 }

package/vcl-react-native.podspec

@@ -20,5 +20,5 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.dependency "React"
-  s.dependency "VCL", "1.14.5"
+  s.dependency "VCL", "1.14.6"
 end