anyline-ocr-react-native-module 53.2.0 → 54.0.0

package/ios/ALPluginHelper.m

@@ -1,5 +1,5 @@
 #import "ALPluginHelper.h"
-#import "ALNFCScanViewController.h" // because NFC-specific code is there
+#import "ALPluginScanViewController.h"
 #import <Anyline/Anyline.h>
 #import <objc/runtime.h>
 
@@ -10,59 +10,34 @@ NSErrorDomain const ALDefaultDomain = @"ALDefaultErrorDomain";
 
 #pragma mark - Launch Anyline
 
-+ (void)startScan:(NSDictionary *)config finished:(ALPluginCallback)callback {
-    
++ (void)startScan:(NSDictionary *)config initializationParamsStr:(NSString *)initializationParamsStr finished:(ALPluginCallback)callback {
+
     NSDictionary *pluginConf = config;
-    
+
     NSString *licenseKey = [config objectForKey:@"licenseKey"];
-    
+
     [[UIApplication sharedApplication] keyWindow].rootViewController.modalPresentationStyle = UIModalPresentationFullScreen;
-    
+
     NSDictionary *optionsDict = [config objectForKey:@"options"];
     ALJSONUIConfiguration *jsonUIConf = [[ALJSONUIConfiguration alloc] initWithDictionary:optionsDict];
-    
-    BOOL isNFC = [optionsDict[@"enableNFCWithMRZ"] boolValue];
-    
-    if (isNFC) {
-        if (@available(iOS 13.0, *)) {
-            
-            if (![ALNFCDetector readingAvailable]) {
-                callback(nil, [NSError errorWithDomain:@"ALReactDomain" code:100 userInfo:@{NSLocalizedDescriptionKey: @"NFC passport reading is not supported on this device or app."}]);
-                
-                return;
-            }
-            
-            ALNFCScanViewController *nfcScanViewController = [[ALNFCScanViewController alloc] initWithLicensekey:licenseKey
-                                                                                                   configuration:pluginConf
-                                                                                                        uiConfig:jsonUIConf
-                                                                                                        finished:callback];            
-            if (nfcScanViewController != nil) {
-                [nfcScanViewController setModalPresentationStyle:UIModalPresentationFullScreen];
-                [[[UIApplication sharedApplication] keyWindow].rootViewController presentViewController:nfcScanViewController
-                                                                                               animated:YES
-                                                                                             completion:nil];
-            }
-        } else {
-            callback(nil,[NSError errorWithDomain:@"ALReactDomain" code:100 userInfo:@{NSLocalizedDescriptionKey: @"NFC passport reading is only supported on iOS 13 and later."}]);
-            return;
-        }
-    } else {
-        ALPluginScanViewController *pluginScanViewController = [[ALPluginScanViewController alloc] initWithLicensekey:licenseKey
-                                                                                                        configuration:pluginConf
-                                                                                                      uiConfiguration:jsonUIConf
-                                                                                                             finished:callback];
-        
-        if ([pluginConf valueForKey:@"quality"]){
-            pluginScanViewController.quality = [[pluginConf valueForKey:@"quality"] integerValue];
-        }
-        
-        if (pluginScanViewController) {
-            [pluginScanViewController setModalPresentationStyle:UIModalPresentationFullScreen];
-            [[[UIApplication sharedApplication] keyWindow].rootViewController presentViewController:pluginScanViewController
-                                                                                           animated:YES
-                                                                                         completion:nil];
-        }
+
+    ALPluginScanViewController *pluginScanViewController = [[ALPluginScanViewController alloc] initWithLicensekey:licenseKey
+                                                                                                    configuration:pluginConf
+                                                                                                  uiConfiguration:jsonUIConf
+                                                                                          initializationParamsStr:initializationParamsStr
+                                                                                                         finished:callback];
+
+    if ([pluginConf valueForKey:@"quality"]){
+        pluginScanViewController.quality = [[pluginConf valueForKey:@"quality"] integerValue];
     }
+
+    if (pluginScanViewController) {
+        [pluginScanViewController setModalPresentationStyle:UIModalPresentationFullScreen];
+        [[[UIApplication sharedApplication] keyWindow].rootViewController presentViewController:pluginScanViewController
+                                                                                       animated:YES
+                                                                                     completion:nil];
+    }
+
 }
 
 #pragma mark - Filesystem handling
@@ -305,16 +280,6 @@ NSErrorDomain const ALDefaultDomain = @"ALDefaultErrorDomain";
 }
 
 // MARK: - Date Utils
-
-+ (NSDate *)formattedStringToDate:(NSString *)formattedStr {
-    // From this: "Sun Apr 12 00:00:00 UTC 1977" to this: "04/12/1977"
-    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
-    [dateFormatter setTimeZone:[NSTimeZone timeZoneWithAbbreviation:@"GMT+0:00"]];
-    dateFormatter.dateFormat = @"E MMM d HH:mm:ss zzz yyyy";
-    NSDate *d = [dateFormatter dateFromString:formattedStr];
-    return d;
-}
-
 + (NSString *)stringForDate:(NSDate *)date {
     NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
     [dateFormatter setTimeZone:[NSTimeZone timeZoneWithAbbreviation:@"GMT+0:00"]];
@@ -329,8 +294,11 @@ NSErrorDomain const ALDefaultDomain = @"ALDefaultErrorDomain";
 + (NSString * _Nullable)confPropKeyWithScanModeForPluginConfig:(ALPluginConfig *)pluginConfig {
     unsigned int count;
     Ivar *ivars = class_copyIvarList(ALPluginConfig.class, &count);
+    if (!ivars) {
+        return nil;
+    }
     for (int i = 0; i < count; i++) {
-        const char *ivarName = ivar_getName(((Ivar * _Nonnull)ivars)[i]);
+        const char *ivarName = ivar_getName(ivars[i]);
         NSString *key = [NSString stringWithCString:(const char * _Nonnull)ivarName encoding:NSUTF8StringEncoding];
         key = [key stringByTrimmingCharactersInSet:NSCharacterSet.punctuationCharacterSet];
 

package/ios/ALPluginScanViewController.h

@@ -10,6 +10,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)initWithLicensekey:(NSString *)licenseKey
                      configuration:(NSDictionary *)config
                    uiConfiguration:(ALJSONUIConfiguration *)JSONUIConfig
+           initializationParamsStr:(NSString *)initializationParamsStr
                           finished:(ALPluginCallback)callback;
 
 @end

package/ios/ALPluginScanViewController.m

@@ -37,6 +37,8 @@
 
 @property (nonatomic, strong) NSError *scanViewError;
 
+@property (nonatomic, nullable) NSString *initializationParamsStr;
+
 @end
 
 
@@ -49,6 +51,7 @@
 - (instancetype)initWithLicensekey:(NSString *)licenseKey
                      configuration:(NSDictionary *)config
                    uiConfiguration:(ALJSONUIConfiguration *)JSONUIConfig
+           initializationParamsStr:(NSString *)initializationParamsStr
                           finished:(ALPluginCallback)callback {
 
     if (self = [super init]) {
@@ -56,7 +59,8 @@
         _callback = callback;
         _config = config;
         _uiConfig = JSONUIConfig;
-        
+        _initializationParamsStr = initializationParamsStr;
+
         self.quality = 100;
     }
     return self;
@@ -79,7 +83,18 @@
         }
     }
 
+    ALScanViewInitializationParameters *initializationParams = nil;
+    if(![self isStringEmpty:_initializationParamsStr]){
+        initializationParams =  [ALScanViewInitializationParameters withJSONString: _initializationParamsStr error:&error];
+    }
+    
+    if ([self showErrorAlertIfNeeded:error]) {
+        self.scanViewError = error;
+        return;
+    }
+        
     self.scanView = [ALScanViewFactory withJSONDictionary:self.config
+                                     initializationParams:initializationParams
                                                  delegate:self
                                                     error:&error];
 
@@ -434,6 +449,13 @@
     return YES;
 }
 
+-(BOOL)isStringEmpty:(NSString *)str {
+    if(str == nil || [str isKindOfClass:[NSNull class]] || str.length==0) {
+        return YES;
+    }
+    return NO;
+}
+
 // MARK: - Miscellaneous
 
 - (BOOL)showErrorAlertIfNeeded:(NSError *)error {

package/ios/AnylineReact.podspec

@@ -7,7 +7,7 @@ Pod::Spec.new do |s|
   s.version      = package["version"]
   s.summary      = "anyline-ocr-react-native-module"
   s.authors      = {
-    'Aldrich Co' => 'aldrich.co@anyline.com'
+    'Anyline GmbH' => 'capture-team@anyline.com'
   }
 
   s.homepage     = "https://github.com/Anyline/anyline-ocr-react-native-module"
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/Anyline/anyline-ocr-react-native-module.git", :tag => "#{s.version}" }
 
   s.source_files  = "*.{h,m}"
-  s.dependency "Anyline", "53.2.0"
+  s.dependency "Anyline", "54.0.0"
   s.dependency "React"
 
-end
+end

package/ios/AnylineSDKPlugin.m

@@ -4,8 +4,6 @@
 #import "ALPluginScanViewController.h"
 #import "ALPluginHelper.h"
 
-#import "ALNFCScanViewController.h"
-
 ALWrapperConfig *wrapperConfig = nil;
 
 @interface AnylineSDKPlugin()
@@ -27,6 +25,8 @@ ALWrapperConfig *wrapperConfig = nil;
 
 @property (nonatomic, copy) NSString *returnMethod;
 
+@property (nonatomic, copy) NSString *initializationParamsStr;
+
 @end
 
 
@@ -46,15 +46,19 @@ RCT_EXPORT_METHOD(setupScanViewWithConfigJson:(NSString *)config scanMode:(NSStr
     self.onErrorCallback = onError;
     self.returnMethod = @"callback";
     self.config = config;
-    [self initView:scanMode];
+    [self initView:scanMode initializationParamsStr:nil];
 }
 
 RCT_EXPORT_METHOD(setup:(NSString *)config scanMode:(NSString *)scanMode onResultCallback:(RCTResponseSenderBlock)onResult onErrorCallback:(RCTResponseSenderBlock)onError) {
+    [self setupWithInitializationParameters:nil config:config scanMode:scanMode onResultCallback:onResult onErrorCallback:onError];
+}
+
+RCT_EXPORT_METHOD(setupWithInitializationParameters:(NSString * _Nullable)initializationParametersStr config:(NSString *)config scanMode:(NSString *)scanMode onResultCallback:(RCTResponseSenderBlock)onResult onErrorCallback:(RCTResponseSenderBlock)onError) {
     self.onResultCallback = onResult;
     self.onErrorCallback = onError;
     self.returnMethod = @"callback";
     self.config = config;
-    [self initView:scanMode];
+    [self initView:scanMode initializationParamsStr:initializationParametersStr];
 }
 
 RCT_EXPORT_METHOD(setupAnylineSDK:(NSString *)licenseKey
@@ -92,11 +96,16 @@ RCT_EXPORT_METHOD(setupAnylineSDKWithCacheConfig:(NSString *)licenseKey
 }
 
 RCT_EXPORT_METHOD(setupPromise:(NSString *)config scanMode:(NSString *)scanMode resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+    [self setupPromiseWithInitializationParameters:nil config:config scanMode:scanMode resolver:resolve rejecter:reject];
+}
+
+RCT_EXPORT_METHOD(setupPromiseWithInitializationParameters:(NSString * _Nullable)initializationParametersStr config:(NSString *)configStr scanMode:(NSString *)scanMode resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
     _resolveBlock = resolve;
     _rejectBlock = reject;
     self.returnMethod = @"promise";
-    self.config = config;
-    [self initView:scanMode];
+    self.config = configStr;
+    self.initializationParamsStr = initializationParametersStr;
+    [self initView:scanMode initializationParamsStr:self.initializationParamsStr];
 }
 
 RCT_EXPORT_METHOD(getSDKVersion:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
@@ -134,7 +143,7 @@ RCT_EXPORT_METHOD(exportCachedEvents:(RCTPromiseResolveBlock)resolve rejecter:(R
 }
 
 
-- (void)initView:(NSString *)scanMode {
+- (void)initView:(NSString *)scanMode initializationParamsStr:(NSString * _Nullable)initializationParamsStr {
     NSData *data = [self.config dataUsingEncoding:NSUTF8StringEncoding];
     if (!data) {
         [NSException raise:@"Config could not be loaded from disk" format:@"Config could not be loaded from disk"];
@@ -165,46 +174,26 @@ RCT_EXPORT_METHOD(exportCachedEvents:(RCTPromiseResolveBlock)resolve rejecter:(R
         [[UIApplication sharedApplication] keyWindow].rootViewController.modalPresentationStyle = UIModalPresentationFullScreen;
         
         if ([[scanMode uppercaseString] isEqualToString:[@"scan" uppercaseString]]) {
-            BOOL isNFC = [optionsDictionary objectForKey:@"enableNFCWithMRZ"];
-            if (isNFC) {
-                if (@available(iOS 13.0, *)) {
-                    if ([ALNFCDetector readingAvailable]) {
-                        ALNFCScanViewController *nfcScanViewController = [[ALNFCScanViewController alloc] initWithLicensekey:self.appKey
-                                                                                                               configuration:dictionary
-                                                                                                                    uiConfig:self.jsonUIConf
-                                                                                                                    finished:^(NSDictionary *  _Nullable callbackObj, NSError * _Nullable error) {
-                            [self returnCallback:callbackObj andError:error];
-                        }];
-
-                        if (nfcScanViewController != nil){
-                            [nfcScanViewController setModalPresentationStyle: UIModalPresentationFullScreen];
-                            [[[UIApplication sharedApplication] keyWindow].rootViewController presentViewController:nfcScanViewController animated:YES completion:nil];
-                        }
-                    } else {
-                        [self returnError:[NSError errorWithDomain:@"ALReactDomain" code:100 userInfo:@{NSLocalizedDescriptionKey: @"NFC passport reading is not supported on this device or app."}]];
-                    }
-                } else {
-                    [self returnError:[NSError errorWithDomain:@"ALReactDomain" code:100 userInfo:@{NSLocalizedDescriptionKey: @"NFC passport reading is only supported on iOS 13 and later."}]];
-
-                }
-            } else {
-                ALPluginScanViewController *pluginScanViewController =
-                [[ALPluginScanViewController alloc] initWithLicensekey:self.appKey
-                                                         configuration:dictionary
-                                                       uiConfiguration:self.jsonUIConf finished:^(NSDictionary *  _Nullable callbackObj, NSError * _Nullable error) {
-                    [self returnCallback:callbackObj andError:error];
-                }];
-                
-                if (pluginScanViewController != nil){
-                    [pluginScanViewController setModalPresentationStyle: UIModalPresentationFullScreen];
-                    [[[UIApplication sharedApplication] keyWindow].rootViewController presentViewController:pluginScanViewController animated:YES completion:nil];
-                }
+            ALPluginScanViewController *pluginScanViewController =
+            [[ALPluginScanViewController alloc] initWithLicensekey:self.appKey
+                                                     configuration:dictionary
+                                                   uiConfiguration:self.jsonUIConf
+                                           initializationParamsStr:initializationParamsStr
+                                                          finished:^(NSDictionary *  _Nullable callbackObj, NSError * _Nullable error) {
+                [self returnCallback:callbackObj andError:error];
+            }];
+            
+            if (pluginScanViewController != nil){
+                [pluginScanViewController setModalPresentationStyle: UIModalPresentationFullScreen];
+                [[[UIApplication sharedApplication] keyWindow].rootViewController presentViewController:pluginScanViewController animated:YES completion:nil];
             }
         } else {
             ALPluginScanViewController *pluginScanViewController =
             [[ALPluginScanViewController alloc] initWithLicensekey:self.appKey
                                                      configuration:dictionary
-                                                   uiConfiguration:self.jsonUIConf finished:^(NSDictionary *  _Nullable callbackObj, NSError * _Nullable error) {
+                                                   uiConfiguration:self.jsonUIConf
+                                           initializationParamsStr:initializationParamsStr
+                                                          finished:^(NSDictionary *  _Nullable callbackObj, NSError * _Nullable error) {
                 [self returnCallback:callbackObj andError:error];
             }];
             

package/package.json

@@ -1,6 +1,6 @@
 {
-  "_from": "anyline-ocr-react-native-module@^53.2.0",
-  "_id": "anyline-ocr-react-native-module@^53.2.0",
+  "_from": "anyline-ocr-react-native-module@^54.0.0",
+  "_id": "anyline-ocr-react-native-module@^54.0.0",
   "_inBundle": false,
   "_integrity": "sha512-BGi9zNkSsoxXywDBIqzgBRvKUBniQOJHDKBrozZubKthZNRBAj8Ry5tW0Me0yLXt/fauME//hbC0wsenfPJZqw==",
   "_location": "/anyline-ocr-react-native-module",
@@ -8,19 +8,19 @@
   "_requested": {
     "type": "range",
     "registry": true,
-    "raw": "anyline-ocr-react-native-module@^53.2.0",
+    "raw": "anyline-ocr-react-native-module@^54.0.0",
     "name": "anyline-ocr-react-native-module",
     "escapedName": "anyline-ocr-react-native-module",
-    "rawSpec": "^53.2.0",
+    "rawSpec": "^54.0.0",
     "saveSpec": null,
-    "fetchSpec": "^53.2.0"
+    "fetchSpec": "^54.0.0"
   },
   "_requiredBy": [
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/anyline-ocr-react-native-module/-/anyline-ocr-react-native-module-53.2.0.tgz",
+  "_resolved": "https://registry.npmjs.org/anyline-ocr-react-native-module/-/anyline-ocr-react-native-module-54.0.0.tgz",
   "_shasum": "bacbcd260cc662244f59393ed81a6edba009b52c",
-  "_spec": "anyline-ocr-react-native-module@^53.2.0",
+  "_spec": "anyline-ocr-react-native-module@^54.0.0",
   "_where": "/Users/amiransari/Projects/anyline-ocr-react-native-module1/example/RNExampleApp",
   "bugs": {
     "url": "https://github.com/Anyline/anyline-ocr-react-native-module/issues"
@@ -47,5 +47,5 @@
     "type": "git",
     "url": "git+https://github.com/Anyline/anyline-ocr-react-native-module.git"
   },
-  "version": "53.2.0"
+  "version": "54.0.0"
 }

package/ios/ALNFCScanViewController.h

@@ -1,14 +0,0 @@
-#import "ALPluginScanViewController.h"
-#import "ALJSONUIConfiguration.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface ALNFCScanViewController : UIViewController
-
-- (instancetype)initWithLicensekey:(NSString *)licensekey
-                     configuration:(NSDictionary *)anylineConfig
-                          uiConfig:(ALJSONUIConfiguration *)uiConfig
-                          finished:(ALPluginCallback)callback;
-@end
-
-NS_ASSUME_NONNULL_END