[In-App Purchases] Site creation flow interface #7959

toupper · 2022-10-27T13:04:26Z

Closes: #7933 (Issue number in branch name is wrong)

Description

With this PR we implement the interface that connects the InAppPurchaseAction and InAppPurchaseStore with the UI that will take care of the site creation flow. In order to test it, we use it here in the InAppPurchasesDebugView as well.

Changes

Create protocol and implementation for the Site Creation Flow interface.
Refactor InAppPurchaseAction to accept a product id when purchasing a product instead of the whole StoreKit product. This makes it easier to call it when the client doesn't have a reference of the whole StoreKit product, hiding these details behind the store.
Add testing functionality InAppPurchasesDebugView: we show when the product is entitled and show the option to retry the synchronization with the backend.

Testing instructions

Go the IAP Debug Menu:

Test that the products are properly loaded.
Test that the product purchase is successful.
Test that when the user is entitled to the product (after a purchase), we show the prefix "Entitled:" before the product name.
Test that retrying the backend synchronization works when the purchase was not successfully synchronized before. That can be tested by commenting await transaction.finish() in InAppPurchaseStore or by making the submitTransaction function fail.

Every test step can be verified through the Xcode console.

Screenshots

I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

…. Fetch products before purchase.

…-site-creation-flow-interface

…ed the product.

wpmobilebot · 2022-10-27T14:07:28Z

You can test the changes from this Pull Request by:

Clicking here or scanning the QR code below to access App Center
Then installing the build number pr7959-d658a7f on your iPhone

If you need access to App Center, please ask a maintainer to add you.

koke · 2022-10-27T15:17:46Z

Yosemite/Yosemite/Stores/InAppPurchaseStore.swift

+        }
+
+        guard await Transaction.unfinished.contains(verificationResult) else {
+            // The transaction is finished. Return successfully


If I understand it correctly, Transaction.unfinished is an async sequence that will emit changes as they happen and so it would never end. Then, if the transaction has somehow been finished when this is called, unfinished would not have a value for this product and this code would wait indefinitely.

Indeed, Transaction.unfinished is an async sequence, but I don't think it never ends, when they find that there are no more values to transmit (no more unfinished transactions found), it ends (returning nil in public mutating func next() async -> VerificationResult<Transaction>?). I tested and worked fine for that case, but I will retest it to be sure.

koke

I left a few cosmetic suggestions, and one concern, although I've tested this with two devices having the app opened at the same time and couldn't make it fail 🤷🏽‍♂️

koke · 2022-10-28T08:24:00Z

WooCommerce/Classes/ViewRelated/InAppPurchases/InAppPurchasesForWPComPlansManager.swift

+                switch result {
+                case .success(let products):
+                    continuation.resume(returning: products)
+                case .failure(let error):
+                    continuation.resume(throwing: error)
+                }


Noting that you can use continuation.resume(with: result) directly to simplify this and the other methods

Great, thanks for the tip. Changed in d0c8d66

koke · 2022-10-28T08:25:33Z

Yosemite/Yosemite/Stores/InAppPurchaseStore.swift

+        }
+
+        switch verificationResult {
+        case .verified(let transaction):


let transaction is never used, so it can be replaced with _ to avoid a warning

True, changed in 16fe318

koke · 2022-10-28T08:35:05Z

WooCommerce/Classes/ViewRelated/InAppPurchases/InAppPurchasesDebugView.swift

-            case .success(let products):
-                self.products = products
-            case .failure(let error):
+        Task {


Instead of calling this from .onAppear, you can call it from .task and make loadProducts async. I had it like that before putting the logic in Yosemite

Good hint, changed in 479aabb

koke · 2022-10-28T08:37:46Z

Yosemite/Yosemite/Actions/InAppPurchaseAction.swift

-    case purchaseProduct(siteID: Int64, product: StoreKit.Product, completion: (Result<StoreKit.Product.PurchaseResult, Error>) -> Void)
+    case purchaseProduct(siteID: Int64, productID: String, completion: (Result<StoreKit.Product.PurchaseResult, Error>) -> Void)
+    case userIsEntitledToProduct(productID: String, completion: (Result<Bool, Error>) -> Void)
+    case inAppPurchasesAreSupported(completion: (Bool) -> Void)


Should we add this to the debug screen as well? My testing account region is set to Spain, so it'd be nice if the debug screen showed that it's not supported in my country. Ideally we'd fail loadProducts/purchaseProduct from an unsupported region as well

Good remark, added in e7a3c3e

toupper added 12 commits October 25, 2022 17:48

Add protocol and manager to handle WPCOM plans In-App Purchases

c755267

Add logic to IAP manager

0582234

Refactor to pass the id instead of the whole WPComPlanProduct product…

2f04498

…. Fetch products before purchase.

Merge branch 'issue/7931-iap-send-actual-receipt' into issue/7934-iap…

e68d90f

…-site-creation-flow-interface

Add action to finish the product purchase

62fbcb0

Move logic to InAppPurchaseStore.

144924e

Use new protocol in debug view.

654ca8a

Add documentation to protocol functions.

647a706

Add documentation for the WPComPlanProduct protocol.

c6ff91b

Merge branch 'trunk' into issue/7934-iap-site-creation-flow-interface

55a0dfa

Refactor to use entitlements instead of verifying if the user purchas…

fb03bfa

…ed the product.

Refactor code.

a82e03c

toupper added type: task An internally driven task. feature: in-app purchases Related to In-app purchases and subscriptions labels Oct 27, 2022

toupper added this to the 11.1 milestone Oct 27, 2022

toupper changed the title ~~Issue/7934 iap site creation flow interface~~ [In-App Purchases] Site creation flow interface Oct 27, 2022

koke reviewed Oct 27, 2022

View reviewed changes

koke approved these changes Oct 28, 2022

View reviewed changes

toupper added 6 commits October 28, 2022 14:55

Use continuation.resume to avoid the need of having a switch

d0c8d66

Merge branch 'trunk' into issue/7934-iap-site-creation-flow-interface

b16c516

Remove not needed constant

16fe318

Use .task instead of .onAppear

479aabb

Assert that in app purchases are supported. Show it in UI

e7a3c3e

Merge branch 'trunk' into issue/7934-iap-site-creation-flow-interface

d658a7f

toupper enabled auto-merge October 28, 2022 17:00

toupper merged commit 7d8e06b into trunk Oct 28, 2022

toupper deleted the issue/7934-iap-site-creation-flow-interface branch October 28, 2022 17:28

[In-App Purchases] Site creation flow interface #7959

[In-App Purchases] Site creation flow interface #7959

Uh oh!

Conversation

toupper commented Oct 27, 2022

Description

Changes

Testing instructions

Screenshots

Uh oh!

wpmobilebot commented Oct 27, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

koke left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

wpmobilebot commented Oct 27, 2022 •

edited

Loading