ccd4531bfb
* chore: bump chromium in DEPS to 117.0.5846.0 * chore: update patches * 4628901: Bump the macOS deployment target to 10.15 https://chromium-review.googlesource.com/c/chromium/src/+/4628901 * 4593350: [Private Network Access] Trigger Permission Prompt https://chromium-review.googlesource.com/c/chromium/src/+/4593350 * 4631011: Remove unlaunched "InstallReplacementAndroidApp" Platform App APIs https://chromium-review.googlesource.com/c/chromium/src/+/4631011 * chore: disable API deprecation warnings in NSKeyedArchiver * chore: update libcxx filenames * chore: bump chromium in DEPS to 117.0.5848.2 * chore: update feat_add_set_theme_source_to_allow_apps_to.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4629743 No manual changes; patch succeeded with fuzz * chore: update process_singleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4605398 Trivial manual patch adjustments to account for code shear. * chore: remove electron::BrowserContext::GetMediaDeviceIDSalt() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4608130 upstream tldr: - content::BrowserContext::GetMediaDeviceIDSalt() - content::ContentBrowserClient::ArePersistentMediaDeviceIDsAllowed() + content::ContentBrowserClient::GetMediaDeviceIDSalt() This commit leaves ElectronBrowserContext::GetMediaDeviceIDSalt() in place (now non-virtual, non-override). It is now called by the new function ElectronBrowserClient::GetMediaDeviceIDSalt(). As a followup, we might want to consider using the new upstream media_device_salt::MediaDeviceSaltService and removing our electron::MediaDeviceIDSalt code. CC @MarshallOfSound for 2nd opinion since he has done the most work on MediaDeviceIDSalt and may have more context. * chore: fix iwyu breakage Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4629624 electron_browser_main_parts.cc uses ui::ColorProviderManager but didn't include it. Things worked anyway because we got it indirectly from content/public/browser/web_contents.h until 4629624. * chore: remove call to base::mac::IsAtLeastOS10_14 upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove obsolete API_AVAILABLE calls in IAP upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove obsolete API_AVAILABLE calls in electron_application_delegate upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove broken-before-macOS-10.15 patch in mas_avoid_usage_of_private_macos_apis.patch Upstream has bumped minimum to macOS 10.15 * chore: remove @available(macOS 10.14) check Upstream minimum requirement for macOS is now 10.15 * chore: update patches * chore: bump chromium in DEPS to 117.0.5850.0 * chore: update patches * chore: bump chromium in DEPS to 117.0.5852.0 * chore: update patches * Move two params from NetworkContextParams to NetworkContextFilePaths. https://chromium-review.googlesource.com/c/chromium/src/+/4615930 * WebUSB: Add exclusionFilters to USBRequestDeviceOptions https://chromium-review.googlesource.com/c/chromium/src/+/4614682 * Convert /chrome/browser/ui to use ARC https://chromium-review.googlesource.com/c/chromium/src/+/4615920 * fixup! Bump the macOS deployment target to 10.15 * fixup! Bump the macOS deployment target to 10.15 * chore: update libcxx files * win: Remove 10Glass from Windows10Glass function and var names https://chromium-review.googlesource.com/c/chromium/src/+/4641314 * chore: revert 392e5f43 from chromium * Add an ExecutionContext to ScriptState https://chromium-review.googlesource.com/c/chromium/src/+/4609446 * fixup! Add an ExecutionContext to ScriptState * chore: fix header * Revert "chore: revert 392e5f43 from chromium" This reverts commit b7f782943e4ce83cae8cd35780d8d3618cf0772c. * fix: return correct min/max sizes in WinFrameView * fixup! Revert chore: revert 392e5f43 from chromium * fixup! Add an ExecutionContext to ScriptState * Revert "fixup! Revert chore: revert 392e5f43 from chromium" This reverts commit 7e2c7281abfc4f309255339fdba073d90a9ae3eb. * Revert "fix: return correct min/max sizes in WinFrameView" This reverts commit 3f418b1ab5155686730e087ae6cabe4a21b4bb61. * Revert "Revert "chore: revert 392e5f43 from chromium"" This reverts commit 56296d8b7c434147e032e3c3b08c0e371b6c27ba. --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
232 lines
6.7 KiB
Text
232 lines
6.7 KiB
Text
// Copyright (c) 2017 Amaplex Software, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/mac/in_app_purchase_observer.h"
|
|
|
|
#include <vector>
|
|
|
|
#include "base/functional/bind.h"
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
|
|
#import <CommonCrypto/CommonCrypto.h>
|
|
#import <StoreKit/StoreKit.h>
|
|
|
|
// ============================================================================
|
|
// InAppTransactionObserver
|
|
// ============================================================================
|
|
|
|
namespace {
|
|
|
|
using InAppTransactionCallback = base::RepeatingCallback<void(
|
|
const std::vector<in_app_purchase::Transaction>&)>;
|
|
|
|
} // namespace
|
|
|
|
@interface InAppTransactionObserver : NSObject <SKPaymentTransactionObserver> {
|
|
@private
|
|
InAppTransactionCallback callback_;
|
|
}
|
|
|
|
- (id)initWithCallback:(const InAppTransactionCallback&)callback;
|
|
|
|
@end
|
|
|
|
@implementation InAppTransactionObserver
|
|
|
|
/**
|
|
* Init with a callback.
|
|
*
|
|
* @param callback - The callback that will be called for each transaction
|
|
* update.
|
|
*/
|
|
- (id)initWithCallback:(const InAppTransactionCallback&)callback {
|
|
if ((self = [super init])) {
|
|
callback_ = callback;
|
|
|
|
[[SKPaymentQueue defaultQueue] addTransactionObserver:self];
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
/**
|
|
* Cleanup.
|
|
*/
|
|
- (void)dealloc {
|
|
[[SKPaymentQueue defaultQueue] removeTransactionObserver:self];
|
|
[super dealloc];
|
|
}
|
|
|
|
/**
|
|
* Run the callback in the browser thread.
|
|
*
|
|
* @param transaction - The transaction to pass to the callback.
|
|
*/
|
|
- (void)runCallback:(NSArray*)transactions {
|
|
// Convert the transaction.
|
|
std::vector<in_app_purchase::Transaction> converted;
|
|
converted.reserve([transactions count]);
|
|
for (SKPaymentTransaction* transaction in transactions) {
|
|
converted.push_back([self skPaymentTransactionToStruct:transaction]);
|
|
}
|
|
|
|
// Send the callback to the browser thread.
|
|
content::GetUIThreadTaskRunner({})->PostTask(
|
|
FROM_HERE, base::BindOnce(callback_, converted));
|
|
}
|
|
|
|
/**
|
|
* Convert an NSDate to ISO String.
|
|
*
|
|
* @param date - The date to convert.
|
|
*/
|
|
- (NSString*)dateToISOString:(NSDate*)date {
|
|
NSDateFormatter* dateFormatter = [[NSDateFormatter alloc] init];
|
|
NSLocale* enUSPOSIXLocale =
|
|
[NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"];
|
|
[dateFormatter setLocale:enUSPOSIXLocale];
|
|
[dateFormatter setDateFormat:@"yyyy-MM-dd'T'HH:mm:ssZZZZZ"];
|
|
|
|
return [dateFormatter stringFromDate:date];
|
|
}
|
|
|
|
/**
|
|
* Convert a SKPaymentDiscount object to a PaymentDiscount structure.
|
|
*
|
|
* @param paymentDiscount - The SKPaymentDiscount object to convert.
|
|
*/
|
|
- (in_app_purchase::PaymentDiscount)skPaymentDiscountToStruct:
|
|
(SKPaymentDiscount*)paymentDiscount {
|
|
in_app_purchase::PaymentDiscount paymentDiscountStruct;
|
|
|
|
paymentDiscountStruct.identifier = [paymentDiscount.identifier UTF8String];
|
|
paymentDiscountStruct.keyIdentifier =
|
|
[paymentDiscount.keyIdentifier UTF8String];
|
|
paymentDiscountStruct.nonce = [[paymentDiscount.nonce UUIDString] UTF8String];
|
|
paymentDiscountStruct.signature = [paymentDiscount.signature UTF8String];
|
|
paymentDiscountStruct.timestamp = [paymentDiscount.timestamp intValue];
|
|
|
|
return paymentDiscountStruct;
|
|
}
|
|
|
|
/**
|
|
* Convert a SKPayment object to a Payment structure.
|
|
*
|
|
* @param payment - The SKPayment object to convert.
|
|
*/
|
|
- (in_app_purchase::Payment)skPaymentToStruct:(SKPayment*)payment {
|
|
in_app_purchase::Payment paymentStruct;
|
|
|
|
if (payment.productIdentifier != nil) {
|
|
paymentStruct.productIdentifier = [payment.productIdentifier UTF8String];
|
|
}
|
|
|
|
if (payment.quantity >= 1) {
|
|
paymentStruct.quantity = (int)payment.quantity;
|
|
}
|
|
|
|
if (payment.applicationUsername != nil) {
|
|
paymentStruct.applicationUsername =
|
|
[payment.applicationUsername UTF8String];
|
|
}
|
|
|
|
if (payment.paymentDiscount != nil) {
|
|
paymentStruct.paymentDiscount =
|
|
[self skPaymentDiscountToStruct:payment.paymentDiscount];
|
|
}
|
|
|
|
return paymentStruct;
|
|
}
|
|
|
|
/**
|
|
* Convert a SKPaymentTransaction object to a Transaction structure.
|
|
*
|
|
* @param transaction - The SKPaymentTransaction object to convert.
|
|
*/
|
|
- (in_app_purchase::Transaction)skPaymentTransactionToStruct:
|
|
(SKPaymentTransaction*)transaction {
|
|
in_app_purchase::Transaction transactionStruct;
|
|
|
|
if (transaction.transactionIdentifier != nil) {
|
|
transactionStruct.transactionIdentifier =
|
|
[transaction.transactionIdentifier UTF8String];
|
|
}
|
|
|
|
if (transaction.transactionDate != nil) {
|
|
transactionStruct.transactionDate =
|
|
[[self dateToISOString:transaction.transactionDate] UTF8String];
|
|
}
|
|
|
|
if (transaction.originalTransaction != nil) {
|
|
transactionStruct.originalTransactionIdentifier =
|
|
[transaction.originalTransaction.transactionIdentifier UTF8String];
|
|
}
|
|
|
|
if (transaction.error != nil) {
|
|
transactionStruct.errorCode = (int)transaction.error.code;
|
|
transactionStruct.errorMessage =
|
|
[[transaction.error localizedDescription] UTF8String];
|
|
}
|
|
|
|
if (transaction.transactionState < 5) {
|
|
transactionStruct.transactionState =
|
|
[[@[ @"purchasing", @"purchased", @"failed", @"restored", @"deferred" ]
|
|
objectAtIndex:transaction.transactionState] UTF8String];
|
|
}
|
|
|
|
if (transaction.payment != nil) {
|
|
transactionStruct.payment = [self skPaymentToStruct:transaction.payment];
|
|
}
|
|
|
|
return transactionStruct;
|
|
}
|
|
|
|
#pragma mark -
|
|
#pragma mark SKPaymentTransactionObserver methods
|
|
|
|
/**
|
|
* Executed when a transaction is updated.
|
|
*
|
|
* @param queue - The payment queue.
|
|
* @param transactions - The list of transactions updated.
|
|
*/
|
|
- (void)paymentQueue:(SKPaymentQueue*)queue
|
|
updatedTransactions:(NSArray*)transactions {
|
|
[self runCallback:transactions];
|
|
}
|
|
|
|
@end
|
|
|
|
// ============================================================================
|
|
// C++ in_app_purchase
|
|
// ============================================================================
|
|
|
|
namespace in_app_purchase {
|
|
|
|
PaymentDiscount::PaymentDiscount() = default;
|
|
PaymentDiscount::PaymentDiscount(const PaymentDiscount&) = default;
|
|
PaymentDiscount::~PaymentDiscount() = default;
|
|
|
|
Payment::Payment() = default;
|
|
Payment::Payment(const Payment&) = default;
|
|
Payment::~Payment() = default;
|
|
|
|
Transaction::Transaction() = default;
|
|
Transaction::Transaction(const Transaction&) = default;
|
|
Transaction::~Transaction() = default;
|
|
|
|
TransactionObserver::TransactionObserver() {
|
|
observer_ = [[InAppTransactionObserver alloc]
|
|
initWithCallback:base::BindRepeating(
|
|
&TransactionObserver::OnTransactionsUpdated,
|
|
weak_ptr_factory_.GetWeakPtr())];
|
|
}
|
|
|
|
TransactionObserver::~TransactionObserver() {
|
|
[observer_ release];
|
|
}
|
|
|
|
} // namespace in_app_purchase
|