Change user cancelled behavior in custom entitlement computation mode#2447
Closed
tonidero wants to merge 1 commit into
Closed
Conversation
Contributor
|
Awesome 👍🏻 I'll add tests for this. |
Contributor
|
TODO: add an assertion to ensure there's no customer info request in this case. |
NachoSoto
reviewed
Apr 26, 2023
| error: error | ||
| )) | ||
| let publicError = ErrorUtils.purchasesError(withUntypedError: error).asPublicError | ||
| let userCancelled = publicError.code == ErrorCode.purchaseCancelledError.rawValue |
Contributor
There was a problem hiding this comment.
Oh I see why you needed this now. We need to compare the error domain too though, I'll fix that.
Contributor
There was a problem hiding this comment.
I'm changing it to this:
Suggested change
| let userCancelled = publicError.code == ErrorCode.purchaseCancelledError.rawValue | |
| let userCancelled = publicError.isCancelledError |
NachoSoto
reviewed
Apr 26, 2023
| // This detects if `Product.PurchaseResult.userCancelled` is true. | ||
| let (userCancelled, sk2Transaction) = try await self.storeKit2TransactionListener | ||
| .handle(purchaseResult: result) | ||
| if self.systemInfo.dangerousSettings.customEntitlementComputation { |
Contributor
There was a problem hiding this comment.
I think this was missing also checking userCancelled.
Contributor
Author
There was a problem hiding this comment.
Ah yes you're completely right. Didn't have time to test this 👍
tonidero
commented
Apr 26, 2023
| } catch StoreKitError.userCancelled { | ||
| if self.systemInfo.dangerousSettings.customEntitlementComputation { | ||
| throw ErrorUtils.purchaseCancelledError() | ||
| } |
Contributor
Author
There was a problem hiding this comment.
I'm not sure if this error would be catched by the following catches... Still had to test each of these cases to make sure it behaved as I expected
| // This detects if `Product.PurchaseResult.userCancelled` is true. | ||
| let (userCancelled, sk2Transaction) = try await self.storeKit2TransactionListener | ||
| .handle(purchaseResult: result) | ||
| if self.systemInfo.dangerousSettings.customEntitlementComputation { |
Contributor
Author
There was a problem hiding this comment.
Ah yes you're completely right. Didn't have time to test this 👍
NachoSoto
added a commit
that referenced
this pull request
Apr 26, 2023
…PurchasesOrchestrator` for cancelled purchases Fixes SDK-3088 Supersedes #2447 Note that it's currently impossible to test this for SK2, so we only have SK1 tests (we have a Radar for that). The next step will be to deprecate the current API to remove the `userCancelled` property and make this the new behavior. See also #1910 for an explanation of the different return values of the purchase APIs.
Contributor
|
Closing in favor of #2449 |
NachoSoto
added a commit
that referenced
this pull request
Apr 26, 2023
…cancelled purchases (#2449) Fixes SDK-3088 Supersedes #2447 Thanks to @tonidero for doing most of this. Note that it's currently impossible to test this for SK2, so we only have SK1 tests (we have a Radar for that). The next step will be to deprecate the current API to remove the `userCancelled` property and make this the new behavior. See also #1910 for an explanation of the different return values of the purchase APIs.
NachoSoto
added a commit
that referenced
this pull request
Apr 26, 2023
…cancelled purchases (#2449) Fixes SDK-3088 Supersedes #2447 Thanks to @tonidero for doing most of this. Note that it's currently impossible to test this for SK2, so we only have SK1 tests (we have a Radar for that). The next step will be to deprecate the current API to remove the `userCancelled` property and make this the new behavior. See also #1910 for an explanation of the different return values of the purchase APIs.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Description
Change user cancelled behavior in custom entitlement mode. Now for