@velocitycareerlabs/vcl-react-native 1.12.3 → 1.12.5

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,10 +35,12 @@ 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.mapToInitializationDescriptor
 import io.velocitycareerlabs.reactnative.utlis.Converter.mapToJwtDescriptor
+import io.velocitycareerlabs.reactnative.utlis.VCLLog
 import java.lang.Exception
 
 /**
@@ -46,6 +48,8 @@ import java.lang.Exception
  */
 class VclReactNativeModule(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) {
 
+  val TAG = "VclReactNativeModule"
+
   companion object {
     const val ModuleName = "VclReactNative"
   }
@@ -56,17 +60,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(
+        reactContext,
+        initializationDescriptorMap
+      )
+      initGlobalConfigurations(initializationDescriptor)
       vcl.initialize(
-        initializationDescriptor = mapToInitializationDescriptor(
-          reactContext,
-          initializationDescriptor
-        ),
+        initializationDescriptor = initializationDescriptor,
         successHandler = {
           promise.resolve("VCL initialization succeed!")
         },
@@ -189,7 +202,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

@@ -14,9 +14,6 @@ import io.velocitycareerlabs.reactnative.extensions.*
 import org.json.JSONObject
 import java.lang.Exception
 
-/**
- * Created by Michael Avoyan on 04/07/2021.
- */
 object Converter {
 
   fun mapToInitializationDescriptor(
@@ -431,9 +428,9 @@ object Converter {
   fun mapToServiceCredentialAgentIssuer(
     serviceMap: ReadableMap?
   ): VCLServiceCredentialAgentIssuer {
-    var payload = JSONObject("{}")
+    var payload = JSONObject()
     try {
-      payload = JSONObject(serviceMap?.getMapOpt("payload").toString()).getJSONObject("NativeMap")
+      payload = serviceMap?.getMapOpt("payload")?.toJsonObject() ?: JSONObject()
     } catch (ex: Exception) {
       ex.printStackTrace()
     }

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/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!")
             },
@@ -128,15 +137,17 @@ class VclReactNative: NSObject {
         credentialManifestDescriptorDictionary: [String: Any],
         resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock
     ) {
+        VCLLog.d("credentialManifestDescriptorDictionary: \(credentialManifestDescriptorDictionary)")
         if let credentialManifestDescriptor = dictionaryToCredentialManifestDescriptor(credentialManifestDescriptorDictionary) {
-        vcl.getCredentialManifest(
-            credentialManifestDescriptor: credentialManifestDescriptor,
-            successHandler: {
-                resolve(credentialManifestToDictionary($0))
-            },
-            errorHandler: {
-                reject(nil, $0.toDictionary().toJsonString(), $0)
-            })
+            VCLLog.d("credentialManifestDescriptor: \(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/package.json

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