From 963ce3fb34bd6c6bd72f1aa956ce602267b90e9c Mon Sep 17 00:00:00 2001
From: Christian Cleberg <hello@cleberg.net>
Date: Sat, 25 Jul 2026 12:14:58 -0500
Subject: feat: owner Pro+ allowlist via CloudKit, cut v5.0.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Grants the app owner Pro+ without a purchase, keyed to their CloudKit
user-record ID so it works on the release App Store build.

- OwnerAccess holds the owner's CloudKit user-record ID (opaque, per-Apple-ID,
  scoped to the app's container; safe to publish — CloudKit verifies identity
  server-side, so it can't be presented by anyone else).
- PurchaseService resolves the allowlist against CloudKit once per launch and,
  on a match, records a persisted owner grant so it applies instantly and
  offline thereafter. The grant only ever elevates the tier to .proPlus and
  defers to the existing #if DEBUG overrides, so real purchases and free/pro
  testing are unaffected. cachedTier / cachedEntitlement were refactored to
  fall back to the owner grant only when no debug override or stored purchase
  applies.
- Supersedes the DEBUG record-ID reveal (PR #60): its only purpose was to read
  the owner's ID, which is now hardcoded, so the reveal is not shipped.

Release cut: MARKETING_VERSION 5.0.0 -> 5.0.1, CURRENT_PROJECT_VERSION 45 -> 46,
AppVersion.current -> 5.0.1, roadmap updated. App builds clean; unit suite 63/63.
---
 DomainDig/PurchaseService.swift | 53 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 50 insertions(+), 3 deletions(-)

(limited to 'DomainDig/PurchaseService.swift')

diff --git a/DomainDig/PurchaseService.swift b/DomainDig/PurchaseService.swift
index 4ab8ef4..91ce211 100644
--- a/DomainDig/PurchaseService.swift
+++ b/DomainDig/PurchaseService.swift
@@ -34,6 +34,20 @@ final class PurchaseService {
     private static let debugForceProPlusArgument = "DOMAIN_DIG_FORCE_PRO_PLUS"
     #endif
 
+    private static let ownerEntitlementKey = "purchase.ownerEntitlement"
+
+    /// Whether the owner allowlist has confirmed this device's iCloud user as the
+    /// owner. Persisted so the grant is instant on later launches and survives
+    /// offline, when CloudKit cannot be reached.
+    static var ownerEntitlementGranted: Bool {
+        UserDefaults.standard.bool(forKey: ownerEntitlementKey)
+    }
+
+    private static var storedEntitlement: CachedEntitlement? {
+        guard let data = UserDefaults.standard.data(forKey: entitlementCacheKey) else { return nil }
+        return try? JSONDecoder().decode(CachedEntitlement.self, from: data)
+    }
+
     static var cachedEntitlement: CachedEntitlement? {
         #if DEBUG
         if let forcedEntitlement = debugForcedEntitlement {
@@ -41,12 +55,17 @@ final class PurchaseService {
         }
         #endif
 
-        guard let data = UserDefaults.standard.data(forKey: entitlementCacheKey) else { return nil }
-        return try? JSONDecoder().decode(CachedEntitlement.self, from: data)
+        return storedEntitlement
     }
 
     static var cachedTier: FeatureTier {
-        cachedEntitlement?.tier ?? .free
+        #if DEBUG
+        // A debug override wins outright so free/pro tiers remain testable on the
+        // owner's own device.
+        if let forcedEntitlement = debugForcedEntitlement { return forcedEntitlement.tier }
+        #endif
+        if ownerEntitlementGranted { return .proPlus }
+        return storedEntitlement?.tier ?? .free
     }
 
     var products: [Product] = []
@@ -64,8 +83,10 @@ final class PurchaseService {
         currentTier = Self.cachedTier
         activeProductID = Self.cachedEntitlement?.activeProductID
         applyDebugOverrideIfNeeded()
+        applyOwnerOverrideIfNeeded()
         updatesTask = observeTransactionUpdates()
         Task {
+            await resolveOwnerEntitlementIfNeeded()
             await refreshProducts()
             await refreshEntitlements()
         }
@@ -118,6 +139,7 @@ final class PurchaseService {
         currentTier = tier(for: activeProductID)
         persistCurrentEntitlement()
         applyDebugOverrideIfNeeded()
+        applyOwnerOverrideIfNeeded()
     }
 
     func purchase(_ product: Product) async {
@@ -251,6 +273,31 @@ final class PurchaseService {
         #endif
     }
 
+    /// Elevates the current tier to Pro+ when the device's iCloud user has been
+    /// confirmed as the owner. Only ever elevates, and defers to a debug override
+    /// so free/pro tiers stay testable on the owner's own device.
+    private func applyOwnerOverrideIfNeeded() {
+        #if DEBUG
+        if Self.debugForcedEntitlement != nil { return }
+        #endif
+        guard Self.ownerEntitlementGranted else { return }
+        currentTier = .proPlus
+    }
+
+    /// Resolves the owner allowlist against CloudKit once per launch. On a match
+    /// it records the grant so future launches apply it synchronously and offline.
+    private func resolveOwnerEntitlementIfNeeded() async {
+        guard OwnerAccess.isConfigured else { return }
+        if Self.ownerEntitlementGranted {
+            applyOwnerOverrideIfNeeded()
+            return
+        }
+        if await OwnerAccess.isOwner() {
+            UserDefaults.standard.set(true, forKey: Self.ownerEntitlementKey)
+            applyOwnerOverrideIfNeeded()
+        }
+    }
+
     private func verifiedTransaction(from result: VerificationResult<Transaction>) throws -> Transaction {
         switch result {
         case .verified(let transaction):
-- 
cgit v1.2.3