RanchiMall/flopay
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed: bug caused due to floCloudAPI's bug fix

Browse Source
This commit is contained in:
sairajzero 2023-08-01 18:39:25 +05:30
parent fad58b6ed4
commit 37215ab265
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
index.html
View File

@ -2743,9 +2743,10 @@
// store user data in separate IDB // store user data in separate IDB
async function organizeSyncedData(obsName) { async function organizeSyncedData(obsName) {
const fetchedData = await floCloudAPI.requestApplicationData(obsName, { mostRecent: true, senderIDs: [floGlobals.myFloID], receiverID: floGlobals.myFloID }); const fetchedData = await floCloudAPI.requestApplicationData(obsName, { mostRecent: true, senderIDs: [floGlobals.myFloID], receiverID: floGlobals.myFloID });
if (fetchedData.length && await compactIDB.readData(obsName, 'lastSyncTime') !== fetchedData[0].time) { let vc = Object.keys(fetchedData).sort().pop();
if (vc && await compactIDB.readData(obsName, 'lastSyncTime') !== fetchedData[vc].time) {
await compactIDB.clearData(obsName); await compactIDB.clearData(obsName);
const dataToDecrypt = floCloudAPI.util.decodeMessage(fetchedData[0].message); const dataToDecrypt = fetchedData[vc].message;
floDapps.user.private.then(privateKey => { floDapps.user.private.then(privateKey => {
if (!privateKey) return; if (!privateKey) return;
const decryptedData = JSON.parse(Crypto.AES.decrypt(dataToDecrypt, privateKey)); const decryptedData = JSON.parse(Crypto.AES.decrypt(dataToDecrypt, privateKey));
@ -2753,7 +2754,7 @@
floGlobals[obsName][key] = decryptedData[key]; floGlobals[obsName][key] = decryptedData[key];
compactIDB.addData(obsName, decryptedData[key], key); compactIDB.addData(obsName, decryptedData[key], key);
} }
compactIDB.addData(obsName, fetchedData[0].time, 'lastSyncTime'); compactIDB.addData(obsName, fetchedData[vc].time, 'lastSyncTime');
return true; return true;
}).catch(error => { }).catch(error => {
console.log(error); console.log(error);

7
scripts/fn_pay.js
View File

@ -63,9 +63,10 @@ User.getCashierUPI = function () {
mostRecent: true mostRecent: true
}))).then(result => { }))).then(result => {
for (let r of result) for (let r of result)
if (r.status === "fulfilled" && r.value.length) { if (r.status === "fulfilled" && Object.keys(r.value).length) {
cashierUPI[r.value[0].senderID] = floCloudAPI.util.decodeMessage(r.value[0].message).upi; let vc = Object.keys(r.value).sort().pop()
cashierPubKeys[r.value[0].senderID] = r.value[0].pubKey; //get pubKey of cashier from messages for encryption cashierUPI[r.value[vc].senderID] = r.value[vc].message.upi;
cashierPubKeys[r.value[vc].senderID] = r.value[vc].pubKey; //get pubKey of cashier from messages for encryption
} }
resolve(cashierUPI); resolve(cashierUPI);
}) })