address review comments

Author: thisisabhash

HostApp/HostApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -12,7 +12,7 @@ struct LivenessResult: Codable {
     let auditImageBytes: String?
     let confidenceScore: Double
     let isLive: Bool
-    let challenge: Challenge?
+    let challenge: Event?
 }
 
 extension LivenessResult: CustomDebugStringConvertible {
@@ -22,8 +22,17 @@ extension LivenessResult: CustomDebugStringConvertible {
             - confidenceScore: \(confidenceScore)
             - isLive: \(isLive)
             - auditImageBytes: \(auditImageBytes == nil ? "nil" : "<placeholder>")
-            - challengeType: \(String(describing: challenge?.type))
-            - challengeVersion: \(String(describing: challenge?.version))
+            - challenge: type: \(String(describing: challenge?.type)) + " version: " + \(String(describing: challenge?.version))
         """
     }
 }
+
+struct Event: Codable {
+    let version: String
+    let type: ChallengeType
+
+    enum CodingKeys: String, CodingKey {
+        case version = "Version"
+        case type = "Type"
+    }
+}

HostApp/HostApp/Model/LivenessResult.swift

@@ -16,7 +16,7 @@ extension LivenessResultContentView {
         let valueBackgroundColor: Color
         let auditImage: Data?
         let isLive: Bool
-        let challenge: Challenge?
+        let challenge: Event?
 
         init(livenessResult: LivenessResult) {
             guard livenessResult.confidenceScore > 0 else {

HostApp/HostApp/Views/LivenessResultContentView+Result.swift

@@ -26,7 +26,7 @@ struct StartSessionView: View {
             )
 
             button(
-                text: "Create Liveness Session (front camera)",
+                text: "Create Liveness Session",
                 backgroundColor: .dynamicColors(
                     light: .hex("#047D95"),
                     dark: .hex("#7dd6e8")
@@ -35,6 +35,7 @@ struct StartSessionView: View {
                     viewModel.createSession { sessionId, err in
                         if let sessionId = sessionId {
                             sessionID = sessionId
+                            // modify camera preference for `FaceMovementChallenge`
                             containerViewState = .liveness(.front)
                         }
 
@@ -55,37 +56,6 @@ struct StartSessionView: View {
                     )
                 )
             }
-            
-            button(
-                text: "Create Liveness Session (back camera)",
-                backgroundColor: .dynamicColors(
-                    light: .hex("#047D95"),
-                    dark: .hex("#7dd6e8")
-                ),
-                action: {
-                    viewModel.createSession { sessionId, err in
-                        if let sessionId = sessionId {
-                            sessionID = sessionId
-                            containerViewState = .liveness(.back)
-                        }
-
-                        showAlert = err != nil
-                    }
-                },
-                enabled: viewModel.isSignedIn
-            )
-            .alert(isPresented: $showAlert) {
-                Alert(
-                    title: Text("Error Creating Liveness Session"),
-                    message: Text("Unable to create a liveness session id.  Please try again."),
-                    dismissButton: .default(
-                                    Text("OK"),
-                                    action: {
-                                        containerViewState = .startSession
-                                    }
-                    )
-                )
-            }
 
             Spacer()
             HStack {

HostApp/HostApp/Views/StartSessionView.swift

@@ -114,14 +114,19 @@ extension FaceDetectorShortRange {
 
             let blazeFaceDetectionThreshold: Float
             if let sessionConfiguration = faceDetectionSessionConfiguration?.sessionConfiguration {
-                blazeFaceDetectionThreshold = Float(sessionConfiguration.ovalMatchChallenge.faceDetectionThreshold)
+                switch sessionConfiguration {
+                case .faceMovement(let ovalMatchChallenge):
+                    blazeFaceDetectionThreshold = Float(ovalMatchChallenge.faceDetectionThreshold)
+                case .faceMovementAndLight(_, let ovalMatchChallenge):
+                    blazeFaceDetectionThreshold = Float(ovalMatchChallenge.faceDetectionThreshold)
+                }
             } else {
                 blazeFaceDetectionThreshold = confidenceScoreThreshold
             }
 
             var passingConfidenceScoresIndices = confidenceScores
                 .enumerated()
-                .filter { $0.element >=  blazeFaceDetectionThreshold}
+                .filter { $0.element >= blazeFaceDetectionThreshold}
                 .sorted(by: {
                     $0.element > $1.element
                 })

Package.resolved

@@ -17,8 +17,14 @@ extension FinalClientEvent {
         faceMatchedEnd: UInt64,
         videoEnd: UInt64
     ) {
-        let normalizedBoundingBox = sessionConfiguration
-            .ovalMatchChallenge
+        let ovalMatchChallenge: FaceLivenessSession.OvalMatchChallenge
+        switch sessionConfiguration {
+        case .faceMovement(let challenge):
+            ovalMatchChallenge = challenge
+        case .faceMovementAndLight(_, let challenge):
+            ovalMatchChallenge = challenge
+        }
+        let normalizedBoundingBox = ovalMatchChallenge
             .oval.boundingBox
             .normalize(within: videoSize)
 

Sources/FaceLiveness/FaceDetection/BlazeFace/FaceDetectorShortRange+Model.swift

@@ -17,7 +17,7 @@ struct CameraPermissionView: View {
     }
 
     var body: some View {
-        VStack(alignment: .leading) {
+        VStack(alignment: .center) {
             Spacer()
             VStack {
                 Text(LocalizedStrings.camera_permission_change_setting_header)

Sources/FaceLiveness/Utilities/FinalClientEvent+Init.swift

@@ -37,7 +37,7 @@ struct GetReadyPageView: View {
                         popoverContent: { photosensitivityWarningPopoverContent }
                     )
                     .accessibilityElement(children: .combine)
-                    .opacity(challenge.type == .faceMovementAndLightChallenge ? 1.0 : 0.0)
+                    .opacity(challenge == Challenge.faceMovementAndLightChallenge("2.0.0") ? 1.0 : 0.0)
                     Text(LocalizedStrings.preview_center_your_face_text)
                         .font(.title)
                         .multilineTextAlignment(.center)
@@ -82,7 +82,7 @@ struct GetReadyPageView_Previews: PreviewProvider {
     static var previews: some View {
         GetReadyPageView(
             onBegin: {},
-            challenge: .init(version: "2.0.0", type: .faceMovementAndLightChallenge),
+            challenge: .faceMovementAndLightChallenge("2.0.0"),
             cameraPosition: .front)
     }
 }

Sources/FaceLiveness/Views/CameraPermission/CameraPermissionView.swift

@@ -111,7 +111,7 @@ struct InstructionContainerView: View {
             }
         case .faceMatched:
             if let challenge = viewModel.challengeReceived,
-               case .faceMovementAndLightChallenge = challenge.type {
+               case .faceMovementAndLightChallenge = challenge {
                 InstructionView(
                     text: LocalizedStrings.challenge_instruction_hold_still,
                     backgroundColor: .livenessPrimaryBackground,