@blueid/access-capacitor 0.101.0 → 0.102.0

package/ios/CBlueIDAccess.xcframework/Info.plist

@@ -10,18 +10,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>
 		<dict>
 			<key>BinaryPath</key>
@@ -29,7 +26,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 +35,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>
@@ -46,15 +45,16 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>macos-arm64_x86_64</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>
+			<string>macos</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/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.102.0",
   "description": "Capacitor JS plugin for the BlueID Access SDK",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",