Skip to content

[in_app_purchase_storekit] Add support for purchase and transactions #7574

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

Merged
merged 34 commits into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
b126a15
pigeon stuff
LouiseHsu Sep 3, 2024
ae9095a
refactored AND working heh
LouiseHsu Sep 4, 2024
c38b66f
format
LouiseHsu Sep 4, 2024
268a50e
pre refactor for cache
LouiseHsu Sep 4, 2024
f6ec07a
.
LouiseHsu Sep 4, 2024
aa36dfd
fix configuration file
LouiseHsu Sep 5, 2024
8724d40
more docs
LouiseHsu Sep 5, 2024
a6cbd98
more docs and clean up
LouiseHsu Sep 5, 2024
b75eec7
.
LouiseHsu Sep 13, 2024
4d2fd59
FIXED TESTING ISSUE
LouiseHsu Sep 24, 2024
aeef979
native tests are donesies
LouiseHsu Sep 25, 2024
acf499f
moreeee clean up and tests,
LouiseHsu Sep 26, 2024
c3c7204
format, comments, remove prints
LouiseHsu Sep 26, 2024
9021b6f
versioning, analyze
LouiseHsu Sep 26, 2024
666df56
symlink the test files
LouiseHsu Sep 26, 2024
97b746f
fix mac cant build
LouiseHsu Sep 26, 2024
add5bf5
podspec, licensing
LouiseHsu Sep 26, 2024
06b42d0
.
LouiseHsu Sep 27, 2024
0701d2a
remove any to get around old linter
LouiseHsu Sep 27, 2024
8f225c0
remove more anys to appease format gods
LouiseHsu Sep 27, 2024
2c6efdb
Merge branch 'main' into iap_add_purchase
LouiseHsu Sep 27, 2024
72ce51c
a lil bit of refactioring
LouiseHsu Oct 1, 2024
2e940fe
Merge branch 'iap_add_purchase' of github.com:LouiseHsu/packages into…
LouiseHsu Oct 1, 2024
442c158
better error messages
LouiseHsu Oct 1, 2024
f48510b
some refactoring
LouiseHsu Oct 1, 2024
6076bf1
.
LouiseHsu Oct 1, 2024
d8dcad2
remove uneeded filed
LouiseHsu Oct 2, 2024
9c2893b
oops pathing
LouiseHsu Oct 2, 2024
1a74fb7
.
LouiseHsu Oct 2, 2024
1b688ae
.
LouiseHsu Oct 2, 2024
74c2de3
.
LouiseHsu Oct 4, 2024
71c9a1b
.
LouiseHsu Oct 4, 2024
582156b
no message
LouiseHsu Oct 4, 2024
e6bec70
.
LouiseHsu Oct 7, 2024
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
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.3.18+2

* Adds support for StoreKit2's `purchase` and `transactions`

## 0.3.18+1

* Adds support for StoreKit2's `canMakePayments` and `products`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,21 @@ public class InAppPurchasePlugin: NSObject, FlutterPlugin, InAppPurchaseAPI {
// This property is optional, as it requires self to exist to be initialized.
public var paymentQueueHandler: FLTPaymentQueueHandlerProtocol?

// This should be an Task, but Task is on available >= iOS 13
private var _updateListenerTask: Any?

@available(iOS 13.0, *)
var getListenerTaskAsTask: Task<(), Never> {
Copy link
Contributor

Choose a reason for hiding this comment

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

You can change it in next PR - getter shouldn't have a get prefix. It should be just var updateListenerTask: Task<(), Never>

return self._updateListenerTask as! Task<(), Never>
}

@available(iOS 13.0, *)
func setListenerTaskAsTask(task: Task<(), Never>) {
self._updateListenerTask = task
}

var transactionCallbackAPI: InAppPurchase2CallbackAPI? = nil

public static func register(with registrar: FlutterPluginRegistrar) {
#if os(iOS)
let messenger = registrar.messenger()
Expand Down Expand Up @@ -93,6 +108,7 @@ public class InAppPurchasePlugin: NSObject, FlutterPlugin, InAppPurchaseAPI {
let messenger = registrar.messenger
#endif
setupTransactionObserverChannelIfNeeded(withMessenger: messenger)
self.transactionCallbackAPI = InAppPurchase2CallbackAPI(binaryMessenger: messenger)
}

// MARK: - Pigeon Functions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@

@available(iOS 15.0, macOS 12.0, *)
extension InAppPurchasePlugin: InAppPurchase2API {

// MARK: - Pigeon Functions

// Wrapper method around StoreKit2's canMakePayments() method
// https://developer.apple.com/documentation/storekit/appstore/3822277-canmakepayments
/// Wrapper method around StoreKit2's canMakePayments() method
/// https://developer.apple.com/documentation/storekit/appstore/3822277-canmakepayments
func canMakePayments() throws -> Bool {
return AppStore.canMakePayments
}

// Wrapper method around StoreKit2's products() method
// https://developer.apple.com/documentation/storekit/product/3851116-products
/// Wrapper method around StoreKit2's products() method
/// https://developer.apple.com/documentation/storekit/product/3851116-products
func products(
identifiers: [String], completion: @escaping (Result<[SK2ProductMessage], Error>) -> Void
) {
Expand All @@ -34,4 +35,144 @@ extension InAppPurchasePlugin: InAppPurchase2API {
}
}
}

/// Gets the appropriate product, then calls purchase on it.
/// https://developer.apple.com/documentation/storekit/product/3791971-purchase
func purchase(
id: String, options: SK2ProductPurchaseOptionsMessage?,
completion: @escaping (Result<SK2ProductPurchaseResultMessage, Error>) -> Void
) {
Task { @MainActor in
do {
guard let product = try await Product.products(for: [id]).first else {
let error = PigeonError(
code: "storekit2_failed_to_fetch_product",
message: "Storekit has failed to fetch this product.",
details: "Product ID : \(id)")
return completion(.failure(error))
}

let result = try await product.purchase(options: [])

switch result {
case .success(let verification):
switch verification {
case .verified(let transaction):
self.sendTransactionUpdate(transaction: transaction)
completion(.success(result.convertToPigeon()))
case .unverified(_, let error):
completion(.failure(error))
}
case .pending:
completion(
.failure(
Copy link
Contributor

Choose a reason for hiding this comment

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

reduce indentation by combining these

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the formatter uncombines these

Copy link
Contributor

Choose a reason for hiding this comment

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

strange. it's clearly less than 100 characters. how's your code like before the formatter?

PigeonError(
code: "storekit2_purchase_pending",
message:
"This transaction is still pending and but may complete in the future. If it completes, it will be delivered via `purchaseStream`",
details: "Product ID : \(id)")))
case .userCancelled:
completion(
.failure(
PigeonError(
code: "storekit2_purchase_cancelled",
message: "This transaction has been cancelled by the user.",
details: "Product ID : \(id)")))
@unknown default:
fatalError("An unknown StoreKit PurchaseResult has been encountered.")
}
} catch {
completion(.failure(error))
}
}
}

/// Wrapper method around StoreKit2's transactions() method
/// https://developer.apple.com/documentation/storekit/product/3851116-products
func transactions(
completion: @escaping (Result<[SK2TransactionMessage], Error>) -> Void
) {
Task {
@MainActor in
do {
let transactionsMsgs = await rawTransactions().map {
$0.convertToPigeon()
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: use keypath

Copy link
Contributor Author

Choose a reason for hiding this comment

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

"Keypath can’t be used on instance methods"

Copy link
Contributor

Choose a reason for hiding this comment

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

oh you are right

}
completion(.success(transactionsMsgs))
}
}
}

/// Wrapper method around StoreKit2's finish() method https://developer.apple.com/documentation/storekit/transaction/3749694-finish
func finish(id: Int64, completion: @escaping (Result<Void, Error>) -> Void) {
Task {
let transaction = try await fetchTransaction(by: UInt64(id))
if let transaction = transaction {
await transaction.finish()
}
}
}

/// This Task listens to Transation.updates as shown here
/// https://developer.apple.com/documentation/storekit/transaction/3851206-updates
/// This function should be called as soon as the app starts to avoid missing any Transactions done outside of the app.
func startListeningToTransactions() throws {
self.setListenerTaskAsTask(
task: Task { [weak self] in
for await verificationResult in Transaction.updates {
switch verificationResult {
case .verified(let transaction):
self?.sendTransactionUpdate(transaction: transaction)
case .unverified:
break
}
}
})
}

/// Stop subscribing to Transaction.updates
func stopListeningToTransactions() throws {
getListenerTaskAsTask.cancel()
}

/// Sends an transaction back to Dart. Access these transactions with `purchaseStream`
func sendTransactionUpdate(transaction: Transaction) {
let transactionMessage = transaction.convertToPigeon()
transactionCallbackAPI?.onTransactionsUpdated(newTransaction: transactionMessage) { result in
switch result {
case .success: break
case .failure(let error):
print("Failed to send transaction updates: \(error)")
}
}
}

/// Helper function that fetches and unwraps all verified transactions
private func rawTransactions() async -> [Transaction] {
var transactions: [Transaction] = []
for await verificationResult in Transaction.all {
switch verificationResult {
case .verified(let transaction):
transactions.append(transaction)
case .unverified:
break
}
}
return transactions
}

/// Helper function to fetch specific transaction
private func fetchTransaction(by id: UInt64) async throws -> Transaction? {
for await result in Transaction.all {
switch result {
case .verified(let transaction):
if transaction.id == id {
return transaction
}
case .unverified:
continue
}
}
return nil
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -167,3 +167,38 @@ extension SK2PriceLocaleMessage: Equatable {
return lhs.currencyCode == rhs.currencyCode && lhs.currencySymbol == rhs.currencySymbol
}
}

@available(iOS 15.0, macOS 12.0, *)
extension Product.PurchaseResult {
func convertToPigeon() -> SK2ProductPurchaseResultMessage {
switch self {
case .success(_):
return SK2ProductPurchaseResultMessage.success
case .userCancelled:
return SK2ProductPurchaseResultMessage.userCancelled
case .pending:
return SK2ProductPurchaseResultMessage.pending
@unknown default:
fatalError()
}
}
}

@available(iOS 15.0, macOS 12.0, *)
extension Transaction {
func convertToPigeon(restoring: Bool = false) -> SK2TransactionMessage {

let dateFromatter: DateFormatter = DateFormatter()
dateFromatter.dateFormat = "yyyy-MM-dd HH:mm:ss"

return SK2TransactionMessage(
id: Int64(id),
originalId: Int64(originalID),
productId: productID,
purchaseDate: dateFromatter.string(from: purchaseDate),
purchasedQuantity: Int64(purchasedQuantity),
appAccountToken: appAccountToken?.uuidString,
restoring: restoring
)
}
}
Loading