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.

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

StoreTransaction: read Storefront from StoreKit.Transaction #2611

Merged
merged 2 commits into from
Jun 12, 2023

Conversation

NachoSoto
Copy link
Contributor

This was added in iOS 17, and it's potentially more accurate than reading Storefront.currentStorefront later.

@codecov
Copy link

codecov bot commented Jun 9, 2023

Codecov Report

❗ No coverage uploaded for pull request base (main@2a95520). Click here to learn what that means.
The diff coverage is 94.11%.

❗ Current head 22eeb3c differs from pull request most recent head 58a6462. Consider uploading reports for the commit 58a6462 to get more accurate results

@@           Coverage Diff           @@
##             main    #2611   +/-   ##
=======================================
  Coverage        ?   86.26%           
=======================================
  Files           ?      205           
  Lines           ?    14382           
  Branches        ?        0           
=======================================
  Hits            ?    12407           
  Misses          ?     1975           
  Partials        ?        0           
Impacted Files Coverage Δ
Sources/Misc/Deprecations.swift 38.40% <0.00%> (ø)
...s/Purchasing/Purchases/PurchasesOrchestrator.swift 85.58% <100.00%> (ø)
...ing/StoreKitAbstractions/SK1StoreTransaction.swift 100.00% <100.00%> (ø)
...ing/StoreKitAbstractions/SK2StoreTransaction.swift 100.00% <100.00%> (ø)
...hasing/StoreKitAbstractions/StoreTransaction.swift 85.71% <100.00%> (ø)

@@ -824,7 +824,7 @@ extension PurchasesOrchestrator: StoreKit2TransactionListenerDelegate {
_ listener: StoreKit2TransactionListener,
updatedTransaction transaction: StoreTransactionType
) async throws {
let storefront = await Storefront.currentStorefront
let storefront = await transaction.storefront ??? (await Storefront.currentStorefront)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FFTI I wonder if we should move this inside the transaction.storefront calculation, in case we ever need it somewhere else.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah let me put that in an extension 👍🏻

This was added in iOS 17, and it's potentially more accurate than reading `Storefront.currentStorefront` later.
@NachoSoto NachoSoto enabled auto-merge (squash) June 12, 2023 16:01
@NachoSoto NachoSoto merged commit 01ed2cb into main Jun 12, 2023
@NachoSoto NachoSoto deleted the sk2-transaction-storefront branch June 12, 2023 16:35
NachoSoto added a commit that referenced this pull request Jun 13, 2023
This was added in #2611 but forgot to put it in API testers.
NachoSoto added a commit that referenced this pull request Jun 13, 2023
This was added in #2611 but forgot to put it in API testers.
NachoSoto pushed a commit that referenced this pull request Jun 13, 2023
**This is an automatic release.**

### New Features
* New `DebugViewController`: UIKit counterpart for SwiftUI's
`debugRevenueCatOverlay` (#2631) via NachoSoto (@NachoSoto)
* Created `PaywallExtensions`: `StoreView` and `SubscriptionStoreView`
overloads for `Offering` (#2593) via NachoSoto (@NachoSoto)
* Introduced `debugRevenueCatOverlay()`: new SwiftUI debug overlay
(#2567) via NachoSoto (@NachoSoto)
### Bugfixes
* Removed `preventPurchasePopupCallFromTriggeringCacheRefresh`, update
caches on `willEnterForeground` (#2623) via NachoSoto (@NachoSoto)
* Fixed `Catalyst` build with `Xcode 15 beta 1` (#2586) via NachoSoto
(@NachoSoto)
### Dependency Updates
* Bump danger from 9.3.0 to 9.3.1 (#2592) via dependabot[bot]
(@dependabot[bot])
### Other Changes
* `StoreTransaction`: added new `Storefront` to API testers (#2634) via
NachoSoto (@NachoSoto)
* `DebugView`: added snapshot tests (#2630) via NachoSoto (@NachoSoto)
* `verifyNoUnfinishedTransactions`/`verifyUnfinishedTransaction`: added
missing `#file` parameter (#2625) via NachoSoto (@NachoSoto)
* `PostReceiptDataOperation`: clean up cache key (#2628) via NachoSoto
(@NachoSoto)
* `PurchasesOrchestrator`: also get `Storefront` from SK1 (#2629) via
NachoSoto (@NachoSoto)
* `CI`: disable iOS 17 for now (#2627) via NachoSoto (@NachoSoto)
* `Tests`: fixed crash on iOS 13 (#2624) via NachoSoto (@NachoSoto)
* `StoreTransaction`: read `Storefront` from `StoreKit.Transaction`
(#2611) via NachoSoto (@NachoSoto)
* `StoreKitConfigTestCase`/`BaseStoreKitIntegrationTests`: also clear
transactions after every test (#2616) via NachoSoto (@NachoSoto)
* `ErrorCode.networkError`: improved description (#2610) via NachoSoto
(@NachoSoto)
* `PurchaseTester`: make CI job always point to current version (#2622)
via NachoSoto (@NachoSoto)
* Improved `finishAllUnfinishedTransactions` (#2615) via NachoSoto
(@NachoSoto)
* `StoreKitConfigTestCase`: improved `waitForStoreKitTestIfNeeded`
(#2614) via NachoSoto (@NachoSoto)
* `StoreKitConfigTestCase`: set `continueAfterFailure` to `false`
(#2617) via NachoSoto (@NachoSoto)
* `PaywallExtensions`: fixed compilation (#2613) via NachoSoto
(@NachoSoto)
* `CI`: added `iOS 17` job (#2591) via NachoSoto (@NachoSoto)
* `Encodable.jsonEncodedData`: fixed tests on iOS 17 due to inconsistent
key ordering (#2607) via NachoSoto (@NachoSoto)
* `debugRevenueCatOverlay`: added ability to display new
`SubscriptionStoreView` (#2595) via NachoSoto (@NachoSoto)
* Refactor: extracted all log strings (#2600) via NachoSoto (@NachoSoto)
* Changed tests to work around `URL` decoding differences in `iOS 17`
(#2605) via NachoSoto (@NachoSoto)
* Removed unnecessary `Strings.trimmedOrError` (#2601) via NachoSoto
(@NachoSoto)
* Fixed test compilation with `Xcode 15` (#2602) via NachoSoto
(@NachoSoto)
* Tests: added `iOS 17` snapshots (#2603) via NachoSoto (@NachoSoto)
* `StoreProductDiscount`: added `description` (#2604) via NachoSoto
(@NachoSoto)
* `debugRevenueCatOverlay` improvements (#2594) via NachoSoto
(@NachoSoto)
* `Xcode 15`: fixed all documentation warnings (#2596) via NachoSoto
(@NachoSoto)
* `StoreKitObserverModeIntegrationTests`: fixed and disabled SK2
`testPurchaseInDevicePostsReceipt` (#2589) via NachoSoto (@NachoSoto)
* `StoreKit2TransactionListener`: added log when receiving
`Transactions.Updates` (#2588) via NachoSoto (@NachoSoto)
* `Dictionary.MergeStrategy`: simplify implementation (#2587) via
NachoSoto (@NachoSoto)
* `Configuration.Builder`: fixed doc reference (#2583) via NachoSoto
(@NachoSoto)
* `APITesters`: available since iOS 11 (#2581) via NachoSoto
(@NachoSoto)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants