@blueid/access-capacitor 0.101.0 → 0.104.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,16 +27,15 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>macos-arm64_x86_64</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>macos</string>
+			<string>ios</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -46,15 +43,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>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/Plugin/BlueIDAccessSDK/BlueAccessSync.swift

@@ -39,7 +39,7 @@ internal class BlueAbstractSynchronizeAccessCommand<T>: BlueSdkAsyncCommand wher
         
         guard let response = try? await self.sync(with: tokenAuthentication, forceRefresh: forceRefresh) else {
             if (credential.hasValidTo) {
-                if let validTo = credential.validTo.toDate() {
+                if let validTo = credential.validTo.toUTCDate() {
                     
                     let isExpired = validTo < Date()
                     if (isExpired) {
@@ -128,7 +128,7 @@ internal class BlueSynchronizeMobileAccessCommand: BlueAbstractSynchronizeAccess
         }
         
         if let validity = synchronizationResult.validity {
-            updatedCredential.validity = BlueLocalTimestamp(Date(timeIntervalSince1970: TimeInterval(validity/1000)))
+            updatedCredential.validity = BlueLocalTimestamp.fromUTCDate(Date(timeIntervalSince1970: TimeInterval(validity/1000)))
         }
         
         try blueAccessCredentialsKeyChain.updateEntry(id: updatedCredential.credentialID.id, data: updatedCredential.jsonUTF8Data())

package/ios/Plugin/BlueIDAccessSDK/BlueAccessSyncScheduler.swift

@@ -109,8 +109,6 @@ internal class BlueAccessSyncScheduler: BlueEventListener {
             blueLogError(error.localizedDescription)
         }
         
-        blueRemoveEventListener(listener: self)
-        
         foregroundScheduler.schedule(now)
     }
     
@@ -143,10 +141,10 @@ internal class BlueAccessSyncScheduler: BlueEventListener {
         if let credentials = try? blueCommands.getAccessCredentials.run().credentials {
             if (!credentials.isEmpty) {
                 credentials.forEach { credential in
-                    if (!credential.checkValidityStart()) {
-                        if let validFrom = credential.validFrom.toDate() {
-                            let now = now ?? Date()
-                            
+                    let now = now ?? Date()
+                    
+                    if (!credential.checkValidityStart(now)) {
+                        if let validFrom = credential.validFrom.toUTCDate() {
                             if validFrom > now {
                                 let differenceInSeconds = validFrom.timeIntervalSince(now)
                                 

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

@@ -13,14 +13,14 @@ private func getColor(_ status: BlueTaskStatus) -> Color {
     }
 }
 
-private func getLineColor(_ status: BlueTaskStatus) -> Color {
+private func getTextColor(_ status: BlueTaskStatus) -> Color {
     switch (status) {
-        case .ready, .started:
-            return .gray
-        case .failed:
-            return .red
-        case .succeeded, .skipped:
-            return .green
+        case .ready, .started, .skipped:
+            return .black
+        case .succeeded:
+            return Color(red: 0.0, green: 0.5, blue: 0.0)
+        default:
+            return getColor(status)
     }
 }
 
@@ -32,8 +32,10 @@ private func getSymbol(_ status: BlueTaskStatus) -> String {
             return "circle.circle"
         case .failed:
             return "xmark.circle"
-        case .succeeded, .skipped:
+        case .succeeded:
             return "checkmark.circle"
+        case .skipped:
+            return "minus.circle"
     }
 }
 
@@ -41,7 +43,7 @@ class BlueTaskModel: ObservableObject, Identifiable {
     @Published var label: String
     @Published var status: BlueTaskStatus
     @Published var statusColor: Color
-    @Published var lineColor: Color
+    @Published var textColor: Color
     @Published var symbol: String
     @Published var errorDescription: String
     @Published var isLast: Bool
@@ -51,8 +53,8 @@ class BlueTaskModel: ObservableObject, Identifiable {
     init(_ task: BlueTask, _ isLast: Bool) {
         self.label = task.label
         self.status = task.status.value
+        self.textColor = getTextColor(task.status.value)
         self.statusColor = getColor(task.status.value)
-        self.lineColor = getLineColor(task.status.value)
         self.symbol = getSymbol(task.status.value)
         self.errorDescription = task.errorDescription ?? ""
         self.isLast = isLast
@@ -61,8 +63,8 @@ class BlueTaskModel: ObservableObject, Identifiable {
             guard let self = self else { return }
             
             self.status = status
+            self.textColor = getTextColor(status)
             self.statusColor = getColor(status)
-            self.lineColor = getLineColor(status)
             self.symbol = getSymbol(status)
             self.errorDescription = task.errorDescription ?? ""
             
@@ -90,23 +92,27 @@ struct TaskView: View {
                 
                 Text(task.label)
                     .font(.system(size: 14))
+                    .foregroundColor(task.textColor)
                     .frame(maxWidth: .infinity, alignment: .leading)
             }
             
-            HStack(alignment: .center) {
-                if !task.isLast {
+            HStack(alignment: .center, spacing: 0) {
+                ZStack(alignment: .leading) {
                     Rectangle()
-                        .fill(task.lineColor)
+                        .fill(task.statusColor)
                         .frame(width: 2)
                         .padding(.horizontal, 10.5)
-                }
-                
-                if !task.errorDescription.isEmpty {
-                    Text(task.errorDescription)
-                        .foregroundColor(.red)
-                        .font(.system(size: 11))
-                        .padding(.vertical, 2)
-                        .multilineTextAlignment(.leading)
+                        .hidden(task.isLast)
+                    
+                    if !task.errorDescription.isEmpty {
+                        Text(task.errorDescription)
+                            .foregroundColor(.red)
+                            .font(.system(size: 11))
+                            .padding(.leading, 32)
+                            .padding(.bottom, 5)
+                            .fixedSize(horizontal: false, vertical: true)
+                            .alignmentGuide(.leading) { d in d[.leading] }
+                    }
                 }
             }
         }
@@ -119,9 +125,10 @@ class BlueSynchronizeAccessDeviceModalViewModel: ObservableObject {
     @Published var dismissEnabled: Bool = true
     @Published var tasks: [BlueTask]
     
-    init(title: String = "", dismiss: String = "", tasks: [BlueTask] = []) {
+    init(title: String = "", dismiss: String = "", dismissEnabled: Bool = true, tasks: [BlueTask] = []) {
         self.title = title
         self.dismiss = dismiss
+        self.dismissEnabled = dismissEnabled
         self.tasks = tasks
     }
 }
@@ -129,7 +136,7 @@ class BlueSynchronizeAccessDeviceModalViewModel: ObservableObject {
 struct BlueSynchronizeAccessDeviceModalView: View {
     @ObservedObject private var vm: BlueSynchronizeAccessDeviceModalViewModel
     
-    internal var height: CGFloat = 500
+    internal var height: CGFloat = 550
     internal var backgroundColor: UIColor = .white
     internal var foregroundColor: UIColor = .black
     
@@ -155,24 +162,30 @@ struct BlueSynchronizeAccessDeviceModalView: View {
                             .foregroundColor(Color(backgroundColor))
                             .shadow(color: .gray, radius: 1)
                         
-                        VStack(alignment: .center) {
+                        VStack(alignment: .center, spacing: 0) {
                             Text(vm.title)
                                 .font(.system(size: 20))
                                 .foregroundColor(.gray)
+                                .multilineTextAlignment(.center)
                             
                             Spacer()
                             
-                            ScrollView {
-                                VStack(alignment: .leading, spacing: 0) {
-                                    ForEach(vm.tasks.indices, id: \.self){ index in
-                                        TaskView(task: BlueTaskModel(vm.tasks[index], index == vm.tasks.indices.last))
+                            GeometryReader { geometry in
+                                ScrollView(.vertical) {
+                                    VStack(alignment: .leading, spacing: 0) {
+                                        ForEach(vm.tasks.indices, id: \.self){ index in
+                                            TaskView(task: BlueTaskModel(vm.tasks[index], index == vm.tasks.indices.last))
+                                        }
                                     }
-                                }.padding(.vertical, 10)
+                                    .padding(.vertical, 10)
+                                    .frame(width: geometry.size.width)
+                                    .frame(minHeight: geometry.size.height)
+                                }
                             }
                             
+                            Spacer()
+                            
                             if !vm.dismiss.isEmpty {
-                                Spacer()
-                                
                                 Button {
                                     onDismiss()
                                 } label: {
@@ -180,7 +193,8 @@ struct BlueSynchronizeAccessDeviceModalView: View {
                                         .font(.system(size: 18))
                                         .frame(maxWidth: .infinity)
                                         .padding(EdgeInsets(top: 15, leading: 10, bottom: 15, trailing: 10))
-                                        .background(Color.gray.opacity(0.5))
+                                        .background(Color.gray.opacity(vm.dismissEnabled ? 0.5 : 0.3))
+                                        .foregroundColor(vm.dismissEnabled ? .black : .gray)
                                         .cornerRadius(10)
                                 }
                                 .disabled(!vm.dismissEnabled)
@@ -198,38 +212,40 @@ struct BlueSynchronizeAccessDeviceModalView: View {
     }
 }
 
+let noop: (BlueSerialTaskRunner) async throws -> BlueTaskResult = { _ in .result(nil) }
+
 struct BlueSynchronizeAccessDeviceModalView_Preview: PreviewProvider {
     static var previews: some View {
         BlueSynchronizeAccessDeviceModalView(
             BlueSynchronizeAccessDeviceModalViewModel(
-                title: "Synchronization in Progress",
-                dismiss: "Cancel",
-                tasks: [
+                title: "Synchronization has failed (Worst case)",
+                dismiss: "Done",
+                tasks: Array(1..<12).map { element in
                     BlueTask(
-                        id: "A",
-                        label: "Retrieve device configuration",
+                        id: element.description,
+                        label: "Task label - \(element.description)",
                         status: .failed,
-                        error: BlueError(.sdkCredentialNotFound, cause: BlueError(.invalidCrc), detail: "Something is wrong")
-                    ) { _ in .result(nil) },
-                    
-                    BlueTask(
-                        id: "B",
-                        label: "Update device configuration",
-                        status: .succeeded
-                    ) { _ in .result(nil) },
-                    
-                    BlueTask(
-                        id: "C",
-                        label: "Wait for device to restart",
-                        status: .started
-                    ) { _ in .result(nil) },
-                    
+                        error: BlueError(.sdkDecodeJsonFailed, cause: BlueError(.sdkNetworkError), detail: "Something went wrong ¯\\_(ツ)_/¯"),
+                        handler: noop
+                    )
+                }
+            )
+        ) {}
+        
+        BlueSynchronizeAccessDeviceModalView(
+            BlueSynchronizeAccessDeviceModalViewModel(
+                title: "Cancelling...",
+                dismiss: "Cancel",
+                dismissEnabled: false,
+                tasks: Array(1..<12).enumerated().map { (index, element) in
                     BlueTask(
-                        id: "D",
-                        label: "Push system status",
-                        status: .ready
-                    ) { _ in .result(nil) }
-                ]
+                        id: element.description,
+                        label: "Task label - \(element.description)",
+                        status: index == 1 ? .failed : .succeeded,
+                        error: index == 1 ? BlueError(.sdkDecodeJsonFailed, cause: BlueError(.sdkNetworkError), detail: "Something went wrong ¯\\_(ツ)_/¯"): nil,
+                        handler: noop
+                    )
+                }
             )
         ) {}
     }

package/ios/Plugin/BlueIDAccessSDK/BlueTaskRunner.swift

@@ -35,7 +35,7 @@ public class BlueTask {
     
     let handler: (BlueSerialTaskRunner) async throws -> BlueTaskResult
     
-    init(id: AnyHashable, label: String, failable: Bool = false, status: BlueTaskStatus = .ready, error: Error? = nil, _ handler: @escaping (BlueSerialTaskRunner) async throws -> BlueTaskResult) {
+    init(id: AnyHashable, label: String, failable: Bool = false, status: BlueTaskStatus = .ready, error: Error? = nil, handler: @escaping (BlueSerialTaskRunner) async throws -> BlueTaskResult) {
         self.id = id
         self.label = label
         self.failable = failable

package/ios/Plugin/BlueIDAccessSDK/Extensions.swift

@@ -1,18 +1,26 @@
 import Foundation
 
 extension BlueLocalTimestamp: Encodable, Decodable {
-    public init(_ date: Date) {
-        self.init()
+    
+    /// Converts a given UTC Date into a BlueLocalTimestamp.
+    ///
+    /// - returns: The BlueLocalTimestamp
+    static public func fromUTCDate(_ date: Date) -> BlueLocalTimestamp {
+        var calendar = Calendar(identifier: .gregorian)
+        calendar.timeZone = TimeZone(identifier: "UTC")!
         
-        let calendar = Calendar.current
         let components = calendar.dateComponents([.year, .month, .day, .hour, .minute, .second], from: date)
         
-        self.year = UInt32(components.year!)
-        self.month = UInt32(components.month!)
-        self.date = UInt32(components.day!)
-        self.hours = UInt32(components.hour!)
-        self.minutes = UInt32(components.minute!)
-        self.seconds = UInt32(components.second!)
+        var instance = BlueLocalTimestamp()
+        
+        instance.year = UInt32(components.year!)
+        instance.month = UInt32(components.month!)
+        instance.date = UInt32(components.day!)
+        instance.hours = UInt32(components.hour!)
+        instance.minutes = UInt32(components.minute!)
+        instance.seconds = UInt32(components.second!)
+        
+        return instance
     }
     
     public init(_ year: Int, _ month: Int, _ date: Int = 1, _ hours: Int = 0, _ minutes: Int = 0, _ seconds: Int = 0) {
@@ -37,7 +45,15 @@ extension BlueLocalTimestamp: Encodable, Decodable {
         seconds = try container.decode(UInt32.self, forKey: .seconds)
     }
     
-    public func toDate() -> Date? {
+    /// Converts the underlying BlueLocalTimestamp into a date in the UTC timezone. If either the timezone cannot be found or the date is invalid, nil is returned.
+    ///
+    /// - returns: The UTC Date if valid.
+    public func toUTCDate() -> Date? {
+        guard let tz = TimeZone(abbreviation: "UTC") else {
+            blueLogWarn("UTC TZ not found")
+            return nil
+        }
+        
         var dateComponents = DateComponents()
         dateComponents.year = Int(year)
         dateComponents.month = Int(month)
@@ -46,7 +62,10 @@ extension BlueLocalTimestamp: Encodable, Decodable {
         dateComponents.minute = Int(minutes)
         dateComponents.second = Int(seconds)
         
-        let date = Calendar.current.date(from: dateComponents)
+        var calendar = Calendar(identifier: .gregorian)
+        calendar.timeZone = tz
+        
+        let date = calendar.date(from: dateComponents)
         if (date?.timeIntervalSince1970 ?? 0 <= 0) {
             return nil
         }
@@ -140,10 +159,12 @@ extension BlueAccessCredential: Decodable {
         }
     }
     
-    public func checkValidityStart() -> Bool {
+    public func checkValidityStart(_ now: Date? = nil) -> Bool {
         if self.hasValidFrom {
-            if let validFrom = self.validFrom.toDate() {
-                if validFrom > Date() {
+            if let validFrom = self.validFrom.toUTCDate() {
+                let now = now ?? Date()
+                
+                if validFrom > now {
                     return false
                 }
             }

package/package.json

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