@regulaforensics/react-native-document-reader-api 7.6.6-beta → 7.6.17-beta

package/android/src/main/java/com/regula/documentreader/BluetoothUtil.kt

@@ -22,7 +22,6 @@ import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.os.Build
 import android.os.IBinder
 import android.provider.Settings
-import androidx.core.app.ActivityCompat.requestPermissions
 import androidx.core.content.ContextCompat.checkSelfPermission
 import com.regula.documentreader.api.ble.BLEWrapper
 import com.regula.documentreader.api.ble.BleWrapperCallback
@@ -153,10 +152,10 @@ fun deniedBluetoothPermission(
 
 fun requestEnableBluetooth(activity: Activity) {
     val enableIntent = Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE)
-    activity.startActivityForResult(enableIntent, INTENT_REQUEST_ENABLE_BLUETOOTH)
+    startActivityForResult(activity, enableIntent, INTENT_REQUEST_ENABLE_BLUETOOTH)
 }
 
 fun requestEnableLocationService(activity: Activity) {
     val myIntent = Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)
-    activity.startActivityForResult(myIntent, INTENT_REQUEST_ENABLE_LOCATION)
+    startActivityForResult(activity, myIntent, INTENT_REQUEST_ENABLE_LOCATION)
 }

package/android/src/main/java/com/regula/documentreader/JSONConstructor.kt

@@ -26,6 +26,7 @@ import com.regula.documentreader.api.enums.PDF417Info
 import com.regula.documentreader.api.enums.eGraphicFieldType
 import com.regula.documentreader.api.enums.eRFID_DataFile_Type
 import com.regula.documentreader.api.enums.eRPRM_Lights
+import com.regula.documentreader.api.listener.NetworkInterceptorListener
 import com.regula.documentreader.api.params.AuthenticityParams
 import com.regula.documentreader.api.params.BackendProcessingConfig
 import com.regula.documentreader.api.params.BleDeviceConfig
@@ -106,6 +107,8 @@ import com.regula.documentreader.Convert.generateByteArray
 import org.json.JSONArray
 import org.json.JSONObject
 
+val weakReferencesHolder = mutableListOf<Any>()
+
 fun generateCompletion(action: Int, results: DocumentReaderResults?, error: RegulaException?, context: Context?) = object : JSONObject() { init {
     put("action", action)
     if (listOf(
@@ -366,6 +369,11 @@ fun onlineProcessingConfigFromJSON(temp: JSONObject?): OnlineProcessingConfig? {
     if (input.has("url")) builder.setUrl(input.getString("url"))
     if (input.has("imageCompressionQuality")) builder.setImageCompressionQuality(input.getDouble("imageCompressionQuality").toFloat())
     if (input.has("processParams")) builder.setProcessParams(processParamFromJSON(input.getJSONObject("processParams")))
+    if (input.has("requestHeaders")) {
+        val listener = NetworkInterceptorListener { input.getJSONObject("requestHeaders").forEach { k, v -> it.setRequestProperty(k, v as String) } }
+        weakReferencesHolder.add(listener)
+        builder.setNetworkInterceptorListener(listener)
+    }
 
     return builder.build()
 }

package/android/src/main/java/com/regula/documentreader/RNRegulaDocumentReaderModule.kt

@@ -1,4 +1,4 @@
-@file:Suppress("UNCHECKED_CAST")
+@file:Suppress("UNCHECKED_CAST", "MissingPermission")
 
 package com.regula.documentreader
 
@@ -21,7 +21,7 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.modules.core.DeviceEventManagerModule
-import com.facebook.react.modules.core.PermissionListener
+import com.facebook.react.modules.core.PermissionAwareActivity
 import com.regula.common.LocalizationCallbacks
 import com.regula.documentreader.Convert.bitmapToBase64
 import com.regula.documentreader.Convert.byteArrayFromBase64
@@ -56,7 +56,7 @@ import org.json.JSONArray
 import org.json.JSONObject
 
 @Suppress("unused", "UNUSED_PARAMETER")
-class RNRegulaDocumentReaderModule(rc: ReactApplicationContext) : ReactContextBaseJavaModule(rc), ActivityEventListener, PermissionListener {
+class RNRegulaDocumentReaderModule(rc: ReactApplicationContext) : ReactContextBaseJavaModule(rc), ActivityEventListener {
     init {
         reactContext = rc
         reactContext.addActivityEventListener(this)
@@ -78,8 +78,16 @@ class RNRegulaDocumentReaderModule(rc: ReactApplicationContext) : ReactContextBa
     override fun onActivityResult(activity: Activity, requestCode: Int, resultCode: Int, data: Intent?) {
         onActivityResult(requestCode, resultCode, data)
     }
+}
+
+fun requestPermissions(activity: Activity, permissions: Array<String>, requestCode: Int) {
+    (activity as PermissionAwareActivity).requestPermissions(permissions, requestCode) { code, perms, grantResults ->
+        onRequestPermissionsResult(code, perms, grantResults)
+    }
+}
 
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) = com.regula.documentreader.onRequestPermissionsResult(requestCode, permissions, grantResults)
+fun startActivityForResult(activity: Activity, intent: Intent, requestCode: Int) {
+    activity.startActivityForResult(intent, requestCode)
 }
 
 fun sendEvent(event: String, data: Any? = "") {

package/example/package.json

@@ -10,8 +10,8 @@
     "test": "jest"
   },
   "dependencies": {
-    "@regulaforensics/react-native-document-reader-api": "7.6.6-beta",
-    "@regulaforensics/react-native-document-reader-core-fullauthrfid": "7.6.8-beta",
+    "@regulaforensics/react-native-document-reader-api": "7.6.17-beta",
+    "@regulaforensics/react-native-document-reader-core-fullauthrfid": "7.5.893",
     "react-native-progress": "5.0.0",
     "react-native-radio-buttons-group": "3.0.5",
     "@rneui/base": "4.0.0-rc.7",

package/index.d.ts

@@ -1477,6 +1477,7 @@ export class OnlineProcessingConfig {
     processParams?: ProcessParams
     imageFormat?: number
     imageCompressionQuality?: number
+    requestHeaders?: Record<string, string>
 
     static fromJson(jsonObject?: any): OnlineProcessingConfig | undefined {
         if (jsonObject == null || jsonObject == undefined) return undefined
@@ -1487,6 +1488,7 @@ export class OnlineProcessingConfig {
         result.processParams = ProcessParams.fromJson(jsonObject["processParams"])
         result.imageFormat = jsonObject["imageFormat"]
         result.imageCompressionQuality = jsonObject["imageCompressionQuality"]
+        result.requestHeaders = jsonObject["requestHeaders"]
 
         return result
     }
@@ -5417,7 +5419,7 @@ export default class DocumentReader {
     static addPKDCertificates(certificates: PKDCertificate[], successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static clearPKDCertificates(successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static startNewSession(successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
-    static connectBluetoothDevice(successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
+    static connectBluetoothDevice(btDeviceName: string, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static setLocalizationDictionary(dictionary: Record<string, string>, successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static getLicense(successCallback: (response: string) => void, errorCallback?: (error: string) => void): void
     static getAvailableScenarios(successCallback: (response: string) => void, errorCallback?: (error: string) => void): void

package/index.js

@@ -998,6 +998,7 @@ export class OnlineProcessingConfig {
         result.processParams = ProcessParams.fromJson(jsonObject["processParams"])
         result.imageFormat = jsonObject["imageFormat"]
         result.imageCompressionQuality = jsonObject["imageCompressionQuality"]
+        result.requestHeaders = jsonObject["requestHeaders"]
 
         return result
     }
@@ -4433,7 +4434,7 @@ DocumentReader.setTCCParams = (params, successCallback, errorCallback) => RNRegu
 DocumentReader.addPKDCertificates = (certificates, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "addPKDCertificates", [certificates], successCallback, errorCallback)
 DocumentReader.clearPKDCertificates = (successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "clearPKDCertificates", [], successCallback, errorCallback)
 DocumentReader.startNewSession = (successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "startNewSession", [], successCallback, errorCallback)
-DocumentReader.connectBluetoothDevice = (successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "connectBluetoothDevice", [], successCallback, errorCallback)
+DocumentReader.connectBluetoothDevice = (btDeviceName, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "connectBluetoothDevice", [btDeviceName], successCallback, errorCallback)
 DocumentReader.setLocalizationDictionary = (dictionary, successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "setLocalizationDictionary", [dictionary], successCallback, errorCallback)
 DocumentReader.getLicense = (successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "getLicense", [], successCallback, errorCallback)
 DocumentReader.getAvailableScenarios = (successCallback, errorCallback) => RNRegulaDocumentReader.exec("DocumentReader", "getAvailableScenarios", [], successCallback, errorCallback)

package/ios/RGLWJSONConstructor.h

@@ -184,4 +184,9 @@
 +(NSDictionary* _Nullable)generateTransactionInfo:(RGLTransactionInfo* _Nullable)input;
 
 @end
+
+@interface RGLWRequestInterceptorProxy : NSObject <RGLURLRequestInterceptingDelegate>
+- (instancetype _Nonnull)initWithHeaders:(NSDictionary*_Nonnull)headers;
+@end
+
 #endif

package/ios/RGLWJSONConstructor.m

@@ -11,6 +11,13 @@
 
 @implementation RGLWJSONConstructor
 
+static NSMutableArray* weakReferencesHolder;
++(void) holdWeakReference:(id)reference {
+    if(!weakReferencesHolder)
+        weakReferencesHolder = [NSMutableArray new];
+    [weakReferencesHolder addObject:reference];
+}
+
 +(NSString*)dictToString:(NSDictionary*)input {
     if(input == nil) return nil;
     return [[NSString alloc] initWithData:[NSJSONSerialization dataWithJSONObject:input options:NSJSONWritingPrettyPrinted error:nil] encoding:NSUTF8StringEncoding];
@@ -406,6 +413,11 @@
         [RGLWConfig setProcessParams:[input valueForKey:@"processParams"] :params];
         result.processParams = params;
     }
+    if([input valueForKey:@"requestHeaders"] != nil) {
+        RGLWRequestInterceptorProxy* proxy = [[RGLWRequestInterceptorProxy alloc] initWithHeaders:[input valueForKey:@"requestHeaders"]];
+        [self holdWeakReference: proxy];
+        result.requestInterceptingDelegate = proxy;
+    }
     
     return result;
 }
@@ -2336,3 +2348,22 @@
 }
 
 @end
+
+@implementation RGLWRequestInterceptorProxy {
+    NSDictionary* _headers;
+}
+
+- (instancetype)initWithHeaders:(NSDictionary*)headers {
+    self = [super init];
+    _headers = [headers copy];
+    return self;
+}
+
+-(NSURLRequest*)interceptorPrepareRequest:(NSURLRequest*)request {
+    NSMutableURLRequest *interceptedRequest = [request mutableCopy];
+    for (NSString* key in _headers.allKeys)
+        [interceptedRequest addValue:[_headers valueForKey:key] forHTTPHeaderField:key];
+    return interceptedRequest;
+}
+
+@end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/react-native-document-reader-api",
-  "version": "7.6.6-beta",
+  "version": "7.6.17-beta",
   "description": "React Native module for reading and validation of identification documents (API framework)",
   "main": "index.js",
   "scripts": {