@regulaforensics/face-sdk 7.2.404-beta → 7.2.408-rc

package/RNFaceSDK.podspec

@@ -5,7 +5,7 @@ source = File.join(__dir__, 'ios')
 
 Pod::Spec.new do |s|
   s.name         = 'RNFaceSDK'
-  s.version      = '7.2.404-beta'
+  s.version      = '7.2.408-rc'
   s.summary      = package['description']
   s.license      = package['license']
 
@@ -16,6 +16,6 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '13.0'
   s.source_files = 'ios/**/*.{h,m}'
   s.exclude_files = [ 'ios/CVDFaceSDK.h', 'ios/CVDFaceSDK.m' ]
-  s.dependency 'FaceSDKStage', '7.2.3006'
+  s.dependency 'FaceSDKStage', '7.2.3010'
   s.dependency 'React'
 end

package/android/src/main/java/com/regula/plugin/facesdk/JSONConstructor.kt

@@ -833,7 +833,6 @@ fun searchPersonRequestFromJSON(it: JSONObject) = object : SearchPersonRequest()
     groupIdsForSearch = it.getJSONArrayOrNull("groupIdsForSearch").toArray()
     threshold = it.getDoubleOrNull("threshold")?.toFloat()
     limit = it.getIntOrNull("limit")
-    tag = it.getStringOrNull("tag")
     imageUpload = imageUploadFromJSON(it.getJSONObjectOrNull("imageUpload"))
     isDetectAll = it.optBoolean("detectAll", false)
     outputImageParams = outputImageParamsFromJSON(it.getJSONObjectOrNull("outputImageParams"))
@@ -844,7 +843,6 @@ fun generateSearchPersonRequest(it: SearchPersonRequest) = mapOf(
     "groupIdsForSearch" to it.groupIdsForSearch.toJson(),
     "threshold" to it.threshold,
     "limit" to it.limit,
-    "tag" to it.tag,
     "imageUpload" to generateImageUpload(it.imageUpload),
     "detectAll" to it.isDetectAll,
     "outputImageParams" to generateOutputImageParams(it.outputImageParams)

package/android/src/main/java/com/regula/plugin/facesdk/Main.kt

@@ -30,12 +30,6 @@ fun methodCall(method: String, callback: (Any?) -> Unit): Any = when (method) {
     "getVersion" -> getVersion(callback)
     "getServiceUrl" -> getServiceUrl(callback)
     "setServiceUrl" -> setServiceUrl(argsNullable(0))
-    "getTenant" -> getTenant(callback)
-    "setTenant" -> setTenant(argsNullable(0))
-    "getEnv" -> getEnv(callback)
-    "setEnv" -> setEnv(argsNullable(0))
-    "getLocale" -> getLocale(callback)
-    "setLocale" -> setLocale(argsNullable(0))
     "setLocalizationDictionary" -> setLocalizationDictionary(args(0))
     "setRequestHeaders" -> setRequestHeaders(args(0))
     "setCustomization" -> setCustomization(args(0))
@@ -87,18 +81,6 @@ fun getServiceUrl(callback: Callback) = callback(Instance().serviceUrl)
 
 fun setServiceUrl(url: String?) = url.let { Instance().serviceUrl = it }
 
-fun getTenant(callback: Callback) = callback(Instance().tenant)
-
-fun setTenant(tag: String?) = tag.let { Instance().tenant = it }
-
-fun getEnv(callback: Callback) = callback(Instance().env)
-
-fun setEnv(tag: String?) = tag.let { Instance().env = it }
-
-fun getLocale(callback: Callback) = callback(Instance().locale)
-
-fun setLocale(locale: String?) = locale.let { Instance().locale = it }
-
 fun setLocalizationDictionary(dictionary: JSONObject) {
     localizationCallbacks = LocalizationCallbacks { if (dictionary.has(it)) dictionary.getString(it) else null }
     Instance().setLocalizationCallback(localizationCallbacks!!)

package/examples/capacitor/package.json

@@ -6,8 +6,8 @@
     "android": "scripts/android.sh"
   },
   "dependencies": {
-    "@regulaforensics/face-sdk": "7.2.404-beta",
-    "@regulaforensics/face-core-basic": "7.2.238-rc",
+    "@regulaforensics/face-sdk": "7.2.408-rc",
+    "@regulaforensics/face-core-basic": "7.2.241-rc",
     "@awesome-cordova-plugins/file": "6.6.0",
     "@awesome-cordova-plugins/camera": "6.6.0",
     "cordova-plugin-file": "8.1.3",

package/examples/cordova/package.json

@@ -6,8 +6,8 @@
     "android": "scripts/android.sh"
   },
   "dependencies": {
-    "@regulaforensics/face-sdk": "7.2.404-beta",
-    "@regulaforensics/face-core-basic": "7.2.238-rc",
+    "@regulaforensics/face-sdk": "7.2.408-rc",
+    "@regulaforensics/face-core-basic": "7.2.241-rc",
     "cordova-ios": "7.1.1",
     "cordova-android": "13.0.0",
     "cordova-plugin-file": "8.1.3",

package/examples/ionic/package.json

@@ -6,8 +6,8 @@
     "android": "scripts/android.sh"
   },
   "dependencies": {
-    "@regulaforensics/face-sdk": "7.2.404-beta",
-    "@regulaforensics/face-core-basic": "7.2.238-rc",
+    "@regulaforensics/face-sdk": "7.2.408-rc",
+    "@regulaforensics/face-core-basic": "7.2.241-rc",
     "@awesome-cordova-plugins/file": "6.16.0",
     "@awesome-cordova-plugins/camera": "6.16.0",
     "@awesome-cordova-plugins/dialogs": "6.16.0",

package/examples/react_native/package.json

@@ -8,8 +8,8 @@
     "start": "expo start"
   },
   "dependencies": {
-    "@regulaforensics/face-sdk": "7.2.404-beta",
-    "@regulaforensics/face-core-basic": "7.2.238-rc",
+    "@regulaforensics/face-sdk": "7.2.408-rc",
+    "@regulaforensics/face-core-basic": "7.2.241-rc",
     "react-native": "0.79.2",
     "react-native-fs": "2.20.0",
     "react-native-image-picker": "8.2.1",

package/ios/RFSWJSONConstructor.h

@@ -52,6 +52,7 @@
 +(RFSImageQualityCharacteristic* _Nonnull)imageQualityCharacteristicFromJSON:(id _Nonnull)input;
 +(NSDictionary<NSString*, id>* _Nonnull)generateImageQualityCharacteristic:(RFSImageQualityCharacteristic* _Nonnull)input;
 
++(RFSFaceSDKVersion* _Nonnull)faceSDKVersionFromJSON:(id _Nonnull)input;
 +(NSDictionary<NSString*, id>* _Nonnull)generateFaceSDKVersion:(RFSFaceSDKVersion* _Nonnull)input;
 
 +(RFSInitializationConfiguration* _Nonnull)initConfigFromJSON:(id _Nonnull)input;

package/ios/RFSWJSONConstructor.m

@@ -203,7 +203,17 @@
     return result;
 }
 
-// No fromJSON and no tests for FaceSDKVersion because of its implementation.
++(id)faceSDKVersionFromJSON:(NSDictionary*)input {
+    if (!input || [input isEqual:[NSNull null]])  return nil;
+    RFSFaceSDKVersion* result = [RFSFaceSDKVersion new];
+    
+    [result setValue:input[@"api"] forKey:@"api"];
+    [result setValue:input[@"core"] forKey:@"core"];
+    [result setValue:input[@"coreMode"] forKey:@"coreMode"];
+    
+    return result;
+}
+
 +(id)generateFaceSDKVersion:(RFSFaceSDKVersion*)input {
     if (!input) return [NSNull null];
     NSMutableDictionary* result = @{}.mutableCopy;
@@ -281,9 +291,9 @@
 
 +(id)livenessResponseFromJSON:(NSDictionary*)input {
     RFSLivenessResponse* result = [RFSLivenessResponse alloc];
-    SEL sel = NSSelectorFromString(@"initWithTag:transactionId:estimatedAge:status:image:error:");
+    SEL sel = NSSelectorFromString(@"initWithTag:transactionId:estimatedAge:status:normalImage:scaledImage:error:");
     IMP imp = [result methodForSelector:sel];
-    void (*func)(id, SEL, id, id, id, NSInteger, id, id) = (void *)imp;
+    void (*func)(id, SEL, id, id, id, NSInteger, id, id, id) = (void *)imp;
     func(result,
          sel,
          input[@"tag"],
@@ -291,6 +301,7 @@
          input[@"estimatedAge"],
          [input[@"liveness"] integerValue],
          [self imageWithBase64:input[@"image"]],
+         [self imageWithBase64:input[@"image"]],
          nil);
     return result;
 }
@@ -882,7 +893,6 @@
                                                                           imageUpload:[self imageUploadFromJSON:input[@"imageUpload"]]];
     result.threshold = input[@"threshold"];
     result.limit = input[@"limit"];
-    result.tag = input[@"tag"];
     if (input[@"detectAll"] && ![input[@"detectAll"] isEqual:[NSNull null]]) result.detectAll = [input[@"detectAll"] boolValue];
     result.outputImageParams = [self outputImageParamsFromJSON:input[@"outputImageParams"]];
     return result;
@@ -896,7 +906,6 @@
     }.mutableCopy;
     if (input.threshold) result[@"threshold"] = input.threshold;
     if (input.limit) result[@"limit"] = input.limit;
-    if (input.tag) result[@"tag"] = input.tag;
     if (input.groupIdsForSearch) result[@"groupIdsForSearch"] = input.groupIdsForSearch;
     if (input.outputImageParams) result[@"outputImageParams"] = [self generateOutputImageParams:input.outputImageParams];
     return result;

package/ios/RFSWMain.m

@@ -9,12 +9,6 @@
         @"getVersion": ^{ [self getVersion :callback]; },
         @"getServiceUrl": ^{ [self getServiceUrl :callback]; },
         @"setServiceUrl": ^{ [self setServiceUrl :args[0] :callback]; },
-        @"getTenant": ^{ [self getTenant :callback]; },
-        @"setTenant": ^{ [self setTenant :args[0]]; },
-        @"getEnv": ^{ [self getEnv :callback]; },
-        @"setEnv": ^{ [self setEnv :args[0]]; },
-        @"getLocale": ^{ [self getLocale :callback]; },
-        @"setLocale": ^{ [self setLocale :args[0]]; },
         @"setLocalizationDictionary": ^{ [self setLocalizationDictionary :args[0]]; },
         @"setRequestHeaders": ^{ [self setRequestHeaders :args[0]]; },
         @"setCustomization": ^{ [self setCustomization :args[0]]; },
@@ -70,30 +64,6 @@ static NSDictionary* headers;
     callback(@"");
 }
 
-+(void)getTenant:(RFSWCallback)callback {
-    callback([RFSFaceSDK.service tenant]);
-}
-
-+(void)setTenant:(NSString*)tag {
-    [RFSFaceSDK.service setTenant:tag];
-}
-
-+(void)getEnv:(RFSWCallback)callback {
-    callback([RFSFaceSDK.service env]);
-}
-
-+(void)setEnv:(NSString*)tag {
-    [RFSFaceSDK.service setEnv:tag];
-}
-
-+(void)getLocale:(RFSWCallback)callback {
-    callback([RFSFaceSDK.service languageLocaleCode]);
-}
-
-+(void)setLocale:(NSString*)locale {
-    [RFSFaceSDK.service setLanguageLocaleCode:locale];
-}
-
 +(void)setLocalizationDictionary:(NSDictionary*)dictionary {
     RFSFaceSDK.service.localizationHandler = ^NSString* (NSString* localizationKey) {
         if (dictionary[localizationKey]) return dictionary[localizationKey];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regulaforensics/face-sdk",
-  "version": "7.2.404-beta",
+  "version": "7.2.408-rc",
   "description": "This is an npm module for Regula Face SDK. It allows you to easily compaire faces using your phone's camera.",
   "main": "www/react-native/index.js",
   "module": "www/capacitor/index.js",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="@regulaforensics/face-sdk" version="7.2.404-beta" xmlns="http://apache.org/cordova/ns/plugins/1.0">
+<plugin id="@regulaforensics/face-sdk" version="7.2.408-rc" xmlns="http://apache.org/cordova/ns/plugins/1.0">
   <name>FaceSDK</name>
   <description>Cordova plugin for Regula Face SDK</description>
   <license>commercial</license>
@@ -29,7 +29,7 @@
         <source url="https://github.com/CocoaPods/Specs.git" />
       </config>
       <pods>
-        <pod name="FaceSDKStage" spec="7.2.3006" />
+        <pod name="FaceSDKStage" spec="7.2.3010" />
       </pods>
     </podspec>
   </platform>

package/www/capacitor/customization/customization_fonts.js

@@ -101,6 +101,6 @@ export class CustomizationFonts {
     }
 
     _apply() {
-        this._set(this.toJson())
+        this._set(toJson())
     }
 }

package/www/capacitor/customization/customization_images.js

@@ -124,6 +124,6 @@ export class CustomizationImages {
     }
 
     _apply() {
-        this._set(this.toJson())
+        this._set(toJson())
     }
 }

package/www/capacitor/customization/font.js

@@ -19,14 +19,6 @@ export class Font {
 
         return result
     }
-
-    toJson() {
-        return {
-            "name": this.name,
-            "size": this.size,
-            "style": this.style,
-        }
-    }
 }
 
 export const FontStyle = {

package/www/capacitor/detect_faces/detect_face_result.js

@@ -35,16 +35,4 @@ export class DetectFaceResult {
 
         return result
     }
-
-    toJson() {
-        return {
-            "quality": this.quality?.map(e => e.toJson()),
-            "crop": this.crop,
-            "attributes": this.attributes?.map(e => e.toJson()),
-            "landmarks": this.landmarks?.map(e => e.toJson()),
-            "faceRect": this.faceRect?.toJson(),
-            "originalRect": this.originalRect?.toJson(),
-            "isQualityCompliant": this.isQualityCompliant,
-        }
-    }
 }

package/www/capacitor/detect_faces/detect_faces_attribute_result.js

@@ -17,13 +17,4 @@ export class DetectFacesAttributeResult {
 
         return result
     }
-
-    toJson() {
-        return {
-            "attribute": this.attribute,
-            "value": this.value,
-            "range": this.range?.toJson(),
-            "confidence": this.confidence,
-        }
-    }
 }

package/www/capacitor/detect_faces/detect_faces_backend_exception.js

@@ -11,13 +11,6 @@ export class DetectFacesBackendException {
 
         return result
     }
-
-    toJson() {
-        return {
-            "code": this.code,
-            "message": this.message,
-        }
-    }
 }
 
 export const DetectFacesBackendErrorCode = {

package/www/capacitor/detect_faces/detect_faces_config.js

@@ -1,6 +1,3 @@
-import { ImageQualityCharacteristic } from '../image_quality/image_quality_characteristic'
-import { OutputImageParams } from '../image_params/output_image_params'
-
 export class DetectFacesConfig {
     attributes
     customQuality
@@ -14,35 +11,4 @@ export class DetectFacesConfig {
         this.outputImageParams = params?.outputImageParams
         this.onlyCentralFace = params?.onlyCentralFace ?? this.onlyCentralFace
     }
-
-    static fromJson(jsonObject) {
-        if (jsonObject == null) return null
-        const result = new DetectFacesConfig()
-
-        if (jsonObject["attributes"] != null) {
-            result.attributes = []
-            for (const item of jsonObject["attributes"]) {
-                result.attributes.push(item)
-            }
-        }
-        if (jsonObject["customQuality"] != null) {
-            result.customQuality = []
-            for (const item of jsonObject["customQuality"]) {
-                result.customQuality.push(ImageQualityCharacteristic.fromJson(item))
-            }
-        }
-        result.outputImageParams = OutputImageParams.fromJson(jsonObject["outputImageParams"])
-        result.onlyCentralFace = jsonObject["onlyCentralFace"]
-
-        return result
-    }
-
-    toJson() {
-        return {
-            "attributes": this.attributes?.map(e => e),
-            "customQuality": this.customQuality?.map(e => e.toJson()),
-            "outputImageParams": this.outputImageParams?.toJson(),
-            "onlyCentralFace": this.onlyCentralFace,
-        }
-    }
 }

package/www/capacitor/detect_faces/detect_faces_exception.js

@@ -15,14 +15,6 @@ export class DetectFacesException {
 
         return result
     }
-
-    toJson() {
-        return {
-            "code": this.code,
-            "message": this.message,
-            "underlyingError": this.underlyingError?.toJson(),
-        }
-    }
 }
 
 export const DetectFacesErrorCode = {

package/www/capacitor/detect_faces/detect_faces_request.js

@@ -1,5 +1,4 @@
 import { DetectFacesScenario } from './detect_faces_scenario'
-import { DetectFacesConfig } from './detect_faces_config'
 
 export class DetectFacesRequest {
     image
@@ -67,25 +66,4 @@ export class DetectFacesRequest {
         result.scenario = DetectFacesScenario.ATTRIBUTES_ALL
         return result
     }
-
-    static fromJson(jsonObject) {
-        if (jsonObject == null) return null
-        const result = new DetectFacesRequest()
-
-        result.tag = jsonObject["tag"]
-        result.scenario = jsonObject["scenario"]
-        result.image = jsonObject["image"]
-        result.configuration = DetectFacesConfig.fromJson(jsonObject["configuration"])
-
-        return result
-    }
-
-    toJson() {
-        return {
-            "tag": this.tag,
-            "scenario": this.scenario,
-            "image": this.image,
-            "configuration": this.configuration?.toJson(),
-        }
-    }
 }

package/www/capacitor/detect_faces/detect_faces_response.js

@@ -21,13 +21,4 @@ export class DetectFacesResponse {
 
         return result
     }
-
-    toJson() {
-        return {
-            "detection": this.detection?.toJson(),
-            "allDetections": this.allDetections?.map(e => e.toJson()),
-            "scenario": this.scenario,
-            "error": this.error?.toJson(),
-        }
-    }
 }

package/www/capacitor/face_capture/face_capture_config.js

@@ -29,41 +29,4 @@ export class FaceCaptureConfig {
         this.timeout = params?.timeout
         this.holdStillDuration = params?.holdStillDuration
     }
-
-    static fromJson(jsonObject) {
-        if (jsonObject == null) return null
-        const result = new FaceCaptureConfig()
-
-        result.copyright = jsonObject["copyright"]
-        result.cameraSwitchEnabled = jsonObject["cameraSwitchEnabled"]
-        result.closeButtonEnabled = jsonObject["closeButtonEnabled"]
-        result.torchButtonEnabled = jsonObject["torchButtonEnabled"]
-        result.vibrateOnSteps = jsonObject["vibrateOnSteps"]
-        result.detectOcclusion = jsonObject["detectOcclusion"]
-        result.showFaceAnimation = jsonObject["showFaceAnimation"]
-        result.cameraPositionAndroid = jsonObject["cameraPositionAndroid"]
-        result.cameraPositionIOS = jsonObject["cameraPositionIOS"]
-        result.screenOrientation = jsonObject["screenOrientation"]
-        result.timeout = jsonObject["timeout"]
-        result.holdStillDuration = jsonObject["holdStillDuration"]
-
-        return result
-    }
-
-    toJson() {
-        return {
-            "copyright": this.copyright,
-            "cameraSwitchEnabled": this.cameraSwitchEnabled,
-            "closeButtonEnabled": this.closeButtonEnabled,
-            "torchButtonEnabled": this.torchButtonEnabled,
-            "vibrateOnSteps": this.vibrateOnSteps,
-            "detectOcclusion": this.detectOcclusion,
-            "showFaceAnimation": this.showFaceAnimation,
-            "cameraPositionAndroid": this.cameraPositionAndroid,
-            "cameraPositionIOS": this.cameraPositionIOS,
-            "screenOrientation": this.screenOrientation,
-            "timeout": this.timeout,
-            "holdStillDuration": this.holdStillDuration,
-        }
-    }
 }

package/www/capacitor/face_capture/face_capture_exception.js

@@ -11,13 +11,6 @@ export class FaceCaptureException {
 
         return result
     }
-
-    toJson() {
-        return {
-            "code": this.code,
-            "message": this.message,
-        }
-    }
 }
 
 export const FaceCaptureErrorCode = {

package/www/capacitor/face_capture/face_capture_image.js

@@ -13,14 +13,6 @@ export class FaceCaptureImage {
 
         return result
     }
-
-    toJson() {
-        return {
-            "imageType": this.imageType,
-            "image": this.image,
-            "tag": this.tag,
-        }
-    }
 }
 
 export const ImageType = {

package/www/capacitor/face_capture/face_capture_response.js

@@ -14,11 +14,4 @@ export class FaceCaptureResponse {
 
         return result
     }
-
-    toJson() {
-        return {
-            "image": this.image?.toJson(),
-            "error": this.error?.toJson(),
-        }
-    }
 }

package/www/capacitor/image_params/output_image_crop.js

@@ -1,5 +1,3 @@
-import { Size } from './size'
-
 export class OutputImageCrop {
     type
     size
@@ -12,27 +10,6 @@ export class OutputImageCrop {
         this.padColor = params?.padColor
         this.returnOriginalRect = params?.returnOriginalRect ?? false
     }
-
-    static fromJson(jsonObject) {
-        if (jsonObject == null) return null
-        return new OutputImageCrop(
-            jsonObject["type"],
-            {
-                size: Size.fromJson(jsonObject["size"]),
-                padColor: jsonObject["padColor"],
-                returnOriginalRect: jsonObject["returnOriginalRect"],
-            }
-        )
-    }
-
-    toJson() {
-        return {
-            "type": this.type,
-            "size": this.size?.toJson(),
-            "padColor": this.padColor,
-            "returnOriginalRect": this.returnOriginalRect,
-        }
-    }
 }
 
 export const OutputImageCropAspectRatio = {

package/www/capacitor/image_params/output_image_params.js

@@ -1,5 +1,3 @@
-import { OutputImageCrop } from './output_image_crop'
-
 export class OutputImageParams {
     crop
     backgroundColor
@@ -8,21 +6,4 @@ export class OutputImageParams {
         this.crop = params?.crop
         this.backgroundColor = params?.backgroundColor
     }
-
-    static fromJson(jsonObject) {
-        if (jsonObject == null) return null
-        const result = new OutputImageParams()
-
-        result.crop = OutputImageCrop.fromJson(jsonObject["crop"])
-        result.backgroundColor = jsonObject["backgroundColor"]
-
-        return result
-    }
-
-    toJson() {
-        return {
-            "crop": this.crop?.toJson(),
-            "backgroundColor": this.backgroundColor,
-        }
-    }
 }

package/www/capacitor/image_params/point.js

@@ -11,11 +11,4 @@ export class Point {
 
         return result
     }
-
-    toJson() {
-        return {
-            "x": this.x,
-            "y": this.y,
-        }
-    }
 }

package/www/capacitor/image_params/rect.js

@@ -15,13 +15,4 @@ export class Rect {
 
         return result
     }
-
-    toJson() {
-        return {
-            "left": this.left,
-            "top": this.top,
-            "right": this.right,
-            "bottom": this.bottom,
-        }
-    }
 }

package/www/capacitor/image_params/size.js

@@ -6,16 +6,4 @@ export class Size {
         this.width = width
         this.height = height
     }
-
-    static fromJson(jsonObject) {
-        if (jsonObject == null) return null
-        return new Size(jsonObject["width"], jsonObject["height"])    
-    }
-
-    toJson() {
-        return {
-            "width": this.width,
-            "height": this.height,
-        }
-    }
 }

package/www/capacitor/image_quality/image_quality_characteristic.js

@@ -23,26 +23,4 @@ export class ImageQualityCharacteristic {
         this.customRange = ImageQualityRange.withValue(value)
         return this
     }
-
-    static fromJson(jsonObject) {
-        if (jsonObject == null) return null
-
-        return ImageQualityCharacteristic._create(
-            jsonObject["characteristicName"],
-            {
-                recommended: ImageQualityRange.fromJson(jsonObject["recommendedRange"]),
-                custom: ImageQualityRange.fromJson(jsonObject["customRange"]),
-                color: jsonObject["color"],
-            }
-        )
-    }
-
-    toJson() {
-        return {
-            "characteristicName": this.characteristicName,
-            "recommendedRange": this.recommendedRange?.toJson(),
-            "customRange": this.customRange?.toJson(),
-            "color": this.color,
-        }
-    }
 }