authorize additional linking keys

4 files changed, 29 insertions, 6 deletions

diff --git a/config/samples/index.sample.js b/config/samples/index.sample.js
index 64070063..eb2976c5 100644
--- a/config/samples/index.sample.js
+++ b/config/samples/index.sample.js
@@ -1,5 +1,11 @@
 const dbOptions = require("./config.json")[process.env.NODE_ENV || "development"];
-const lnurl = require("./lnurl");
+let lnurl;
+
+try {
+  lnurl = require("./lnurl");
+} catch(e) {
+  l.warn("lnurl config not found");
+} 
 
 module.exports = {
   lnurl,
diff --git a/index.js b/index.js
index ac6bd359..d31cb93b 100644
--- a/index.js
+++ b/index.js
@@ -44,7 +44,10 @@ require("./routes/invoices");
 require("./routes/payments");
 require("./routes/info");
 require("./routes/users");
-require("./routes/lnurl");
+
+if (config.lnurl) {
+  require("./routes/lnurl");
+}
 
 app.use((err, req, res, next) => {
   const details = {
diff --git a/routes/lnurl.js b/routes/lnurl.js
index b89f52a2..7cd1a19e 100644
--- a/routes/lnurl.js
+++ b/routes/lnurl.js
@@ -6,13 +6,19 @@ logins = {};
 
 lnurlServer = lnurl.createServer(config.lnurl);
 
-app.get("/loginUrl", async (req, res) => {
+var optionalAuth = function(req, res, next) {
+  passport.authenticate('jwt', { session: false }, function(err, user, info) {
+    req.user = user;
+    next();
+  })(req, res, next);
+};
+
+app.get("/loginUrl", optionalAuth, async (req, res) => {
   try {
     const result = await lnurlServer.generateNewUrl("login");
-    const { username } = req.query;
 
-    if (username !== "undefined") {
-      logins[result.secret] = username;
+    if (req.user) {
+      logins[result.secret] = req.user.username;
     }
 
     res.send(result);
diff --git a/routes/users.js b/routes/users.js
index 522d2e6a..5a708d00 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -262,6 +262,14 @@ app.post("/keys", auth, async (req, res) => {
   emit(req.user.username, "key", key);
 });
 
+app.post("/keys/delete", auth, async (req, res) => {
+  const { hex } = req.body;
+  (await db.Key.findOne({ where: {
+    user_id: req.user.id,
+    hex
+  }})).destroy();
+});
+
 app.post("/login", async (req, res) => {
   const {
     params,