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>
231 lines
7.9 KiB
C++
231 lines
7.9 KiB
C++
// 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/api/electron_api_in_app_purchase.h"
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "shell/common/gin_helper/dictionary.h"
|
|
#include "shell/common/gin_helper/object_template_builder.h"
|
|
#include "shell/common/gin_helper/promise.h"
|
|
#include "shell/common/node_includes.h"
|
|
|
|
namespace gin {
|
|
|
|
template <>
|
|
struct Converter<in_app_purchase::PaymentDiscount> {
|
|
static v8::Local<v8::Value> ToV8(
|
|
v8::Isolate* isolate,
|
|
const in_app_purchase::PaymentDiscount& paymentDiscount) {
|
|
gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
|
|
dict.SetHidden("simple", true);
|
|
dict.Set("identifier", paymentDiscount.identifier);
|
|
dict.Set("keyIdentifier", paymentDiscount.keyIdentifier);
|
|
dict.Set("nonce", paymentDiscount.nonce);
|
|
dict.Set("signature", paymentDiscount.signature);
|
|
dict.Set("timestamp", paymentDiscount.timestamp);
|
|
return dict.GetHandle();
|
|
}
|
|
};
|
|
|
|
template <>
|
|
struct Converter<in_app_purchase::Payment> {
|
|
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
|
const in_app_purchase::Payment& payment) {
|
|
gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
|
|
dict.SetHidden("simple", true);
|
|
dict.Set("productIdentifier", payment.productIdentifier);
|
|
dict.Set("quantity", payment.quantity);
|
|
dict.Set("applicationUsername", payment.applicationUsername);
|
|
if (payment.paymentDiscount.has_value()) {
|
|
dict.Set("paymentDiscount", payment.paymentDiscount.value());
|
|
}
|
|
return dict.GetHandle();
|
|
}
|
|
};
|
|
|
|
template <>
|
|
struct Converter<in_app_purchase::Transaction> {
|
|
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
|
const in_app_purchase::Transaction& val) {
|
|
gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
|
|
dict.SetHidden("simple", true);
|
|
dict.Set("transactionIdentifier", val.transactionIdentifier);
|
|
dict.Set("transactionDate", val.transactionDate);
|
|
dict.Set("originalTransactionIdentifier",
|
|
val.originalTransactionIdentifier);
|
|
dict.Set("transactionState", val.transactionState);
|
|
dict.Set("errorCode", val.errorCode);
|
|
dict.Set("errorMessage", val.errorMessage);
|
|
dict.Set("payment", val.payment);
|
|
return dict.GetHandle();
|
|
}
|
|
};
|
|
|
|
template <>
|
|
struct Converter<in_app_purchase::ProductSubscriptionPeriod> {
|
|
static v8::Local<v8::Value> ToV8(
|
|
v8::Isolate* isolate,
|
|
const in_app_purchase::ProductSubscriptionPeriod&
|
|
productSubscriptionPeriod) {
|
|
gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
|
|
dict.SetHidden("simple", true);
|
|
dict.Set("numberOfUnits", productSubscriptionPeriod.numberOfUnits);
|
|
dict.Set("unit", productSubscriptionPeriod.unit);
|
|
return dict.GetHandle();
|
|
}
|
|
};
|
|
|
|
template <>
|
|
struct Converter<in_app_purchase::ProductDiscount> {
|
|
static v8::Local<v8::Value> ToV8(
|
|
v8::Isolate* isolate,
|
|
const in_app_purchase::ProductDiscount& productDiscount) {
|
|
gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
|
|
dict.SetHidden("simple", true);
|
|
dict.Set("identifier", productDiscount.identifier);
|
|
dict.Set("type", productDiscount.type);
|
|
dict.Set("price", productDiscount.price);
|
|
dict.Set("priceLocale", productDiscount.priceLocale);
|
|
dict.Set("paymentMode", productDiscount.paymentMode);
|
|
dict.Set("numberOfPeriods", productDiscount.numberOfPeriods);
|
|
if (productDiscount.subscriptionPeriod.has_value()) {
|
|
dict.Set("subscriptionPeriod",
|
|
productDiscount.subscriptionPeriod.value());
|
|
}
|
|
return dict.GetHandle();
|
|
}
|
|
};
|
|
|
|
template <>
|
|
struct Converter<in_app_purchase::Product> {
|
|
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate,
|
|
const in_app_purchase::Product& val) {
|
|
gin_helper::Dictionary dict = gin::Dictionary::CreateEmpty(isolate);
|
|
dict.SetHidden("simple", true);
|
|
dict.Set("productIdentifier", val.productIdentifier);
|
|
dict.Set("localizedDescription", val.localizedDescription);
|
|
dict.Set("localizedTitle", val.localizedTitle);
|
|
|
|
// Pricing Information
|
|
dict.Set("price", val.price);
|
|
dict.Set("formattedPrice", val.formattedPrice);
|
|
dict.Set("currencyCode", val.currencyCode);
|
|
if (val.introductoryPrice.has_value()) {
|
|
dict.Set("introductoryPrice", val.introductoryPrice.value());
|
|
}
|
|
dict.Set("discounts", val.discounts);
|
|
dict.Set("subscriptionGroupIdentifier", val.subscriptionGroupIdentifier);
|
|
if (val.subscriptionPeriod.has_value()) {
|
|
dict.Set("subscriptionPeriod", val.subscriptionPeriod.value());
|
|
}
|
|
// Downloadable Content Information
|
|
dict.Set("isDownloadable", val.isDownloadable);
|
|
dict.Set("downloadContentVersion", val.downloadContentVersion);
|
|
dict.Set("downloadContentLengths", val.downloadContentLengths);
|
|
|
|
return dict.GetHandle();
|
|
}
|
|
};
|
|
|
|
} // namespace gin
|
|
|
|
namespace electron::api {
|
|
|
|
gin::WrapperInfo InAppPurchase::kWrapperInfo = {gin::kEmbedderNativeGin};
|
|
|
|
#if BUILDFLAG(IS_MAC)
|
|
// static
|
|
gin::Handle<InAppPurchase> InAppPurchase::Create(v8::Isolate* isolate) {
|
|
return gin::CreateHandle(isolate, new InAppPurchase());
|
|
}
|
|
|
|
gin::ObjectTemplateBuilder InAppPurchase::GetObjectTemplateBuilder(
|
|
v8::Isolate* isolate) {
|
|
return gin_helper::EventEmitterMixin<InAppPurchase>::GetObjectTemplateBuilder(
|
|
isolate)
|
|
.SetMethod("canMakePayments", &in_app_purchase::CanMakePayments)
|
|
.SetMethod("restoreCompletedTransactions",
|
|
&in_app_purchase::RestoreCompletedTransactions)
|
|
.SetMethod("getReceiptURL", &in_app_purchase::GetReceiptURL)
|
|
.SetMethod("purchaseProduct", &InAppPurchase::PurchaseProduct)
|
|
.SetMethod("finishAllTransactions",
|
|
&in_app_purchase::FinishAllTransactions)
|
|
.SetMethod("finishTransactionByDate",
|
|
&in_app_purchase::FinishTransactionByDate)
|
|
.SetMethod("getProducts", &InAppPurchase::GetProducts);
|
|
}
|
|
|
|
const char* InAppPurchase::GetTypeName() {
|
|
return "InAppPurchase";
|
|
}
|
|
|
|
InAppPurchase::InAppPurchase() = default;
|
|
|
|
InAppPurchase::~InAppPurchase() = default;
|
|
|
|
v8::Local<v8::Promise> InAppPurchase::PurchaseProduct(
|
|
const std::string& product_id,
|
|
gin::Arguments* args) {
|
|
v8::Isolate* isolate = args->isolate();
|
|
gin_helper::Promise<bool> promise(isolate);
|
|
v8::Local<v8::Promise> handle = promise.GetHandle();
|
|
|
|
int quantity = 1;
|
|
args->GetNext(&quantity);
|
|
std::string username = "";
|
|
args->GetNext(&username);
|
|
|
|
in_app_purchase::PurchaseProduct(
|
|
product_id, quantity, username,
|
|
base::BindOnce(gin_helper::Promise<bool>::ResolvePromise,
|
|
std::move(promise)));
|
|
|
|
return handle;
|
|
}
|
|
|
|
v8::Local<v8::Promise> InAppPurchase::GetProducts(
|
|
const std::vector<std::string>& productIDs,
|
|
gin::Arguments* args) {
|
|
v8::Isolate* isolate = args->isolate();
|
|
gin_helper::Promise<std::vector<in_app_purchase::Product>> promise(isolate);
|
|
v8::Local<v8::Promise> handle = promise.GetHandle();
|
|
|
|
in_app_purchase::GetProducts(
|
|
productIDs,
|
|
base::BindOnce(gin_helper::Promise<
|
|
std::vector<in_app_purchase::Product>>::ResolvePromise,
|
|
std::move(promise)));
|
|
|
|
return handle;
|
|
}
|
|
|
|
void InAppPurchase::OnTransactionsUpdated(
|
|
const std::vector<in_app_purchase::Transaction>& transactions) {
|
|
Emit("transactions-updated", transactions);
|
|
}
|
|
#endif
|
|
|
|
} // namespace electron::api
|
|
|
|
namespace {
|
|
|
|
using electron::api::InAppPurchase;
|
|
|
|
void Initialize(v8::Local<v8::Object> exports,
|
|
v8::Local<v8::Value> unused,
|
|
v8::Local<v8::Context> context,
|
|
void* priv) {
|
|
#if BUILDFLAG(IS_MAC)
|
|
v8::Isolate* isolate = context->GetIsolate();
|
|
gin_helper::Dictionary dict(isolate, exports);
|
|
dict.Set("inAppPurchase", InAppPurchase::Create(isolate));
|
|
#endif
|
|
}
|
|
|
|
} // namespace
|
|
|
|
NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_in_app_purchase, Initialize)
|