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

Bug Fix: Password issue

Browse Source
This commit is contained in:
sairajzero 2021-10-23 01:17:00 +05:30
parent f745b22955
commit 160102ea66
1 changed files with 70 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
public/home.html
View File

@ -723,7 +723,7 @@
} }
// displays a popup for asking user input. Use this instead of JS prompt // displays a popup for asking user input. Use this instead of JS prompt
async function getPromptInput(title, message = '', options = {}) { function getPromptInput(title, message = '', options = {}) {
const { isPassword = true, cancelText = 'Cancel', confirmText = 'OK' } = options const { isPassword = true, cancelText = 'Cancel', confirmText = 'OK' } = options
showPopup('prompt_popup', true) showPopup('prompt_popup', true)
getRef('prompt_title').textContent = title; getRef('prompt_title').textContent = title;
@ -737,7 +737,7 @@
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
buttons[0].onclick = () => { buttons[0].onclick = () => {
hidePopup() hidePopup()
return; reject(null);
} }
buttons[1].onclick = () => { buttons[1].onclick = () => {
const value = getRef('prompt_input').value; const value = getRef('prompt_input').value;
@ -1058,9 +1058,9 @@
showProcess('trade_button_wrapper') showProcess('trade_button_wrapper')
try { try {
if (tradeType === 'buy') { if (tradeType === 'buy') {
await buy(quantity, price, proxy.secret) await buy(quantity, price, await proxy.secret)
} else { } else {
await sell(quantity, price, proxy.secret) await sell(quantity, price, await proxy.secret)
} }
getRef('trade_button_wrapper').append(getRef('success_template').content.cloneNode(true)) getRef('trade_button_wrapper').append(getRef('success_template').content.cloneNode(true))
notify(`Placed ${tradeType} order`, 'success') notify(`Placed ${tradeType} order`, 'success')
@ -1182,16 +1182,16 @@
if (type === 'deposit') { if (type === 'deposit') {
const privKey = getRef('get_private_key').value; const privKey = getRef('get_private_key').value;
if (asset === 'FLO') { if (asset === 'FLO') {
await depositFLO(quantity, userID, privKey, proxy.secret) await depositFLO(quantity, userID, privKey, await proxy.secret)
} else { } else {
await depositRupee(quantity, userID, privKey, proxy.secret) await depositRupee(quantity, userID, privKey, await proxy.secret)
} }
showWalletResult('success', `Sent ${asset} deposit request`, 'This may take upto 30 mins to reflect in your wallet.') showWalletResult('success', `Sent ${asset} deposit request`, 'This may take upto 30 mins to reflect in your wallet.')
} else { } else {
if (asset === 'FLO') { if (asset === 'FLO') {
await withdrawFLO(quantity, proxy.secret) await withdrawFLO(quantity, await proxy.secret)
} else { } else {
await withdrawRupee(quantity, proxy.secret) await withdrawRupee(quantity, await proxy.secret)
} }
showWalletResult('success', `Sent ${asset} withdraw request`, 'This may take upto 30 mins to reflect in your wallet.') showWalletResult('success', `Sent ${asset} withdraw request`, 'This may take upto 30 mins to reflect in your wallet.')
} }
@ -1320,12 +1320,12 @@
getRef('orders_list').addEventListener('click', e => { getRef('orders_list').addEventListener('click', e => {
if (e.target.closest('.cancel-order')) { if (e.target.closest('.cancel-order')) {
getConfirmation('Cancel this order?').then(res => { getConfirmation('Cancel this order?').then(async res => {
if (res) { if (res) {
const target = e.target.closest('.order-card') const target = e.target.closest('.order-card')
const id = target.dataset.id const id = target.dataset.id
const type = target.dataset.type const type = target.dataset.type
cancelOrder(type, id, proxy.secret) cancelOrder(type, id, await proxy.secret)
.then(() => { .then(() => {
notify('Order cancelled', 'success') notify('Order cancelled', 'success')
target.animate([ target.animate([
@ -1375,8 +1375,9 @@
getConfirmation('Cancel all selected orders?').then(async res => { getConfirmation('Cancel all selected orders?').then(async res => {
if (res) { if (res) {
try { try {
let proxy_secret = await proxy.secret;
await Promise.all( await Promise.all(
selectedOrders.map((type, id) => cancelOrder(type, id, proxy.secret)) selectedOrders.map((type, id) => cancelOrder(type, id, proxy_secret))
) )
selectedOrders.forEach((type, id) => { selectedOrders.forEach((type, id) => {
getRef('orders_list').querySelector(`[data-id="${id}"]`).remove() getRef('orders_list').querySelector(`[data-id="${id}"]`).remove()
@ -1519,17 +1520,21 @@
public: null, public: null,
async lock() { async lock() {
if (!this.private) if (!this.private)
throw "No proxy key found!"; return notify("No proxy key found!", 'error');
let pwd = await getPromptInput("Add password", 'This password applies to this browser only!', { isPassword: true, confirmText: "Add password" }); getPromptInput("Add password", 'This password applies to this browser only!', {
if (!pwd) isPassword: true,
notify("Password cannot be empty", 'error'); confirmText: "Add password"
else if (pwd.length < 4) }).then(pwd => {
notify("Password minimum length is 4", 'error'); if (!pwd)
else { notify("Password cannot be empty", 'error');
let tmp = Crypto.AES.encrypt(this.private, pwd); else if (pwd.length < 4)
localStorage.setItem("proxy_secret", "?" + tmp); notify("Password minimum length is 4", 'error');
notify("Successfully locked with Password", 'success'); else {
} let tmp = Crypto.AES.encrypt(this.private, pwd);
localStorage.setItem("proxy_secret", "?" + tmp);
notify("Successfully locked with Password", 'success');
}
}).catch(_ => null);
}, },
clear() { clear() {
localStorage.removeItem("proxy_secret"); localStorage.removeItem("proxy_secret");
@ -1542,32 +1547,44 @@
this.public = floCrypto.getPubKeyHex(key); this.public = floCrypto.getPubKeyHex(key);
}, },
get secret() { get secret() {
if (this.private) const self = this;
return this.private; return new Promise((resolve, reject) => {
try { if (self.private)
let tmp = localStorage.getItem("proxy_secret"); return resolve(self.private);
if (typeof tmp === "string" && tmp.startsWith("?")) {
getPromptInput("Enter password", '', { isPassword: true }).then(pwd => {
if (!pwd)
throw "Password Required for making transactions";
else {
try {
tmp = Crypto.AES.decrypt(tmp.substring(1), pwd);
} catch (error) {
throw "Incorrect Password! Password Required for making transactions";
}
} const Reject = reason => {
}); notify(reason, 'error');
reject(reason);
} }
this.private = tmp; const setValues = priv => {
this.public = floCrypto.getPubKeyHex(tmp); try {
return this.private; self.private = priv;
} catch (error) { self.public = floCrypto.getPubKeyHex(priv);
alert(error); resolve(self.private);
console.error(error); } catch (error) {
throw "Unable to fetch Proxy secret"; Reject("Unable to fetch Proxy secret");
} }
};
let tmp = localStorage.getItem("proxy_secret");
if (typeof tmp !== "string")
Reject("Unable to fetch Proxy secret");
else if (tmp.startsWith("?")) {
getPromptInput("Enter password", '', {
isPassword: true
}).then(pwd => {
if (!pwd)
return Reject("Password Required for making transactions");
try {
tmp = Crypto.AES.decrypt(tmp.substring(1), pwd);
setValues(tmp);
} catch (error) {
Reject("Incorrect Password! Password Required for making transactions");
}
}).catch(_ => Reject("Password Required for making transactions"));
} else
setValues(tmp);
})
} }
} }
@ -1605,6 +1622,7 @@
const balance = {} const balance = {}
let accountDetails = {} let accountDetails = {}
function account() { function account() {
getAccount().then(acc => { getAccount().then(acc => {
getRef("login_form").classList.add('hide-completely') getRef("login_form").classList.add('hide-completely')
@ -1632,12 +1650,8 @@
balance.rupee = rupee_net balance.rupee = rupee_net
showBalance("rupee_balance", rupee_net, rupee_locked) showBalance("rupee_balance", rupee_net, rupee_locked)
//My orders //My orders
renderUserOrders() renderUserOrders();
try { proxy.secret.then(_ => null).catch(_ => null);
proxy.secret;
} catch (error) {
console.warn(error);
}
}).catch(error => { }).catch(error => {
getRef('home').classList.remove('signed-in') getRef('home').classList.remove('signed-in')
if (error instanceof ResponseError) { if (error instanceof ResponseError) {
@ -1670,7 +1684,10 @@
}, },
logout() { logout() {
getConfirmation('Log out?', { cancelText: 'Stay', confirmText: 'Log out' }).then(res => { getConfirmation('Log out?', {
cancelText: 'Stay',
confirmText: 'Log out'
}).then(res => {
if (res) { if (res) {
logout().then(result => { logout().then(result => {
console.warn(result); console.warn(result);