Update and refactor, support visionOS, add tests

Author: yusuftor

Sources/SuperwallKit/Dependencies/DependencyContainer.swift

@@ -41,7 +41,7 @@ final class DependencyContainer {
   var webEntitlementRedeemer: WebEntitlementRedeemer!
   var deepLinkRouter: DeepLinkRouter!
   var attributionFetcher: AttributionFetcher!
-  var userPermissions: UserPermissions!
+  var permissionHandler: PermissionHandling!
   // swiftlint:enable implicitly_unwrapped_optional
   let paywallArchiveManager = PaywallArchiveManager()
 
@@ -184,7 +184,7 @@ final class DependencyContainer {
       factory: self
     )
 
-    userPermissions = UserPermissionsImpl()
+    permissionHandler = PermissionHandler()
   }
 }
 
@@ -268,7 +268,7 @@ extension DependencyContainer: ViewControllerFactory {
     let messageHandler = PaywallMessageHandler(
       receiptManager: receiptManager,
       factory: self,
-      userPermissions: userPermissions
+      permissionHandler: permissionHandler
     )
     let webView = SWWebView(
       isMac: deviceHelper.isMac,

Sources/SuperwallKit/Graveyard/SuperwallGraveyard.swift

@@ -99,7 +99,7 @@ extension Superwall {
         messageHandler: .init(
           receiptManager: dependencyContainer.receiptManager,
           factory: dependencyContainer,
-          userPermissions: dependencyContainer.userPermissions
+          permissionHandler: dependencyContainer.permissionHandler
         ),
         isOnDeviceCacheEnabled: false,
         factory: dependencyContainer

Sources/SuperwallKit/Paywall/View Controller/Web View/Message Handling/PaywallMessageHandler.swift

@@ -30,7 +30,7 @@ final class PaywallMessageHandler: WebEventDelegate {
   weak var delegate: PaywallMessageHandlerDelegate?
   private unowned let receiptManager: ReceiptManager
   private let factory: VariablesFactory
-  private let userPermissions: UserPermissions
+  private let permissionHandler: PermissionHandling
 
   struct EnqueuedMessage {
     let name: String
@@ -42,11 +42,11 @@ final class PaywallMessageHandler: WebEventDelegate {
   init(
     receiptManager: ReceiptManager,
     factory: VariablesFactory,
-    userPermissions: UserPermissions
+    permissionHandler: PermissionHandling
   ) {
     self.receiptManager = receiptManager
     self.factory = factory
-    self.userPermissions = userPermissions
+    self.permissionHandler = permissionHandler
   }
 
   func handle(_ message: PaywallMessage) {
@@ -187,7 +187,11 @@ final class PaywallMessageHandler: WebEventDelegate {
       )
       delegate?.eventDidOccur(.scheduleNotification(notification: notification))
     case let .requestPermission(permissionType, requestId):
-      handleRequestPermission(permissionType: permissionType, requestId: requestId)
+      handleRequestPermission(
+        permissionType: permissionType,
+        requestId: requestId,
+        paywall: paywall
+      )
     }
   }
 
@@ -489,64 +493,40 @@ final class PaywallMessageHandler: WebEventDelegate {
 
   private func handleRequestPermission(
     permissionType: PermissionType,
-    requestId: String
+    requestId: String,
+    paywall: Paywall
   ) {
-    let paywallIdentifier = delegate?.paywall.identifier ?? ""
     let permissionName = permissionType.rawValue
 
-    // Notify delegate that permission was requested
-    delegate?.eventDidOccur(.requestPermission(permissionType: permissionType, requestId: requestId))
-
     Task {
       // Track permission requested event
       let requestedEvent = InternalSuperwallEvent.Permission(
         state: .requested,
         permissionName: permissionName,
-        paywallIdentifier: paywallIdentifier
+        paywallIdentifier: paywall.identifier
       )
       await Superwall.shared.track(requestedEvent)
 
-      let status = await userPermissions.requestPermission(permissionType)
+      let status = await permissionHandler.requestPermission(permissionType)
 
       // Track permission result event
       let resultState: InternalSuperwallEvent.PermissionState = status == .granted ? .granted : .denied
       let resultEvent = InternalSuperwallEvent.Permission(
         state: resultState,
         permissionName: permissionName,
-        paywallIdentifier: paywallIdentifier
+        paywallIdentifier: paywall.identifier
       )
       await Superwall.shared.track(resultEvent)
 
-      await sendPermissionResult(
-        requestId: requestId,
-        permissionType: permissionType,
-        status: status
-      )
-    }
-  }
-
-  private func sendPermissionResult(
-    requestId: String,
-    permissionType: PermissionType,
-    status: PermissionStatus
-  ) async {
-    let event: [String: Any] = [
-      "event_name": "permission_result",
-      "permission_type": permissionType.rawValue,
-      "request_id": requestId,
-      "status": status.rawValue
-    ]
-
-    guard let jsonData = try? JSONSerialization.data(withJSONObject: [event]) else {
-      Logger.debug(
-        logLevel: .error,
-        scope: .paywallViewController,
-        message: "Failed to serialize permission result"
+      await pass(
+        placement: "permission_result",
+        from: paywall,
+        payload: [
+          "permission_type": permissionType.rawValue,
+          "request_id": requestId,
+          "status": status.rawValue
+        ]
       )
-      return
     }
-
-    let base64Event = jsonData.base64EncodedString()
-    passMessageToWebView(base64Event)
   }
 }

Sources/SuperwallKit/Paywall/View Controller/Web View/Message Handling/PaywallWebEvent.swift

@@ -18,5 +18,4 @@ enum PaywallWebEvent: Equatable {
   case customPlacement(name: String, params: JSON)
   case scheduleNotification(notification: LocalNotification)
   case userAttributesUpdated(attributes: JSON)
-  case requestPermission(permissionType: PermissionType, requestId: String)
 }

Sources/SuperwallKit/Permissions/AuthorizationStatus+PermissionStatus.swift

@@ -0,0 +1,97 @@
+//
+//  AuthorizationStatus+PermissionStatus.swift
+//  SuperwallKit
+//
+//  Created by Superwall on 2024.
+//
+
+import AVFoundation
+import Contacts
+import CoreLocation
+import Photos
+import UserNotifications
+
+extension UNAuthorizationStatus {
+  var toPermissionStatus: PermissionStatus {
+    switch self {
+    case .authorized, .provisional, .ephemeral:
+      return .granted
+    case .denied, .notDetermined:
+      return .denied
+    @unknown default:
+      return .unsupported
+    }
+  }
+}
+
+extension CLAuthorizationStatus {
+  var toPermissionStatus: PermissionStatus {
+    switch self {
+    case .authorizedWhenInUse, .authorizedAlways:
+      return .granted
+    case .denied, .restricted, .notDetermined:
+      return .denied
+    @unknown default:
+      return .unsupported
+    }
+  }
+
+  var toBackgroundPermissionStatus: PermissionStatus {
+    switch self {
+    case .authorizedAlways:
+      return .granted
+    case .authorizedWhenInUse, .denied, .restricted, .notDetermined:
+      return .denied
+    @unknown default:
+      return .unsupported
+    }
+  }
+}
+
+extension PHAuthorizationStatus {
+  var toPermissionStatus: PermissionStatus {
+    switch self {
+    case .authorized,
+      .limited:
+      return .granted
+    case .denied,
+      .restricted,
+      .notDetermined:
+      return .denied
+    @unknown default:
+      return .unsupported
+    }
+  }
+}
+
+extension CNAuthorizationStatus {
+  var toPermissionStatus: PermissionStatus {
+    switch self {
+    case .authorized,
+      .limited:
+      return .granted
+    case .denied,
+      .restricted,
+      .notDetermined:
+      return .denied
+    @unknown default:
+      // Handles .limited on iOS 18+ and future cases
+      return .granted
+    }
+  }
+}
+
+extension AVAuthorizationStatus {
+  var toPermissionStatus: PermissionStatus {
+    switch self {
+    case .authorized:
+      return .granted
+    case .denied,
+      .restricted,
+      .notDetermined:
+      return .denied
+    @unknown default:
+      return .unsupported
+    }
+  }
+}

Sources/SuperwallKit/Permissions/Handlers/PermissionHandler+Camera.swift

@@ -0,0 +1,33 @@
+//
+//  PermissionHandler+Camera.swift
+//  SuperwallKit
+//
+//  Created by Superwall on 2024.
+//
+
+import AVFoundation
+
+extension PermissionHandler {
+  func checkCameraPermission() -> PermissionStatus {
+    return AVCaptureDevice.authorizationStatus(for: .video).toPermissionStatus
+  }
+
+  func requestCameraPermission() async -> PermissionStatus {
+    guard hasPlistKey(PlistKey.camera) else {
+      Logger.debug(
+        logLevel: .error,
+        scope: .paywallViewController,
+        message: "Missing \(PlistKey.camera) in Info.plist. Cannot request camera permission."
+      )
+      return .unsupported
+    }
+
+    let currentStatus = checkCameraPermission()
+    if currentStatus == .granted {
+      return .granted
+    }
+
+    let granted = await AVCaptureDevice.requestAccess(for: .video)
+    return granted ? .granted : .denied
+  }
+}

Sources/SuperwallKit/Permissions/Handlers/PermissionHandler+Contacts.swift

@@ -0,0 +1,44 @@
+//
+//  PermissionHandler+Contacts.swift
+//  SuperwallKit
+//
+//  Created by Superwall on 2024.
+//
+
+import Contacts
+
+extension PermissionHandler {
+  func checkContactsPermission() -> PermissionStatus {
+    return CNContactStore.authorizationStatus(for: .contacts).toPermissionStatus
+  }
+
+  func requestContactsPermission() async -> PermissionStatus {
+    guard hasPlistKey(PlistKey.contacts) else {
+      Logger.debug(
+        logLevel: .error,
+        scope: .paywallViewController,
+        message: "Missing \(PlistKey.contacts) in Info.plist. Cannot request contacts permission."
+      )
+      return .unsupported
+    }
+
+    let currentStatus = checkContactsPermission()
+    if currentStatus == .granted {
+      return .granted
+    }
+
+    let store = CNContactStore()
+    do {
+      let granted = try await store.requestAccess(for: .contacts)
+      return granted ? .granted : .denied
+    } catch {
+      Logger.debug(
+        logLevel: .error,
+        scope: .paywallViewController,
+        message: "Error requesting contacts permission",
+        error: error
+      )
+      return .denied
+    }
+  }
+}