61374019c0
* chore: bump chromium in DEPS to 103.0.5020.0 * chore: bump chromium in DEPS to 103.0.5022.0 * chore: bump chromium in DEPS to 103.0.5024.0 * chore: update patches * 3587410: [Printing] Remove JobEventDetails Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3587410 * chore: bump chromium in DEPS to 103.0.5026.0 * chore: update patches * 3577218: WebUI: Delete webui_resources.grd and related GN targets. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3577218 * chore: bump chromium in DEPS to 103.0.5028.0 * chore: update patches * 3579297: Convert UpdatePrintSettings() to use non-deprecated base::Value APIs. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3579297 * 3560622: serial: Add SerialPort.forget() method Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560622 * 3581708: Restore original display when moving from tab-fullscreen to browser-fullscreen. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3581708 * chore: fix authorization flags lint error * 3583363: Remove net wrappers around base/strings/escape.h Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3583363 * fixup! 3560622: serial: Add SerialPort.forget() method Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560622 * 3587589: Reland "Propagate the MIME type from DownloadTargetDeterminer to DownloadItem" Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3587589 * 3584006: Remove IsRenderViewLive from content public Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3584006 * 3596174: [api] Remove APIs for resurrecting finalizers Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3596174 * 3368244: Hook SnapshotForContentAnalysis renderer API to scan system prints Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3368244 * chore: bump chromium in DEPS to 103.0.5030.0 * chore: update patches * chore: bump chromium in DEPS to 103.0.5032.0 * chore: bump chromium in DEPS to 103.0.5034.0 * chore: bump chromium in DEPS to 103.0.5036.0 * chore: update patches * 3586363: Introduce PrintRenderFrame.PrintWithParams() for batch printing to PDF Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3586363 * 3593199: Remove content::PermissionType references and replace them with blink::PermissionType Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3593199 * 3368244: Hook SnapshotForContentAnalysis renderer API to scan system prints Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3368244 * chore: lint * chore: bump chromium in DEPS to 103.0.5038.0 * chore: update patches * fixup! 3560622: serial: Add SerialPort.forget() method * 3606495: mac screen capture: add metric Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3606495 * chore: bump chromium in DEPS to 103.0.5040.0 * chore: update patches * 3590840: Add IPs to DnsOverHttpsServerConfig https://chromium-review.googlesource.com/c/chromium/src/+/3590840 * stub functions for ElectronSerialDelegate and SerialChooserController to fix link * 3566412: [base] Remove base/android dependency on post_task.h and officially remove post_task.h! Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3566412 * 3347944: [content] No longer hand-off whole MainFunctionParams to BrowserMainParts Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3347944 * fixup! 3566412: [base] Remove base/android dependency on post_task.h and off… e3ea3e1 …icially remove post_task.h! * chore: update process_singleton patches for content::GetIOThreadTaskRunner({}) Ref: 2015655: [BrowserThread] Migrate co/pub/br and co/br/scheduler to the new API | https://chromium-review.googlesource.com/c/chromium/src/+/2015655 * chore: migrate base::DeleteSoon to content::GetUIThreadTaskRunner({})->DeleteSoon Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3566412 * chore: remove duplicate functions for RevokePortPermissionWebInitiated & GetPortInfo * chore: migrate Linux/Windows methods off of post_task.h Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3566412 * 64908: Stop building legacy SwiftShader GL in Chromium https://swiftshader-review.googlesource.com/c/SwiftShader/+/64908 * 3573245: Added Themed versions of RoundedRectBackground and RoundedRectBorder. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3573245 * chore: bump chromium in DEPS to 103.0.5042.0 * chore: update patches * 3571804: [api] Advance API deprecation for V8 version v10.2 https://chromium-review.googlesource.com/c/v8/v8/+/3571804 * fixup! 3571804: [api] Advance API deprecation for V8 version v10.2 * build: fix run-clang-format extension matching * lint * fix windows build * how is clang-format still not working for me * chore: update patches * 3623985: Replace ad-hoc SetPublicFirstPartySets calls with method in ContentBrowserClient. https://chromium-review.googlesource.com/c/chromium/src/+/3623985 * no need to implement WillProvidePublicFirstPartySets; the default is false * 3601036: [QT] Introduce ui/views/linux_ui/linux_ui_factory.* https://chromium-review.googlesource.com/c/chromium/src/+/3601036 * 3583363: Remove net wrappers around base/strings/escape.h https://chromium-review.googlesource.com/c/chromium/src/+/3583363 * lint * chore: bump chromium in DEPS to 103.0.5044.0 * fix conflicts * chore: update patches * upgrade nan * pin version of nan in tests * replace my hacky deprecated override fix with the fix from upstream * revert runtime dcheck in v8 * pin nan version at root too * refactor: tell gyp to use c++17 when building with our node * Revert "refactor: tell gyp to use c++17 when building with our node" This reverts commit 41a03a5799a8f40f31555d73d20ea865acfcd192. * Undo the reversion of 41a03a5799a8f40f31555d73d20ea865acfcd192. This reverts commit 54440abc598153bd7e259be4a908f0ecc0b33348. * disable sequential/test-cpu-prof-kill for now * also sequential/test-diagnostic-dir-cpu-prof Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <japthorp@slack-corp.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Charles Kerr <charles@charleskerr.com>
234 lines
6.8 KiB
Text
234 lines
6.8 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/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 API_AVAILABLE(macosx(10.14.4)) {
|
|
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 (@available(macOS 10.14.4, *)) {
|
|
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
|