@blueid/access-capacitor 0.79.0 → 0.81.0

package/ios/CBlueIDAccess.xcframework/Info.plist

@@ -10,15 +10,18 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libCBlueIDAccess.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -26,16 +29,15 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libCBlueIDAccess.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>ios</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -43,7 +45,7 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>macos-arm64_x86_64</string>
 			<key>LibraryPath</key>
 			<string>libCBlueIDAccess.a</string>
 			<key>SupportedArchitectures</key>
@@ -52,9 +54,7 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>macos</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/Plugin/BlueIDAccessSDK/BlueAccess.swift

@@ -500,9 +500,9 @@ public struct BlueTryAccessDeviceCommand: BlueAsyncCommand {
     /// A modal view (sheet) is shown in iOS to represent the progress of the command execution.
     ///
     /// - parameter deviceID: The Device ID.
-    /// - throws: Throws an error of type `BlueError(.invalidState)` if the device could not be found.
-    /// - throws: Throws an error of type `BlueError(.notFound)` if neither an OssSo nor an OssSid token is found.
-    /// - throws: Throws an error of type `BlueError(.notSuported)` If the macOS version is earlier than 10.15.
+    /// - throws: Throws an error of type `BlueError(.sdkDeviceNotFound)` if the device could not be found.
+    /// - throws: Throws an error of type `BlueError(.sdkSpTokenNotFound)` if neither an OssSo nor an OssSid token is found.
+    /// - throws: Throws an error of type `BlueError(.sdkUnsupportedPlatform)` If the macOS version is earlier than 10.15.
     public func runAsync(deviceID: String) async throws -> BlueOssAccessResult {
         guard let device = blueGetDevice(deviceID) else {
             throw BlueError(.sdkDeviceNotFound)

package/ios/Plugin/BlueIDAccessSDK/BlueAccessSync.swift

@@ -150,22 +150,16 @@ internal class BlueSynchronizeMobileAccessCommand: BlueAbstractSynchronizeAccess
     override func purge(_ credential: BlueAccessCredential) throws {
         _ = try? blueAccessCredentialsKeyChain.deleteEntry(id: credential.credentialID.id)
         _ = try? blueAccessAuthenticationTokensKeyChain.deleteEntry(id: credential.credentialID.id)
+        _ = try? blueDeleteSpTokens(credential: credential)
         
         guard let deviceList = try? BlueGetAccessDevicesCommand().run(credentialID: credential.credentialID.id) else {
             return
         }
-        
-        purgeSpTokens(credential, deviceList.devices)
+
         purgeTerminalPublicKeys(deviceList.devices)
         purgeDevicesStorage(credential)
     }
     
-    private func purgeSpTokens(_ credential: BlueAccessCredential, _ devices: [BlueAccessDevice]) {
-        devices.forEach { device in
-            _ = try? blueDeleteSpTokens(credential: credential, deviceID: device.deviceID)
-        }
-    }
-    
     /// Deletes terminal public keys for a given device list.
     /// The terminal public keys are only removed if there are no BlueSPTokens in use by the device.
     /// We may have more than one credential that grants access to the same device.
@@ -197,7 +191,6 @@ public class BlueSynchronizeAccessCredentialsCommand: BlueAPIAsyncCommand {
     }
     
     /// Synchronizes all stored credentials.
-    /// Note: Master credentials are not synced in case of any, as they can only be synced once during the claiming process.
     ///
     /// - throws: Throws an error of type `BlueError(.sdkUnsupportedPlatform)` If the macOS version is earlier than 10.15.
     /// - returns: The exit status (BlueReturnCode) of each credential, and its error description, if any.
@@ -206,8 +199,7 @@ public class BlueSynchronizeAccessCredentialsCommand: BlueAPIAsyncCommand {
             throw BlueError(.sdkUnsupportedPlatform)
         }
         
-        let credentials = try await BlueGetAccessCredentialsCommand().runAsync().credentials
-            .filter { $0.credentialType != .master }
+        var credentials = try await BlueGetAccessCredentialsCommand().runAsync().credentials
         
         if (credentials.isEmpty) {
             return BlueSynchronizeAccessCredentials()

package/ios/Plugin/BlueIDAccessSDK/BlueAccessSyncScheduler.swift

@@ -0,0 +1,145 @@
+import Foundation
+
+private class ForegroundScheduler {
+    private var timer: Timer?
+    private var scheduler: BlueAccessSyncScheduler?
+    
+    func setup(_ scheduler: BlueAccessSyncScheduler) {
+        self.scheduler = scheduler
+    }
+    
+    func suspend() {
+        timer?.invalidate()
+        timer = nil
+    }
+    
+    func schedule(_ now: Bool? = false) {
+        guard #available(macOS 10.15, *) else {
+            blueLogWarn("Unsupported platform")
+            return
+        }
+        
+        suspend()
+        
+        if now == true {
+            self.handleTask()
+        } else {
+            blueRunInMainThread {
+                self.timer = Timer.scheduledTimer(
+                    timeInterval: self.scheduler!.timeInterval,
+                    target: self,
+                    selector: #selector(self.handleTask),
+                    userInfo: nil,
+                    repeats: false
+                )
+            }
+        }
+    }
+    
+    @available(macOS 10.15, *)
+    @objc private func handleTask() {
+        DispatchQueue.global(qos: .background).async {
+            Task {
+                do {
+                    try await self.scheduler!.synchronizeAccessCredentials()
+                } catch {
+                    blueLogError(error.localizedDescription)
+                }
+                
+                if (self.scheduler!.autoSchedule) {
+                    self.schedule()
+                }
+            }
+        }
+    }
+}
+
+internal class BlueAccessSyncScheduler: BlueEventListener {
+    public static let shared = BlueAccessSyncScheduler()
+    
+    let timeInterval: TimeInterval
+    let autoSchedule: Bool
+    
+    private let foregroundScheduler = ForegroundScheduler()
+    
+    private let command: BlueSynchronizeAccessCredentialsCommand
+    
+    private var syncing = false
+    
+    init(
+        timeInterval: TimeInterval? = 60 * 60 * 6, // every 6h by default
+        autoSchedule: Bool? = true,
+        command: BlueSynchronizeAccessCredentialsCommand? = nil
+    ) {
+        self.command = command ?? blueCommands.synchronizeAccessCredentials
+        self.timeInterval = timeInterval ?? 60
+        self.autoSchedule = autoSchedule ?? true
+        
+        foregroundScheduler.setup(self)
+        
+        blueAddEventListener(listener: self)
+    }
+    
+    deinit {
+        blueRemoveEventListener(listener: self)
+    }
+    
+    func willResignActive() {
+        suspend()
+    }
+    
+    func willTerminate() {
+        suspend()
+    }
+    
+    func didBecomeActive() {
+        schedule(true)
+    }
+    
+    func didFinishLaunching() {
+        schedule(true)
+    }
+    
+    func blueEvent(event: BlueEventType, data: Any?) {
+        if (event == .accessCredentialAdded) {
+            schedule()
+        }
+    }
+    
+    func schedule(_ now: Bool? = false) {
+        do {
+            guard try blueAccessCredentialsKeyChain.getNumberOfEntries() > 0 else {
+                return
+            }
+        } catch {
+            blueLogError(error.localizedDescription)
+        }
+        
+        blueRemoveEventListener(listener: self)
+        
+        foregroundScheduler.schedule(now)
+    }
+    
+    func suspend() {
+        foregroundScheduler.suspend()
+    }
+    
+    func synchronizeAccessCredentials() async throws -> Void {
+        if (syncing) {
+            blueLogInfo("There is already a synchronization in progress")
+            return
+        }
+        
+        syncing = true
+        
+        blueFireListeners(fireEvent: BlueEventType.tokenSyncStarted, data: nil)
+        
+        defer {
+            syncing = false
+            
+            blueFireListeners(fireEvent: BlueEventType.tokenSyncFinished, data: nil)
+        }
+        
+        _ = try await command.runAsync()
+    }
+}

package/ios/Plugin/BlueIDAccessSDK/BlueApp.swift

@@ -40,18 +40,3 @@ public struct BlueOpenAppSettingsCommand: BlueAsyncCommand {
         completionHandler(false)
     }
 }
-
-internal func blueAppHasLaunchedBefore() -> Bool {
-    if let hasLaunchedBefore = hasLaunchedBefore {
-        return hasLaunchedBefore
-    }
-    
-    let result = blueAppStorage.getBool(id: "hasLaunchedBefore")
-    if (!result) {
-        blueAppStorage.storeBool(id: "hasLaunchedBefore", bool: true)
-    }
-    
-    hasLaunchedBefore = true
-    
-    return result
-}

package/ios/Plugin/BlueIDAccessSDK/BlueAppDelegate.swift

@@ -18,7 +18,7 @@ public final class BlueAppDelegate: NSObject {
         }
 #endif
         
-        BlueTokenSyncScheduler.shared.didFinishLaunching()
+        BlueAccessSyncScheduler.shared.didFinishLaunching()
     }
     
 #if os(iOS) || os(watchOS)
@@ -38,7 +38,7 @@ public final class BlueAppDelegate: NSObject {
 #endif
 
     @objc public static func willResignActive() {
-        BlueTokenSyncScheduler.shared.willResignActive()
+        BlueAccessSyncScheduler.shared.willResignActive()
     }
 
     @objc public static func didBecomeActive() {
@@ -46,7 +46,7 @@ public final class BlueAppDelegate: NSObject {
         blueNearbyAppBecameActive()
 #endif
         
-        BlueTokenSyncScheduler.shared.didBecomeActive()
+        BlueAccessSyncScheduler.shared.didBecomeActive()
     }
     
     @objc public static func didEnterBackground() {
@@ -62,6 +62,6 @@ public final class BlueAppDelegate: NSObject {
             fatalError(error.localizedDescription)
         }
         
-        BlueTokenSyncScheduler.shared.willTerminate()
+        BlueAccessSyncScheduler.shared.willTerminate()
     }
 }

package/ios/Plugin/BlueIDAccessSDK/BlueTerminal.swift

@@ -66,10 +66,22 @@ internal func blueStoreSpToken(credential: BlueAccessCredential, deviceID: Strin
     )
 }
 
-internal func blueDeleteSpTokens(credential: BlueAccessCredential, deviceID: String) throws {
-    try blueGetSpTokenEntryIds(deviceID: deviceID).forEach{ entryID in
+/// Deletes all SP Tokens for a given credential.
+///
+/// - parameter credential: The credential.
+/// - throws: An error is thrown if any error occurs during the retrieval of the entry IDs from the KeyChain.
+internal func blueDeleteSpTokens(credential: BlueAccessCredential) throws {
+    try blueTerminalRequestDataKeychain.getEntryIds().forEach { entryID in
+
         if let storedEntry = try? blueGetSpTokenEntry(entryID) {
+            
             if var spTokenEntries = storedEntry as? [BlueSPTokenEntry] {
+                
+                let matchCredential = spTokenEntries.contains(where: { $0.credentialID == credential.credentialID.id })
+                guard matchCredential else {
+                    return
+                }
+                
                 spTokenEntries.removeAll( where: { $0.credentialID == credential.credentialID.id } )
                 
                 if (spTokenEntries.isEmpty) {
@@ -81,6 +93,7 @@ internal func blueDeleteSpTokens(credential: BlueAccessCredential, deviceID: Str
                     )
                 }
             }
+            
             else if var _ = storedEntry as? Data {
                 _ = try? blueTerminalRequestDataKeychain.deleteEntry(id: entryID)
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blueid/access-capacitor",
-  "version": "0.79.0",
+  "version": "0.81.0",
   "description": "Capacitor JS plugin for the BlueID Access SDK",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",

package/ios/Plugin/BlueIDAccessSDK/BlueTokenSyncScheduler.swift

@@ -1,265 +0,0 @@
-//
-//  BlueTokenSyncScheduler.swift
-//
-//  Description: Synchronize all tokens from all available credentials at specific intervals.
-//
-//  If you would like to test the background task during development, execute the following code in the console:
-//  ```
-//  e -l objc -- (void)[[BGTaskScheduler sharedScheduler] _simulateLaunchForTaskWithIdentifier:@"com.blue-id.BlueTokenSyncScheduler"]
-//  ```
-//
-//  Reference: https://developer.apple.com/documentation/backgroundtasks/starting-and-terminating-tasks-during-development#Launch-a-Task
-//
-//  Copyright © 2023 BlueID. All rights reserved.
-//
-
-import Foundation
-
-private let bgTaskIdentifier = "com.blue-id.BlueTokenSyncScheduler"
-
-private class ForegroundScheduler {
-    private var timer: Timer?
-    private var scheduler: BlueTokenSyncScheduler?
-    
-    func setup(_ scheduler: BlueTokenSyncScheduler) {
-        self.scheduler = scheduler
-    }
-    
-    func suspend() {
-        timer?.invalidate()
-        timer = nil
-    }
-    
-    func schedule(_ now: Bool? = false) {
-        guard #available(macOS 10.15, *) else {
-            blueLogWarn("Unsupported platform")
-            return
-        }
-        
-        suspend()
-        
-        if now == true {
-            self.handleTask()
-        } else {
-            blueRunInMainThread {
-                self.timer = Timer.scheduledTimer(
-                    timeInterval: self.scheduler!.timeInterval,
-                    target: self,
-                    selector: #selector(self.handleTask),
-                    userInfo: nil,
-                    repeats: false
-                )
-            }
-        }
-    }
-    
-    @available(macOS 10.15, *)
-    @objc private func handleTask() {
-        DispatchQueue.global(qos: .background).async {
-            Task {
-                do {
-                    try await self.scheduler!.syncTokens()
-                } catch {
-                    blueLogError("Tokens could not be synchronized")
-                }
-                
-                if (self.scheduler!.autoSchedule) {
-                    self.schedule()
-                }
-            }
-        }
-    }
-}
-
-
-#if os(iOS) || os(watchOS)
-import BackgroundTasks
-
-private class BackgroundScheduler {
-    private var scheduler: BlueTokenSyncScheduler?
-    
-    func setup(_ scheduler: BlueTokenSyncScheduler) {
-        self.scheduler = scheduler
-    }
-    
-    func registerIdentifiers() {
-        let registered = BGTaskScheduler.shared.register(forTaskWithIdentifier: bgTaskIdentifier, using: DispatchQueue.global()) { task in
-            self.handleTask(task: task as! BGProcessingTask)
-        }
-        
-        if (!registered) {
-            blueLogWarn("Could not register background task identifier: \(bgTaskIdentifier)")
-            return
-        }
-        
-        blueLogDebug("Background task identifier has been successfully registered: \(bgTaskIdentifier)")
-    }
-    
-    func suspend() {
-        BGTaskScheduler.shared.cancel(taskRequestWithIdentifier: bgTaskIdentifier)
-    }
-    
-    func schedule() {
-        do {
-            let request = BGProcessingTaskRequest(identifier: bgTaskIdentifier)
-            request.earliestBeginDate = Date(timeIntervalSinceNow: scheduler!.timeInterval)
-            request.requiresNetworkConnectivity = true
-            
-            try BGTaskScheduler.shared.submit(request)
-            
-            blueLogDebug("Background task has been successfully scheduled")
-        } catch {
-            blueLogError("Background task could not be scheduled: \(error)")
-        }
-    }
-    
-    private func handleTask(task: BGProcessingTask) -> Void {
-        task.expirationHandler = {
-            task.setTaskCompleted(success: false)
-        }
-        
-        Task {
-            do {
-                try await scheduler!.syncTokens()
-                
-                task.setTaskCompleted(success: true)
-            } catch {
-                task.setTaskCompleted(success: false)
-            }
-            
-            if (scheduler!.autoSchedule) {
-                schedule()
-            }
-        }
-    }
-}
-#endif
-
-internal class BlueTokenSyncScheduler: BlueEventListener {
-    public static let shared = BlueTokenSyncScheduler()
-    
-    let timeInterval: TimeInterval
-    let autoSchedule: Bool
-    
-#if os(iOS) || os(watchOS)
-    private let backgroundScheduler = BackgroundScheduler()
-#endif
-    
-    private let foregroundScheduler = ForegroundScheduler()
-    
-    private let command: BlueSynchronizeAccessCredentialCommand
-    
-    init(
-        timeInterval: TimeInterval? = 60,
-        autoSchedule: Bool? = true,
-        command: BlueSynchronizeAccessCredentialCommand? = nil
-    ) {
-        self.command = command ?? blueCommands.synchronizeAccessCredential
-        self.timeInterval = timeInterval ?? 60
-        self.autoSchedule = autoSchedule ?? true
-        
-        foregroundScheduler.setup(self)
-        
-#if os(iOS) || os(watchOS)
-        backgroundScheduler.setup(self)
-#endif
-        
-        blueAddEventListener(listener: self)
-    }
-    
-    deinit {
-        blueRemoveEventListener(listener: self)
-    }
-    
-    func willResignActive() {
-        foregroundScheduler.suspend()
-        
-#if os(iOS) || os(watchOS)
-        backgroundScheduler.schedule()
-#endif
-    }
-    
-    func didBecomeActive() {
-#if os(iOS) || os(watchOS)
-        backgroundScheduler.suspend()
-#endif
-        
-        foregroundScheduler.schedule()
-    }
-    
-    func didFinishLaunching() {
-        setup()
-    }
-    
-    func willTerminate() {
-        suspend()
-    }
-    
-    func blueEvent(event: BlueEventType, data: Any?) {
-        if (event == .accessCredentialAdded) {
-            schedule()
-        }
-    }
-    
-    func setup() {
-#if os(iOS)
-        backgroundScheduler.registerIdentifiers()
-#endif
-        
-        schedule(true)
-    }
-    
-    func schedule(_ now: Bool? = false) {
-        do {
-            guard try blueAccessCredentialsKeyChain.getNumberOfEntries() > 0 else {
-                return
-            }
-        } catch {
-            blueLogError(error.localizedDescription)
-        }
-        
-        blueRemoveEventListener(listener: self)
-        
-        foregroundScheduler.schedule(now)
-    }
-    
-    func suspend() {
-        foregroundScheduler.suspend()
-        
-#if os(iOS) || os(watchOS)
-        backgroundScheduler.suspend()
-#endif
-    }
-    
-    @available(macOS 10.15, *)
-    func syncTokens() async throws -> Void {
-        blueFireListeners(fireEvent: BlueEventType.tokenSyncStarted, data: nil)
-        
-        defer {
-            blueFireListeners(fireEvent: BlueEventType.tokenSyncFinished, data: nil)
-        }
-        
-        let accessCredentialList = try await blueCommands.getAccessCredentials.runAsync()
-        
-        await withThrowingTaskGroup(of: Void.self) { group in
-            // After deleting the app, since we store credentials in KeyChain Access, they reappear upon app reinstallation.
-            // But, as the device list is not saved there, it is lost.
-            // So, when searching for nearby devices, nothing is shown due to the absence of the device list.
-            // Although this issue would be solved in this synchronization, the synchronization may not return the device list as it depends on the refresh rate and can take up to 30 days, which is not ideal.
-            // Therefore, we force a refresh in case the app has never been launched before.
-            let forceRefresh = !blueAppHasLaunchedBefore()
-            
-            for credential in accessCredentialList.credentials {
-                group.addTask {
-                    do {
-                        try await self.command.runAsync(credentialID: credential.credentialID.id, forceRefresh: forceRefresh)
-                        
-                        blueLogDebug("Access credential has been successfully synchronized: \(credential.credentialID.id)")
-                    } catch {
-                        blueLogError("Access credential could not be synchronized: \(credential.credentialID.id) - \(error.localizedDescription)")
-                    }
-                }
-            }
-        }
-    }
-}