Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: storekit2 add verificationResultIOS to getAvailablePurchases #2874

Merged
merged 2 commits into from
Nov 1, 2024
+11 −11
Merged

fix: storekit2 add verificationResultIOS to getAvailablePurchases #2874

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c29c754
fix: storekit2 add verificationResultIOS to getAvailablePurchases
charlyBerthet Oct 31, 2024
3663417
fix type format
charlyBerthet Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions ios/RNIapIosSk2.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,10 +592,10 @@ class RNIapIosSk2iOS15: Sk2Delegate {
reject: @escaping RCTPromiseRejectBlock = { _, _, _ in }
) {
Task {
var purchasedItems: [Transaction] = []
var purchasedItemsSerialized: [[String: Any?]] = []

func addTransaction(transaction: Transaction) {
purchasedItems.append( transaction)
func addTransaction(transaction: Transaction, verification: VerificationResult<Transaction>) {
purchasedItemsSerialized.append(serialize(transaction, verification))
if alsoPublishToEventListener {
self.sendEvent?("purchase-updated", serialize(transaction))
}
Expand All @@ -606,19 +606,19 @@ class RNIapIosSk2iOS15: Sk2Delegate {
}
}
// Iterate through all of the user's purchased products.
for await result in onlyIncludeActiveItems ? Transaction.currentEntitlements : Transaction.all {
for await verification in onlyIncludeActiveItems ? Transaction.currentEntitlements : Transaction.all {
do {
// Check whether the transaction is verified. If it isn’t, catch `failedVerification` error.
let transaction = try checkVerified(result)
let transaction = try checkVerified(verification)
// Check the `productType` of the transaction and get the corresponding product from the store.
if !onlyIncludeActiveItems {
addTransaction(transaction: transaction)
addTransaction(transaction: transaction, verification: verification)
continue
}
switch transaction.productType {
case .nonConsumable:
if await productStore.getProduct(productID: transaction.productID) != nil {
addTransaction(transaction: transaction)
addTransaction(transaction: transaction, verification: verification)
}

case .nonRenewable:
Expand All @@ -633,18 +633,18 @@ class RNIapIosSk2iOS15: Sk2Delegate {
to: transaction.purchaseDate)!

if currentDate < expirationDate {
addTransaction(transaction: transaction)
addTransaction(transaction: transaction, verification: verification)
}
}

case .autoRenewable:
if await productStore.getProduct(productID: transaction.productID) != nil {
addTransaction(transaction: transaction)
addTransaction(transaction: transaction, verification: verification)
}

case .consumable:
if await productStore.getProduct(productID: transaction.productID) != nil {
addTransaction(transaction: transaction)
addTransaction(transaction: transaction, verification: verification)
}

default:
Expand Down Expand Up @@ -674,7 +674,7 @@ class RNIapIosSk2iOS15: Sk2Delegate {
// group, so products in the subscriptions array all belong to the same group. The statuses that
// `product.subscription.status` returns apply to the entire subscription group.
// subscriptionGroupStatus = try? await subscriptions.first?.subscription?.status.first?.state
resolve(purchasedItems.map({(t: Transaction) in serialize(t)}))
resolve(purchasedItemsSerialized)
}
}

Expand Down
Loading