Skip to content

Commit 308a251

Browse files
author
Jenkins
committed
8.2.971
1 parent 4ff935a commit 308a251

30 files changed

Lines changed: 1744 additions & 2033 deletions

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ include:
1919

2020
trivy scan:
2121
stage: test
22-
image: aquasec/trivy
22+
image: aquasec/trivy:0.69.3
2323
rules:
2424
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
2525
script:
@@ -38,12 +38,3 @@ secret_detection:
3838
artifacts:
3939
paths:
4040
- gl-secret-detection-report.json
41-
42-
gemnasium-dependency_scanning:
43-
variables:
44-
DS_MAX_DEPTH: -1
45-
rules:
46-
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
47-
artifacts:
48-
paths:
49-
- gl-dependency-scanning-report.json

‎.gitlab/report.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ view reports:
3131
artifacts: true
3232
- job: secret_detection
3333
artifacts: true
34-
- job: gemnasium-dependency_scanning
35-
artifacts: true
3634
rules:
3735
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
3836
script:

‎android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ android {
2828
}
2929

3030
dependencies {
31-
implementation('com.regula.face:api:8.1.4577') {
31+
implementation('com.regula.face:api:8.2.4691') {
3232
transitive = true
3333
}
3434

‎android/src/main/kotlin/com/regula/plugin/facesdk/Config.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ fun setFaceCaptureConfig(builder: FaceCaptureConfiguration.Builder, config: JSON
2424
"vibrateOnSteps" -> builder.setVibrateOnStep(v as Boolean)
2525
"detectOcclusion" -> builder.setDetectOcclusion(v as Boolean)
2626
"showFaceAnimation" -> builder.setShowFaceAnimation(v as Boolean)
27+
"preventScreenRecording" -> builder.setPreventScreenRecording(v as Boolean)
2728
"cameraPositionAndroid" -> builder.setCameraId(v.toInt())
2829
"screenOrientation" -> builder.setScreenOrientation(*screenOrientationArrayFromJSON(v as JSONArray))
2930
"timeout" -> builder.setTimeout(v.toFloat())
@@ -39,6 +40,7 @@ fun getFaceCaptureConfig(input: FaceCaptureConfiguration) = mapOf(
3940
"vibrateOnSteps" to input.isVibrateOnSteps,
4041
"detectOcclusion" to input.isDetectOcclusion,
4142
"showFaceAnimation" to input.isShowFaceAnimation,
43+
"preventScreenRecording" to input.doPreventScreenRecording(),
4244
"cameraPositionAndroid" to input.cameraId,
4345
"screenOrientation" to generateScreenOrientationArray(input.screenOrientation),
4446
"timeout" to input.timeout,
@@ -55,6 +57,7 @@ fun setLivenessConfig(builder: LivenessConfiguration.Builder, config: JSONObject
5557
"cameraPositionAndroid" -> builder.setCameraId(v.toInt())
5658
"screenOrientation" -> builder.setScreenOrientation(*screenOrientationArrayFromJSON(v as JSONArray))
5759
"locationTrackingEnabled" -> builder.setLocationTrackingEnabled(v as Boolean)
60+
"preventScreenRecording" -> builder.setPreventScreenRecording(v as Boolean)
5861
"attemptsCount" -> builder.setAttemptsCount(v.toInt())
5962
"recordingProcess" -> builder.setRecordingProcess(RecordingProcess.values()[v.toInt()])
6063
"livenessType" -> builder.setType(LivenessType.values()[v.toInt()])
@@ -73,6 +76,7 @@ fun getLivenessConfig(input: LivenessConfiguration) = mapOf(
7376
"cameraPositionAndroid" to input.cameraId,
7477
"screenOrientation" to generateScreenOrientationArray(input.screenOrientation),
7578
"locationTrackingEnabled" to input.isLocationTrackingEnabled,
79+
"preventScreenRecording" to input.doPreventScreenRecording(),
7680
"attemptsCount" to input.attemptsCount,
7781
"recordingProcess" to input.recordingProcess.ordinal,
7882
"livenessType" to input.type.ordinal,

‎android/src/main/kotlin/com/regula/plugin/facesdk/JSONConstructor.kt‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -636,13 +636,18 @@ fun generateDetectFacesConfig(input: DetectFacesConfiguration?) = input?.let {
636636

637637
fun detectFacesRequestFromJSON(input: JSONObject) = input.let {
638638
val image = it.getString("image").toBitmap()!!
639-
it.getStringOrNull("scenario")?.let { scenario ->
640-
DetectFacesRequest::class.java.getDeclaredConstructor(Bitmap::class.java, String::class.java).instantiate(image, scenario)
641-
} ?: DetectFacesRequest(
642-
image,
643-
detectFacesConfigFromJSON(it.getJSONObjectOrNull("configuration")),
644-
it.getStringOrNull("tag")
645-
)
639+
val scenario = it.getStringOrNull("scenario")
640+
val config = detectFacesConfigFromJSON(it.getJSONObjectOrNull("configuration"))
641+
val tag = it.getStringOrNull("tag")
642+
643+
scenario?.let { scenario ->
644+
DetectFacesRequest::class.java.getDeclaredConstructor(
645+
Bitmap::class.java,
646+
String::class.java,
647+
DetectFacesConfiguration::class.java,
648+
String::class.java
649+
).instantiate(image, scenario, null, tag)
650+
} ?: DetectFacesRequest(image, config, tag)
646651
}
647652

648653
fun generateDetectFacesRequest(it: DetectFacesRequest) = mapOf(

‎android/src/main/kotlin/com/regula/plugin/facesdk/Utils.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,9 @@ fun Any.setImage(customization: Customization, value: Any) {
158158
val uiConfig = customization.uiConfigurationLive.value!!
159159
val private = uiConfig.javaClass.getDeclaredField("d")
160160
private.isAccessible = true
161-
val images = private.get(uiConfig) as HashMap<CustomizationImage, Drawable>
161+
val images = private.get(uiConfig) as HashMap<String, Drawable>
162162

163-
val field = CustomizationImage.values().find { it.value == this.toInt() }!!
164-
images[field] = (value as String?).toDrawable(context)!!
163+
images[this as String] = (value as String?).toDrawable(context)!!
165164
}
166165

167166
fun Int.toOutputImageCropAspectRatio(): OutputImageCropAspectRatio {

‎example/ios/Tests/Tests.swift‎

Lines changed: 43 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,163 +6,167 @@ class Tests: XCTestCase {
66
// image_params
77

88
func test_point() {
9-
compare(name: "point", fromJson: RFSWJSONConstructor.point, generate: RFSWJSONConstructor.generate)
9+
compare("point", Point.decode, Point.encode)
1010
}
1111

1212
func test_rect() {
13-
compare(name: "rect", fromJson: RFSWJSONConstructor.rect, generate: RFSWJSONConstructor.generate)
13+
compare("rect", CGRect.decode, CGRect.encode)
1414
}
1515

1616
func test_size() {
17-
compare(name: "size", fromJson: RFSWJSONConstructor.size, generate: RFSWJSONConstructor.generate)
17+
compare("size", CGSize.decode, CGSize.encode)
1818
}
1919

2020
func test_outputImageCrop() {
21-
compare(name: "outputImageCrop", fromJson: RFSWJSONConstructor.outputImageCrop, generate: RFSWJSONConstructor.generate)
21+
compare("outputImageCrop", OutputImageCrop.decode, OutputImageCrop.encode)
2222
}
2323

2424
func test_outputImageParams() {
25-
compare(name: "outputImageParams", fromJson: RFSWJSONConstructor.outputImageParams, generate: RFSWJSONConstructor.generate)
25+
compare("outputImageParams", OutputImageParams.decode, OutputImageParams.encode)
2626
}
2727

2828
// image_quality
2929

3030
func test_imageQualityRange() {
31-
compare(name: "imageQualityRange", fromJson: RFSWJSONConstructor.imageQualityRange, generate: RFSWJSONConstructor.generate)
31+
compare("imageQualityRange", ImageQualityRange.decode, ImageQualityRange.encode)
3232
}
3333

3434
func test_imageQualityResult() {
35-
compare(name: "imageQualityResult", fromJson: RFSWJSONConstructor.imageQualityResult, generate: RFSWJSONConstructor.generate)
35+
compare("imageQualityResult", ImageQualityResult.decode, ImageQualityResult.encode)
3636
}
3737

3838
func test_imageQualityCharacteristic() {
39-
compare(name: "imageQualityCharacteristic", fromJson: RFSWJSONConstructor.imageQualityCharacteristic, generate: RFSWJSONConstructor.generate)
39+
compare("imageQualityCharacteristic", ImageQualityCharacteristic.decode, ImageQualityCharacteristic.encode)
4040
}
4141

4242
// init
4343

4444
func test_initConfig() {
45-
compare(name: "initConfig", fromJson: RFSWJSONConstructor.initConfig, generate: RFSWJSONConstructor.generateInitConfig, omit: ["useBleDevice"])
45+
compare("initConfig", InitializationConfiguration.decode, InitializationConfiguration.encode, omit: ["useBleDevice"])
4646
}
4747

4848
// detect_faces
4949

5050
func test_detectFacesAttributeResult() {
51-
compare(name: "detectFacesAttributeResult", fromJson: RFSWJSONConstructor.detectFacesAttributeResult, generate: RFSWJSONConstructor.generate)
51+
compare("detectFacesAttributeResult", DetectFacesAttributeResult.decode, DetectFacesAttributeResult.encode)
5252
}
5353

5454
func test_detectFaceResult() {
55-
compare(name: "detectFaceResult", fromJson: RFSWJSONConstructor.detectFaceResult, generate: RFSWJSONConstructor.generate)
55+
compare("detectFaceResult", DetectFaceResult.decode, DetectFaceResult.encode)
5656
}
5757

5858
func test_detectFacesConfig() {
59-
compare(name: "detectFacesConfig", fromJson: RFSWJSONConstructor.detectFacesConfig, generate: RFSWJSONConstructor.generateDetectFacesConfig)
59+
compare("detectFacesConfig", DetectFacesConfiguration.decode, DetectFacesConfiguration.encode)
6060
}
6161

6262
func test_detectFacesRequest() {
63-
compare(name: "detectFacesRequest", fromJson: RFSWJSONConstructor.detectFacesRequest, generate: RFSWJSONConstructor.generate)
63+
compare("detectFacesRequest", DetectFacesRequest.decode, DetectFacesRequest.encode)
6464
}
6565

6666
func test_detectFacesResponse() {
67-
compare(name: "detectFacesResponse", fromJson: RFSWJSONConstructor.detectFacesResponse, generate: RFSWJSONConstructor.generate, omit: ["error"])
67+
compare("detectFacesResponse", DetectFacesResponse.decode, DetectFacesResponse.encode, omit: ["error"])
6868
}
6969

7070
// face_capture
7171

7272
func test_faceCaptureConfig() {
73-
compare(name: "faceCaptureConfig", fromJson: RFSWConfig.faceCapture, generate: RFSWConfig.generateFaceCapture, omit: ["cameraPositionAndroid", "screenOrientation"])
73+
compare("faceCaptureConfig", FaceCaptureConfiguration.decode, FaceCaptureConfiguration.encode, omit: ["cameraPositionAndroid", "screenOrientation"])
7474
}
7575

7676
func test_faceCaptureImage() {
77-
compare(name: "faceCaptureImage", fromJson: RFSWJSONConstructor.faceCaptureImage, generate: RFSWJSONConstructor.generateFaceCapture)
77+
compare("faceCaptureImage", Image.decode, Image.encode)
7878
}
7979

8080
func test_faceCaptureResponse() {
81-
compare(name: "faceCaptureResponse", fromJson: RFSWJSONConstructor.faceCaptureResponse, generate: RFSWJSONConstructor.generate, omit: ["error"])
81+
compare("faceCaptureResponse", FaceCaptureResponse.decode, FaceCaptureResponse.encode, omit: ["error"])
8282
}
8383

8484
// liveness
8585

8686
func test_livenessConfig() {
87-
compare(name: "livenessConfig", fromJson: RFSWConfig.livenessConfig, generate: RFSWConfig.generateLivenessConfig, omit: ["cameraPositionAndroid",
88-
"screenOrientation"])
87+
compare("livenessConfig", LivenessConfiguration.decode, LivenessConfiguration.encode, omit: [
88+
"cameraPositionAndroid",
89+
"screenOrientation",
90+
])
8991
}
9092

9193
func test_livenessResponse() {
92-
compare(name: "livenessResponse", fromJson: RFSWJSONConstructor.livenessResponse, generate: RFSWJSONConstructor.generate, omit: ["error"])
94+
compare("livenessResponse", LivenessResponse.decode, LivenessResponse.encode, omit: ["error"])
9395
}
9496

9597
// match_faces
9698

9799
func test_matchFacesConfig() {
98-
compare(name: "matchFacesConfig", fromJson: RFSWConfig.matchFacesConfig, generate: RFSWConfig.generateMatchFacesConfig)
100+
compare("matchFacesConfig", MatchFacesConfiguration.decode, MatchFacesConfiguration.encode)
99101
}
100102

101103
func test_matchFacesImage() {
102-
compare(name: "matchFacesImage", fromJson: RFSWJSONConstructor.matchFacesImage, generate: RFSWJSONConstructor.generate)
104+
compare("matchFacesImage", MatchFacesImage.decode, MatchFacesImage.encode)
103105
}
104106

105107
func test_matchFacesRequest() {
106-
compare(name: "matchFacesRequest", fromJson: RFSWJSONConstructor.matchFacesRequest, generate: RFSWJSONConstructor.generate)
108+
compare("matchFacesRequest", MatchFacesRequest.decode, MatchFacesRequest.encode)
107109
}
108110

109111
func test_matchFacesDetectionFace() {
110-
compare(name: "matchFacesDetectionFace", fromJson: RFSWJSONConstructor.matchFacesDetectionFace, generate: RFSWJSONConstructor.generate)
112+
compare("matchFacesDetectionFace", MatchFacesDetectionFace.decode, MatchFacesDetectionFace.encode)
111113
}
112114

113115
func test_matchFacesDetection() {
114-
compare(name: "matchFacesDetection", fromJson: RFSWJSONConstructor.matchFacesDetection, generate: RFSWJSONConstructor.generate, omit: ["error"])
116+
compare("matchFacesDetection", MatchFacesDetection.decode, MatchFacesDetection.encode, omit: ["error"])
115117
}
116118

117119
func test_comparedFace() {
118-
compare(name: "comparedFace", fromJson: RFSWJSONConstructor.comparedFace, generate: RFSWJSONConstructor.generate)
120+
compare("comparedFace", MatchFacesComparedFace.decode, MatchFacesComparedFace.encode)
119121
}
120122

121123
func test_comparedFacesPair() {
122-
compare(name: "comparedFacesPair", fromJson: RFSWJSONConstructor.comparedFacesPair, generate: RFSWJSONConstructor.generate, omit: ["error"])
124+
compare("comparedFacesPair", MatchFacesComparedFacesPair.decode, MatchFacesComparedFacesPair.encode, omit: ["error"])
123125
}
124126

125127
func test_matchFacesResponse() {
126-
compare(name: "matchFacesResponse", fromJson: RFSWJSONConstructor.matchFacesResponse, generate: RFSWJSONConstructor.generate, omit: ["error",
127-
"results.error",
128-
"detections.error"])
128+
compare("matchFacesResponse", MatchFacesResponse.decode, MatchFacesResponse.encode, omit: [
129+
"error",
130+
"results.error",
131+
"detections.error",
132+
])
129133
}
130134

131135
// person_database
132136

133137
func test_editGroupPersonsRequest() {
134-
compare(name: "editGroupPersonsRequest", fromJson: RFSWJSONConstructor.editGroupPersonsRequest, generate: RFSWJSONConstructor.generate)
138+
compare("editGroupPersonsRequest", PersonDatabase.EditGroupPersonsRequest.decode, PersonDatabase.EditGroupPersonsRequest.encode)
135139
}
136140

137141
func test_imageUpload() {
138-
compare(name: "imageUpload", fromJson: RFSWJSONConstructor.imageUpload, generate: RFSWJSONConstructor.generate)
142+
compare("imageUpload", PersonDatabase.ImageUpload.decode, PersonDatabase.ImageUpload.encode)
139143
}
140144

141145
func test_person() {
142-
compare(name: "person", fromJson: RFSWJSONConstructor.person, generate: RFSWJSONConstructor.generate)
146+
compare("person", PersonDatabase.Person.decode, PersonDatabase.Person.encode)
143147
}
144148

145149
func test_personGroup() {
146-
compare(name: "personGroup", fromJson: RFSWJSONConstructor.personGroup, generate: RFSWJSONConstructor.generate)
150+
compare("personGroup", PersonDatabase.PersonGroup.decode, PersonDatabase.PersonGroup.encode)
147151
}
148152

149153
func test_personImage() {
150-
compare(name: "personImage", fromJson: RFSWJSONConstructor.personImage, generate: RFSWJSONConstructor.generate)
154+
compare("personImage", PersonDatabase.PersonImage.decode, PersonDatabase.PersonImage.encode)
151155
}
152156

153157
func test_searchPersonDetection() {
154-
compare(name: "searchPersonDetection", fromJson: RFSWJSONConstructor.searchPersonDetection, generate: RFSWJSONConstructor.generate)
158+
compare("searchPersonDetection", PersonDatabase.SearchPersonDetection.decode, PersonDatabase.SearchPersonDetection.encode)
155159
}
156160

157161
func test_searchPersonImage() {
158-
compare(name: "searchPersonImage", fromJson: RFSWJSONConstructor.searchPersonImage, generate: RFSWJSONConstructor.generate)
162+
compare("searchPersonImage", PersonDatabase.SearchPersonImage.decode2, PersonDatabase.SearchPersonImage.encode2)
159163
}
160164

161165
func test_searchPerson() {
162-
compare(name: "searchPerson", fromJson: RFSWJSONConstructor.searchPerson, generate: RFSWJSONConstructor.generate)
166+
compare("searchPerson", PersonDatabase.SearchPerson.decode2, PersonDatabase.SearchPerson.encode2)
163167
}
164168

165169
func test_searchPersonRequest() {
166-
compare(name: "searchPersonRequest", fromJson: RFSWJSONConstructor.searchPersonRequest, generate: RFSWJSONConstructor.generate)
170+
compare("searchPersonRequest", PersonDatabase.SearchPersonRequest.decode, PersonDatabase.SearchPersonRequest.encode)
167171
}
168172
}

0 commit comments

Comments
 (0)