taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

fix #4153 and #0004154

Browse Source
This commit is contained in:
Florian Dold 2016-01-26 17:21:17 +01:00
parent 5f996fedbc
commit d2f1cb3234
21 changed files with 486 additions and 5667 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extension/.gitignore vendored
View File

@ -3,5 +3,6 @@ node_modules/
background/*.js
lib/wallet/*.js
lib/*.js
!lib/module-trampoline.js
popup/*.js
test/tests/*.js

51
extension/content_scripts/notify.js
View File

@ -18,6 +18,11 @@
/// <reference path="../lib/decl/chrome/chrome.d.ts" />
"use strict";
console.log("Taler injected");
function subst(url, H_contract) {
url = url.replace("${H_contract}", H_contract);
url = url.replace("${$}", "$");
return url;
}
document.addEventListener("taler-probe", function (e) {
var evt = new Event("taler-wallet-present");
document.dispatchEvent(evt);
@ -55,10 +60,15 @@ document.addEventListener("taler-contract", function (e) {
});
document.addEventListener('taler-execute-payment', function (e) {
console.log("got taler-execute-payment in content page");
if (!e.detail.pay_url) {
console.log("field 'pay_url' missing in taler-execute-payment event");
return;
}
var payUrl = e.detail.pay_url;
var msg = {
type: "execute-payment",
detail: {
H_contract: e.detail.H_contract
H_contract: e.detail.H_contract,
},
};
chrome.runtime.sendMessage(msg, function (resp) {
@ -66,38 +76,29 @@ document.addEventListener('taler-execute-payment', function (e) {
console.log("failure!");
return;
}
console.log("Making request to ", resp.payUrl);
var contract = resp.contract;
if (!contract) {
throw Error("contract missing");
}
var payReq = Object.assign({}, resp.payReq);
if (e.detail.require_contract) {
payReq.contract = contract;
}
console.log("Making request to ", payUrl);
var r = new XMLHttpRequest();
r.open('post', resp.payUrl);
r.send(JSON.stringify(resp.payReq));
var detail = {};
r.onload = function (e) {
r.open('post', payUrl);
r.send(JSON.stringify(payReq));
r.onload = function () {
switch (r.status) {
case 200:
detail.success = true;
var respJson = JSON.parse(r.responseText);
console.log("respJson:", JSON.stringify(respJson));
if (!respJson) {
console.log("Invalid JSON in response from $pay_url");
detail.success = false;
break;
}
if (!respJson.fulfillment_url) {
console.log("Missing 'fulfillment_url' in response from $pay_url");
detail.success = false;
break;
}
detail.fulfillmentUrl = respJson.fulfillment_url;
console.log("going to", contract.fulfillment_url);
window.location.href = subst(contract.fulfillment_url, e.detail.H_contract);
window.location.reload(true);
break;
default:
console.log("Unexpected status code for $pay_url:", r.status);
detail.success = false;
break;
}
detail.status = r.status;
detail.responseText = r.responseText;
detail.fulfillmentUrl =
document.dispatchEvent(new CustomEvent("taler-payment-result", { detail: detail }));
};
});
});

56
extension/content_scripts/notify.ts
View File

@ -23,6 +23,13 @@
console.log("Taler injected");
function subst(url: string, H_contract) {
url = url.replace("${H_contract}", H_contract);
url = url.replace("${$}", "$");
return url;
}
document.addEventListener("taler-probe", function(e) {
let evt = new Event("taler-wallet-present");
document.dispatchEvent(evt);
@ -65,10 +72,15 @@ document.addEventListener("taler-contract", function(e: CustomEvent) {
document.addEventListener('taler-execute-payment', function(e: CustomEvent) {
console.log("got taler-execute-payment in content page");
if (!e.detail.pay_url) {
console.log("field 'pay_url' missing in taler-execute-payment event");
return;
}
let payUrl = e.detail.pay_url;
let msg = {
type: "execute-payment",
detail: {
H_contract: e.detail.H_contract
H_contract: e.detail.H_contract,
},
};
chrome.runtime.sendMessage(msg, (resp) => {
@ -76,38 +88,32 @@ document.addEventListener('taler-execute-payment', function(e: CustomEvent) {
console.log("failure!");
return;
}
console.log("Making request to ", resp.payUrl);
let contract = resp.contract;
if (!contract) {
throw Error("contract missing");
}
let payReq = Object.assign({}, resp.payReq);
if (e.detail.require_contract) {
payReq.contract = contract;
}
console.log("Making request to ", payUrl);
let r = new XMLHttpRequest();
r.open('post', resp.payUrl);
r.send(JSON.stringify(resp.payReq));
let detail: any = {};
r.onload = (e) => {
r.open('post', payUrl);
r.send(JSON.stringify(payReq));
r.onload = () => {
switch (r.status) {
case 200:
detail.success = true;
let respJson = JSON.parse(r.responseText);
console.log("respJson:", JSON.stringify(respJson));
if (!respJson) {
console.log("Invalid JSON in response from $pay_url");
detail.success = false;
break;
}
if (!respJson.fulfillment_url) {
console.log("Missing 'fulfillment_url' in response from $pay_url");
detail.success = false;
break;
}
detail.fulfillmentUrl = respJson.fulfillment_url;
console.log("going to", contract.fulfillment_url);
window.location.href = subst(contract.fulfillment_url,
e.detail.H_contract);
window.location.reload(true);
break;
default:
console.log("Unexpected status code for $pay_url:", r.status);
detail.success = false;
break;
}
detail.status = r.status;
detail.responseText = r.responseText;
detail.fulfillmentUrl =
document.dispatchEvent(new CustomEvent("taler-payment-result", {detail: detail}));
};
});
});

68
extension/lib/module-trampoline.js Normal file
View File

@ -0,0 +1,68 @@
/*
This file is part of TALER
(C) 2016 GNUnet e.V.
TALER is free software; you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the Free Software
Foundation; either version 3, or (at your option) any later version.
TALER is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
TALER; see the file COPYING. If not, If not, see <http://www.gnu.org/licenses/>
*/
/**
* Boilerplate to initialize the module system and call main()
*/
"use strict";
if (typeof System === "undefined") {
throw Error("system loader not present (must be included before the" +
" trampoline");
}
System.config({
defaultJSExtensions: true,
});
let me = window.location.protocol
+ "//" + window.location.host
+ window.location.pathname.replace(/[.]html$/, ".js");
let domLoaded = false;
document.addEventListener("DOMContentLoaded", function(event) {
domLoaded = true;
});
function execMain(m) {
if (m.main) {
console.log("executing module main");
m.main();
} else {
console.warn("module does not export a main() function");
}
}
console.log("loading", me);
System.import(me)
.then((m) => {
console.log("module imported", me);
if (domLoaded) {
execMain(m);
return;
}
document.addEventListener("DOMContentLoaded", function(event) {
execMain(m);
});
})
.catch((e) => {
console.log("trampoline failed");
console.error(e.stack);
});

4608
extension/lib/vendor/handlebars-v4.0.5.js vendored
View File

File diff suppressed because one or more lines are too long

2
extension/lib/vendor/mithril.js vendored
View File

@ -1404,5 +1404,3 @@ var m = (function app(window, undefined) {
return m;
})(typeof window !== "undefined" ? window : {});
if (typeof module === "object" && module != null && module.exports) module.exports = m;
else if (typeof define === "function" && define.amd) define(function() { return m });

858
extension/lib/vendor/system.src.js → extension/lib/vendor/system-csp-production.src.js vendored
View File

File diff suppressed because it is too large Load Diff

25
extension/lib/wallet/wallet.ts
View File

@ -89,7 +89,6 @@ class CoinPaySig {
interface ConfirmPayRequest {
merchantPageUrl: string;
offer: Offer;
}
@ -107,8 +106,6 @@ interface Offer {
contract: Contract;
sig: string;
H_contract: string;
pay_url: string;
exec_url: string;
}
interface Contract {
@ -140,7 +137,6 @@ interface CoinPaySig_interface {
interface Transaction {
contractHash: string;
contract: any;
payUrl: string;
payReq: any;
}
@ -153,8 +149,8 @@ interface Reserve {
interface PaymentResponse {
payUrl: string;
payReq: any;
contract: Contract;
}
@ -370,7 +366,6 @@ export class Wallet {
executePay(offer: Offer,
payCoinInfo: PayCoinInfo,
merchantBaseUrl: string,
chosenMint: string): Promise<void> {
let payReq = {};
payReq["H_wire"] = offer.contract.H_wire;
@ -380,15 +375,12 @@ export class Wallet {
payReq["mint"] = URI(chosenMint).href();
payReq["coins"] = payCoinInfo.map((x) => x.sig);
payReq["timestamp"] = offer.contract.timestamp;
let payUrl = URI(offer.pay_url).absoluteTo(merchantBaseUrl);
let t: Transaction = {
contractHash: offer.H_contract,
contract: offer.contract,
payUrl: payUrl.href(),
payReq: payReq
payReq: payReq,
};
let historyEntry = {
type: "pay",
timestamp: (new Date).getTime(),
@ -406,7 +398,7 @@ export class Wallet {
.finish();
}
confirmPay(offer: Offer, merchantPageUrl: string): Promise<any> {
confirmPay(offer: Offer): Promise<any> {
return Promise.resolve().then(() => {
return this.getPossibleMintCoins(offer.contract.amount,
offer.contract.max_fee,
@ -417,7 +409,7 @@ export class Wallet {
}
let mintUrl = Object.keys(mcs)[0];
let ds = Wallet.signDeposit(offer, mcs[mintUrl]);
return this.executePay(offer, ds, merchantPageUrl, mintUrl);
return this.executePay(offer, ds, mintUrl);
});
}
@ -430,15 +422,14 @@ export class Wallet {
throw Error("contract not found");
}
let resp: PaymentResponse = {
payUrl: t.payUrl,
payReq: t.payReq
payReq: t.payReq,
contract: t.contract,
};
return resp;
});
});
}
initReserve(reserveRecord) {
this.updateMintFromUrl(reserveRecord.mint_base_url)
.then((mint) =>
@ -652,6 +643,7 @@ export class Wallet {
});
}
withdraw(denom, reserve): Promise<void> {
return this.withdrawPrepare(denom, reserve)
.then((pc) => this.withdrawExecute(pc))
@ -741,6 +733,7 @@ export class Wallet {
});
}
/**
* Update or add mint DB entry by fetching the /keys information.
* Optionally link the reserve entry to the new or existing
@ -782,11 +775,13 @@ export class Wallet {
.reduce(collectBalances, {});
}
getHistory() {
function collect(x, acc) {
acc.push(x);
return acc;
}
return Query(this.db)
.iter("history", {indexName: "timestamp"})
.reduce(collect, [])

7
extension/lib/wallet/wxmessaging.js
View File

@ -81,8 +81,8 @@ System.register(["./wallet", "./db", "./http"], function(exports_1) {
.then(function (r) {
sendResponse({
success: true,
payUrl: r.payUrl,
payReq: r.payReq
payReq: r.payReq,
contract: r.contract,
});
})
.catch(function (e) {
@ -105,6 +105,9 @@ System.register(["./wallet", "./db", "./http"], function(exports_1) {
});
return true;
},
_a["error-fatal"] = function (db, detail, sendResponse) {
console.log("fatal error from page", detail.url);
},
_a
);
var _a;

7
extension/lib/wallet/wxmessaging.ts
View File

@ -98,8 +98,8 @@ function makeHandlers(wallet) {
.then((r) => {
sendResponse({
success: true,
payUrl: r.payUrl,
payReq: r.payReq
payReq: r.payReq,
contract: r.contract,
});
})
.catch((e) => {
@ -121,6 +121,9 @@ function makeHandlers(wallet) {
console.error(e.stack);
});
return true;
},
["error-fatal"]: function(db, detail, sendResponse) {
console.log("fatal error from page", detail.url);
}
};
}

21
extension/lib/web-common.ts Normal file
View File

@ -0,0 +1,21 @@
/*
This file is part of TALER
(C) 2016 GNUnet e.V.
TALER is free software; you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the Free Software
Foundation; either version 3, or (at your option) any later version.
TALER is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
TALER; see the file COPYING. If not, If not, see <http://www.gnu.org/licenses/>
*/
export function substituteFulfillmentUrl(url: string, offer) {
url = url.replace("${H_contract}", offer.H_contract);
url = url.replace("${$}", "$");
return url;
}

6
extension/manifest.json
View File

@ -26,8 +26,8 @@
{
"matches": ["*://*/*"],
"js": [
"lib/vendor/system.src.js",
"lib/vendor/URI.js",
"lib/vendor/system-csp-production.src.js",
"content_scripts/notify.js"
],
"run_at": "document_start"
@ -44,12 +44,10 @@
"lib/vendor/URI.js",
"lib/vendor/handlebars-v4.0.5.js",
"lib/emscripten/libwrapper.js",
"lib/vendor/system.src.js",
"lib/vendor/system-csp-production.src.js",
"background/main.js"
]
},
"content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'",
"minimum_chrome_version": "47.0.2526"
}

23
extension/pages/confirm-contract.html
View File

@ -4,17 +4,14 @@
<head>
<title>Taler Wallet: Confirm Reserve Creation</title>
<script src="../lib/vendor/URI.js"></script>
<script src="../lib/vendor/handlebars-v4.0.5.js"></script>
<script src="../lib/commonHelpers.js"></script>
<script src="confirm-contract.js"></script>
<script src="../lib/vendor/mithril.js"></script>
<script src="../lib/i18n.js"></script>
<script src="../lib/vendor/lodash.core.min.js"></script>
<script src="../lib/vendor/system-csp-production.src.js"></script>
<script src="../lib/module-trampoline.js"></script>
<link rel="stylesheet" type="text/css" href="../style/wallet.css">
<script id="contract-template" type="text/x-handlebars-template">
Hello, this is the wallet. The merchant "{{merchant.name}}"
wants to enter a contract over {{prettyAmount amount}}
with you.
<p />
Your contract includes these products:
<ul>
@ -41,15 +38,7 @@
</aside>
<section id="main">
<article id="contract">
<div id="render-contract"></div>
<button id="confirm-pay">Confirm Payment</button>
<div id="confirm-warning"></div>
</article>
<article id="status"></article>
<article id="contract"></article>
</section>
</body>

66
extension/pages/confirm-contract.js
View File

@ -13,47 +13,55 @@
You should have received a copy of the GNU General Public License along with
TALER; see the file COPYING. If not, If not, see <http://www.gnu.org/licenses/>
*/
System.register(["../lib/web-common"], function(exports_1) {
/// <reference path="../lib/decl/handlebars/handlebars.d.ts" />
"use strict";
var web_common_1;
function prettyAmount(amount) {
var v = amount.value + amount.fraction / 1e6;
return v.toFixed(2) + " " + amount.currency;
}
function main() {
var url = URI(document.location.href);
var query = URI.parseQuery(url.query());
var $_ = function (x) { return document.getElementById(x); };
function renderContract(contract) {
var showAmount = document.getElementById("show-amount");
$_('merchant-name').innerText = contract.merchant.name;
}
function clone(obj) {
// This is faster than it looks ...
return JSON.parse(JSON.stringify(obj));
}
Handlebars.registerHelper('prettyAmount', function (amount) {
var v = amount.value + amount.fraction / 10e6;
return v.toFixed(2) + " " + amount.currency;
});
document.addEventListener("DOMContentLoaded", function (e) {
var offer = JSON.parse(query.offer);
console.dir(offer);
var source = $_("contract-template").innerHTML;
var template = Handlebars.compile(source);
$_("render-contract").innerHTML = template(offer.contract);
document.getElementById("confirm-pay").addEventListener("click", function (e) {
console.log("Query:", JSON.stringify(query));
var contract = offer.contract;
var Contract = {
view: function (ctrl) {
return [
m("p", (_a = ["Hello, this is the wallet. The merchant \"", "\"\n wants to enter a contract over ", "\n with you."], _a.raw = ["Hello, this is the wallet. The merchant \"", "\"\n wants to enter a contract over ", "\n with you."], i18n(_a, contract.merchant.name, prettyAmount(contract.amount)))),
m("p", (_b = ["The contract contains the following products:"], _b.raw = ["The contract contains the following products:"], i18n(_b))),
m('ul', _.map(contract.products, function (p) { return m("li", p.description + ": " + prettyAmount(p.price)); })),
m("button", { onclick: doPayment }, (_c = ["Confirm Payment"], _c.raw = ["Confirm Payment"], i18n(_c)))
];
var _a, _b, _c;
}
};
m.mount(document.getElementById("contract"), Contract);
function doPayment() {
var d = {
offer: JSON.parse(query.offer),
merchantPageUrl: query.merchantPageUrl
offer: offer
};
chrome.runtime.sendMessage({ type: 'confirm-pay', detail: d }, function (resp) {
if (!resp.success) {
var source_1 = $_("error-template").innerHTML;
var template_1 = Handlebars.compile(source_1);
$_("status").innerHTML = template_1(resp);
console.log("confirm-pay error", JSON.stringify(resp));
return;
}
document.location.href = URI(d.offer.exec_url)
.absoluteTo(query.merchantPageUrl)
.addQuery({ H_contract: d.offer.H_contract })
.href();
});
var c = d.offer.contract;
console.log("contract", c);
document.location.href = web_common_1.substituteFulfillmentUrl(c.fulfillment_url, offer);
});
}
}
exports_1("main", main);
return {
setters:[
function (web_common_1_1) {
web_common_1 = web_common_1_1;
}],
execute: function() {
}
}
});
//# sourceMappingURL=confirm-contract.js.map

79
extension/pages/confirm-contract.tsx
View File

@ -17,55 +17,56 @@
/// <reference path="../lib/decl/handlebars/handlebars.d.ts" />
"use strict";
import {substituteFulfillmentUrl} from "../lib/web-common";
declare var m: any;
function prettyAmount(amount) {
let v = amount.value + amount.fraction / 1e6;
return `${v.toFixed(2)} ${amount.currency}`;
}
export function main() {
let url = URI(document.location.href);
let query: any = URI.parseQuery(url.query());
let $_ = (x) => document.getElementById(x);
function renderContract(contract) {
let showAmount = document.getElementById("show-amount");
$_('merchant-name').innerText = contract.merchant.name;
}
function clone(obj) {
// This is faster than it looks ...
return JSON.parse(JSON.stringify(obj));
}
Handlebars.registerHelper('prettyAmount', function(amount) {
let v = amount.value + amount.fraction / 10e6;
return v.toFixed(2) + " " + amount.currency;
});
document.addEventListener("DOMContentLoaded", (e) => {
let offer = JSON.parse(query.offer);
console.dir(offer);
let contract = offer.contract;
let source = $_("contract-template").innerHTML;
let template = Handlebars.compile(source);
$_("render-contract").innerHTML = template(offer.contract);
var Contract = {
view(ctrl) {
return [
m("p",
i18n`Hello, this is the wallet. The merchant "${contract.merchant.name}"
wants to enter a contract over ${prettyAmount(contract.amount)}
with you.`),
m("p",
i18n`The contract contains the following products:`),
m('ul',
_.map(contract.products,
(p: any) => m("li",
`${p.description}: ${prettyAmount(p.price)}`))),
m("button", {onclick: doPayment}, i18n`Confirm Payment`)
];
}
};
document.getElementById("confirm-pay").addEventListener("click", (e) => {
console.log("Query:", JSON.stringify(query));
m.mount(document.getElementById("contract"), Contract);
function doPayment() {
let d = {
offer: JSON.parse(query.offer),
merchantPageUrl: query.merchantPageUrl
offer
};
chrome.runtime.sendMessage({type: 'confirm-pay', detail: d}, (resp) => {
if (!resp.success) {
let source = $_("error-template").innerHTML;
let template = Handlebars.compile(source);
$_("status").innerHTML = template(resp);
console.log("confirm-pay error", JSON.stringify(resp));
return;
}
document.location.href = URI(d.offer.exec_url)
.absoluteTo(query.merchantPageUrl)
.addQuery({H_contract: d.offer.H_contract})
.href();
let c = d.offer.contract;
console.log("contract", c);
document.location.href = substituteFulfillmentUrl(c.fulfillment_url, offer);
});
});
});
}
}

4
extension/pages/confirm-create-reserve.html
View File

@ -4,8 +4,8 @@
<head>
<title>Taler Wallet: Select Taler Provider</title>
<script src="../lib/vendor/URI.js"></script>
<script src="../lib/polyfill-react.js"></script>
<script src="confirm-create-reserve.js"></script>
<script src="../lib/vendor/system-csp-production.src.js"></script>
<script src="../lib/module-trampoline.js"></script>
<link rel="stylesheet" type="text/css" href="../style/wallet.css">
</head>

24
extension/pages/confirm-create-reserve.js
View File

@ -1,6 +1,6 @@
/*
This file is part of TALER
(C) 2015 GNUnet e.V.
(C) 2015-2016 GNUnet e.V.
TALER is free software; you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the Free Software
@ -13,11 +13,9 @@
You should have received a copy of the GNU General Public License along with
TALER; see the file COPYING. If not, If not, see <http://www.gnu.org/licenses/>
*/
System.register([], function(exports_1) {
"use strict";
var ConfirmCreateReserve;
(function (ConfirmCreateReserve) {
var url = URI(document.location.href);
var query = URI.parseQuery(url.query());
function main() {
function updateAmount() {
var showAmount = document.getElementById("show-amount");
console.log("Query is " + JSON.stringify(query));
@ -28,12 +26,13 @@ var ConfirmCreateReserve;
}
showAmount.textContent = s;
}
document.addEventListener("DOMContentLoaded", function (e) {
var url = URI(document.location.href);
var query = URI.parseQuery(url.query());
updateAmount();
document.getElementById("confirm").addEventListener("click", function (e) {
var d = Object.assign({}, query);
d.mint = document.getElementById('mint-url').value;
chrome.runtime.sendMessage({ type: 'confirm-reserve', detail: d }, function (resp) {
var cb = function (resp) {
if (resp.success === true) {
document.location.href = resp.backlink;
}
@ -41,8 +40,15 @@ var ConfirmCreateReserve;
document.body.innerHTML =
"Oops, something went wrong. It looks like the bank could not\n transfer funds to the mint. Please go back to your bank's website\n to check what happened.";
}
};
chrome.runtime.sendMessage({ type: 'confirm-reserve', detail: d }, cb);
});
}
exports_1("main", main);
return {
setters:[],
execute: function() {
}
}
});
});
})(ConfirmCreateReserve || (ConfirmCreateReserve = {}));
//# sourceMappingURL=confirm-create-reserve.js.map

20
extension/pages/confirm-create-reserve.tsx
View File

@ -1,6 +1,6 @@
/*
This file is part of TALER
(C) 2015 GNUnet e.V.
(C) 2015-2016 GNUnet e.V.
TALER is free software; you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the Free Software
@ -16,11 +16,8 @@
"use strict";
namespace ConfirmCreateReserve {
let url = URI(document.location.href);
let query: any = URI.parseQuery(url.query());
export function main() {
function updateAmount() {
let showAmount = document.getElementById("show-amount");
console.log("Query is " + JSON.stringify(query));
@ -32,15 +29,16 @@ namespace ConfirmCreateReserve {
showAmount.textContent = s;
}
let url = URI(document.location.href);
let query: any = URI.parseQuery(url.query());
document.addEventListener("DOMContentLoaded", (e) => {
updateAmount();
document.getElementById("confirm").addEventListener("click", (e) => {
let d = Object.assign({}, query);
d.mint = (document.getElementById('mint-url') as HTMLInputElement).value;
chrome.runtime.sendMessage({type:'confirm-reserve', detail: d},
(resp) => {
const cb = (resp) => {
if (resp.success === true) {
document.location.href = resp.backlink;
} else {
@ -49,9 +47,7 @@ namespace ConfirmCreateReserve {
transfer funds to the mint. Please go back to your bank's website
to check what happened.`;
}
};
chrome.runtime.sendMessage({type: 'confirm-reserve', detail: d}, cb);
});
});
});
}

3
extension/popup/popup.html
View File

@ -6,7 +6,8 @@
<script src="../lib/vendor/mithril.js"></script>
<script src="../lib/i18n.js"></script>
<script src="../lib/vendor/lodash.core.min.js"></script>
<script src="popup.js"></script>
<script src="../lib/vendor/system-csp-production.src.js"></script>
<script src="../lib/module-trampoline.js"></script>
</head>
<body>
<div id="nav"></div>

49
extension/popup/popup.tsx
View File

@ -20,11 +20,12 @@
"use strict";
declare var m: any;
declare var i18n: any;
document.addEventListener("DOMContentLoaded", function(event) {
export function main() {
console.log("popup main");
m.route.mode = "hash";
m.route(document.getElementById("content"), "/balance", {
"/balance": WalletBalance,
@ -32,7 +33,9 @@ document.addEventListener("DOMContentLoaded", function(event) {
"/debug": WalletDebug,
});
m.mount(document.getElementById("nav"), WalletNavBar);
});
}
console.log("this is popup");
function makeTab(target, name) {
@ -84,7 +87,9 @@ var WalletBalance = {
if (listing.length > 0) {
return listing;
}
let link = m("a[href=https://demo.taler.net]", {config: openInExtension}, i18n`free KUDOS`);
let link = m("a[href=https://demo.taler.net]",
{config: openInExtension},
i18n`free KUDOS`);
return i18n.parts`You have no balance to show. Want to get some ${link}?`;
}
};
@ -112,7 +117,8 @@ function formatHistoryItem(historyItem) {
switch (historyItem.type) {
case "create-reserve":
return m("p",
i18n.parts`Created reserve (${abbrevKey(d.reservePub)}) of ${formatAmount(d.requestedAmount)} at ${formatTimestamp(
i18n.parts`Created reserve (${abbrevKey(d.reservePub)}) of ${formatAmount(
d.requestedAmount)} at ${formatTimestamp(
t)}`);
case "withdraw":
return m("p",
@ -155,17 +161,20 @@ var WalletHistory = {
};
function reload() {
try {
chrome.runtime.reload();
window.close();
} catch (e) {
// Functionality missing in firefox, ignore!
}
}
function confirmReset() {
if (confirm("Do you want to IRREVOCABLY DESTROY everything inside your" +
" wallet and LOSE ALL YOUR COINS?")) {
chrome.runtime.sendMessage({type: "reset"});
window.close();
try {
chrome.runtime.reload();
} catch (e) {
// Functionality missing in firefox, ignore!
}
}
}
@ -173,15 +182,25 @@ function confirmReset() {
var WalletDebug = {
view() {
return [
m("button", {onclick: openWalletAsTab}, "wallet tab"),
m("button", {onclick: confirmReset}, "reset")
m("button",
{onclick: openExtensionPage("popup/popup.html")},
"wallet tab"),
m("button",
{onclick: openExtensionPage("pages/show-db.html")},
"show db"),
m("br"),
m("button", {onclick: confirmReset}, "reset"),
m("button", {onclick: reload}, "reload chrome extension"),
]
}
};
function openWalletAsTab() {
function openExtensionPage(page) {
return function() {
chrome.tabs.create({
"url": chrome.extension.getURL("popup/popup.html")
"url": chrome.extension.getURL(page)
});
}
}

1
extension/tsconfig.json
View File

@ -10,6 +10,7 @@
"files": [
"lib/i18n.ts",
"lib/refs.ts",
"lib/web-common.ts",
"lib/wallet/checkable.ts",
"lib/wallet/db.ts",
"lib/wallet/emscriptif.ts",