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

rename data -> contract_terms

Browse Source
This commit is contained in:
Florian Dold 2018-01-16 17:57:29 +01:00
parent 09c7be80fd
commit 894a09a51c
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/webex/notify.ts
View File

@ -213,27 +213,16 @@ async function downloadContract(url: string, nonce: string): Promise<any> {
async function processProposal(proposal: any) { async function processProposal(proposal: any) {
if (!proposal.data) { if (!proposal.contract_terms) {
console.error("field proposal.data field missing"); console.error("field proposal.contract_terms field missing");
return; return;
} }
if (!proposal.hash) { const contractHash = await wxApi.hashContract(proposal.contract_terms);
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 proposalId = await wxApi.saveProposal({ const proposalId = await wxApi.saveProposal({
contractTerms: proposal.data, contractTerms: proposal.contract_terms,
contractTermsHash: proposal.hash, contractTermsHash: contractHash,
merchantSig: proposal.sig, merchantSig: proposal.sig,
timestamp: (new Date()).getTime(), timestamp: (new Date()).getTime(),
}); });
@ -375,7 +364,7 @@ function talerPay(msg: any): Promise<any> {
if (msg.contract_url) { if (msg.contract_url) {
const nonce = await wxApi.generateNonce(); const nonce = await wxApi.generateNonce();
const proposal = await downloadContract(msg.contract_url, nonce); const proposal = await downloadContract(msg.contract_url, nonce);
if (proposal.data.nonce !== nonce) { if (proposal.contract_terms.nonce !== nonce) {
console.error("stale contract"); console.error("stale contract");
return; return;
} }