Fix Cancel Action on Error (#272)

* move operation canceled callback inside the cancel action

* return api error if it exists when cancelling.

* disable offline mode on enhance selfie capture for now.

Author: tobitech

Sources/SmileID/Classes/SelfieCapture/EnhancedSmartSelfieViewModel.swift

@@ -368,7 +368,11 @@ extension EnhancedSmartSelfieViewModel {
 
     private func handleCancelSelfieCapture() {
         invalidateSubmissionTask()
-        onFinished(callback: onResult)
+        if let error {
+            onResult.didError(error: error)
+        } else {
+            onResult.didError(error: SmileIDError.operationCanceled("User cancelled"))
+        }
     }
 }
 
@@ -523,8 +527,6 @@ extension EnhancedSmartSelfieViewModel: SelfieSubmissionDelegate {
             )
         } else if let error = error {
             callback.didError(error: error)
-        } else {
-            callback.didError(error: SmileIDError.operationCanceled("User cancelled"))
         }
     }
 

Sources/SmileID/Classes/SelfieCapture/SelfieSubmissionManager.swift

@@ -55,11 +55,6 @@ final class SelfieSubmissionManager {
             // Create an authentication request based on the job type
             let authRequest = createAuthRequest(jobType: jobType)
 
-            // Save the job locally if offline mode is allowed
-            if SmileID.allowOfflineMode {
-                try saveOfflineMode(jobType: jobType)
-            }
-
             // Authenticate the request with the API
             let authResponse = try await SmileID.api.authenticate(request: authRequest)
 
@@ -74,9 +69,6 @@ final class SelfieSubmissionManager {
                 failureReason: failureReason
             )
 
-            // Update local storage after successful submission
-            try updateLocalStorageAfterSuccess()
-
             // Send out api response after successful submission
             self.delegate?.submissionDidSucceed(response)
         } catch let error as SmileIDError {
@@ -103,19 +95,6 @@ final class SelfieSubmissionManager {
         )
     }
 
-    // we need to discuss this
-    private func saveOfflineMode(jobType: JobType) throws {
-        try LocalStorage.saveOfflineJob(
-            jobId: userId,
-            userId: userId,
-            jobType: jobType,
-            enrollment: isEnroll,
-            allowNewEnroll: allowNewEnroll,
-            localMetadata: localMetadata,
-            partnerParams: extraPartnerParams
-        )
-    }
-
     private func prepareImagesForSubmission() throws -> (MultipartBody, [MultipartBody]) {
         guard let smartSelfieImage = createMultipartBody(from: selfieImageUrl) else {
             throw SmileIDError.fileNotFound("Could not create multipart body for file")
@@ -182,64 +161,15 @@ final class SelfieSubmissionManager {
         }
     }
 
-    private func updateLocalStorageAfterSuccess() throws {
-        // Move the job to the submitted jobs directory for record-keeping
-        try LocalStorage.moveToSubmittedJobs(jobId: self.userId)
-
-        // Update the references to the submitted selfie and liveness images
-        self.selfieImageUrl = try LocalStorage.getFileByType(
-            jobId: userId,
-            fileType: FileType.selfie,
-            submitted: true
-        )
-        self.livenessImages =
-            try LocalStorage.getFilesByType(
-                jobId: userId,
-                fileType: FileType.liveness,
-                submitted: true
-            ) ?? []
-    }
-
     private func handleJobSubmissionFailure(_ smileIDError: SmileIDError) {
-        do {
-            let didMove = try LocalStorage.handleOfflineJobFailure(jobId: self.userId, error: smileIDError)
-            if didMove {
-                self.selfieImageUrl = try LocalStorage.getFileByType(jobId: userId, fileType: .selfie, submitted: true)
-                self.livenessImages =
-                    try LocalStorage.getFilesByType(jobId: userId, fileType: .liveness, submitted: true) ?? []
-            }
-        } catch {
-            let (errorMessageRes, errorMessage) = toErrorMessage(error: smileIDError)
-            self.delegate?
-                .submissionDidFail(
-                    with: error,
-                    errorMessage: errorMessageRes,
-                    errorMessageRes: errorMessage,
-                    updatedSelfieImageUrl: selfieImageUrl,
-                    updatedLivenessImages: livenessImages
-                )
-            return
-        }
-
-        if SmileID.allowOfflineMode, SmileIDError.isNetworkFailure(error: smileIDError) {
-            self.delegate?
-                .submissionDidFail(
-                    with: smileIDError,
-                    errorMessage: nil,
-                    errorMessageRes: "Offline.Message",
-                    updatedSelfieImageUrl: selfieImageUrl,
-                    updatedLivenessImages: livenessImages
-                )
-        } else {
-            let (errorMessageRes, errorMessage) = toErrorMessage(error: smileIDError)
-            self.delegate?
-                .submissionDidFail(
-                    with: smileIDError,
-                    errorMessage: errorMessage,
-                    errorMessageRes: errorMessageRes,
-                    updatedSelfieImageUrl: selfieImageUrl,
-                    updatedLivenessImages: livenessImages
-                )
-        }
+        let (errorMessageRes, errorMessage) = toErrorMessage(error: smileIDError)
+        self.delegate?
+            .submissionDidFail(
+                with: smileIDError,
+                errorMessage: errorMessage,
+                errorMessageRes: errorMessageRes,
+                updatedSelfieImageUrl: selfieImageUrl,
+                updatedLivenessImages: livenessImages
+            )
     }
 }