@blueid/access-capacitor 0.76.0 → 0.78.0

package/ios/CBlueIDAccess.xcframework/Info.plist

@@ -10,7 +10,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>
@@ -19,9 +19,7 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>macos</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -29,7 +27,7 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libCBlueIDAccess.a</string>
 			<key>SupportedArchitectures</key>
@@ -38,7 +36,9 @@
 				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>macos</string>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>

package/ios/Plugin/BlueIDAccessSDK/BlueAccess.swift

@@ -249,15 +249,18 @@ public class BlueUpdateDeviceConfigurationCommand: BlueAPIAsyncCommand {
     private func pushEventLogs(status: BlueSystemStatus, credential: BlueAccessCredential, deviceID: String, with tokenAuthentication: BlueTokenAuthentication) async throws {
         do {
             guard status.settings.eventLogEntriesCount > 0 else {
-                blueLogWarn("No event logs to be deployed")
+                blueLogInfo("No event logs to be deployed")
                 return
             }
             
-            let limit = 40
-            
-            let pushEvents = { (_ offset: Int) in
+            try await iterateEvents(
+                sequenceID: status.settings.eventLogSequenceID,
+                entriesCount: status.settings.eventLogEntriesCount,
+                limit: 100
+            ) { offset in
+                
                 var query = BlueEventLogQuery()
-                query.maxCount = UInt32(limit)
+                query.maxCount = UInt32(40)
                 
                 // newest -> oldest
                 query.sequenceID = UInt32(offset)
@@ -279,20 +282,9 @@ public class BlueUpdateDeviceConfigurationCommand: BlueAPIAsyncCommand {
                     }
                 }
                 
-                return logResult
+                return logResult.events.count
             }
             
-            var sent = 0
-            var offset = max(1, Int(status.settings.eventLogSequenceID) - 100)
-            
-            repeat {
-                let logResult = try await pushEvents(offset)
-                
-                offset += logResult.events.count
-                sent += logResult.events.count
-                
-            } while (sent < 100 && offset < status.settings.eventLogEntriesCount)
-            
         } catch {
             throw BlueError(.sdkEventLogsPushFailed, cause: error)
         }
@@ -301,11 +293,19 @@ public class BlueUpdateDeviceConfigurationCommand: BlueAPIAsyncCommand {
     @available(macOS 10.15, *)
     private func pushSystemLogs(status: BlueSystemStatus, deviceID: String, with tokenAuthentication: BlueTokenAuthentication) async throws {
         do {
-            let limit = 10
+            guard status.settings.systemLogEntriesCount > 0 else {
+                blueLogInfo("No system log entries to be deployed")
+                return
+            }
             
-            let pushEvents = { (_ offset: Int) in
+            try await iterateEvents(
+                sequenceID: status.settings.systemLogSequenceID,
+                entriesCount: status.settings.systemLogEntriesCount,
+                limit: 50
+            ) { offset in
+                
                 var query = BlueSystemLogQuery()
-                query.maxCount = UInt32(limit)
+                query.maxCount = UInt32(10)
                 
                 // newest -> oldest
                 query.sequenceID = UInt32(max(1, Int(status.settings.systemLogSequenceID) - offset + 1))
@@ -327,27 +327,26 @@ public class BlueUpdateDeviceConfigurationCommand: BlueAPIAsyncCommand {
                     }
                 }
                 
-                return logResult
+                return logResult.entries.count
             }
-            
-            var sent = 0
-            var offset = 0
-            
-            repeat {
-                offset += limit
-                
-                let logResult = try await pushEvents(offset)
-                if (logResult.entries.count < limit) {
-                    break
-                }
-                
-                sent += logResult.entries.count
-                
-            } while (sent < 50 && sent < status.settings.systemLogEntriesCount)
+
         } catch {
             throw BlueError(.sdkSystemLogEntriesPushFailed, cause: error)
         }
     }
+    
+    private func iterateEvents(sequenceID: UInt32, entriesCount: UInt32, limit: Int, _ sendBatch: (_ offset: Int) async throws -> Int) async throws {
+        var sent = 0
+        var offset = max(1, Int(sequenceID) - limit)
+        
+        repeat {
+            let entriesSent = try await sendBatch(offset)
+            
+            offset += entriesSent
+            sent += entriesSent
+            
+        } while (sent < limit && offset < entriesCount)
+    }
 }
 
 public class BlueGetAccessObjectsCommand: BlueAPIAsyncCommand {
@@ -537,12 +536,7 @@ public struct BlueTryAccessDeviceCommand: BlueAsyncCommand {
         }
         
 #if os(iOS) || os(watchOS)
-        return try await blueShowAccessDeviceModal(
-            title: blueI18n.openViaOssTitle,
-            message: blueI18n.openViaOssWaitMessage,
-            successfulMessage: blueI18n.openViaOssSuccessfulMessage,
-            unsuccessfulMessage: blueI18n.openViaOssUnsuccessfulMessage
-        ) {
+        return try await blueShowAccessDeviceModal {
             return try await tryOssAccess()
         }
 #else

package/ios/Plugin/BlueIDAccessSDK/BlueModal/BlueModal.swift

@@ -2,41 +2,55 @@
 import Foundation
 
 /// Displays a modal view (sheet) which performs a scoped task related to accessing an device via OSS.
-/// - parameter title: The  modal title.
-/// - parameter message: The modal message.
-/// - parameter successfulMessage: A successful message to be shown in case the OSS task grants access successfully.
-/// - parameter unsuccessfulMessage: An unsuccessful message to be shown in case the OSS task does not grant access successfully.
 /// - parameter task: The OSS task to be performed.
-public func blueShowAccessDeviceModal(
-    title: String,
-    message: String? = nil,
-    successfulMessage: String? = nil,
-    unsuccessfulMessage: String? = nil,
-    _ task: @escaping () async throws -> BlueOssAccessResult)
-async throws -> BlueOssAccessResult {
+public func blueShowAccessDeviceModal(_ task: @escaping () async throws -> BlueOssAccessResult) async throws -> BlueOssAccessResult {
     let session = BlueModalSession()
 
     blueRunInMainThread {
-        session.begin(title: title, message: message)
+        session.begin(title: blueI18n.openViaOssTitle, message: blueI18n.openViaOssWaitMessage)
     }
     
     do {
         let result = try await task()
         
-        if (!result.accessGranted) {
-            blueRunInMainThread {
-                session.invalidate(errorMessage: unsuccessfulMessage ?? "")
-            }
-        } else {
-            blueRunInMainThread {
-                session.invalidate(successMessage: successfulMessage ?? "")
+        blueRunInMainThread {
+            if (!result.accessGranted) {
+                if (result.hasScheduleMissmatch && result.scheduleMissmatch) {
+                    session.invalidate(
+                        title: blueI18n.openViaOssAccessDeniedTitle,
+                        errorMessage: blueI18n.openViaOssAccessDeniedScheduleMismatchMessage
+                    )
+                }
+                else {
+                    session.invalidate(
+                        title: blueI18n.openViaOssAccessDeniedTitle,
+                        errorMessage: blueI18n.openViaOssAccessDeniedMessage
+                    )
+                }
+            } else {
+                session.invalidate(
+                    title: blueI18n.openViaOssAccessGrantedTitle,
+                    successMessage: blueI18n.openViaOssAccessGrantedMessage
+                )
             }
         }
         
         return result
     } catch {
+        var errorMessage = error.localizedDescription
+        
+        if let blueError = error as? BlueError {
+            errorMessage = "Error: \(String(describing: blueError.returnCode)). Code: \(blueError.returnCode.rawValue)"
+        }
+        else if let terminalError = error as? BlueTerminalError {
+            errorMessage = "Error: \(String(describing: terminalError.terminalError.returnCode)). Code: \(terminalError.terminalError.returnCode.rawValue)"
+        }
+        
         blueRunInMainThread {
-            session.invalidate(errorMessage: error.localizedDescription)
+            session.invalidate(
+                title: blueI18n.openViaOssErrorTitle,
+                errorMessage: errorMessage
+            )
         }
         
         throw error

package/ios/Plugin/BlueIDAccessSDK/BlueModal/BlueModalSession.swift

@@ -36,9 +36,14 @@ internal class BlueModalSession {
     }
     
     /// Closes the modal session.  The session cannot be re-used.
+    /// - parameter title: Optional title.
     /// - parameter errorMessage: The specified error message and an error symbol will be displayed momentarily on the modal before it is automatically dismissed.
     /// - parameter successMessage: The specified success message and an success symbol will be displayed momentarily on the modal before it is automatically dismissed.
-    func invalidate(errorMessage: String? = nil, successMessage: String? = nil) {
+    func invalidate(
+        title: String? = nil,
+        errorMessage: String? = nil,
+        successMessage: String? = nil
+    ) {
         if (isInvalidated)  {
             return
         }
@@ -50,16 +55,16 @@ internal class BlueModalSession {
         viewModel.showDismissButton = false
         
         if let errorMessage = errorMessage {
-            viewModel.title = ""
+            viewModel.title = title ?? ""
             viewModel.message = errorMessage
             viewModel.status = .Failed
-            delay = 2
+            delay = 3
             
             BlueSound.shared.play(BlueNegativeSoundSystemID)
         }
         
         if let successMessage = successMessage {
-            viewModel.title = ""
+            viewModel.title = title ?? ""
             viewModel.message = successMessage
             viewModel.status = .Success
             delay = 2

package/ios/Plugin/BlueIDAccessSDK/BlueModal/BlueModalView.swift

@@ -119,6 +119,7 @@ internal struct BlueModalView: View {
                                 }
                                 
                                 Text(vm.message)
+                                    .multilineTextAlignment(.center)
                                     .font(.system(size: 12))
                                     .padding(.top, 20)
                                     .hidden(vm.message.isEmpty)
@@ -167,21 +168,23 @@ struct ContentView_Preview: PreviewProvider {
     static var previews: some View {
         BlueModalView(
             BlueModalViewModel(
-                title: "Unlocking the device...",
-                message: "Please wait..."
+                title: "Unlocking in Progress",
+                message: "Establishing secure connection..."
             )
         ) {}
         
         BlueModalView(
             BlueModalViewModel(
-                message: "Success",
+                title: "Access Granted",
+                message: "Please proceed.",
                 status: .Success
             )
         ) {}
         
         BlueModalView(
             BlueModalViewModel(
-                message: "Failed",
+                title: "Access Denied",
+                message: "Credentials are not valid at this time and/or day of the week.",
                 status: .Failed
             )
         ) {}

package/ios/Plugin/BlueIDAccessSDK/BlueNfc.swift

@@ -46,7 +46,7 @@ private final class BlueNfcSessionListener: NSObject, NFCTagReaderSessionDelegat
     }
 }
 
-internal func blueNfcExecute(_ handler: @escaping (_: BlueTransponderType) throws -> String, timeoutSeconds: Double = 0, ignoreErrors: [BlueReturnCode]? = nil) throws {
+internal func blueNfcExecute(_ handler: @escaping (_: BlueTransponderType) throws -> String, timeoutSeconds: Double = 0, errorHandler: ((_: Error) -> String?)? = nil) throws {
     try blueExecuteWithTimeout({
         let isActive = blueNfcSession != nil
         
@@ -97,15 +97,17 @@ internal func blueNfcExecute(_ handler: @escaping (_: BlueTransponderType) throw
         } catch let error {
             var errorMessage: String? = BlueError.unknownErrorMessage
             
-            if (error.localizedDescription != "") {
+            if let blueError = error as? BlueError {
+                errorMessage = "Error: \(String(describing: blueError.returnCode)). Code: \(blueError.returnCode.rawValue)"
+            }
+            else if (error.localizedDescription != "") {
                 errorMessage = error.localizedDescription
             }
             
-            if let ignoreErrors = ignoreErrors {
-                if let blueError = error as? BlueError {
-                    if (ignoreErrors.contains(blueError.returnCode)) {
-                        errorMessage = nil
-                    }
+            if let errorHandler = errorHandler {
+                if let message = errorHandler(error) {
+                    errorMessage = nil
+                    blueNfcSession?.alertMessage = message
                 }
             }
             
@@ -184,7 +186,7 @@ internal func blueNfc_Transceive(_ pCommandApdu: UnsafePointer<UInt8>, _ command
 
 #else
 
-internal func blueNfcExecute(_ handler: @escaping (_: BlueTransponderType) throws -> String, timeoutSeconds: Double = 0, ignoreErrors: [BlueReturnCode]? = nil) throws {
+internal func blueNfcExecute(_ handler: @escaping (_: BlueTransponderType) throws -> String, timeoutSeconds: Double = 0, errorHandler: ((_: Error) -> String?)? = nil) throws {
     throw BlueError(.notSupported)
 }
 

package/ios/Plugin/BlueIDAccessSDK/BlueOssSo.swift

@@ -80,11 +80,12 @@ public struct BlueOssSoCreateMobileCommand: BlueCommand {
     }
 }
 
+
 fileprivate func executeOssSoNfc<ResultType>(
     settings: BlueOssSoSettings?,
     successMessage: String,
-    ignoreErrors: [BlueReturnCode]? = nil,
-    handler: @escaping (_: UnsafeMutablePointer<BlueOssSoStorage_t>) throws -> ResultType) throws -> ResultType {
+    handler: @escaping (_: UnsafeMutablePointer<BlueOssSoStorage_t>) throws -> ResultType,
+    errorHandler: ((_: Error) -> String?)? = nil) throws -> ResultType {
     
     var result: ResultType? = nil
     
@@ -105,8 +106,8 @@ fileprivate func executeOssSoNfc<ResultType>(
             result = try handler(pStorage)
             
             return successMessage
-        },
-        ignoreErrors: ignoreErrors
+        }, 
+        errorHandler: errorHandler
     )
     
     guard let result = result else {
@@ -260,12 +261,12 @@ public struct BlueOssSoReadConfigurationCommand: BlueCommand {
         ))
     }
     
-    public func run(_ settings: BlueOssSoSettings?, ignoreErrors: [BlueReturnCode]? = nil) throws -> BlueOssSoConfiguration {
-        return try executeOssSoNfc(settings: settings, successMessage: blueI18n.nfcOssSuccessReadConfigurationMessage, ignoreErrors: ignoreErrors, handler: { pStorage in
+    public func run(_ settings: BlueOssSoSettings?, errorHandler: ((_: Error) -> String?)? = nil) throws -> BlueOssSoConfiguration {
+        return try executeOssSoNfc(settings: settings, successMessage: blueI18n.nfcOssSuccessReadConfigurationMessage, handler: { pStorage in
             return try blueClibFunctionOut({ (dataPtr, dataSize) in
                 return blueOssSo_ReadConfiguration_Ext(pStorage, dataPtr, dataSize, BlueOssSoReadWriteFlags_t(rawValue: BlueOssSoReadWriteFlags_All.rawValue))
             })
-        })
+        }, errorHandler: errorHandler)
     }
 }
 
@@ -323,9 +324,15 @@ public struct BlueReadOssSoCredentialCommand: BlueCommand {
         
         let ossSoSettings = try blueGetOssSoSettings(credentialID: credential.credentialID.id)
         
-        return try BlueOssSoReadConfigurationCommand().run(ossSoSettings, ignoreErrors: [
-            .notFound
-        ])
+        return try BlueOssSoReadConfigurationCommand().run(ossSoSettings) { error in
+            if let blueError = error as? BlueError {
+                if (blueError.returnCode == .notFound) {
+                    return blueI18n.nfcInitializingWritingProcess
+                }
+            }
+            
+            return nil
+        }
     }
 }