@blueid/access-capacitor 0.75.0 → 0.77.0

package/ios/Plugin/BlueIDAccessSDK/BlueOssSo.swift

@@ -80,26 +80,34 @@ public struct BlueOssSoCreateMobileCommand: BlueCommand {
     }
 }
 
-fileprivate func executeOssSoNfc<ResultType>(settings: BlueOssSoSettings?, successMessage: String, handler: @escaping (_: UnsafeMutablePointer<BlueOssSoStorage_t>) throws -> ResultType) throws -> ResultType {
+fileprivate func executeOssSoNfc<ResultType>(
+    settings: BlueOssSoSettings?,
+    successMessage: String,
+    ignoreErrors: [BlueReturnCode]? = nil,
+    handler: @escaping (_: UnsafeMutablePointer<BlueOssSoStorage_t>) throws -> ResultType) throws -> ResultType {
+    
     var result: ResultType? = nil
     
     let settingsInUse: BlueOssSoSettings = settings ?? blueCreateOssSoDemoSettings()
     
-    try blueNfcExecute({ transponderType in
-        let pStorage = UnsafeMutablePointer<BlueOssSoStorage_t>.allocate(capacity: 1)
-        
-        defer {
-            pStorage.deallocate()
-        }
-        
-        try blueClibFunctionIn(message: settingsInUse, { (dataPtr, dataSize) in
-            return blueOssSo_GetStorage_Ext(BlueTransponderType_t(UInt32(transponderType.rawValue)), pStorage, dataPtr, dataSize, nil, nil)
-        })
-        
-        result = try handler(pStorage)
-        
-        return successMessage
-    })
+    try blueNfcExecute(
+        { transponderType in
+            let pStorage = UnsafeMutablePointer<BlueOssSoStorage_t>.allocate(capacity: 1)
+            
+            defer {
+                pStorage.deallocate()
+            }
+            
+            try blueClibFunctionIn(message: settingsInUse, { (dataPtr, dataSize) in
+                return blueOssSo_GetStorage_Ext(BlueTransponderType_t(UInt32(transponderType.rawValue)), pStorage, dataPtr, dataSize, nil, nil)
+            })
+            
+            result = try handler(pStorage)
+            
+            return successMessage
+        },
+        ignoreErrors: ignoreErrors
+    )
     
     guard let result = result else {
         throw BlueError(.invalidState)
@@ -252,8 +260,8 @@ public struct BlueOssSoReadConfigurationCommand: BlueCommand {
         ))
     }
     
-    public func run(_ settings: BlueOssSoSettings?) throws -> BlueOssSoConfiguration {
-        return try executeOssSoNfc(settings: settings, successMessage: blueI18n.nfcOssSuccessReadConfigurationMessage, handler: { pStorage in
+    public func run(_ settings: BlueOssSoSettings?, ignoreErrors: [BlueReturnCode]? = nil) throws -> BlueOssSoConfiguration {
+        return try executeOssSoNfc(settings: settings, successMessage: blueI18n.nfcOssSuccessReadConfigurationMessage, ignoreErrors: ignoreErrors, handler: { pStorage in
             return try blueClibFunctionOut({ (dataPtr, dataSize) in
                 return blueOssSo_ReadConfiguration_Ext(pStorage, dataPtr, dataSize, BlueOssSoReadWriteFlags_t(rawValue: BlueOssSoReadWriteFlags_All.rawValue))
             })
@@ -291,7 +299,7 @@ public struct BlueFormatOssSoCredentialCommand: BlueCommand {
     
     public func run(organisation: String, siteID: Int) throws {
         guard let credential = blueGetAccessCredential(organisation: organisation, siteID: siteID, credentialType: .nfcWriter) else {
-            throw BlueError(.notFound)
+            throw BlueError(.sdkCredentialNotFound)
         }
         
         let ossSoSettings = try blueGetOssSoSettings(credentialID: credential.credentialID.id)
@@ -310,12 +318,14 @@ public struct BlueReadOssSoCredentialCommand: BlueCommand {
     
     public func run(organisation: String, siteID: Int) throws -> BlueOssSoConfiguration {
         guard let credential = blueGetAccessCredential(organisation: organisation, siteID: siteID, credentialType: .nfcWriter) else {
-            throw BlueError(.notFound)
+            throw BlueError(.sdkCredentialNotFound)
         }
         
         let ossSoSettings = try blueGetOssSoSettings(credentialID: credential.credentialID.id)
         
-        return try BlueOssSoReadConfigurationCommand().run(ossSoSettings)
+        return try BlueOssSoReadConfigurationCommand().run(ossSoSettings, ignoreErrors: [
+            .notFound
+        ])
     }
 }
 
@@ -341,11 +351,11 @@ public class BlueWriteOssSoCredentialCommand: BlueAPIAsyncCommand {
     /// - returns: A boolean indicating whether a new configuration has been written in the Transponder or not.
     public func runAsync(credentialID: String, organisation: String, siteID: Int) async throws -> Bool {
         guard #available(macOS 10.15, *) else {
-            throw BlueError(.notSupported)
+            throw BlueError(.sdkUnsupportedPlatform)
         }
         
         guard let credential = blueGetAccessCredential(organisation: organisation, siteID: siteID, credentialType: .nfcWriter) else {
-            throw BlueError(.notFound)
+            throw BlueError(.sdkCredentialNotFound)
         }
         
         let ossSoSettings = try blueGetOssSoSettings(credentialID: credential.credentialID.id)
@@ -425,11 +435,11 @@ public class BlueRefreshOssSoCredentialCommand: BlueAPIAsyncCommand {
     /// - returns: The configuration stored in the transponder.
     public func runAsync(organisation: String, siteID: Int) async throws -> BlueOssSoConfiguration {
         guard #available(macOS 10.15, *) else {
-            throw BlueError(.notSupported)
+            throw BlueError(.sdkUnsupportedPlatform)
         }
         
         guard let credential = blueGetAccessCredential(organisation: organisation, siteID: siteID, credentialType: .nfcWriter) else {
-            throw BlueError(.notFound)
+            throw BlueError(.sdkCredentialNotFound)
         }
         
         let ossSoSettings = try blueGetOssSoSettings(credentialID: credential.credentialID.id)
@@ -491,13 +501,13 @@ public class BlueRefreshOssSoCredentialsCommand: BlueAPIAsyncCommand {
     /// - returns: The status of each NFC credential, and in the case of success, the configuration stored in the transponder.
     public func runAsync() async throws -> BlueRefreshOssSoCredentials {
         guard #available(macOS 10.15, *) else {
-            throw BlueError(.notSupported)
+            throw BlueError(.sdkUnsupportedPlatform)
         }
         
         let credentials = try await BlueGetAccessCredentialsCommand().runAsync(credentialType: .nfcWriter, includePrivateKey: true).credentials
         
         guard !credentials.isEmpty else {
-            throw BlueError(.notFound)
+            throw BlueError(.sdkCredentialNotFound)
         }
         
         var refreshResult = BlueRefreshOssSoCredentials()
@@ -594,11 +604,11 @@ public class BlueRefreshOssSoCredentialsCommand: BlueAPIAsyncCommand {
 
 private func blueGetOssSoSettings(credentialID: String) throws -> BlueOssSoSettings {
     guard let ossSoEntry: BlueOssEntry = try blueAccessOssSettingsKeyChain.getCodableEntry(id: credentialID) else {
-        throw BlueError(.invalidState)
+        throw BlueError(.sdkOssEntryNotFound)
     }
     
     guard let ossSoSettingsData = ossSoEntry.ossSo else {
-        throw BlueError(.invalidState)
+        throw BlueError(.sdkOssSoSettingsNotFound)
     }
     
     return try blueDecodeMessage(ossSoSettingsData)

package/ios/Plugin/BlueIDAccessSDK/BlueTerminal.swift

@@ -10,6 +10,14 @@ private var blueActiveDevice: BlueDevice? = nil
 
 public var defaultTimeoutSec: Double = 10
 
+internal func isActiveDevice(_ device: BlueDevice) -> Bool {
+    guard let activeDevice = blueActiveDevice else {
+        return false
+    }
+    
+    return activeDevice.info.deviceID == device.info.deviceID
+}
+
 internal struct BlueSPTokenEntry: Codable {
     var credentialID: String
     var data: Data
@@ -330,7 +338,7 @@ public func blueTerminalRun<HandlerResult>(
     }
     
     guard let device = blueGetDevice(deviceID) else {
-        return completion(.failure(BlueError(.notFound)))
+        return completion(.failure(BlueError(.sdkDeviceNotFound)))
     }
     
     return DispatchQueue.global(qos: .background).async {

package/package.json

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