aiolabs/lightning-pub
2
0
Fork 0
Code Issues 9 Pull requests 4 Projects Releases Packages Wiki Activity Actions

Merge pull request #38 from shocknet/bug/empty_auth_errors

Browse source 
Fixed empty messages when sanitized bug
This commit is contained in:
Daniel Lugo 2020-02-24 12:41:37 -04:00 • committed by GitHub
commit 51e73aeeac
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/routes.js
View file

@ -36,13 +36,17 @@ module.exports = async (
}) })
}) })
const sanitizeLNDError = (message = "") => const sanitizeLNDError = (message = "") => {
message.toLowerCase().includes("unknown") if (message.toLowerCase().includes("unknown")) {
? message const splittedMessage = message
.split("UNKNOWN: ") .split("UNKNOWN: ");
.slice(1) return splittedMessage.length > 1
.join("") ? splittedMessage.slice(1).join("")
: message : splittedMessage.join("")
}
return message
}
const getAvailableService = () => const getAvailableService = () =>
new Promise((resolve, reject) => { new Promise((resolve, reject) => {
@ -395,7 +399,6 @@ module.exports = async (
} }
const publicKey = await GunDB.authenticate(alias, password); const publicKey = await GunDB.authenticate(alias, password);
if (walletInitialized && health.LNDStatus.walletStatus === "locked" && publicKey) { if (walletInitialized && health.LNDStatus.walletStatus === "locked" && publicKey) {
await unlockWallet(password); await unlockWallet(password);
} }
@ -433,9 +436,9 @@ module.exports = async (
}); });
return false; return false;
} catch (err) { } catch (err) {
logger.debug("Unlock Error:", err); logger.error("Unlock Error:", err);
res.status(400); res.status(400);
res.json({ field: "user", errorMessage: sanitizeLNDError(err.message), success: false }); res.json({ field: "user", errorMessage: err.message ? sanitizeLNDError(err.message) : err, success: false });
return err; return err;
} }
}); });