LOOP-1800: fix carbs being recorded before authentication is complete (#218)

Author: novalegra

Loop/View Models/BolusEntryViewModel.swift

@@ -14,6 +14,7 @@ import os.log
 import LoopKit
 import LoopKitUI
 import LoopUI
+import SwiftUI
 
 
 final class BolusEntryViewModel: ObservableObject {
@@ -33,6 +34,8 @@ final class BolusEntryViewModel: ObservableObject {
         case staleGlucoseData
     }
 
+    @Environment(\.authenticate) var authenticate
+
     // MARK: - State
 
     @Published var glucoseValues: [GlucoseValue] = [] // stored glucose values + manual glucose entry
@@ -198,7 +201,28 @@ final class BolusEntryViewModel: ObservableObject {
                 presentAlert(.manualGlucoseEntryOutOfAcceptableRange)
                 return
             }
+        }
 
+        // Authenticate the bolus before saving anything
+        if enteredBolus.doubleValue(for: .internationalUnit()) > 0 {
+            let message = String(format: NSLocalizedString("Authenticate to Bolus %@ Units", comment: "The message displayed during a device authentication prompt for bolus specification"), enteredBolusAmountString)
+            authenticate(message) {
+                switch $0 {
+                case .success:
+                    self.continueSaving(onSuccess: completion)
+                case .failure:
+                    break
+                }
+            }
+        } else if potentialCarbEntry != nil  { // Allow user to save carbs without bolusing
+            self.continueSaving(onSuccess: completion)
+        } else {
+            completion()
+        }
+    }
+    
+    private func continueSaving(onSuccess completion: @escaping () -> Void) {
+        if let manualGlucoseSample = manualGlucoseSample {
             isInitiatingSaveOrBolus = true
             dataManager.loopManager.addGlucose([manualGlucoseSample]) { result in
                 DispatchQueue.main.async {
@@ -219,7 +243,7 @@ final class BolusEntryViewModel: ObservableObject {
 
     private func saveCarbsAndDeliverBolus(onSuccess completion: @escaping () -> Void) {
         guard let carbEntry = potentialCarbEntry else {
-            authenticateAndDeliverBolus(onSuccess: completion)
+            deliverBolus(onSuccess: completion)
             return
         }
 
@@ -237,7 +261,7 @@ final class BolusEntryViewModel: ObservableObject {
             DispatchQueue.main.async {
                 switch result {
                 case .success:
-                    self.authenticateAndDeliverBolus(onSuccess: completion)
+                    self.deliverBolus(onSuccess: completion)
                 case .failure(let error):
                     self.isInitiatingSaveOrBolus = false
                     self.presentAlert(.carbEntryPersistenceFailure)
@@ -247,36 +271,16 @@ final class BolusEntryViewModel: ObservableObject {
         }
     }
 
-    private func authenticateAndDeliverBolus(onSuccess completion: @escaping () -> Void) {
+    private func deliverBolus(onSuccess completion: @escaping () -> Void) {
         let bolusVolume = enteredBolus.doubleValue(for: .internationalUnit())
         guard bolusVolume > 0 else {
             completion()
             return
         }
 
         isInitiatingSaveOrBolus = true
-
-        let context = LAContext()
-        guard context.canEvaluatePolicy(.deviceOwnerAuthentication, error: nil) else {
-            dataManager.enactBolus(units: bolusVolume)
-            completion()
-            return
-        }
-
-        context.evaluatePolicy(
-            .deviceOwnerAuthentication,
-            localizedReason: String(format: NSLocalizedString("Authenticate to Bolus %@ Units", comment: "The message displayed during a device authentication prompt for bolus specification"), enteredBolusAmountString),
-            reply: { success, error in
-                DispatchQueue.main.async {
-                    if success {
-                        self.dataManager.enactBolus(units: bolusVolume)
-                        completion()
-                    } else {
-                        self.isInitiatingSaveOrBolus = false
-                    }
-                }
-            }
-        )
+        dataManager.enactBolus(units: bolusVolume)
+        completion()
     }
 
     private func presentAlert(_ alert: Alert) {