@blueid/access-capacitor 0.93.0 → 0.95.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/CBlueIDAccess.xcframework/ios-arm64/Headers/core/BlueCore.pb.h

@@ -105,6 +105,11 @@ typedef enum BlueReturnCode {
     BlueReturnCode_SdkDecodeJsonFailed = -414,
     BlueReturnCode_SdkFetchDataFailed = -415,
     BlueReturnCode_SdkTimeout = -416,
+    BlueReturnCode_SdkGetAuthenticationTokenFailed = -417,
+    BlueReturnCode_SdkUpdateDeviceFailed = -418,
+    BlueReturnCode_SdkGetBlacklistEntriesFailed = -419,
+    BlueReturnCode_SdkGetSystemStatusFailed = -420,
+    BlueReturnCode_SdkWaitDeviceToRestartFailed = -421,
     BlueReturnCode_OssMAReturnCodeStart = -1000,
     BlueReturnCode_OssMAReturnCodeEnd = -1100
 } BlueReturnCode_t;

package/ios/CBlueIDAccess.xcframework/ios-arm64_x86_64-simulator/Headers/core/BlueCore.pb.h

@@ -105,6 +105,11 @@ typedef enum BlueReturnCode {
     BlueReturnCode_SdkDecodeJsonFailed = -414,
     BlueReturnCode_SdkFetchDataFailed = -415,
     BlueReturnCode_SdkTimeout = -416,
+    BlueReturnCode_SdkGetAuthenticationTokenFailed = -417,
+    BlueReturnCode_SdkUpdateDeviceFailed = -418,
+    BlueReturnCode_SdkGetBlacklistEntriesFailed = -419,
+    BlueReturnCode_SdkGetSystemStatusFailed = -420,
+    BlueReturnCode_SdkWaitDeviceToRestartFailed = -421,
     BlueReturnCode_OssMAReturnCodeStart = -1000,
     BlueReturnCode_OssMAReturnCodeEnd = -1100
 } BlueReturnCode_t;

package/ios/CBlueIDAccess.xcframework/macos-arm64_x86_64/Headers/core/BlueCore.pb.h

@@ -105,6 +105,11 @@ typedef enum BlueReturnCode {
     BlueReturnCode_SdkDecodeJsonFailed = -414,
     BlueReturnCode_SdkFetchDataFailed = -415,
     BlueReturnCode_SdkTimeout = -416,
+    BlueReturnCode_SdkGetAuthenticationTokenFailed = -417,
+    BlueReturnCode_SdkUpdateDeviceFailed = -418,
+    BlueReturnCode_SdkGetBlacklistEntriesFailed = -419,
+    BlueReturnCode_SdkGetSystemStatusFailed = -420,
+    BlueReturnCode_SdkWaitDeviceToRestartFailed = -421,
     BlueReturnCode_OssMAReturnCodeStart = -1000,
     BlueReturnCode_OssMAReturnCodeEnd = -1100
 } BlueReturnCode_t;

package/ios/Plugin/BlueIDAccessSDK/BlueAccess.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Combine
 import SwiftProtobuf
 
 internal let blueAccessCredentialsKeyChain = BlueKeychain(attrService: "blueid.accessCredentials")
@@ -6,6 +7,8 @@ internal let blueAccessAuthenticationTokensKeyChain = BlueKeychain(attrService:
 internal let blueAccessDevicesStorage = BlueStorage(collection: "blueid.accessDevices")
 internal let blueAccessOssSettingsKeyChain = BlueKeychain(attrService: "blueid.accessOssSettings")
 
+// TODO: Split into separate files
+
 public class BlueAddAccessCredentialCommand: BlueSdkAsyncCommand {
     internal override func runAsync(arg0: Any?, arg1: Any?, arg2: Any?) async throws -> Any? {
         return try await runAsync(credential: try blueCastArg(BlueAccessCredential.self, arg0))
@@ -124,19 +127,29 @@ public struct BlueGetAccessDevicesCommand: BlueCommand {
 }
 
 public class BlueSynchronizeAccessDeviceCommand: BlueSdkAsyncCommand {
+    public enum BlueSynchronizeAccessTaskId {
+        case getAuthenticationToken
+        case getDeviceConfig
+        case updateDeviceConfig
+        case updateDeviceTime
+        case waitForRestart
+        case pushEventLogs
+        case pushSystemLogs
+        case getBlacklistEntries
+        case deployBlacklistEntries
+        case getSystemStatus
+        case pushSystemStatus
+    }
+    
     internal override func runAsync(arg0: Any? = nil, arg1: Any? = nil, arg2: Any? = nil) async throws -> Any? {
-        if #available(macOS 10.15, *) {
-            return try await runAsync(
-                credentialID: try blueCastArg(String.self, arg0),
-                deviceID: try blueCastArg(String.self, arg1)
-            )
-        } else {
-            throw BlueError(.sdkUnsupportedPlatform)
-        }
+        return try await runAsync(
+            credentialID: try blueCastArg(String.self, arg0),
+            deviceID: try blueCastArg(String.self, arg1),
+            showModal: try blueCastArg(Bool.self, arg2)
+        )
     }
     
-    @available(macOS 10.15, *)
-    public func runAsync(credentialID: String, deviceID: String) async throws -> BlueSystemStatus? {
+    public func runAsync(credentialID: String, deviceID: String, showModal: Bool? = false) async throws -> BlueSystemStatus? {
         guard let device = blueGetDevice(deviceID) else {
             throw BlueError(.sdkDeviceNotFound)
         }
@@ -145,66 +158,207 @@ public class BlueSynchronizeAccessDeviceCommand: BlueSdkAsyncCommand {
             throw BlueError(.sdkCredentialNotFound)
         }
         
-        let tokenAuthentication = try await sdkService.authenticationTokenService
-            .getTokenAuthentication(credential: credential)
-        
-        let config = try await getBlueSystemConfig(deviceID: deviceID, with: tokenAuthentication)
+        let tasks = [
+            BlueTask(
+                id: BlueSynchronizeAccessTaskId.getAuthenticationToken,
+                label: blueI18n.syncDeviceGetAuthenticationTokenTaskLabel
+            ) { _ in
+                .result(try await self.getAuthenticationToken(credential))
+            },
+            
+            BlueTask(
+                id: BlueSynchronizeAccessTaskId.getDeviceConfig,
+                label: blueI18n.syncDeviceRetrieveDeviceConfigurationTaskLabel
+            ) { runner in
+                let tokenAuthentication: BlueTokenAuthentication = try runner.getResult(BlueSynchronizeAccessTaskId.getAuthenticationToken)
+                
+                return .result(try await self.getBlueSystemConfig(deviceID: deviceID, with: tokenAuthentication))
+            },
+            
+            BlueTask(
+                id: BlueSynchronizeAccessTaskId.updateDeviceConfig,
+                label: blueI18n.syncDeviceUpdateDeviceConfigurationTaskLabel
+            ) { runner in
+                let config: BlueSystemConfig? = try runner.getResult(BlueSynchronizeAccessTaskId.getDeviceConfig)
+                
+                let status: BlueSystemStatus = try await self.updateDevice(deviceID, config)
+                
+                device.updateInfo(systemStatus: status)
+                
+                return .resultWithStatus(status, config == nil ? .skipped: .succeeded)
+            },
+            
+            BlueTask(
+                id: BlueSynchronizeAccessTaskId.updateDeviceTime,
+                label: blueI18n.syncDeviceUpdateDeviceTimeTaskLabel
+            ) { runner in
+                let status: BlueSystemStatus = try runner.getResult(BlueSynchronizeAccessTaskId.updateDeviceConfig)
+                
+                return .resultWithStatus(nil, status.settings.timeWasSet == true ? .succeeded : .skipped)
+            },
+            
+            BlueTask(
+                id: BlueSynchronizeAccessTaskId.waitForRestart,
+                label: blueI18n.syncDeviceWaitForDeviceToRestartTaskLabel
+            ) { _ in
+                .result(try await self.waitUntilDeviceHasBeenRestarted(deviceID))
+            },
+            
+            BlueTask(
+                id: BlueSynchronizeAccessTaskId.pushEventLogs,
+                label: blueI18n.syncDevicePushEventLogsTaskLabel,
+                failable: true
+            ) { runner in                
+                let tokenAuthentication: BlueTokenAuthentication = try runner.getResult(BlueSynchronizeAccessTaskId.getAuthenticationToken)
+                let status: BlueSystemStatus = try runner.getResult(BlueSynchronizeAccessTaskId.updateDeviceConfig)
+                
+                return .result(try await self.pushEventLogs(status: status, credential: credential, deviceID: deviceID, with: tokenAuthentication))
+            },
+            
+            BlueTask(
+                id: BlueSynchronizeAccessTaskId.pushSystemLogs,
+                label: blueI18n.syncDevicePushSystemLogsTaskLabel,
+                failable: true
+            ) { runner in
+                let tokenAuthentication: BlueTokenAuthentication = try runner.getResult(BlueSynchronizeAccessTaskId.getAuthenticationToken)
+                let status: BlueSystemStatus = try runner.getResult(BlueSynchronizeAccessTaskId.updateDeviceConfig)
+                
+                return .result(try await self.pushSystemLogs(status: status, deviceID: deviceID, with: tokenAuthentication))
+            },
+            
+            BlueTask(
+                id: BlueSynchronizeAccessTaskId.getBlacklistEntries,
+                label: blueI18n.syncDeviceRetrieveBlacklistEntriesTaskLabel,
+                failable: true
+            ) { runner in
+                let tokenAuthentication: BlueTokenAuthentication = try runner.getResult(BlueSynchronizeAccessTaskId.getAuthenticationToken)
+                
+                return .result(try await self.getBlacklistEntries(deviceID, tokenAuthentication))
+            },
+            
+            BlueTask(
+                id: BlueSynchronizeAccessTaskId.deployBlacklistEntries,
+                label: blueI18n.syncDeviceDeployBlacklistEntriesTaskLabel,
+                failable: true
+            ) { runner in
+                let entries: BlueBlacklistEntries? = try runner.getResult(BlueSynchronizeAccessTaskId.getBlacklistEntries)
+                
+                guard let entries = entries else {
+                    return .resultWithStatus(nil, .failed)
+                }
+                
+                return .result(try await self.deployBlacklistEntries(deviceID, entries))
+            },
+            
+            BlueTask(
+                id: BlueSynchronizeAccessTaskId.getSystemStatus,
+                label: blueI18n.syncDeviceRetrieveSystemStatusTaskLabel
+            ) { _ in
+                .result(try await self.getSystemStatus(deviceID))
+            },
+            
+            BlueTask(
+                id: BlueSynchronizeAccessTaskId.pushSystemStatus,
+                label: blueI18n.syncDevicePushSystemStatusTaskLabel
+            ) { runner in
+                let tokenAuthentication: BlueTokenAuthentication = try runner.getResult(BlueSynchronizeAccessTaskId.getAuthenticationToken)
+                let status: BlueSystemStatus = try runner.getResult(BlueSynchronizeAccessTaskId.getSystemStatus)
+                
+                try await self.pushDeviceSystemStatus(status: status, with: tokenAuthentication)
+                
+                return .result(status)
+            }
+        ]
         
-        var update = BlueSystemUpdate()
-        update.timeUnix = BlueSystemTimeUnix()
-        update.timeUnix.epoch = UInt32(Date().timeIntervalSince1970)
+        let runner = BlueSerialTaskRunner(tasks)
         
-        if let config = config {
-            update.config = config
+#if os(iOS) || os(watchOS)
+        if (showModal == true) {
+            try await blueShowSynchronizeAccessDeviceModal(runner)
+        } else {
+            try await runner.execute(true)
         }
+#else
+        try await runner.execute(true)
+#endif
         
-        let updateStatus: BlueSystemStatus = try await blueTerminalRun(
-            deviceID: deviceID,
-            timeoutSeconds: 30.0,
-            action: "UPDATE",
-            data: update
-        )
-        
-        device.updateInfo(systemStatus: updateStatus)
-        
-        await waitUntilDeviceHasBeenRestarted()
-        
-        try await pushEventLogs(status: updateStatus, credential: credential, deviceID: deviceID, with: tokenAuthentication)
-        try await pushSystemLogs(status: updateStatus, deviceID: deviceID, with: tokenAuthentication)
-        try await deployBlacklistEntries(deviceID: deviceID, with: tokenAuthentication)
-        
-        let status: BlueSystemStatus = await getSystemStatus(deviceID) ?? updateStatus
-        
-        try await pushDeviceSystemStatus(status: status, with: tokenAuthentication)
+        if runner.isSuccessful() {
+            return try runner.getResult(BlueSynchronizeAccessTaskId.pushSystemStatus)
+        }
         
-        return status
+        return nil
     }
     
-    @available(macOS 10.15, *)
-    private func waitUntilDeviceHasBeenRestarted() async {
-        try? await Task.sleep(nanoseconds: UInt64(blueSecondsToNanoseconds(10)))
+    private func updateDevice(_ deviceID: String, _ config: BlueSystemConfig?) async throws -> BlueSystemStatus {
+        do {
+            var update = BlueSystemUpdate()
+            update.timeUnix = BlueSystemTimeUnix()
+            update.timeUnix.epoch = UInt32(Date().timeIntervalSince1970)
+            
+            if let config = config {
+                update.config = config
+            }
+            
+            return try await blueTerminalRun(
+                deviceID: deviceID,
+                timeoutSeconds: 30.0,
+                action: "UPDATE",
+                data: update
+            )
+        } catch {
+            throw BlueError(.sdkUpdateDeviceFailed, cause: error)
+        }
     }
     
-    @available(macOS 10.15, *)
-    private func getSystemStatus(_ deviceID: String) async -> BlueSystemStatus? {
-        return try? await blueTerminalRun(
-            deviceID: deviceID,
-            timeoutSeconds: 30.0,
-            action: "STATUS"
-        )
+    private func getAuthenticationToken(_ credential: BlueAccessCredential) async throws -> BlueTokenAuthentication {
+        do {
+            return try await sdkService.authenticationTokenService
+                .getTokenAuthentication(credential: credential)
+        } catch {
+            throw BlueError(.sdkGetAuthenticationTokenFailed, cause: error)
+        }
+    }
+    
+    private func waitUntilDeviceHasBeenRestarted(_ deviceID: String) async throws {
+        do {
+            try? await Task.sleep(nanoseconds: UInt64(blueSecondsToNanoseconds(30)))
+            
+            if blueGetDevice(deviceID) == nil {
+                throw BlueError(.sdkDeviceNotFound)
+            }
+        } catch {
+            throw BlueError(.sdkWaitDeviceToRestartFailed, cause: error)
+        }
+    }
+    
+    private func getSystemStatus(_ deviceID: String) async throws -> BlueSystemStatus {
+        do {
+            return try await blueTerminalRun(
+                deviceID: deviceID,
+                timeoutSeconds: 30.0,
+                action: "STATUS"
+            )
+        } catch {
+            throw BlueError(.sdkGetSystemStatusFailed, cause: error)
+        }
     }
     
-    @available(macOS 10.15, *)
-    private func deployBlacklistEntries(deviceID: String, with tokenAuthentication: BlueTokenAuthentication) async throws {
+    private func getBlacklistEntries(_ deviceID: String, _ tokenAuthentication: BlueTokenAuthentication) async throws -> BlueBlacklistEntries {
         do {
             let response = try await sdkService.apiService.getBlacklistEntries(deviceID: deviceID, with: tokenAuthentication, limit: 50).getData()
             
             guard let data = Data(base64Encoded: response.blacklistEntries) else {
-                return
+                throw BlueError(.sdkDecodeBase64Failed)
             }
             
-            let entries: BlueBlacklistEntries = try blueDecodeMessage(data)
-            
+            return try blueDecodeMessage(data)
+        } catch {
+            throw BlueError(.sdkGetBlacklistEntriesFailed, cause: error)
+        }
+    }
+    
+    private func deployBlacklistEntries(_ deviceID: String, _ entries: BlueBlacklistEntries) async throws {
+        do {
             try await blueTerminalRun(
                 deviceID: deviceID,
                 timeoutSeconds: 30.0,
@@ -248,7 +402,6 @@ public class BlueSynchronizeAccessDeviceCommand: BlueSdkAsyncCommand {
         }
     }
     
-    @available(macOS 10.15, *)
     private func pushEventLogs(status: BlueSystemStatus, credential: BlueAccessCredential, deviceID: String, with tokenAuthentication: BlueTokenAuthentication) async throws {
         do {
             guard status.settings.eventLogEntriesCount > 0 else {
@@ -293,7 +446,6 @@ public class BlueSynchronizeAccessDeviceCommand: BlueSdkAsyncCommand {
         }
     }
     
-    @available(macOS 10.15, *)
     private func pushSystemLogs(status: BlueSystemStatus, deviceID: String, with tokenAuthentication: BlueTokenAuthentication) async throws {
         do {
             guard status.settings.systemLogEntriesCount > 0 else {
@@ -332,7 +484,7 @@ public class BlueSynchronizeAccessDeviceCommand: BlueSdkAsyncCommand {
                 
                 return logResult.entries.count
             }
-
+            
         } catch {
             throw BlueError(.sdkSystemLogEntriesPushFailed, cause: error)
         }
@@ -414,8 +566,7 @@ public class BlueClaimAccessDeviceCommand: BlueSdkAsyncCommand {
             throw BlueError(.sdkUnsupportedPlatform)
         }
     }
-    
-    @available(macOS 10.15, *)
+
     public func runAsync(credentialID: String, deviceID: String, objectID: String) async throws -> BlueSystemStatus? {
         guard let _ = blueGetDevice(deviceID) else {
             throw BlueError(.sdkDeviceNotFound)

package/ios/Plugin/BlueIDAccessSDK/BlueCore.pb.swift

@@ -124,6 +124,11 @@ public enum BlueReturnCode: SwiftProtobuf.Enum {
   case sdkDecodeJsonFailed // = -414
   case sdkFetchDataFailed // = -415
   case sdkTimeout // = -416
+  case sdkGetAuthenticationTokenFailed // = -417
+  case sdkUpdateDeviceFailed // = -418
+  case sdkGetBlacklistEntriesFailed // = -419
+  case sdkGetSystemStatusFailed // = -420
+  case sdkWaitDeviceToRestartFailed // = -421
   case ossMareturnCodeStart // = -1000
   case ossMareturnCodeEnd // = -1100
 
@@ -135,6 +140,11 @@ public enum BlueReturnCode: SwiftProtobuf.Enum {
     switch rawValue {
     case -1100: self = .ossMareturnCodeEnd
     case -1000: self = .ossMareturnCodeStart
+    case -421: self = .sdkWaitDeviceToRestartFailed
+    case -420: self = .sdkGetSystemStatusFailed
+    case -419: self = .sdkGetBlacklistEntriesFailed
+    case -418: self = .sdkUpdateDeviceFailed
+    case -417: self = .sdkGetAuthenticationTokenFailed
     case -416: self = .sdkTimeout
     case -415: self = .sdkFetchDataFailed
     case -414: self = .sdkDecodeJsonFailed
@@ -233,6 +243,11 @@ public enum BlueReturnCode: SwiftProtobuf.Enum {
     switch self {
     case .ossMareturnCodeEnd: return -1100
     case .ossMareturnCodeStart: return -1000
+    case .sdkWaitDeviceToRestartFailed: return -421
+    case .sdkGetSystemStatusFailed: return -420
+    case .sdkGetBlacklistEntriesFailed: return -419
+    case .sdkUpdateDeviceFailed: return -418
+    case .sdkGetAuthenticationTokenFailed: return -417
     case .sdkTimeout: return -416
     case .sdkFetchDataFailed: return -415
     case .sdkDecodeJsonFailed: return -414
@@ -3580,6 +3595,11 @@ extension BlueReturnCode: SwiftProtobuf._ProtoNameProviding {
   public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     -1100: .same(proto: "OssMAReturnCodeEnd"),
     -1000: .same(proto: "OssMAReturnCodeStart"),
+    -421: .same(proto: "SdkWaitDeviceToRestartFailed"),
+    -420: .same(proto: "SdkGetSystemStatusFailed"),
+    -419: .same(proto: "SdkGetBlacklistEntriesFailed"),
+    -418: .same(proto: "SdkUpdateDeviceFailed"),
+    -417: .same(proto: "SdkGetAuthenticationTokenFailed"),
     -416: .same(proto: "SdkTimeout"),
     -415: .same(proto: "SdkFetchDataFailed"),
     -414: .same(proto: "SdkDecodeJsonFailed"),

package/ios/Plugin/BlueIDAccessSDK/BlueModal/{BlueModalSession.swift → BlueAccessDeviceModalSession.swift}

@@ -2,20 +2,20 @@
 import AVFoundation
 import SwiftUI
 
-private class HostingController: UIHostingController<BlueModalView> {
+private class HostingController: UIHostingController<BlueAccessDeviceModalView> {
     override var prefersHomeIndicatorAutoHidden: Bool {
         return true
     }
 }
 
 /**
- * @class BlueModalSession
+ * @class BlueAccessDeviceModalSession
  *
  * Modal session for processing BlueModal.
  * BlueModal (sheet) helps people perform a scoped task that’s closely related to their current context.
  */
-internal class BlueModalSession {
-    private var viewModel = BlueModalViewModel()
+internal class BlueAccessDeviceModalSession {
+    private var viewModel = BlueAccessDeviceModalViewModel()
     private var isInvalidated: Bool = false
     
     /// Starts the modal session.
@@ -26,7 +26,7 @@ internal class BlueModalSession {
         viewModel.message = message ?? ""
         
         let hostingController = HostingController(
-            rootView: BlueModalView(viewModel) { self.invalidate() }
+            rootView: BlueAccessDeviceModalView(viewModel) { self.invalidate() }
         )
         
         hostingController.view.backgroundColor = .clear

package/ios/Plugin/BlueIDAccessSDK/BlueModal/{BlueModalView.swift → BlueAccessDeviceModalView.swift}

@@ -7,7 +7,7 @@ internal enum BlueModalStatus {
     case Failed
 }
 
-internal class BlueModalViewModel: ObservableObject {
+internal class BlueAccessDeviceModalViewModel: ObservableObject {
     @Published var title = ""
     @Published var message = ""
     @Published var status: BlueModalStatus = .Waiting
@@ -44,8 +44,8 @@ internal class BlueModalViewModel: ObservableObject {
     }
 }
 
-internal struct BlueModalView: View {
-    @ObservedObject private var vm: BlueModalViewModel
+internal struct BlueAccessDeviceModalView: View {
+    @ObservedObject private var vm: BlueAccessDeviceModalViewModel
     
     internal var height: CGFloat = 350
     internal var backgroundColor: UIColor = .white
@@ -55,7 +55,7 @@ internal struct BlueModalView: View {
     private let cornerRadius: CGFloat = 35
     
     public init(
-        _ vm: BlueModalViewModel,
+        _ vm: BlueAccessDeviceModalViewModel,
         _ onDismiss: @escaping () -> Void)
     {
         self.vm = vm
@@ -152,37 +152,26 @@ internal struct BlueModalView: View {
     }
 }
 
-extension View {
-    @ViewBuilder
-    func hidden(_ isHidden: Bool) -> some View {
-        if isHidden {
-            self.hidden()
-        } else {
-            self
-        }
-    }
-}
-
 @available(iOS 16.0, *)
-struct ContentView_Preview: PreviewProvider {
+struct BlueAccessDeviceModalView_Preview: PreviewProvider {
     static var previews: some View {
-        BlueModalView(
-            BlueModalViewModel(
+        BlueAccessDeviceModalView(
+            BlueAccessDeviceModalViewModel(
                 title: "Unlocking in Progress",
                 message: "Establishing secure connection..."
             )
         ) {}
         
-        BlueModalView(
-            BlueModalViewModel(
+        BlueAccessDeviceModalView(
+            BlueAccessDeviceModalViewModel(
                 title: "Access Granted",
                 message: "Please proceed.",
                 status: .Success
             )
         ) {}
         
-        BlueModalView(
-            BlueModalViewModel(
+        BlueAccessDeviceModalView(
+            BlueAccessDeviceModalViewModel(
                 title: "Access Denied",
                 message: "Credentials are not valid at this time and/or day of the week.",
                 status: .Failed

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

@@ -0,0 +1,14 @@
+#if os(iOS) || os(watchOS)
+import SwiftUI
+
+extension View {
+    @ViewBuilder
+    func hidden(_ isHidden: Bool) -> some View {
+        if isHidden {
+            self.hidden()
+        } else {
+            self
+        }
+    }
+}
+#endif