TransactionPoster: avoid posting transactions multiple times
#2914
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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 |
|---|---|---|
|
|
@@ -865,7 +865,7 @@ extension PurchasesOrchestrator: StoreKit2TransactionListenerDelegate { | |
| let subscriberAttributes = self.unsyncedAttributes | ||
| let adServicesToken = self.attribution.unsyncedAdServicesToken | ||
|
|
||
| let result: TransactionPosterResult = await Async.call { completed in | ||
| self.transactionPoster.handlePurchasedTransaction( | ||
| StoreTransaction.from(transaction: transaction), | ||
| data: .init( | ||
|
|
@@ -1058,7 +1058,7 @@ private extension PurchasesOrchestrator { | |
| source: .init(isRestore: isRestore, initiationSource: initiationSource) | ||
| ), | ||
| observerMode: self.observerMode) { result in | ||
| self.handleReceiptPost(result: .init(result), | ||
| subscriberAttributes: unsyncedAttributes, | ||
| adServicesToken: adServicesToken, | ||
| completion: completion) | ||
|
|
@@ -1068,7 +1068,7 @@ private extension PurchasesOrchestrator { | |
| } | ||
| } | ||
|
|
||
| func handleReceiptPost(result: TransactionPosterResult, | ||
| subscriberAttributes: SubscriberAttribute.Dictionary, | ||
| adServicesToken: String?, | ||
| completion: (@Sendable (Result<CustomerInfo, PurchasesError>) -> Void)?) { | ||
|
|
@@ -1080,21 +1080,33 @@ private extension PurchasesOrchestrator { | |
|
|
||
| if let completion = completion { | ||
| self.operationDispatcher.dispatchOnMainThread { | ||
| self.convertToResult(result) { result in | ||
| completion(result.mapError { $0.asPurchasesError }) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func handlePostReceiptResult(_ result: TransactionPosterResult, | ||
| subscriberAttributes: SubscriberAttribute.Dictionary, | ||
| adServicesToken: String?) { | ||
| switch result { | ||
| case .alreadyPosted: | ||
| // Nothing to do | ||
| break | ||
|
|
||
| case let .success(customerInfo): | ||
| self.customerInfoManager.cache(customerInfo: customerInfo, appUserID: self.appUserID) | ||
|
|
||
| self.markSyncedIfNeeded(subscriberAttributes: subscriberAttributes, | ||
| adServicesToken: adServicesToken, | ||
| error: nil) | ||
|
|
||
| case let .failure(error): | ||
| self.markSyncedIfNeeded(subscriberAttributes: subscriberAttributes, | ||
| adServicesToken: adServicesToken, | ||
| error: error) | ||
| } | ||
| } | ||
|
|
||
| func handlePurchasedTransaction(_ purchasedTransaction: StoreTransaction, | ||
|
|
@@ -1104,31 +1116,41 @@ private extension PurchasesOrchestrator { | |
| let unsyncedAttributes = self.unsyncedAttributes | ||
| let adServicesToken = self.attribution.unsyncedAdServicesToken | ||
|
|
||
| self.operationDispatcher.dispatchOnWorkerThread { | ||
|
There was a problem hiding this comment.
|
||
| self.transactionPoster.handlePurchasedTransaction( | ||
| purchasedTransaction, | ||
| data: .init( | ||
| appUserID: self.appUserID, | ||
| presentedOfferingID: offeringID, | ||
| unsyncedAttributes: unsyncedAttributes, | ||
| aadAttributionToken: adServicesToken, | ||
| storefront: storefront, | ||
| source: self.purchaseSource(for: purchasedTransaction.productIdentifier, | ||
| transaction: purchasedTransaction, | ||
| restored: restored) | ||
| ) | ||
| ) { result in | ||
| let completion: (@Sendable(Result<CustomerInfo, PurchasesError>) -> Void)? = | ||
| self.getAndRemovePurchaseCompletedCallback(forTransaction: purchasedTransaction) | ||
| .map { completion in | ||
| return { @Sendable result in | ||
| self.operationDispatcher.dispatchOnMainActor { | ||
| completion( | ||
| purchasedTransaction, | ||
| result.value, | ||
| result.error?.asPublicError, | ||
| result.error?.isCancelledError ?? false | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. There's a possibility that this ends up with Need to write a unit test for this and fix it. There was a problem hiding this comment. Fixed and tested. |
||
| self.handleReceiptPost( | ||
| result: result, | ||
| subscriberAttributes: unsyncedAttributes, | ||
| adServicesToken: adServicesToken, | ||
| completion: completion | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -1200,6 +1222,19 @@ private extension PurchasesOrchestrator { | |
| } | ||
| } | ||
|
|
||
| func convertToResult( | ||
| _ transactionResult: TransactionPosterResult, | ||
| completion: @escaping @Sendable (Result<CustomerInfo, BackendError>) -> Void | ||
| ) { | ||
| transactionResult.toResult(completion: completion) { | ||
| self.customerInfoManager.customerInfo( | ||
| appUserID: self.appUserID, | ||
| fetchPolicy: .cachedOrFetched, | ||
| completion: $0 | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| private extension PurchasesOrchestrator { | ||
|
|
@@ -1235,7 +1270,7 @@ extension PurchasesOrchestrator { | |
| let unsyncedAttributes = self.unsyncedAttributes | ||
| let adServicesToken = self.attribution.unsyncedAdServicesToken | ||
|
|
||
| let postResult = await self.transactionPoster.handlePurchasedTransaction( | ||
| transaction, | ||
| data: .init( | ||
| appUserID: self.appUserID, | ||
|
|
@@ -1248,11 +1283,12 @@ extension PurchasesOrchestrator { | |
| ) | ||
| ) | ||
|
|
||
| self.handlePostReceiptResult(postResult, | ||
| subscriberAttributes: unsyncedAttributes, | ||
| adServicesToken: adServicesToken) | ||
|
|
||
| return try await self | ||
| .convertToResult(postResult) | ||
| .mapError(\.asPurchasesError) | ||
| .get() | ||
| } | ||
|
|
@@ -1268,4 +1304,14 @@ extension PurchasesOrchestrator { | |
| } | ||
| } | ||
|
|
||
| /// Converts a `TransactionPosterResult` to a `Result<CustomerInfo, BackendError>` | ||
| /// by optionally loading a customer info for `TransactionPosterResult.alreadyPosted`. | ||
| private func convertToResult( | ||
| _ transactionResult: TransactionPosterResult | ||
| ) async -> Result<CustomerInfo, BackendError> { | ||
| return await Async.call { completion in | ||
| self.convertToResult(transactionResult, completion: completion) | ||
| } | ||
| } | ||
|
|
||
| } | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a follow-up to #2954. We look for the first un-posted transaction now.