@blueid/access-capacitor 0.80.0 → 0.82.0

package/ios/Plugin/BlueIDAccessSDK/BlueAccess.swift

@@ -120,7 +120,7 @@ public struct BlueGetAccessDevicesCommand: BlueCommand {
     }
 }
 
-public class BlueUpdateDeviceConfigurationCommand: BlueAPIAsyncCommand {
+public class BlueSynchronizeAccessDeviceCommand: BlueAPIAsyncCommand {
     internal override func runAsync(arg0: Any? = nil, arg1: Any? = nil, arg2: Any? = nil) async throws -> Any? {
         if #available(macOS 10.15, *) {
             return try await runAsync(
@@ -429,7 +429,7 @@ public class BlueClaimAccessDeviceCommand: BlueAPIAsyncCommand {
         
         try await BlueSynchronizeMobileAccessCommand(self.blueAPI).runAsync(credentialID: credential.credentialID.id)
         
-        let status = try await BlueUpdateDeviceConfigurationCommand(self.blueAPI).runAsync(credentialID: credential.credentialID.id, deviceID: deviceID)
+        let status = try await BlueSynchronizeAccessDeviceCommand(self.blueAPI).runAsync(credentialID: credential.credentialID.id, deviceID: deviceID)
         
         blueFireListeners(fireEvent: .accessDeviceClaimed, data: nil)
         
@@ -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/BlueCommands.swift

@@ -77,7 +77,7 @@ public struct BlueCommands {
     public let synchronizeAccessCredentials = BlueSynchronizeAccessCredentialsCommand()
     public let getAccessDevices = BlueGetAccessDevicesCommand()
     public let listAccessDevices = BlueListAccessDevicesCommand()
-    public let updateDeviceConfiguration = BlueUpdateDeviceConfigurationCommand()
+    public let synchronizeAccessDevice = BlueSynchronizeAccessDeviceCommand()
     public let getAccessObjects = BlueGetAccessObjectsCommand()
     public let claimAccessDevice = BlueClaimAccessDeviceCommand()
     public let getWritableAccessCredentials = BlueGetWritableAccessCredentialsCommand()

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.80.0",
+  "version": "0.82.0",
   "description": "Capacitor JS plugin for the BlueID Access SDK",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",