mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-03 20:49:27 +00:00
Bug 898499 - Support mozPay API on desktop webapprt. r=ferjm
This commit is contained in:
parent
591c847f7f
commit
ca32bd1a60
@ -452,6 +452,9 @@ pref("media.realtime_decoder.enabled", true);
|
||||
// TCPSocket
|
||||
pref("dom.mozTCPSocket.enabled", true);
|
||||
|
||||
// WebPayment
|
||||
pref("dom.mozPay.enabled", true);
|
||||
|
||||
// "Preview" landing of bug 710563, which is bogged down in analysis
|
||||
// of talos regression. This is a needed change for higher-framerate
|
||||
// CSS animations, and incidentally works around an apparent bug in
|
||||
|
@ -58,3 +58,5 @@ if test "$OS_TARGET" = "WINNT" -o "$OS_TARGET" = "Darwin"; then
|
||||
MOZ_FOLD_LIBS=1
|
||||
fi
|
||||
MOZ_WEBGL_CONFORMANT=1
|
||||
# Enable navigator.mozPay
|
||||
MOZ_PAY=1
|
||||
|
@ -223,6 +223,7 @@
|
||||
#ifdef MOZ_GAMEPAD
|
||||
@BINPATH@/components/dom_gamepad.xpt
|
||||
#endif
|
||||
@BINPATH@/components/dom_payment.xpt
|
||||
@BINPATH@/components/downloads.xpt
|
||||
@BINPATH@/components/editor.xpt
|
||||
@BINPATH@/components/embed_base.xpt
|
||||
@ -540,6 +541,11 @@
|
||||
@BINPATH@/components/AppProtocolHandler.js
|
||||
@BINPATH@/components/AppProtocolHandler.manifest
|
||||
|
||||
@BINPATH@/components/Payment.js
|
||||
@BINPATH@/components/PaymentFlowInfo.js
|
||||
@BINPATH@/components/PaymentRequestInfo.js
|
||||
@BINPATH@/components/Payment.manifest
|
||||
|
||||
#ifdef MOZ_WEBRTC
|
||||
@BINPATH@/components/PeerConnection.js
|
||||
@BINPATH@/components/PeerConnection.manifest
|
||||
@ -772,6 +778,7 @@ bin/libfreebl_32int64_3.so
|
||||
@BINPATH@/webapprt/components/CommandLineHandler.js
|
||||
@BINPATH@/webapprt/components/ContentPermission.js
|
||||
@BINPATH@/webapprt/components/DirectoryProvider.js
|
||||
@BINPATH@/webapprt/components/PaymentUIGlue.js
|
||||
@BINPATH@/webapprt/components/components.manifest
|
||||
@BINPATH@/webapprt/defaults/preferences/prefs.js
|
||||
@BINPATH@/webapprt/modules/Startup.jsm
|
||||
|
@ -78,6 +78,14 @@ PaymentContentHelper.prototype = {
|
||||
// nsIDOMGlobalPropertyInitializer
|
||||
|
||||
init: function(aWindow) {
|
||||
try {
|
||||
if (!Services.prefs.getBoolPref("dom.mozPay.enabled")) {
|
||||
return null;
|
||||
}
|
||||
} catch (e) {
|
||||
return null;
|
||||
}
|
||||
|
||||
this._window = aWindow;
|
||||
this.initDOMRequestHelper(aWindow, PAYMENT_IPC_MSG_NAMES);
|
||||
|
||||
|
@ -750,6 +750,9 @@ pref("browser.contentHandlers.types.3.title", "chrome://browser/locale/region.pr
|
||||
pref("browser.contentHandlers.types.3.uri", "chrome://browser/locale/region.properties");
|
||||
pref("browser.contentHandlers.types.3.type", "application/vnd.mozilla.maybe.feed");
|
||||
|
||||
// WebPayment
|
||||
pref("dom.mozPay.enabled", true);
|
||||
|
||||
#ifndef RELEASE_BUILD
|
||||
pref("dom.payment.provider.0.name", "Firefox Marketplace");
|
||||
pref("dom.payment.provider.0.description", "marketplace.firefox.com");
|
||||
|
140
webapprt/PaymentUIGlue.js
Normal file
140
webapprt/PaymentUIGlue.js
Normal file
@ -0,0 +1,140 @@
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
"use strict";
|
||||
|
||||
const { interfaces: Ci, utils: Cu } = Components;
|
||||
|
||||
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
Cu.import("resource://gre/modules/Services.jsm");
|
||||
|
||||
XPCOMUtils.defineLazyServiceGetter(this, "cpmm",
|
||||
"@mozilla.org/childprocessmessagemanager;1",
|
||||
"nsIMessageSender");
|
||||
|
||||
function paymentSuccess(aRequestId) {
|
||||
return paymentCallback(aRequestId, "Payment:Success");
|
||||
}
|
||||
|
||||
function paymentFailed(aRequestId) {
|
||||
return paymentCallback(aRequestId, "Payment:Failed");
|
||||
}
|
||||
|
||||
function paymentCallback(aRequestId, aMsg) {
|
||||
return function(aResult) {
|
||||
closePaymentWindow(aRequestId, function() {
|
||||
cpmm.sendAsyncMessage(aMsg, { result: aResult,
|
||||
requestId: aRequestId });
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
let payments = {};
|
||||
|
||||
function closePaymentWindow(aId, aCallback) {
|
||||
if (payments[aId]) {
|
||||
payments[aId].handled = true;
|
||||
payments[aId].win.close();
|
||||
payments[aId] = null;
|
||||
}
|
||||
|
||||
aCallback();
|
||||
}
|
||||
|
||||
function PaymentUI() {}
|
||||
|
||||
PaymentUI.prototype = {
|
||||
classID: Components.ID("{ede1124f-72e8-4a31-9567-3270d46f21fb}"),
|
||||
QueryInterface: XPCOMUtils.generateQI([Ci.nsIPaymentUIGlue]),
|
||||
|
||||
confirmPaymentRequest: function(aRequestId, aRequests, aSuccessCb, aErrorCb) {
|
||||
// If there's only one payment provider that will work, just move on
|
||||
// without prompting the user.
|
||||
if (aRequests.length == 1) {
|
||||
aSuccessCb.onresult(aRequestId, aRequests[0].wrappedJSObject.type);
|
||||
return;
|
||||
}
|
||||
|
||||
let items = [];
|
||||
|
||||
// Otherwise, let the user select a payment provider from a list.
|
||||
for (let i = 0; i < aRequests.length; i++) {
|
||||
let request = aRequests[i].wrappedJSObject;
|
||||
let requestText = request.providerName;
|
||||
if (request.productPrice && Array.isArray(request.productPrice)) {
|
||||
// We should guess the user currency and use that instead.
|
||||
requestText += " (" + request.productPrice[0].amount + " " +
|
||||
request.productPrice[0].currency + ")";
|
||||
}
|
||||
items.push(requestText);
|
||||
}
|
||||
|
||||
let selected = {};
|
||||
|
||||
let bundle = Services.strings.
|
||||
createBundle("chrome://webapprt/locale/webapp.properties");
|
||||
let result = Services.prompt.
|
||||
select(null, bundle.GetStringFromName("paymentDialog.title"),
|
||||
bundle.GetStringFromName("paymentDialog.message"),
|
||||
items.length, items, selected);
|
||||
if (result) {
|
||||
aSuccessCb.onresult(aRequestId,
|
||||
aRequests[selected.value].wrappedJSObject.type);
|
||||
} else {
|
||||
aErrorCb.onresult(aRequestId, "USER_CANCELLED");
|
||||
}
|
||||
},
|
||||
|
||||
showPaymentFlow: function(aRequestId, aPaymentFlowInfo, aErrorCb) {
|
||||
let win = Services.ww.
|
||||
openWindow(null,
|
||||
"chrome://webapprt/content/webapp.xul",
|
||||
"_blank",
|
||||
"chrome,dialog=no,resizable,scrollbars,centerscreen",
|
||||
null);
|
||||
|
||||
// Store a reference to the window so that we can close it when the payment
|
||||
// succeeds or fails.
|
||||
payments[aRequestId] = { win: win, handled: false };
|
||||
|
||||
// Inject paymentSuccess and paymentFailed methods into the document after
|
||||
// its loaded.
|
||||
win.addEventListener("DOMWindowCreated", function() {
|
||||
let browserElement = win.document.getElementById("content");
|
||||
browserElement.
|
||||
setAttribute("src", aPaymentFlowInfo.uri + aPaymentFlowInfo.jwt);
|
||||
|
||||
browserElement.addEventListener("DOMWindowCreated", function() {
|
||||
win.document.getElementById("content").contentDocument.defaultView
|
||||
.wrappedJSObject.mozPaymentProvider = {
|
||||
__exposedProps__: {
|
||||
paymentSuccess: 'r',
|
||||
paymentFailed: 'r'
|
||||
},
|
||||
paymentSuccess: paymentSuccess(aRequestId),
|
||||
paymentFailed: paymentFailed(aRequestId)
|
||||
};
|
||||
}, true);
|
||||
});
|
||||
|
||||
let winObserver = function(aClosedWin, aTopic) {
|
||||
if (aTopic == "domwindowclosed") {
|
||||
// Fail the payment if the window is closed.
|
||||
if (aClosedWin == win) {
|
||||
Services.ww.unregisterNotification(winObserver);
|
||||
if (!payments[aRequestId].handled) {
|
||||
aErrorCb.onresult(aRequestId, "USER_CANCELLED");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Services.ww.registerNotification(winObserver);
|
||||
},
|
||||
|
||||
cleanup: function() {
|
||||
},
|
||||
}
|
||||
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PaymentUI]);
|
@ -17,6 +17,7 @@ Cu.import("resource://gre/modules/Services.jsm");
|
||||
Cu.import("resource://gre/modules/Webapps.jsm");
|
||||
Cu.import("resource://gre/modules/AppsUtils.jsm");
|
||||
Cu.import("resource://gre/modules/PermissionsInstaller.jsm");
|
||||
Cu.import('resource://gre/modules/Payment.jsm');
|
||||
Cu.import("resource://gre/modules/Task.jsm");
|
||||
Cu.import("resource://gre/modules/Promise.jsm");
|
||||
|
||||
|
@ -11,3 +11,7 @@ contract @mozilla.org/content-permission/prompt;1 {07ef5b2e-88fb-47bd-8cec-d3b0b
|
||||
component {e1799fda-4b2f-4457-b671-e0641d95698d} DirectoryProvider.js
|
||||
contract @mozilla.org/webapprt/directory-provider;1 {e1799fda-4b2f-4457-b671-e0641d95698d}
|
||||
category xpcom-directory-providers webapprt-directory-provider @mozilla.org/webapprt/directory-provider;1
|
||||
|
||||
# PaymentUIGlue.js
|
||||
component {ede1124f-72e8-4a31-9567-3270d46f21fb} PaymentUIGlue.js
|
||||
contract @mozilla.org/payment/ui-glue;1 {ede1124f-72e8-4a31-9567-3270d46f21fb}
|
||||
|
@ -40,3 +40,6 @@ webapps.install.title=Install %S
|
||||
webapps.install.description=Do you want to install %S?
|
||||
webapps.install.install=Install App
|
||||
webapps.install.dontinstall=Don't Install
|
||||
|
||||
paymentDialog.title=Payment
|
||||
paymentDialog.message=Which payment provider do you want to use?
|
||||
|
@ -18,6 +18,7 @@ EXTRA_COMPONENTS += [
|
||||
'CommandLineHandler.js',
|
||||
'ContentPermission.js',
|
||||
'DirectoryProvider.js',
|
||||
'PaymentUIGlue.js',
|
||||
'components.manifest',
|
||||
]
|
||||
|
||||
|
@ -46,6 +46,18 @@ pref("dom.mozTCPSocket.enabled", true);
|
||||
// Enable smooth scrolling
|
||||
pref("general.smoothScroll", true);
|
||||
|
||||
// WebPayment
|
||||
pref("dom.mozPay.enabled", true);
|
||||
|
||||
#ifndef RELEASE_BUILD
|
||||
// Enable mozPay default provider
|
||||
pref("dom.payment.provider.0.name", "Firefox Marketplace");
|
||||
pref("dom.payment.provider.0.description", "marketplace.firefox.com");
|
||||
pref("dom.payment.provider.0.uri", "https://marketplace.firefox.com/mozpay/?req=");
|
||||
pref("dom.payment.provider.0.type", "mozilla/payments/pay/v1");
|
||||
pref("dom.payment.provider.0.requestMethod", "GET");
|
||||
#endif
|
||||
|
||||
// Enable window resize and move
|
||||
pref("dom.always_allow_move_resize_window", true);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user