Skip to content

[In-app Purchases] Include purchase result in purchaseProduct API #8133

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 16, 2022
Merged

[In-app Purchases] Include purchase result in purchaseProduct API #8133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54fdec4
Include purchase result in purchaseProduct API
koke Nov 16, 2022
ded8c4c
Typealias the purchase result type
koke Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions WooCommerce/Classes/ViewRelated/InAppPurchases/InAppPurchasesDebugView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import SwiftUI
import StoreKit
import Yosemite

@MainActor
Expand Down Expand Up @@ -37,7 +36,8 @@ struct InAppPurchasesDebugView: View {
Task {
isPurchasing = true
do {
try await inAppPurchasesForWPComPlansManager.purchaseProduct(with: product.id, for: siteID)
let result = try await inAppPurchasesForWPComPlansManager.purchaseProduct(with: product.id, for: siteID)
print("[IAP Debug] Purchase result: \(result)")
} catch {
purchaseError = PurchaseError(error: error)
}
Expand Down
8 changes: 5 additions & 3 deletions WooCommerce/Classes/ViewRelated/InAppPurchases/InAppPurchasesForWPComPlansManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ protocol WPComPlanProduct {

extension StoreKit.Product: WPComPlanProduct {}

typealias InAppPurchaseResult = StoreKit.Product.PurchaseResult

protocol InAppPurchasesForWPComPlansProtocol {
/// Retrieves asynchronously all WPCom plans In-App Purchases products.
///
Expand All @@ -33,7 +35,7 @@ protocol InAppPurchasesForWPComPlansProtocol {
/// id: the id of the product to be purchased
/// remoteSiteId: the id of the site linked to the purchasing plan
///
func purchaseProduct(with id: String, for remoteSiteId: Int64) async throws
func purchaseProduct(with id: String, for remoteSiteId: Int64) async throws -> InAppPurchaseResult

/// Retries forwarding the product purchase to our backend, so the plan can be unlocked.
/// This can happen when the purchase was previously successful but unlocking the WPCom plan request
Expand Down Expand Up @@ -73,8 +75,8 @@ final class InAppPurchasesForWPComPlansManager: InAppPurchasesForWPComPlansProto
}
}

func purchaseProduct(with id: String, for remoteSiteId: Int64) async throws {
_ = try await withCheckedThrowingContinuation { continuation in
func purchaseProduct(with id: String, for remoteSiteId: Int64) async throws -> InAppPurchaseResult {
try await withCheckedThrowingContinuation { continuation in
stores.dispatch(InAppPurchaseAction.purchaseProduct(siteID: remoteSiteId, productID: id, completion: { result in
continuation.resume(with: result)
}))
Expand Down