@smile_identity/react-native 10.2.3 → 10.2.4

package/ios/Utils/FileUtils.swift

@@ -1,24 +1,24 @@
 protocol SmileIDFileUtilsProtocol {
-  var fileManager: FileManager { get set }
-  func getFilePath(fileName: String) -> String?
+    var fileManager: FileManager { get set }
+    func getFilePath(fileName: String) -> String?
 }
 
 extension SmileIDFileUtilsProtocol {
-  func getSmileIDDirectory() -> String? {
-    guard let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask).first else {
-      print("Unable to access documents directory")
-      return nil
+    func getSmileIDDirectory() -> String? {
+        guard let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask).first else {
+            print("Unable to access documents directory")
+            return nil
+        }
+
+        let smileIDDirectory = documentsDirectory.appendingPathComponent("SmileID")
+        return smileIDDirectory.absoluteURL.absoluteString
     }
-    
-    let smileIDDirectory = documentsDirectory.appendingPathComponent("SmileID")
-    return smileIDDirectory.absoluteURL.absoluteString
-  }
-  
-  func getFilePath(fileName: String) -> String? {
-    guard let smileIDDirectory = getSmileIDDirectory() else {
-      return nil
+
+    func getFilePath(fileName: String) -> String? {
+        guard let smileIDDirectory = getSmileIDDirectory() else {
+            return nil
+        }
+
+        return (smileIDDirectory as NSString).appendingPathComponent(fileName)
     }
-    
-    return (smileIDDirectory as NSString).appendingPathComponent(fileName)
-  }
 }

package/ios/Utils/SmileIDDictExt.swift

@@ -2,21 +2,21 @@ import Foundation
 import SmileID
 
 extension NSDictionary {
-
     func toConfig() -> Config {
-        return Config (
+        return Config(
             partnerId: (self["partnerId"] as? String)!,
             authToken: (self["authToken"] as? String)!,
             prodLambdaUrl: (self["prodLambdaUrl"] as? String)!,
             testLambdaUrl: (self["testLambdaUrl"] as? String)!
         )
     }
-    
+
     func toAuthenticationRequest() -> AuthenticationRequest? {
         guard let jobTypeValue = self["jobType"] as? Int,
               let jobType = JobType(rawValue: jobTypeValue),
               let jobId = self["jobId"] as? String,
-              let userId = self["userId"] as? String else {
+              let userId = self["userId"] as? String
+        else {
             return nil
         }
 
@@ -40,7 +40,8 @@ extension NSDictionary {
               let callbackUrl = self["callbackUrl"] as? String,
               let partnerId = self["partnerId"] as? String,
               let timestamp = self["timestamp"] as? String,
-              let signature = self["signature"] as? String else {
+              let signature = self["signature"] as? String
+        else {
             return nil
         }
 
@@ -70,7 +71,8 @@ extension NSDictionary {
     func toUploadImageInfo() -> UploadImageInfo? {
         guard let imageTypeIdValue = self["imageTypeId"] as? String,
               let imageTypeId = ImageType(rawValue: imageTypeIdValue),
-              let imageName = self["imageName"] as? String else {
+              let imageName = self["imageName"] as? String
+        else {
             return nil
         }
 
@@ -121,7 +123,8 @@ extension NSDictionary {
               let partnerParamsDict = self["partnerParams"] as? NSDictionary,
               let partnerParams = partnerParamsDict.toPartnerParams(),
               let timestamp = self["timestamp"] as? String,
-              let signature = self["signature"] as? String else {
+              let signature = self["signature"] as? String
+        else {
             return nil
         }
 
@@ -150,7 +153,8 @@ extension NSDictionary {
               let includeHistory = self["includeHistory"] as? Bool,
               let partnerId = self["partnerId"] as? String,
               let timestamp = self["timestamp"] as? String,
-              let signature = self["signature"] as? String else {
+              let signature = self["signature"] as? String
+        else {
             return nil
         }
 
@@ -168,7 +172,8 @@ extension NSDictionary {
     func toProductsConfigRequest() -> ProductsConfigRequest? {
         guard let partnerId = self["partnerId"] as? String,
               let timestamp = self["timestamp"] as? String,
-              let signature = self["signature"] as? String else {
+              let signature = self["signature"] as? String
+        else {
             return nil
         }
 

package/ios/View/BaseSmileIDView.swift

@@ -3,9 +3,9 @@ import SwiftUI
 
 class BaseSmileIDView: UIView {
     typealias ContentView = AnyView
-    var contentView : AnyView?
+    var contentView: AnyView?
     private var _onResult: RCTBubblingEventBlock?
-    var product : SmileIDProductModel?
+    var product: SmileIDProductModel?
 
     @objc var onResult: RCTBubblingEventBlock? {
         get {
@@ -19,7 +19,7 @@ class BaseSmileIDView: UIView {
         }
     }
 
-    init(frame: CGRect,contentView:AnyView,product:SmileIDProductModel) {
+    init(frame: CGRect, contentView: AnyView, product: SmileIDProductModel) {
         self.contentView = contentView
         self.product = product
         super.init(frame: frame)
@@ -34,7 +34,7 @@ class BaseSmileIDView: UIView {
     private func commonInit() {
         // Perform initialization tasks here
         // For example, setup subviews, add constraints, configure appearance
-        let hostingController = UIHostingController(rootView:contentView)
+        let hostingController = UIHostingController(rootView: contentView)
         let hostingView = hostingController.view!
         hostingView.translatesAutoresizingMaskIntoConstraints = false
         addSubview(hostingView)
@@ -42,9 +42,10 @@ class BaseSmileIDView: UIView {
         hostingView.leftAnchor.constraint(equalTo: leftAnchor).isActive = true
         hostingView.bottomAnchor.constraint(equalTo: bottomAnchor).isActive = true
         hostingView.rightAnchor.constraint(equalTo: rightAnchor).isActive = true
+        hostingView.overrideUserInterfaceStyle = .light
     }
 
-    func getView(product:SmileIDProductModel) -> AnyView {
+    func getView(product _: SmileIDProductModel) -> AnyView {
         fatalError("Must be implemented by subclass")
     }
 }

package/ios/View/SmileIDBiometricKYCView.swift

@@ -2,62 +2,62 @@ import Foundation
 import SmileID
 import SwiftUI
 
-struct SmileIDBiometricKYCView: View ,SmileIDFileUtilsProtocol {
-  var fileManager: FileManager = Foundation.FileManager.default
-  @ObservedObject var product : SmileIDProductModel
-  var body: some View{
-    NavigationView {
-      if let idInfo = product.idInfo {
-        SmileID.biometricKycScreen(
-          idInfo: idInfo, // already validated in the SmileIDBiometricKYCViewManager
-          userId: product.userId ?? generateUserId(),
-          jobId: product.jobId ?? generateJobId(),
-          allowNewEnroll: product.allowNewEnroll,
-          allowAgentMode: product.allowAgentMode,
-          showAttribution: product.showAttribution,
-          showInstructions: product.showInstructions,
-          extraPartnerParams: product.extraPartnerParams as [String: String],
-          delegate: self
-        )
-      } else {
-        // This exists for debugging purposes and will show in extreme cases
-        // when the params were not set NB: setParams in the viewmanager will always
-        // return an error if the required data is missing
-        Text("An error has occured")
-      }
-    }.navigationViewStyle(StackNavigationViewStyle())
-  }
+struct SmileIDBiometricKYCView: View, SmileIDFileUtilsProtocol {
+    var fileManager: FileManager = Foundation.FileManager.default
+    @ObservedObject var product: SmileIDProductModel
+    var smileIDUIViewDelegate: SmileIDUIViewDelegate
+    var body: some View {
+        NavigationView {
+            if let idInfo = product.idInfo {
+                SmileID.biometricKycScreen(
+                    idInfo: idInfo, // already validated in the SmileIDBiometricKYCViewManager
+                    userId: product.userId ?? generateUserId(),
+                    jobId: product.jobId ?? generateJobId(),
+                    allowNewEnroll: product.allowNewEnroll,
+                    allowAgentMode: product.allowAgentMode,
+                    showAttribution: product.showAttribution,
+                    showInstructions: product.showInstructions,
+                    extraPartnerParams: product.extraPartnerParams as [String: String],
+                    delegate: self
+                )
+            } else {
+                // This exists for debugging purposes and will show in extreme cases
+                // when the params were not set NB: setParams in the viewmanager will always
+                // return an error if the required data is missing
+                Text("An error has occured")
+            }
+        }.navigationViewStyle(StackNavigationViewStyle())
+    }
 }
 
 extension SmileIDBiometricKYCView: BiometricKycResultDelegate {
-  func didSucceed(selfieImage: URL, livenessImages: [URL], didSubmitBiometricJob: Bool) {
-    
-    let params: [String: Any] = [
-      "selfieFile": getFilePath(fileName: selfieImage.absoluteString),
-      "livenessFiles": livenessImages.map {
-        getFilePath(fileName: $0.absoluteString)
-      },
-      "didSubmitBiometricKycJob": didSubmitBiometricJob,
-    ]
-    
-    guard let jsonData = try? JSONSerialization.data(withJSONObject: params.toJSONCompatibleDictionary(), options: .prettyPrinted) else {
-      product.onResult?(["error": SmileIDError.unknown("SmileIDBiometricKYCView encoding error")])
-      return
+    func didSucceed(selfieImage: URL, livenessImages: [URL], didSubmitBiometricJob: Bool) {
+        let params: [String: Any] = [
+            "selfieFile": getFilePath(fileName: selfieImage.absoluteString),
+            "livenessFiles": livenessImages.map {
+                getFilePath(fileName: $0.absoluteString)
+            },
+            "didSubmitBiometricKycJob": didSubmitBiometricJob,
+        ]
+
+        guard let jsonData = try? JSONSerialization.data(withJSONObject: params.toJSONCompatibleDictionary(), options: .prettyPrinted) else {
+            smileIDUIViewDelegate.onError(error: SmileIDError.unknown("SmileIDBiometricKYCView encoding error"))
+            return
+        }
+        smileIDUIViewDelegate.onResult(smileResult: String(data: jsonData, encoding: .utf8)!)
+    }
+
+    func didSucceed(
+        selfieImage _: URL,
+        livenessImages _: [URL],
+        jobStatusResponse: BiometricKycJobStatusResponse
+    ) {
+        let encoder = JSONEncoder()
+        let jsonData = try! encoder.encode(jobStatusResponse)
+        smileIDUIViewDelegate.onResult(smileResult: String(data: jsonData, encoding: .utf8)!)
+    }
+
+    func didError(error: Error) {
+        smileIDUIViewDelegate.onError(error: error.localizedDescription)
     }
-    product.onResult?(["result": String(data: jsonData, encoding: .utf8)!])
-  }
-  
-  func didSucceed(
-    selfieImage _: URL,
-    livenessImages _: [URL],
-    jobStatusResponse: BiometricKycJobStatusResponse
-  ) {
-    let encoder = JSONEncoder()
-    let jsonData = try! encoder.encode(jobStatusResponse)
-    product.onResult?(["result": String(data: jsonData, encoding: .utf8)!])
-  }
-  
-  func didError(error: Error) {
-    product.onResult?(["error": error.localizedDescription])
-  }
 }

package/ios/View/SmileIDConsentView.swift

@@ -3,8 +3,9 @@ import SmileID
 import SwiftUI
 
 struct SmileIDConsentView: View {
-    @ObservedObject var product : SmileIDProductModel
+    @ObservedObject var product: SmileIDProductModel
     var onResult: RCTBubblingEventBlock?
+    var smileIDUIViewDelegate: SmileIDUIViewDelegate
     var body: some View {
         NavigationView {
             if let partnerIcon = product.partnerIcon,

package/ios/View/SmileIDDocumentCaptureView.swift

@@ -3,80 +3,80 @@ import SmileID
 import SwiftUI
 
 struct DocumentCaptureResult {
-  let documentFile: URL? // Using URL to represent file paths in Swift
+    let documentFile: URL? // Using URL to represent file paths in Swift
 
-  init(documentFile: URL?) {
-    self.documentFile = documentFile
-  }
+    init(documentFile: URL?) {
+        self.documentFile = documentFile
+    }
 }
 
 struct SmileIDDocumentCaptureView: View {
-  @ObservedObject var product : SmileIDProductModel
-  @State private var localMetadata = LocalMetadata()
-  var body: some View {
-    NavigationView {
-      DocumentCaptureScreen(
-        side: self.product.front ? .front : .back,
-        showInstructions: self.product.showInstructions,
-        showAttribution: self.product.showAttribution,
-        allowGallerySelection: self.product.allowGalleryUpload,
-        showSkipButton: false,
-        instructionsHeroImage: self.product.front ? SmileIDResourcesHelper.DocVFrontHero : SmileIDResourcesHelper.DocVBackHero,
-        instructionsTitleText: SmileIDResourcesHelper.localizedString(
-          for: self.product.front ? "Instructions.Document.Front.Header": "Instructions.Document.Back.Header"
-        ),
-        instructionsSubtitleText: SmileIDResourcesHelper.localizedString(
-          for: self.product.front ? "Instructions.Document.Front.Callout": "Instructions.Document.Back.Callout"
-        ),
-        captureTitleText: SmileIDResourcesHelper.localizedString(for: "Action.TakePhoto"),
-        knownIdAspectRatio: self.product.idAspectRatio,
-        showConfirmation:self.product.showConfirmation,
-        onConfirm: onConfirmed,
-        onError: onError,
-        onSkip: onSkip
-      )
-    }.navigationViewStyle(StackNavigationViewStyle()).environmentObject(localMetadata)
-  }
-
-  func onConfirmed(data: Data) {
-    do {
-      // Attempt to create the document file
-      let url = try LocalStorage.createDocumentFile(
-        jobId: self.product.jobId ?? generateJobId(),
-        fileType: self.product.front ? FileType.documentFront : FileType.documentBack,
-        document: data
-      )
+    @ObservedObject var product: SmileIDProductModel
+    @State private var localMetadata = LocalMetadata()
+    var smileIDUIViewDelegate: SmileIDUIViewDelegate
+    var body: some View {
+        NavigationView {
+            DocumentCaptureScreen(
+                side: self.product.front ? .front : .back,
+                showInstructions: self.product.showInstructions,
+                showAttribution: self.product.showAttribution,
+                allowGallerySelection: self.product.allowGalleryUpload,
+                showSkipButton: false,
+                instructionsHeroImage: self.product.front ? SmileIDResourcesHelper.DocVFrontHero : SmileIDResourcesHelper.DocVBackHero,
+                instructionsTitleText: SmileIDResourcesHelper.localizedString(
+                    for: self.product.front ? "Instructions.Document.Front.Header" : "Instructions.Document.Back.Header"
+                ),
+                instructionsSubtitleText: SmileIDResourcesHelper.localizedString(
+                    for: self.product.front ? "Instructions.Document.Front.Callout" : "Instructions.Document.Back.Callout"
+                ),
+                captureTitleText: SmileIDResourcesHelper.localizedString(for: "Action.TakePhoto"),
+                knownIdAspectRatio: self.product.idAspectRatio,
+                showConfirmation: self.product.showConfirmation,
+                onConfirm: onConfirmed,
+                onError: onError,
+                onSkip: onSkip
+            )
+        }.navigationViewStyle(StackNavigationViewStyle()).environmentObject(localMetadata)
+    }
 
+    func onConfirmed(data: Data) {
+        do {
+            // Attempt to create the document file
+            let url = try LocalStorage.createDocumentFile(
+                jobId: product.jobId ?? generateJobId(),
+                fileType: product.front ? FileType.documentFront : FileType.documentBack,
+                document: data
+            )
 
-      // Create params dictionary
-      var params: [String: Any] = [
-        "documentFrontImage": product.front ? url.absoluteString : nil ,
-        "documentBackImage": product.front ? nil : url.absoluteString
-      ]
+            // Create params dictionary
+            var params: [String: Any] = [
+                "documentFrontImage": product.front ? url.absoluteString : nil,
+                "documentBackImage": product.front ? nil : url.absoluteString,
+            ]
 
-      // Convert params to JSON-compatible dictionary and serialize to JSON
-      guard let jsonData = try? JSONSerialization.data(withJSONObject: params.toJSONCompatibleDictionary(), options: .prettyPrinted),
-            let jsonString = String(data: jsonData, encoding: .utf8) else {
-        // If serialization fails, call the error handler
-        product.onResult?(["error": SmileIDError.unknown("SmileIDDocumentCaptureView encoding error")])
-        return
-      }
+            // Convert params to JSON-compatible dictionary and serialize to JSON
+            guard let jsonData = try? JSONSerialization.data(withJSONObject: params.toJSONCompatibleDictionary(), options: .prettyPrinted),
+                  let jsonString = String(data: jsonData, encoding: .utf8)
+            else {
+                // If serialization fails, call the error handler
+                smileIDUIViewDelegate.onError(error: SmileIDError.unknown("SmileIDDocumentCaptureView encoding error"))
+                return
+            }
 
-      // Send the result as a JSON string
-      product.onResult?(["result": jsonString])
+            // Send the result as a JSON string
+            smileIDUIViewDelegate.onResult(smileResult: jsonString)
 
-    } catch {
-      // Handle file creation error
-      product.onResult?(["error": SmileIDError.unknown("Error creating document file: \(error.localizedDescription)")])
+        } catch {
+            // Handle file creation error
+          smileIDUIViewDelegate.onError(error: SmileIDError.unknown("Error creating document file: \(error.localizedDescription)"))
+        }
     }
-  }
 
-  func onError(error: Error) {
-    product.onResult?(["error": error.localizedDescription])
-  }
+    func onError(error: Error) {
+        smileIDUIViewDelegate.onError(error: error.localizedDescription)
+    }
 
-  func onSkip() {
-    product.onResult?(["error": SmileIDError.unknown("SmileIDDocumentCaptureView skipped")])
-  }
+    func onSkip() {
+        smileIDUIViewDelegate.onError(error: SmileIDError.unknown("SmileIDDocumentCaptureView skipped"))
+    }
 }
-

package/ios/View/SmileIDDocumentVerificationView.swift

@@ -2,60 +2,60 @@ import Foundation
 import SmileID
 import SwiftUI
 
-struct SmileIDDocumentVerificationView: View ,SmileIDFileUtilsProtocol {
-  var fileManager: FileManager = Foundation.FileManager.default
-  @ObservedObject var product : SmileIDProductModel
-  var body : some View {
-    AnyView(NavigationView {
-      if let countryCode = product.countryCode {
-        SmileID.documentVerificationScreen(
-          userId: product.userId ?? generateUserId(),
-          jobId: product.jobId ?? generateJobId(),
-          allowNewEnroll: product.allowNewEnroll,
-          countryCode: countryCode, // already validated in SmileIDDocumentVerificationViewManager
-          documentType: product.documentType,
-          idAspectRatio: product.idAspectRatio,
-          bypassSelfieCaptureWithFile: product.bypassSelfieCaptureWithFilePath,
-          captureBothSides: product.captureBothSides,
-          allowAgentMode: product.allowAgentMode,
-          allowGalleryUpload: product.allowGalleryUpload,
-          showInstructions: product.showInstructions,
-          showAttribution: product.showAttribution,
-          skipApiSubmission: product.skipApiSubmission,
-          extraPartnerParams: product.extraPartnerParams as [String: String],
-          delegate: self
-        )
-      } else {
-        // This exists for debugging purposes and will show in extreme cases
-        // when the params were not set NB: setParams in the viewmanager will always
-        // return an error if the required data is missing
-        Text("An error has occured")
-      }
-    }.navigationViewStyle(StackNavigationViewStyle()))
-  }
+struct SmileIDDocumentVerificationView: View, SmileIDFileUtilsProtocol {
+    var fileManager: FileManager = Foundation.FileManager.default
+    @ObservedObject var product: SmileIDProductModel
+    var smileIDUIViewDelegate: SmileIDUIViewDelegate
+    var body: some View {
+        AnyView(NavigationView {
+            if let countryCode = product.countryCode {
+                SmileID.documentVerificationScreen(
+                    userId: product.userId ?? generateUserId(),
+                    jobId: product.jobId ?? generateJobId(),
+                    allowNewEnroll: product.allowNewEnroll,
+                    countryCode: countryCode, // already validated in SmileIDDocumentVerificationViewManager
+                    documentType: product.documentType,
+                    idAspectRatio: product.idAspectRatio,
+                    bypassSelfieCaptureWithFile: product.bypassSelfieCaptureWithFilePath,
+                    captureBothSides: product.captureBothSides,
+                    allowAgentMode: product.allowAgentMode,
+                    allowGalleryUpload: product.allowGalleryUpload,
+                    showInstructions: product.showInstructions,
+                    showAttribution: product.showAttribution,
+                    skipApiSubmission: product.skipApiSubmission,
+                    extraPartnerParams: product.extraPartnerParams as [String: String],
+                    delegate: self
+                )
+            } else {
+                // This exists for debugging purposes and will show in extreme cases
+                // when the params were not set NB: setParams in the viewmanager will always
+                // return an error if the required data is missing
+                Text("An error has occured")
+            }
+        }.navigationViewStyle(StackNavigationViewStyle()))
+    }
 }
 
 extension SmileIDDocumentVerificationView: DocumentVerificationResultDelegate {
-  func didSucceed(selfie: URL, documentFrontImage: URL, documentBackImage: URL?, didSubmitDocumentVerificationJob: Bool) {
-    
-    var params: [String: Any] = [
-      "selfieFile": getFilePath(fileName: selfie.absoluteString),
-      "documentFrontFile": getFilePath(fileName: documentFrontImage.absoluteString),
-      "didSubmitDocumentVerificationJob": didSubmitDocumentVerificationJob
-    ]
-    
-    if let documentBackImage = documentBackImage {
-      params["documentBackFile"] = getFilePath(fileName: documentBackImage.absoluteString)
+    func didSucceed(selfie: URL, documentFrontImage: URL, documentBackImage: URL?, didSubmitDocumentVerificationJob: Bool) {
+        var params: [String: Any] = [
+            "selfieFile": getFilePath(fileName: selfie.absoluteString),
+            "documentFrontFile": getFilePath(fileName: documentFrontImage.absoluteString),
+            "didSubmitDocumentVerificationJob": didSubmitDocumentVerificationJob,
+        ]
+
+        if let documentBackImage = documentBackImage {
+            params["documentBackFile"] = getFilePath(fileName: documentBackImage.absoluteString)
+        }
+
+        guard let jsonData = try? JSONSerialization.data(withJSONObject: params.toJSONCompatibleDictionary(), options: .prettyPrinted) else {
+            smileIDUIViewDelegate.onError(error: SmileIDError.unknown("SmileIDDocumentVerificationView encoding error"))
+            return
+        }
+        smileIDUIViewDelegate.onResult(smileResult: String(data: jsonData, encoding: .utf8)!)
     }
-    
-    guard let jsonData = try? JSONSerialization.data(withJSONObject: params.toJSONCompatibleDictionary(), options: .prettyPrinted) else {
-      product.onResult?(["error": SmileIDError.unknown("SmileIDDocumentVerificationView encoding error")])
-      return
+
+    func didError(error: Error) {
+        smileIDUIViewDelegate.onError(error: error.localizedDescription)
     }
-    product.onResult?(["result": String(data: jsonData, encoding: .utf8)!])
-  }
-  
-  func didError(error: Error) {
-    product.onResult?(["error": error.localizedDescription])
-  }
 }