Added logoff on auth route and improves on error handling. Fixes #14

This commit is contained in:
emad-salah 2019-12-23 21:18:35 +01:00
parent 838ae70aa6
commit e9fe495409

View file

@ -26,10 +26,12 @@ module.exports = (
{ serverPort } { serverPort }
) => { ) => {
const sanitizeLNDError = (message = "") => const sanitizeLNDError = (message = "") =>
message message.toLowerCase().includes("unknown")
.split("UNKNOWN: ") ? message
.slice(1) .split("UNKNOWN: ")
.join("") .slice(1)
.join("")
: message
const getAvailableService = () => const getAvailableService = () =>
new Promise((resolve, reject) => { new Promise((resolve, reject) => {
@ -287,6 +289,10 @@ module.exports = (
await recreateLnServices(); await recreateLnServices();
if (GunDB.isAuthenticated()) {
GunDB.logoff();
}
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) {
@ -327,7 +333,6 @@ module.exports = (
return false; return false;
} catch (err) { } catch (err) {
logger.debug("Unlock Error:", err); logger.debug("Unlock Error:", err);
console.error(err);
res.status(400); res.status(400);
res.send({ field: "user", errorMessage: sanitizeLNDError(err.message), success: false }); res.send({ field: "user", errorMessage: sanitizeLNDError(err.message), success: false });
return err; return err;