remove users from archive once migrated

2 files changed, 48 insertions, 48 deletions

diff --git a/routes/lnurl.js b/routes/lnurl.js
index 5660fa1b..b43d3010 100644
--- a/routes/lnurl.js
+++ b/routes/lnurl.js
@@ -76,38 +76,41 @@ export default {
   async lnurlw({ params: { k1, pr } }, res) {},
 
   async lnurl({ params: { id }, query: { amount, nostr } }, res) {
-    let uid = await g(`lnurl:${id}`);
-    let user = await g(`user:${uid}`);
-    if (!user) user = await migrate(uid);
-    if (!(user && user.username)) return bail(res, "user not found");
-    let { username } = user;
-    username = username.replace(/\s/g, "").toLowerCase();
+    try {
+      let uid = await g(`lnurl:${id}`);
+      let user = await getUser(uid);
+      if (!user) fail("user not found");
+      let { username } = user;
+      username = username.replace(/\s/g, "").toLowerCase();
 
-    let metadata = JSON.stringify([
-      ["text/plain", `Paying ${username}@${host}`],
-      ["text/identifier", `${username}@${host}`],
-    ]);
+      let metadata = JSON.stringify([
+        ["text/plain", `Paying ${username}@${host}`],
+        ["text/identifier", `${username}@${host}`],
+      ]);
 
-    if (nostr) {
-      try {
-        let event = JSON.parse(decodeURIComponent(nostr));
-        // TODO: validate the event
-        await s(`zap:${id}`, event);
-        metadata = nostr;
-      } catch (e) {
-        err("problem handling zap", e.message);
+      if (nostr) {
+        try {
+          let event = JSON.parse(decodeURIComponent(nostr));
+          // TODO: validate the event
+          await s(`zap:${id}`, event);
+          metadata = nostr;
+        } catch (e) {
+          err("problem handling zap", e.message);
+        }
       }
-    }
 
-    let { text: pr } = await generate({
-      invoice: {
-        amount: Math.round(amount / 1000),
-        type: types.lightning,
-      },
-      memo: metadata,
-      user,
-    });
+      let { text: pr } = await generate({
+        invoice: {
+          amount: Math.round(amount / 1000),
+          type: types.lightning,
+        },
+        memo: metadata,
+        user,
+      });
 
-    res.send({ pr, routes: [] });
+      res.send({ pr, routes: [] });
+    } catch (e) {
+      bail(res, e.message);
+    }
   },
 };
diff --git a/routes/users.js b/routes/users.js
index 5ebb2878..2299094f 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -89,10 +89,7 @@ export default {
         } catch (e) {}
       }
 
-      let user = await g(`user:${key}`);
-      if (typeof user === "string") {
-        user = await g(`user:${user}`);
-      }
+      let user = await getUser(key);
 
       if (!user && key.length === 64) {
         user = {
@@ -132,22 +129,22 @@ export default {
     }
   },
 
-  async create(req, res) {
+  async create({ body, headers }, res) {
     try {
-      const ip = req.headers["cf-connecting-ip"];
-      let { profile, cipher, pubkey, password, username, salt } = req.body.user;
-
-      let user = {
-        profile,
-        cipher,
-        pubkey,
-        password,
-        username,
-        salt,
-      };
+      const ip = headers["cf-connecting-ip"];
+      if (!body.user) fail("no user object provided");
+      let { user } = body;
+      let fields = [
+        "profile",
+        "cipher",
+        "pubkey",
+        "password",
+        "username",
+        "salt",
+      ];
 
-      user = await register(user, ip, false);
-      l("registered new user", username);
+      user = await register(pick(user, fields), ip, false);
+      l("registered new user", user.username);
       res.send(pick(user, whitelist));
     } catch (e) {
       res.code(500).send(e.message);
@@ -199,7 +196,7 @@ export default {
         shopifyStore,
       } = body;
 
-      if (user.pin && !(pin === user.pin)) throw new Error("Pin required");
+      if (user.pin && !(pin === user.pin)) fail("Pin required");
       if (typeof newpin !== "undefined" && newpin.length === 6)
         user.pin = newpin;
       if (user.pin === "delete") delete user.pin;
@@ -210,7 +207,7 @@ export default {
       let token;
       if (user.username.toLowerCase() !== username.toLowerCase() && exists) {
         err("username taken", username, user.username, exists.username);
-        throw new Error("Username taken");
+        fail("Username taken");
       } else if (username) {
         if (user.username.toLowerCase() !== username.toLowerCase())
           l("changing username", user.username, username);