aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2018-01-16 17:57:29 +0100
committerFlorian Dold <florian.dold@gmail.com>2018-01-16 17:57:29 +0100
commit894a09a51c1111257be56809f1d3daf0146f8509 (patch)
tree3c27eb64245c66a3ec5dcae12155113e3add1041
parent09c7be80fd53318c9d3287b9952d70714d415e21 (diff)
rename data -> contract_terms
-rw-r--r--src/webex/notify.ts23
1 files changed, 6 insertions, 17 deletions
diff --git a/src/webex/notify.ts b/src/webex/notify.ts
index 1a447c0ac..a7d393a65 100644
--- a/src/webex/notify.ts
+++ b/src/webex/notify.ts
@@ -213,27 +213,16 @@ async function downloadContract(url: string, nonce: string): Promise<any> {
async function processProposal(proposal: any) {
- if (!proposal.data) {
- console.error("field proposal.data field missing");
+ if (!proposal.contract_terms) {
+ console.error("field proposal.contract_terms field missing");
return;
}
- if (!proposal.hash) {
- console.error("proposal.hash field missing");
- return;
- }
-
- const contractHash = await wxApi.hashContract(proposal.data);
-
- if (contractHash !== proposal.hash) {
- console.error(`merchant-supplied contract hash is wrong (us: ${contractHash}, merchant: ${proposal.hash})`);
- console.dir(proposal.data);
- return;
- }
+ const contractHash = await wxApi.hashContract(proposal.contract_terms);
const proposalId = await wxApi.saveProposal({
- contractTerms: proposal.data,
- contractTermsHash: proposal.hash,
+ contractTerms: proposal.contract_terms,
+ contractTermsHash: contractHash,
merchantSig: proposal.sig,
timestamp: (new Date()).getTime(),
});
@@ -375,7 +364,7 @@ function talerPay(msg: any): Promise<any> {
if (msg.contract_url) {
const nonce = await wxApi.generateNonce();
const proposal = await downloadContract(msg.contract_url, nonce);
- if (proposal.data.nonce !== nonce) {
+ if (proposal.contract_terms.nonce !== nonce) {
console.error("stale contract");
return;
}