@blueid/access-capacitor 0.83.0 → 0.84.0

package/ios/CBlueIDAccess.xcframework/Info.plist

@@ -27,15 +27,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>
@@ -43,18 +46,15 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</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>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/Plugin/BlueIDAccessSDK/BlueAccessSync.swift

@@ -199,16 +199,16 @@ public class BlueSynchronizeAccessCredentialsCommand: BlueAPIAsyncCommand {
             throw BlueError(.sdkUnsupportedPlatform)
         }
         
-        var credentials = try await BlueGetAccessCredentialsCommand().runAsync().credentials
+        let credentials = try await BlueGetAccessCredentialsCommand().runAsync().credentials
         
         if (credentials.isEmpty) {
             return BlueSynchronizeAccessCredentials()
         }
         
-        return await withTaskGroup(of: BlueSynchronizeAccessCredential.self, returning: BlueSynchronizeAccessCredentials.self) { group in
+        let result = await withTaskGroup(of: BlueSynchronizeAccessCredential.self, returning: BlueSynchronizeAccessCredentials.self) { group in
             
             for credential in credentials {
-                group.addTask { await self.handleCredential(credential) }
+                group.addTask { await self.synchronizeCredential(credential) }
             }
             
             var credentials: [BlueSynchronizeAccessCredential] = []
@@ -219,9 +219,14 @@ public class BlueSynchronizeAccessCredentialsCommand: BlueAPIAsyncCommand {
             
             return BlueSynchronizeAccessCredentials(credentials: credentials)
         }
+
+        await purgeTokens()
+        
+        return result
     }
     
-    private func handleCredential(_ credential: BlueAccessCredential) async -> BlueSynchronizeAccessCredential {
+    /// Synchronize a given credential.
+    private func synchronizeCredential(_ credential: BlueAccessCredential) async -> BlueSynchronizeAccessCredential {
         var resultItem = BlueSynchronizeAccessCredential()
         resultItem.credentialID.id = credential.credentialID.id
         
@@ -242,4 +247,40 @@ public class BlueSynchronizeAccessCredentialsCommand: BlueAPIAsyncCommand {
         
         return resultItem
     }
+    
+    /// Purges orphaned tokens.
+    private func purgeTokens() async {
+        do {
+            let credentialIds = try await BlueGetAccessCredentialsCommand().runAsync().credentials.compactMap { $0.credentialID.id }
+            
+            try blueGetSpTokenEntryIds().forEach{ entryID in
+                do {
+                    let storedEntry = try blueGetSpTokenEntry(entryID)
+                    
+                    if var spTokenEntries = storedEntry as? [BlueSPTokenEntry] {
+                        
+                        let initialSize = spTokenEntries.count
+                        
+                        spTokenEntries.removeAll{ !credentialIds.contains($0.credentialID) }
+                        
+                        if (initialSize != spTokenEntries.count) {
+                            if (spTokenEntries.isEmpty) {
+                                _ = try blueTerminalRequestDataKeychain.deleteEntry(id: entryID)
+                            } else {
+                                try blueTerminalRequestDataKeychain.storeEntry(
+                                    id: entryID,
+                                    data: JSONEncoder().encode(spTokenEntries)
+                                )
+                            }
+                        }
+                    }
+                    
+                } catch {
+                    blueLogError(error.localizedDescription)
+                }
+            }
+        } catch {
+            blueLogError(error.localizedDescription)
+        }
+    }
 }

package/ios/Plugin/BlueIDAccessSDK/BlueDemoData.swift

@@ -40,13 +40,13 @@ internal func blueCreateSignedCommandDemoToken(_ command: String) throws -> Blue
   return try blueCreateSignedDemoToken(token)
 }
 
-internal func blueCreateSignedOssSoDemoToken() throws -> BlueSPToken {
+internal func blueCreateSignedOssSoDemoToken(_ credentialID: String? = nil) throws -> BlueSPToken {
   var token = BlueSPToken()
   token.signature = Data()
 
   let demoConfiguration = blueCreateOssSoDemoConfiguration()
 
-  let provisioningData = try blueCommands.ossSoCreateStandardProvisioningData.run("SO12345678", 1)
+  let provisioningData = try blueCommands.ossSoCreateStandardProvisioningData.run(credentialID ?? "SO12345678", 1)
 
   token.ossSo = try blueCommands.ossSoCreateMobile.run(provisioningData, demoConfiguration)
 

package/ios/Plugin/BlueIDAccessSDK/BlueTerminal.swift

@@ -101,16 +101,19 @@ internal func blueDeleteSpTokens(credential: BlueAccessCredential) throws {
     }
 }
 
-/// Returns all entry IDs for a given device.
+/// Returns all entry IDs for a given device, if any.
 ///
 /// - parameter deviceID: The Device ID.
 /// - throws: An error is thrown if any error occurs during the retrieval of the entry IDs from the KeyChain.
-internal func blueGetSpTokenEntryIds(deviceID: String) throws -> [String] {
+internal func blueGetSpTokenEntryIds(deviceID: String? = nil) throws -> [String] {
     return try blueTerminalRequestDataKeychain.getEntryIds().compactMap{ entryId in
-        if (entryId.hasPrefix(deviceID)) {
-            return entryId
+        if let deviceID = deviceID {
+            if !entryId.hasPrefix(deviceID) {
+                return nil
+            }
         }
-        return nil
+
+        return entryId
     }
 }
 
@@ -399,6 +402,8 @@ public func blueTerminalRun<HandlerResult>(
                 completion(.success(handlerResult))
             }
         } catch let error {
+            blueActiveDevice = nil
+            
             if !wasConnected && device.isConnected {
                 do {
                     try device.disconnect()

package/package.json

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