@flomentumsolutions/capacitor-health-extended 0.6.0 → 0.6.2

package/ios/Sources/HealthPluginPlugin/HealthPlugin.swift

@@ -80,62 +80,122 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
             return
         }
         
-        healthStore.requestAuthorization(toShare: nil, read: Set(types)) { success, error in
-            if success {
-                //we don't know which actual permissions were granted, so we assume all
-                var result: [String: Bool] = [:]
-                permissions.forEach{ result[$0] = true }
-                call.resolve(["permissions": result])
-            } else if let error = error {
-                call.reject("Authorization failed: \(error.localizedDescription)")
-            } else {
-                //assume no permissions were granted. We can ask user to adjust them manually
-                var result: [String: Bool] = [:]
-                permissions.forEach{ result[$0] = false }
-                call.resolve(["permissions": result])
+        DispatchQueue.main.async {
+            self.healthStore.requestAuthorization(toShare: nil, read: Set(types)) { success, error in
+                DispatchQueue.main.async {
+                    if success {
+                        //we don't know which actual permissions were granted, so we assume all
+                        var result: [String: Bool] = [:]
+                        permissions.forEach{ result[$0] = true }
+                        call.resolve(["permissions": result])
+                    } else if let error = error {
+                        call.reject("Authorization failed: \(error.localizedDescription)")
+                    } else {
+                        //assume no permissions were granted. We can ask user to adjust them manually
+                        var result: [String: Bool] = [:]
+                        permissions.forEach{ result[$0] = false }
+                        call.resolve(["permissions": result])
+                    }
+                }
             }
         }
     }
 
     @objc func getCharacteristics(_ call: CAPPluginCall) {
-        var result: [String: Any] = [:]
-
-        func setValue(_ key: String, _ value: String?) {
-            result[key] = value ?? NSNull()
+        guard HKHealthStore.isHealthDataAvailable() else {
+            call.resolve([
+                "platformSupported": false,
+                "platformMessage": "Health data is unavailable on this device."
+            ])
+            return
         }
 
-        if let biologicalSexObject = try? healthStore.biologicalSex() {
-            setValue("biologicalSex", mapBiologicalSex(biologicalSexObject.biologicalSex))
-        } else {
-            setValue("biologicalSex", nil)
-        }
+        let characteristicTypes: [HKObjectType] = [
+            HKObjectType.characteristicType(forIdentifier: .biologicalSex),
+            HKObjectType.characteristicType(forIdentifier: .bloodType),
+            HKObjectType.characteristicType(forIdentifier: .dateOfBirth),
+            HKObjectType.characteristicType(forIdentifier: .fitzpatrickSkinType),
+            HKObjectType.characteristicType(forIdentifier: .wheelchairUse)
+        ].compactMap { $0 }
 
-        if let bloodTypeObject = try? healthStore.bloodType() {
-            setValue("bloodType", mapBloodType(bloodTypeObject.bloodType))
-        } else {
-            setValue("bloodType", nil)
+        guard !characteristicTypes.isEmpty else {
+            call.reject("HealthKit characteristics are unavailable on this device.")
+            return
         }
 
-        if let dateComponents = try? healthStore.dateOfBirthComponents() {
-            setValue("dateOfBirth", isoBirthDateString(from: dateComponents))
-        } else {
-            setValue("dateOfBirth", nil)
-        }
+        func resolveCharacteristics() {
+            var result: [String: Any] = [:]
 
-        if let fitzpatrickObject = try? healthStore.fitzpatrickSkinType() {
-            setValue("fitzpatrickSkinType", mapFitzpatrickSkinType(fitzpatrickObject.skinType))
-        } else {
-            setValue("fitzpatrickSkinType", nil)
+            func setValue(_ key: String, _ value: String?) {
+                result[key] = value ?? NSNull()
+            }
+
+            if let biologicalSexObject = try? healthStore.biologicalSex() {
+                setValue("biologicalSex", mapBiologicalSex(biologicalSexObject.biologicalSex))
+            } else {
+                setValue("biologicalSex", nil)
+            }
+
+            if let bloodTypeObject = try? healthStore.bloodType() {
+                setValue("bloodType", mapBloodType(bloodTypeObject.bloodType))
+            } else {
+                setValue("bloodType", nil)
+            }
+
+            if let dateComponents = try? healthStore.dateOfBirthComponents() {
+                setValue("dateOfBirth", isoBirthDateString(from: dateComponents))
+            } else {
+                setValue("dateOfBirth", nil)
+            }
+
+            if let fitzpatrickObject = try? healthStore.fitzpatrickSkinType() {
+                setValue("fitzpatrickSkinType", mapFitzpatrickSkinType(fitzpatrickObject.skinType))
+            } else {
+                setValue("fitzpatrickSkinType", nil)
+            }
+
+            if let wheelchairUseObject = try? healthStore.wheelchairUse() {
+                setValue("wheelchairUse", mapWheelchairUse(wheelchairUseObject.wheelchairUse))
+            } else {
+                setValue("wheelchairUse", nil)
+            }
+
+            result["platformSupported"] = true
+            call.resolve(result)
         }
 
-        if let wheelchairUseObject = try? healthStore.wheelchairUse() {
-            setValue("wheelchairUse", mapWheelchairUse(wheelchairUseObject.wheelchairUse))
-        } else {
-            setValue("wheelchairUse", nil)
+        func requestCharacteristicsAccess() {
+            self.healthStore.requestAuthorization(toShare: nil, read: Set(characteristicTypes)) { success, error in
+                DispatchQueue.main.async {
+                    if success {
+                        resolveCharacteristics()
+                    } else if let error = error {
+                        call.reject("Authorization failed: \(error.localizedDescription)")
+                    } else {
+                        call.resolve([
+                            "platformSupported": true,
+                            "platformMessage": "Characteristics access was not granted. Update permissions in the Health app."
+                        ])
+                    }
+                }
+            }
         }
 
-        result["platformSupported"] = true
-        call.resolve(result)
+        healthStore.getRequestStatusForAuthorization(toShare: nil, read: Set(characteristicTypes)) { status, error in
+            DispatchQueue.main.async {
+                if let error = error {
+                    call.reject("Failed to determine HealthKit authorization status: \(error.localizedDescription)")
+                    return
+                }
+
+                switch status {
+                case .shouldRequest, .unknown:
+                    requestCharacteristicsAccess()
+                default:
+                    resolveCharacteristics()
+                }
+            }
+        }
     }
 
     @objc func queryLatestSample(_ call: CAPPluginCall) {
@@ -629,17 +689,17 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
 
     private func mapFitzpatrickSkinType(_ skinType: HKFitzpatrickSkinType) -> String {
         switch skinType {
-        case .typeI:
+        case .I:
             return "type1"
-        case .typeII:
+        case .II:
             return "type2"
-        case .typeIII:
+        case .III:
             return "type3"
-        case .typeIV:
+        case .IV:
             return "type4"
-        case .typeV:
+        case .V:
             return "type5"
-        case .typeVI:
+        case .VI:
             return "type6"
         case .notSet:
             return "not_set"
@@ -650,9 +710,9 @@ public class HealthPlugin: CAPPlugin, CAPBridgedPlugin {
 
     private func mapWheelchairUse(_ wheelchairUse: HKWheelchairUse) -> String {
         switch wheelchairUse {
-        case .wheelchairUser:
+        case .yes:
             return "wheelchair_user"
-        case .notWheelchairUser:
+        case .no:
             return "not_wheelchair_user"
         case .notSet:
             return "not_set"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flomentumsolutions/capacitor-health-extended",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Capacitor plugin for Apple HealthKit and Google Health Connect Platform",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",