- Notifications
You must be signed in to change notification settings - Fork3.6k
[in_app_purchase_storekit] Fix consumable repurchase issue in StoreKit2#10521
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Draft
ANONYMOUSZED-beep wants to merge6 commits intoflutter:mainChoose a base branch
base:main
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
Uh oh!
There was an error while loading.Please reload this page.
Draft
Changes from1 commit
Commits
Show all changes
6 commits Select commitHold shift + click to select a range
814e600 [in_app_purchase_storekit] Fix consumable repurchase issue in StoreKit2
ANONYMOUSZED-beep97dcd3b Merge branch 'main' into fix-consumable-repurchase-issue
ANONYMOUSZED-beepcc0994d Fix Swift formatting issues
ANONYMOUSZED-beep41a7230 Merge branch 'main' into fix-consumable-repurchase-issue
ANONYMOUSZED-beepd031e46 Address reviewer feedback: use Transaction.unfinished and return erro…
ANONYMOUSZED-beep9f90cc6 Return success instead of error when transaction not found in finish()
ANONYMOUSZED-beepFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
42 changes: 37 additions & 5 deletions...e_storekit/Sources/in_app_purchase_storekit/StoreKit2/InAppPurchasePlugin+StoreKit2.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -263,10 +263,24 @@ extension InAppPurchasePlugin: InAppPurchase2API { | ||
| /// Wrapper method around StoreKit2's finish() method https://developer.apple.com/documentation/storekit/transaction/3749694-finish | ||
| func finish(id: Int64, completion: @escaping (Result<Void, Error>) -> Void) { | ||
| Task { | ||
| do { | ||
| let transaction = try await fetchTransaction(by: UInt64(id)) | ||
| if let transaction = transaction { | ||
| await transaction.finish() | ||
| completion(.success(Void())) | ||
| } else { | ||
| // Transaction not found - this can happen for consumables that have | ||
| ||
| // already been finished or are no longer in the transaction history. | ||
| // We still return success as the transaction is effectively complete. | ||
| completion(.success(Void())) | ||
| } | ||
| } catch { | ||
| completion( | ||
| .failure( | ||
| PigeonError( | ||
| code: "storekit2_finish_transaction_failed", | ||
| message: "Failed to finish transaction: \(error.localizedDescription)", | ||
| details: "Transaction ID: \(id)"))) | ||
| } | ||
| } | ||
| } | ||
| @@ -362,8 +376,11 @@ extension InAppPurchasePlugin: InAppPurchase2API { | ||
| return transactions | ||
| } | ||
| /// Helper function to fetch specific transaction by ID. | ||
| /// First checks Transaction.all, then falls back to unfinished transactions | ||
| /// to ensure consumable transactions can be found and finished. | ||
| func fetchTransaction(by id: UInt64) async throws -> Transaction? { | ||
| // First, try to find in Transaction.all | ||
| for await result in Transaction.all { | ||
| switch result { | ||
| case .verified(let transaction): | ||
| @@ -374,6 +391,21 @@ extension InAppPurchasePlugin: InAppPurchase2API { | ||
| continue | ||
| } | ||
| } | ||
| // If not found in Transaction.all, check unfinished transactions | ||
| ||
| // This is important for consumables that may have been purchased | ||
| // but not yet iterated through Transaction.all | ||
| for await result in Transaction.unfinished { | ||
| switch result { | ||
| case .verified(let transaction): | ||
| if transaction.id == id { | ||
| return transaction | ||
| } | ||
| case .unverified: | ||
| continue | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
| } | ||
61 changes: 61 additions & 0 deletions..._app_purchase_storekit/example/shared/RunnerTests/InAppPurchaseStoreKit2PluginTests.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -415,6 +415,67 @@ final class InAppPurchase2PluginTests: XCTestCase { | ||
| await fulfillment(of: [finishExpectation], timeout: 5) | ||
| } | ||
| func testFinishNonExistentTransactionSucceeds() async throws { | ||
| // Test that finishing a non-existent transaction returns success | ||
| // This is important for consumables that may have already been finished | ||
| // or are no longer in the transaction history | ||
| let finishExpectation = self.expectation(description: "Finishing non-existent transaction should succeed") | ||
| plugin.finish(id: 999999) { result in | ||
| switch result { | ||
| case .success(): | ||
| finishExpectation.fulfill() | ||
| case .failure(let error): | ||
| XCTFail("Finish should NOT fail for non-existent transaction. Failed with \(error)") | ||
| } | ||
| } | ||
| await fulfillment(of: [finishExpectation], timeout: 5) | ||
| } | ||
| func testConsumableCanBeRepurchasedAfterFinish() async throws { | ||
| // Test that a consumable can be purchased again after finishing | ||
| let firstPurchaseExpectation = self.expectation(description: "First purchase should succeed") | ||
| let finishExpectation = self.expectation(description: "Finishing purchase should succeed") | ||
| let secondPurchaseExpectation = self.expectation(description: "Second purchase should succeed") | ||
| // First purchase | ||
| plugin.purchase(id: "consumable", options: nil) { result in | ||
| switch result { | ||
| case .success: | ||
| firstPurchaseExpectation.fulfill() | ||
| case .failure(let error): | ||
| XCTFail("First purchase should NOT fail. Failed with \(error)") | ||
| } | ||
| } | ||
| await fulfillment(of: [firstPurchaseExpectation], timeout: 5) | ||
| // Finish the transaction | ||
| plugin.finish(id: 0) { result in | ||
| switch result { | ||
| case .success(): | ||
| finishExpectation.fulfill() | ||
| case .failure(let error): | ||
| XCTFail("Finish should NOT fail. Failed with \(error)") | ||
| } | ||
| } | ||
| await fulfillment(of: [finishExpectation], timeout: 5) | ||
Comment on lines +454 to +464 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Using a hardcoded transaction ID lettransactionsExpectation=self.expectation(description:"Get transactions")vartransactionId:Int64? plugin.transactions{ resultinswitch result{case.success(let transactions): transactionId= transactions.first?.id transactionsExpectation.fulfill()case.failure(let error):XCTFail("Getting transactions should NOT fail. Failed with\(error)") transactionsExpectation.fulfill()}}awaitfulfillment(of:[transactionsExpectation], timeout:5)guardlet idToFinish= transactionIdelse{XCTFail("Could not get transaction ID to finish")return} // Finish the transaction plugin.finish(id: idToFinish){ result in switchresult{ case.success(): finishExpectation.fulfill() case.failure(let error):XCTFail("Finish should NOT fail. Failed with\(error)")}}await fulfillment(of:[finishExpectation], timeout:5) | ||
| // Second purchase - this should also succeed | ||
| plugin.purchase(id: "consumable", options: nil) { result in | ||
| switch result { | ||
| case .success: | ||
| secondPurchaseExpectation.fulfill() | ||
| case .failure(let error): | ||
| XCTFail("Second purchase should NOT fail. Failed with \(error)") | ||
| } | ||
| } | ||
| await fulfillment(of: [secondPurchaseExpectation], timeout: 5) | ||
| } | ||
| @available(iOS 18.0, macOS 15.0, *) | ||
| func testIsWinBackOfferEligibleEligible() async throws { | ||
| let purchaseExpectation = self.expectation(description: "Purchase should succeed") | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.