Refactor StoreKit 2 subscription system and add interactive vote widget
## StoreKit 2 Refactor - Rewrote IAPManager with clean enum-based state model (SubscriptionState) - Added native SubscriptionStoreView for iOS 17+ purchase UI - Subscription status now checked on every app launch - Synced subscription status to UserDefaults for widget access - Simplified PurchaseButtonView and IAPWarningView - Removed unused StatusInfoView ## Interactive Vote Widget - New FeelsVoteWidget with App Intents for mood voting - Subscribers can vote directly from widget, shows stats after voting - Non-subscribers see "Tap to subscribe" which opens subscription store - Added feels:// URL scheme for deep linking ## Firebase Removal - Commented out Firebase imports and initialization - EventLogger now prints to console in DEBUG mode only ## Other Changes - Added fallback for Core Data when App Group unavailable - Added new localization strings for subscription UI - Updated entitlements and Info.plist 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Trey t
@@ -1,410 +1,235 @@
|
||||
/*
|
||||
See LICENSE folder for this sample’s licensing information.
|
||||
|
||||
Abstract:
|
||||
The store class is responsible for requesting products from the App Store and starting purchases.
|
||||
*/
|
||||
//
|
||||
// IAPManager.swift
|
||||
// Feels
|
||||
//
|
||||
// Refactored StoreKit 2 subscription manager with clean state model.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import StoreKit
|
||||
import SwiftUI
|
||||
|
||||
typealias Transaction = StoreKit.Transaction
|
||||
typealias RenewalInfo = StoreKit.Product.SubscriptionInfo.RenewalInfo
|
||||
typealias RenewalState = StoreKit.Product.SubscriptionInfo.RenewalState
|
||||
// MARK: - Subscription State
|
||||
|
||||
public enum StoreError: Error {
|
||||
case failedVerification
|
||||
enum SubscriptionState: Equatable {
|
||||
case unknown
|
||||
case subscribed(expirationDate: Date?, willAutoRenew: Bool)
|
||||
case inTrial(daysRemaining: Int)
|
||||
case trialExpired
|
||||
case expired
|
||||
}
|
||||
|
||||
class IAPManager: ObservableObject {
|
||||
@Published private(set) var showIAP = false
|
||||
@Published private(set) var showIAPWarning = false
|
||||
|
||||
@Published private(set) var isPurchasing = false
|
||||
|
||||
@Published private(set) var subscriptions = [Product: (status: [Product.SubscriptionInfo.Status], renewalInfo: RenewalInfo)?]()
|
||||
private(set) var purchasedProductIDs = Set<String>()
|
||||
|
||||
@AppStorage(UserDefaultsStore.Keys.firstLaunchDate.rawValue, store: GroupUserDefaults.groupDefaults) private var firstLaunchDate = Date()
|
||||
|
||||
@Published private(set) var isLoadingSubscriptions = false
|
||||
|
||||
public var sortedSubscriptionKeysByPriceOptions: [Product] {
|
||||
subscriptions.keys.sorted(by: {
|
||||
$0.price < $1.price
|
||||
})
|
||||
}
|
||||
// MARK: - IAPManager
|
||||
|
||||
public var daysLeftBeforeIAP: Int {
|
||||
let daysSinceInstall = Calendar.current.dateComponents([.day, .hour, .minute, .second], from: firstLaunchDate, to: Date())
|
||||
if let days = daysSinceInstall.day {
|
||||
return 30 - days
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
private var shouldShowIAP: Bool {
|
||||
if shouldShowIAPWarning && daysLeftBeforeIAP <= 0{
|
||||
return true
|
||||
}
|
||||
|
||||
@MainActor
|
||||
class IAPManager: ObservableObject {
|
||||
|
||||
// MARK: - Constants
|
||||
|
||||
static let subscriptionGroupID = "2CFE4C4F"
|
||||
|
||||
private let productIdentifiers: Set<String> = [
|
||||
"com.tt.ifeel.IAP.subscriptions.monthly",
|
||||
"com.tt.ifeel.IAP.subscriptions.yearly"
|
||||
]
|
||||
|
||||
private let trialDays = 30
|
||||
|
||||
// MARK: - Published State
|
||||
|
||||
@Published private(set) var state: SubscriptionState = .unknown
|
||||
@Published private(set) var availableProducts: [Product] = []
|
||||
@Published private(set) var currentProduct: Product? = nil
|
||||
@Published private(set) var isLoading = false
|
||||
|
||||
// MARK: - Storage
|
||||
|
||||
@AppStorage(UserDefaultsStore.Keys.firstLaunchDate.rawValue, store: GroupUserDefaults.groupDefaults)
|
||||
private var firstLaunchDate = Date()
|
||||
|
||||
// MARK: - Private
|
||||
|
||||
private var updateListenerTask: Task<Void, Error>?
|
||||
|
||||
// MARK: - Computed Properties
|
||||
|
||||
var isSubscribed: Bool {
|
||||
if case .subscribed = state { return true }
|
||||
return false
|
||||
}
|
||||
|
||||
private var shouldShowIAPWarning: Bool {
|
||||
// if we have't fetch all subscriptions yet use faster
|
||||
// purchasedProductIDs
|
||||
if subscriptions.isEmpty {
|
||||
if purchasedProductIDs.isEmpty {
|
||||
return true
|
||||
} else {
|
||||
return false
|
||||
}
|
||||
} else {
|
||||
if currentSubscription == nil {
|
||||
return true
|
||||
}
|
||||
|
||||
var hasFullAccess: Bool {
|
||||
switch state {
|
||||
case .subscribed, .inTrial:
|
||||
return true
|
||||
case .unknown, .trialExpired, .expired:
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
public var currentSubscription: Product? {
|
||||
let sortedProducts = subscriptions.keys.sorted(by: {
|
||||
$0.price > $1.price
|
||||
})
|
||||
|
||||
// first see if we have a product + sub that is set to autorenew
|
||||
for product in sortedProducts {
|
||||
if let _value = subscriptions[product]??.renewalInfo {
|
||||
if _value.willAutoRenew {
|
||||
return product
|
||||
}
|
||||
}
|
||||
var shouldShowPaywall: Bool {
|
||||
switch state {
|
||||
case .trialExpired, .expired:
|
||||
return true
|
||||
case .unknown, .subscribed, .inTrial:
|
||||
return false
|
||||
}
|
||||
|
||||
// if no auto renew then return
|
||||
// highest priced that has a sub status
|
||||
for product in sortedProducts {
|
||||
if let _ = subscriptions[product]??.status {
|
||||
return product
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// for all products return the one that is set
|
||||
// to auto renew
|
||||
public var nextRenewllOption: Product? {
|
||||
if let currentSubscription = currentSubscription,
|
||||
let info = subscriptions[currentSubscription],
|
||||
let status = info?.status {
|
||||
for aStatus in status {
|
||||
if let renewalInfo = try? checkVerified(aStatus.renewalInfo),
|
||||
renewalInfo.willAutoRenew {
|
||||
if let renewToProduct = subscriptions.first(where: {
|
||||
$0.key.id == renewalInfo.autoRenewPreference
|
||||
})?.key {
|
||||
return renewToProduct
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
|
||||
var shouldShowTrialWarning: Bool {
|
||||
if case .inTrial = state { return true }
|
||||
return false
|
||||
}
|
||||
|
||||
var updateListenerTask: Task<Void, Error>? = nil
|
||||
|
||||
public var expireDate: Date? {
|
||||
Calendar.current.date(byAdding: .day, value: 30, to: firstLaunchDate) ?? nil
|
||||
|
||||
var daysLeftInTrial: Int {
|
||||
if case .inTrial(let days) = state { return days }
|
||||
return 0
|
||||
}
|
||||
|
||||
private let iapIdentifiers = Set([
|
||||
// "com.88oakapps.ifeel.IAP.subscriptions.weekly",
|
||||
"com.88oakapps.ifeel.IAP.subscriptions.monthly",
|
||||
"com.88oakapps.ifeel.IAP.subscriptions.yearly"
|
||||
])
|
||||
|
||||
var expireOnTimer: Timer?
|
||||
|
||||
|
||||
var trialExpirationDate: Date? {
|
||||
Calendar.current.date(byAdding: .day, value: trialDays, to: firstLaunchDate)
|
||||
}
|
||||
|
||||
/// Products sorted by price (lowest first)
|
||||
var sortedProducts: [Product] {
|
||||
availableProducts.sorted { $0.price < $1.price }
|
||||
}
|
||||
|
||||
// MARK: - Initialization
|
||||
|
||||
init() {
|
||||
isLoadingSubscriptions = true
|
||||
|
||||
//Start a transaction listener as close to app launch as possible so you don't miss any transactions.
|
||||
updateListenerTask = listenForTransactions()
|
||||
|
||||
updateEverything()
|
||||
|
||||
Task {
|
||||
await checkSubscriptionStatus()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
deinit {
|
||||
updateListenerTask?.cancel()
|
||||
}
|
||||
|
||||
public func updateEverything() {
|
||||
Task {
|
||||
DispatchQueue.main.async {
|
||||
self.subscriptions.removeAll()
|
||||
self.purchasedProductIDs.removeAll()
|
||||
}
|
||||
|
||||
// get current sub from local cache
|
||||
await updatePurchasedProducts()
|
||||
|
||||
// update local variables to show iap warning / purchase views
|
||||
self.updateShowVariables()
|
||||
|
||||
// if they have a subscription we dont care about showing the loading indicator
|
||||
if !self.showIAP {
|
||||
DispatchQueue.main.async {
|
||||
self.isLoadingSubscriptions = false
|
||||
}
|
||||
}
|
||||
|
||||
// During store initialization, request products from the App Store.
|
||||
await requestProducts()
|
||||
|
||||
// Deliver products that the customer purchases.
|
||||
await updateCustomerProductStatus()
|
||||
|
||||
self.updateShowVariables()
|
||||
|
||||
self.setUpdateTimer()
|
||||
|
||||
DispatchQueue.main.async {
|
||||
self.isLoadingSubscriptions = false
|
||||
}
|
||||
}
|
||||
}
|
||||
// MARK: - Public Methods
|
||||
|
||||
private func updateShowVariables() {
|
||||
DispatchQueue.main.async {
|
||||
self.showIAP = self.shouldShowIAP
|
||||
self.showIAPWarning = self.shouldShowIAPWarning
|
||||
}
|
||||
}
|
||||
|
||||
private func setUpdateTimer() {
|
||||
if !self.showIAPWarning {
|
||||
if let expireOnTimer = expireOnTimer {
|
||||
expireOnTimer.invalidate()
|
||||
}
|
||||
/// Check subscription status - call on app launch and when becoming active
|
||||
func checkSubscriptionStatus() async {
|
||||
isLoading = true
|
||||
defer { isLoading = false }
|
||||
|
||||
// Fetch available products
|
||||
await loadProducts()
|
||||
|
||||
// Check for active subscription
|
||||
let hasActiveSubscription = await checkForActiveSubscription()
|
||||
|
||||
if hasActiveSubscription {
|
||||
// State already set in checkForActiveSubscription
|
||||
syncSubscriptionStatusToUserDefaults()
|
||||
return
|
||||
}
|
||||
if let expireDate = expireDate {
|
||||
expireOnTimer = Timer.init(fire: expireDate, interval: 0, repeats: false, block: { _ in
|
||||
self.updateShowVariables()
|
||||
})
|
||||
RunLoop.main.add(expireOnTimer!, forMode: .common)
|
||||
} else {
|
||||
if let expireOnTimer = expireOnTimer {
|
||||
expireOnTimer.invalidate()
|
||||
}
|
||||
}
|
||||
|
||||
// No active subscription - check trial status
|
||||
updateTrialState()
|
||||
}
|
||||
|
||||
func listenForTransactions() -> Task<Void, Error> {
|
||||
return Task.detached {
|
||||
//Iterate through any transactions that don't come from a direct call to `purchase()`.
|
||||
for await result in Transaction.updates {
|
||||
do {
|
||||
let transaction = try self.checkVerified(result)
|
||||
|
||||
//Deliver products to the user.
|
||||
await self.updateCustomerProductStatus()
|
||||
|
||||
self.updateShowVariables()
|
||||
|
||||
//Always finish a transaction.
|
||||
await transaction.finish()
|
||||
} catch {
|
||||
//StoreKit has a transaction that fails verification. Don't deliver content to the user.
|
||||
print("Transaction failed verification")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Sync subscription status to UserDefaults for widget access
|
||||
private func syncSubscriptionStatusToUserDefaults() {
|
||||
GroupUserDefaults.groupDefaults.set(hasFullAccess, forKey: UserDefaultsStore.Keys.hasActiveSubscription.rawValue)
|
||||
}
|
||||
|
||||
// fetch all available iap from remote and store locally
|
||||
// in subscriptions
|
||||
@MainActor
|
||||
func requestProducts() async {
|
||||
do {
|
||||
subscriptions.removeAll()
|
||||
|
||||
//Request products from the App Store using the identifiers that the Products.plist file defines.
|
||||
let storeProducts = try await Product.products(for: iapIdentifiers)
|
||||
|
||||
//Filter the products into categories based on their type.
|
||||
for product in storeProducts {
|
||||
switch product.type {
|
||||
case .consumable:
|
||||
break
|
||||
case .nonConsumable:
|
||||
break
|
||||
case .autoRenewable:
|
||||
subscriptions.updateValue(nil, forKey: product)
|
||||
case .nonRenewable:
|
||||
break
|
||||
default:
|
||||
//Ignore this product.
|
||||
print("Unknown product")
|
||||
}
|
||||
}
|
||||
|
||||
} catch {
|
||||
print("Failed product request from the App Store server: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
// quickly check current entitlments if we have a sub
|
||||
private func updatePurchasedProducts() async {
|
||||
for await result in Transaction.currentEntitlements {
|
||||
guard case .verified(let transaction) = result else {
|
||||
continue
|
||||
}
|
||||
|
||||
if transaction.revocationDate == nil {
|
||||
self.purchasedProductIDs.insert(transaction.productID)
|
||||
} else {
|
||||
self.purchasedProductIDs.remove(transaction.productID)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// fetch all subscriptions and fill out subscriptions with current
|
||||
// status of each
|
||||
@MainActor
|
||||
func updateCustomerProductStatus() async {
|
||||
var purchasedSubscriptions: [Product] = []
|
||||
|
||||
// Iterate through all of the user's purchased products.
|
||||
for await result in Transaction.currentEntitlements {
|
||||
do {
|
||||
//Check whether the transaction is verified. If it isn’t, catch `failedVerification` error.
|
||||
let transaction = try checkVerified(result)
|
||||
|
||||
//Check the `productType` of the transaction and get the corresponding product from the store.
|
||||
switch transaction.productType {
|
||||
case .nonConsumable:
|
||||
break
|
||||
case .nonRenewable:
|
||||
break
|
||||
case .autoRenewable:
|
||||
if let subscription = subscriptions.first(where: {
|
||||
$0.key.id == transaction.productID
|
||||
}) {
|
||||
purchasedSubscriptions.append(subscription.key)
|
||||
}
|
||||
default:
|
||||
break
|
||||
}
|
||||
} catch {
|
||||
print()
|
||||
}
|
||||
}
|
||||
|
||||
for sub in purchasedSubscriptions {
|
||||
guard let statuses = try? await sub.subscription?.status else {
|
||||
return
|
||||
}
|
||||
|
||||
for status in statuses {
|
||||
switch status.state {
|
||||
case .expired, .revoked:
|
||||
continue
|
||||
default:
|
||||
if let renewalInfo = try? checkVerified(status.renewalInfo) {
|
||||
subscriptions.updateValue((statuses, renewalInfo), forKey: sub)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func purchase(_ product: Product) async throws -> Transaction? {
|
||||
DispatchQueue.main.async {
|
||||
self.isPurchasing = true
|
||||
}
|
||||
|
||||
//Begin purchasing the `Product` the user selects.
|
||||
let result = try await product.purchase()
|
||||
|
||||
switch result {
|
||||
case .success(let verification):
|
||||
//Check whether the transaction is verified. If it isn't,
|
||||
//this function rethrows the verification error.
|
||||
let transaction = try checkVerified(verification)
|
||||
|
||||
//The transaction is verified. Deliver content to the user.
|
||||
await updateCustomerProductStatus()
|
||||
|
||||
self.updateShowVariables()
|
||||
|
||||
//Always finish a transaction.
|
||||
await transaction.finish()
|
||||
|
||||
DispatchQueue.main.async {
|
||||
self.isPurchasing = false
|
||||
}
|
||||
|
||||
return transaction
|
||||
case .userCancelled, .pending:
|
||||
return nil
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func isPurchased(_ product: Product) async throws -> Bool {
|
||||
//Determine whether the user purchases a given product.
|
||||
switch product.type {
|
||||
case .nonRenewable:
|
||||
return false
|
||||
case .nonConsumable:
|
||||
return false
|
||||
case .autoRenewable:
|
||||
return subscriptions.keys.contains(product)
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
public func restore() async {
|
||||
|
||||
/// Restore purchases
|
||||
func restore() async {
|
||||
do {
|
||||
try await AppStore.sync()
|
||||
await checkSubscriptionStatus()
|
||||
} catch {
|
||||
print(error)
|
||||
print("Failed to restore purchases: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
func checkVerified<T>(_ result: VerificationResult<T>) throws -> T {
|
||||
//Check whether the JWS passes StoreKit verification.
|
||||
switch result {
|
||||
case .unverified:
|
||||
//StoreKit parses the JWS, but it fails verification.
|
||||
throw StoreError.failedVerification
|
||||
case .verified(let safe):
|
||||
//The result is verified. Return the unwrapped value.
|
||||
return safe
|
||||
|
||||
// MARK: - Private Methods
|
||||
|
||||
private func loadProducts() async {
|
||||
do {
|
||||
let products = try await Product.products(for: productIdentifiers)
|
||||
availableProducts = products.filter { $0.type == .autoRenewable }
|
||||
} catch {
|
||||
print("Failed to load products: \(error)")
|
||||
}
|
||||
}
|
||||
|
||||
func sortByPrice(_ products: [Product]) -> [Product] {
|
||||
products.sorted(by: { return $0.price < $1.price })
|
||||
|
||||
private func checkForActiveSubscription() async -> Bool {
|
||||
var foundActiveSubscription = false
|
||||
|
||||
for await result in Transaction.currentEntitlements {
|
||||
guard case .verified(let transaction) = result else { continue }
|
||||
|
||||
// Skip revoked transactions
|
||||
if transaction.revocationDate != nil { continue }
|
||||
|
||||
// Check if this is one of our subscription products
|
||||
guard productIdentifiers.contains(transaction.productID) else { continue }
|
||||
|
||||
// Found an active subscription
|
||||
foundActiveSubscription = true
|
||||
|
||||
// Get the product for this transaction
|
||||
currentProduct = availableProducts.first { $0.id == transaction.productID }
|
||||
|
||||
// Get renewal info
|
||||
if let product = currentProduct,
|
||||
let subscription = product.subscription,
|
||||
let statuses = try? await subscription.status {
|
||||
|
||||
for status in statuses {
|
||||
guard case .verified(let renewalInfo) = status.renewalInfo else { continue }
|
||||
|
||||
switch status.state {
|
||||
case .subscribed, .inGracePeriod, .inBillingRetryPeriod:
|
||||
state = .subscribed(
|
||||
expirationDate: transaction.expirationDate,
|
||||
willAutoRenew: renewalInfo.willAutoRenew
|
||||
)
|
||||
return true
|
||||
case .expired, .revoked:
|
||||
continue
|
||||
default:
|
||||
continue
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Fallback if we couldn't get detailed status
|
||||
state = .subscribed(expirationDate: transaction.expirationDate, willAutoRenew: false)
|
||||
return true
|
||||
}
|
||||
|
||||
// No active subscription found
|
||||
currentProduct = nil
|
||||
return false
|
||||
}
|
||||
|
||||
func colorForIAPButton(iapIdentifier: String) -> Color {
|
||||
if iapIdentifier == "com.88oakapps.ifeel.IAP.subscriptions.weekly" {
|
||||
return DefaultMoodTint.color(forMood: .horrible)
|
||||
|
||||
private func updateTrialState() {
|
||||
let daysSinceInstall = Calendar.current.dateComponents([.day], from: firstLaunchDate, to: Date()).day ?? 0
|
||||
let daysRemaining = trialDays - daysSinceInstall
|
||||
|
||||
if daysRemaining > 0 {
|
||||
state = .inTrial(daysRemaining: daysRemaining)
|
||||
} else {
|
||||
state = .trialExpired
|
||||
}
|
||||
else if iapIdentifier == "com.88oakapps.ifeel.IAP.subscriptions.monthly" {
|
||||
return DefaultMoodTint.color(forMood: .average)
|
||||
|
||||
syncSubscriptionStatusToUserDefaults()
|
||||
}
|
||||
|
||||
private func listenForTransactions() -> Task<Void, Error> {
|
||||
Task.detached { [weak self] in
|
||||
for await result in Transaction.updates {
|
||||
guard case .verified(let transaction) = result else { continue }
|
||||
|
||||
await transaction.finish()
|
||||
await self?.checkSubscriptionStatus()
|
||||
}
|
||||
}
|
||||
else if iapIdentifier == "com.88oakapps.ifeel.IAP.subscriptions.yearly" {
|
||||
return DefaultMoodTint.color(forMood: .great)
|
||||
}
|
||||
|
||||
return .blue
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user