@blueid/access-capacitor 0.88.0 → 0.90.0

package/ios/Plugin/BlueIDAccessSDK/BlueError.swift

@@ -1,7 +1,7 @@
 import Foundation
 
 public final class BlueError: Error, LocalizedError, Equatable {
-    public static var timeoutMessage = "A timeout has occurred"
+    public static var timeoutMessage = "A timeout has occurred with return code %returnCode%"
     public static var returnCodeMessage = "Error with return code %returnCode%"
     public static var unknownErrorMessage = "Unknnown error has ocurred"
     
@@ -11,10 +11,11 @@ public final class BlueError: Error, LocalizedError, Equatable {
     private let detail: String?
     
     public var errorDescription: String? {
-        if (returnCode == .timeout) {
-            return BlueError.timeoutMessage
+        var returnCodeStr = "\(returnCode.rawValue) (\(String(describing: returnCode)))"
+        
+        if (returnCode == .timeout || returnCode == .sdkTimeout) {
+            return BlueError.timeoutMessage.replacingOccurrences(of: "%returnCode%", with: returnCodeStr)
         } else {
-            var returnCodeStr = "\(returnCode.rawValue) (\(String(describing: returnCode)))"
             if let cause = cause {
                 returnCodeStr += "\nCause: \(cause.localizedDescription)"
             }

package/ios/Plugin/BlueIDAccessSDK/BlueKeychain.swift

@@ -33,6 +33,22 @@ internal class BlueKeychain {
         return nil
     }
     
+    /// Updates an entry with the specified ID using the provided data without purging it beforehand.
+    /// If the entry does not exist, a new one is created.
+    ///
+    /// - parameter id: The ID of the entry to be updated.
+    /// - parameter data: The data to update the entry with.
+    /// - throws: Throws an error of type `BlueError(.invalidState)` in case the operation does not succeed.
+    func updateEntry(id: String, data: Data) throws {
+        return try BlueKeychain.storeEntry(attrService: attrService, attrAccessible: attrAccessible, id: id, data: data, purge: false)
+    }
+    
+    /// Stores an entry with the specified ID using the provided data.
+    /// If the entry already exists, it is first purged.
+    ///
+    /// - parameter id: The ID of the entry to be updated.
+    /// - parameter data: The data to update the entry with.
+    /// - throws: Throws an error of type `BlueError(.invalidState)` in case the operation does not succeed.
     func storeEntry(id: String, data: Data) throws {
         return try BlueKeychain.storeEntry(attrService: attrService, attrAccessible: attrAccessible, id: id, data: data)
     }
@@ -138,7 +154,7 @@ internal class BlueKeychain {
         return try entryIds.compactMap{ try getEntry(attrService: attrService, attrAccessible: attrAccessible, id: $0) }
     }
     
-    static func storeEntry(attrService: String, attrAccessible: String, id: String, data: Data) throws {
+    static func storeEntry(attrService: String, attrAccessible: String, id: String, data: Data, purge: Bool? = true) throws {
         let query: [String: Any] = [
             kSecClass as String: kSecClassGenericPassword,
             kSecAttrService as String: attrService,
@@ -147,7 +163,9 @@ internal class BlueKeychain {
             kSecValueData as String: data,
         ]
         
-        SecItemDelete(query as CFDictionary)
+        if (purge != false) {
+            SecItemDelete(query as CFDictionary)
+        }
         
         let status = SecItemUpdate(query as CFDictionary, [kSecValueData as String: data] as CFDictionary)
         

package/ios/Plugin/BlueIDAccessSDK/BlueNfc.swift

@@ -170,7 +170,7 @@ internal func blueNfc_Transceive(_ pCommandApdu: UnsafePointer<UInt8>, _ command
     let waitResponse = waitSemaphore.wait(timeout: DispatchTime.now() + 13.0)
     
     if waitResponse != .success {
-        return blueAsClibReturnCode(.timeout)
+        return blueAsClibReturnCode(.sdkTimeout)
     }
     
     do {

package/ios/Plugin/BlueIDAccessSDK/BlueOssSid.swift

@@ -36,7 +36,7 @@ public struct BlueOssSidCreateMobileCommand: BlueCommand {
             
             ossSidMobileOutputSizeMutable.pointee = ossSidMobileOutputSize
             
-            _ = try blueClibErrorCheck(blueOssSid_GetStorage_Ext(BlueTransponderType_t(UInt32(BlueTransponderType.mobileTransponder.rawValue)), pStorage, nil, 0, ossSidMobileOutputPtr, ossSidMobileOutputSizeMutable))
+            _ = try blueClibErrorCheck(blueOssSid_GetStorage_Ext(BlueTransponderType_t(UInt8(BlueTransponderType.mobileTransponder.rawValue)), pStorage, nil, 0, ossSidMobileOutputPtr, ossSidMobileOutputSizeMutable))
             
             // Clear configuration as we always want to use the default one for mobile
             var usedProvisioningData = provisioningData
@@ -64,7 +64,7 @@ fileprivate func executeOssSidNfc<ResultType>(settings: BlueOssSidSettings?, suc
         }
         
         try blueClibFunctionIn(message: settingsInUse, { (dataPtr, dataSize) in
-            return blueOssSid_GetStorage_Ext(BlueTransponderType_t(UInt32(transponderType.rawValue)), pStorage, dataPtr, dataSize, nil, nil)
+            return blueOssSid_GetStorage_Ext(BlueTransponderType_t(UInt8(transponderType.rawValue)), pStorage, dataPtr, dataSize, nil, nil)
         })
         
         result = try handler(pStorage)
@@ -109,7 +109,7 @@ public struct BlueOssSidGetStorageProfileCommand: BlueCommand {
             pStorage.deallocate()
         }
         
-        _ = try blueClibErrorCheck(blueOssSid_GetStorage(BlueTransponderType_t(UInt32(transponderType.rawValue)), pStorage, nil, nil, nil))
+        _ = try blueClibErrorCheck(blueOssSid_GetStorage(BlueTransponderType_t(UInt8(transponderType.rawValue)), pStorage, nil, nil, nil))
         
         if let provisioningConfig = provisioningConfig {
             return try blueClibFunctionInOut(message: provisioningConfig, { (configDataPtr, configDataSize, dataPtr, dataSize) in

package/ios/Plugin/BlueIDAccessSDK/BlueOssSo.swift

@@ -61,7 +61,7 @@ public struct BlueOssSoCreateMobileCommand: BlueCommand {
             
             ossSoMobileOutputSizeMutable.pointee = ossSoMobileOutputSize
             
-            _ = try blueClibErrorCheck(blueOssSo_GetStorage_Ext(BlueTransponderType_t(UInt32(BlueTransponderType.mobileTransponder.rawValue)), pStorage, nil, 0, ossSoMobileOutputPtr, ossSoMobileOutputSizeMutable))
+            _ = try blueClibErrorCheck(blueOssSo_GetStorage_Ext(BlueTransponderType_t(UInt8(BlueTransponderType.mobileTransponder.rawValue)), pStorage, nil, 0, ossSoMobileOutputPtr, ossSoMobileOutputSizeMutable))
             
             // Clear configuration as we always want to use the default one for mobile
             var usedProvisioningData = provisioningData
@@ -100,7 +100,7 @@ fileprivate func executeOssSoNfc<ResultType>(
             }
             
             try blueClibFunctionIn(message: settingsInUse, { (dataPtr, dataSize) in
-                return blueOssSo_GetStorage_Ext(BlueTransponderType_t(UInt32(transponderType.rawValue)), pStorage, dataPtr, dataSize, nil, nil)
+                return blueOssSo_GetStorage_Ext(BlueTransponderType_t(UInt8(transponderType.rawValue)), pStorage, dataPtr, dataSize, nil, nil)
             })
             
             result = try handler(pStorage)
@@ -147,7 +147,7 @@ public struct BlueOssSoGetStorageProfileCommand: BlueCommand {
             pStorage.deallocate()
         }
         
-        _ = try blueClibErrorCheck(blueOssSo_GetStorage(BlueTransponderType_t(UInt32(transponderType.rawValue)), pStorage, nil, nil, nil))
+        _ = try blueClibErrorCheck(blueOssSo_GetStorage(BlueTransponderType_t(UInt8(transponderType.rawValue)), pStorage, nil, nil, nil))
         
         if let provisioningConfig = provisioningConfig {
             return try blueClibFunctionInOut(message: provisioningConfig, { (configDataPtr, configDataSize, dataPtr, dataSize) in
@@ -535,7 +535,7 @@ public class BlueRefreshOssSoCredentialsCommand: BlueAPIAsyncCommand {
                     let ossSoSettings = try blueGetOssSoSettings(credentialID: credential.credentialID.id)
                     
                     try blueClibFunctionIn(message: ossSoSettings, { (dataPtr, dataSize) in
-                        return blueOssSo_GetStorage_Ext(BlueTransponderType_t(UInt32(transponderType.rawValue)), pStorage, dataPtr, dataSize, nil, nil)
+                        return blueOssSo_GetStorage_Ext(BlueTransponderType_t(UInt8(transponderType.rawValue)), pStorage, dataPtr, dataSize, nil, nil)
                     })
                     
                     let isProvisioned = blueOssSo_IsProvisioned(pStorage) == BlueReturnCode_Ok

package/ios/Plugin/BlueIDAccessSDK/BlueUtils.swift

@@ -36,7 +36,7 @@ internal func blueExecuteWithTimeout(_ handler: @escaping () throws -> Void, tim
         workItem.wait()
     } else {
         if workItem.wait(timeout: DispatchTime.now() + timeoutSeconds) == .timedOut {
-            throw BlueError(.timeout)
+            throw BlueError(.sdkTimeout)
         }
     }
     

package/package.json

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