secrez 1.1.6 → 2.0.0

package/src/commands/Contacts.js

@@ -1,8 +1,6 @@
 const Crypto = require("@secrez/crypto");
-const { utils: hubUtils } = require("@secrez/hub");
 const chalk = require("chalk");
 const ContactManager = require("../utils/ContactManager");
-const superagent = require("superagent");
 
 class Contacts extends require("../Command") {
   setHelpAndCompletion() {
@@ -57,10 +55,10 @@ class Contacts extends require("../Command") {
       examples: [
         [
           "contacts -a pan",
-          "adds a new trusted contact pan, asking for his public key or hub url",
+          "adds a new trusted contact pan, asking for his public key",
         ],
-        ["contacts -u pan", "updates the hub url"],
-        ["contacts -s pan", "returns pan's public key and url"],
+        ["contacts -u pan", "updates a contact"],
+        ["contacts -s pan", "returns pan's public key"],
         ["contacts -d ema", "deletes ema's data"],
         ["contacts -r ema joe", "renames ema"],
         ["contacts", "listed all trusted contacts"],
@@ -68,20 +66,6 @@ class Contacts extends require("../Command") {
     };
   }
 
-  async getPublicKeyFromUrl(url) {
-    try {
-      url = new URL(url);
-      let id = hubUtils.getClientIdFromHostname(url.hostname);
-      let apiurl = url.protocol + "//" + url.host.split(id + ".")[1];
-      let res = await superagent
-        .get(`${apiurl}/api/v1/publickey/${id}`)
-        .set("Accept", "application/json");
-      return res.body.publickey;
-    } catch (e) {
-      throw new Error("Inactive/wrong url");
-    }
-  }
-
   async createContact(options) {
     const { name } = options;
     if (options.update) {
@@ -90,7 +74,6 @@ class Contacts extends require("../Command") {
     await this.contactManager.create({
       name,
       publicKey: options.publicKey,
-      url: options.url,
     });
   }
 
@@ -101,57 +84,27 @@ class Contacts extends require("../Command") {
       throw new Error(`A contact named "${name}" already exists`);
     }
     let publicKey;
-    let url;
     if (process.env.NODE_ENV === "test") {
       publicKey = options.publicKey;
-      url = options.url;
     } else {
-      let choice = await this.useSelect({
-        message: "Chose method",
-        choices: ["Public key", "Url on hub"],
-      });
-      if (!choice) {
-        throw new Error("Operation canceled");
-      }
-      if (choice === "Url on hub") {
-        url = await this.useInput(
-          Object.assign(options, {
-            message: `Paste ${name}'s url on hub`,
-          })
-        );
-        if (!url) {
-          throw new Error("Operation canceled");
-        }
-        try {
-          publicKey = await this.getPublicKeyFromUrl(url);
-        } catch (e) {}
-      } else {
-        publicKey = await this.useInput(
-          Object.assign(options, {
-            message: `Paste ${name}'s public key`,
-          })
-        );
-      }
+      publicKey = await this.useInput(
+        Object.assign(options, {
+          message: `Paste ${name}'s public key`,
+        })
+      );
       if (!publicKey) {
-        throw new Error(
-          choice === "Url on hub"
-            ? "Client not found on hub"
-            : "Operation canceled"
-        );
+        throw new Error("Operation canceled");
       }
     }
     if (!Crypto.isValidSecrezPublicKey(publicKey)) {
       throw new Error("The public key is not a valid one");
     }
-    if (url && !hubUtils.isValidUrl(url)) {
-      throw new Error("The url does not look valid");
-    }
-    this.checkIfAlreadyExists(name, publicKey, url);
-    await this.createContact(Object.assign(options, { publicKey, url }));
+    this.checkIfAlreadyExists(name, publicKey);
+    await this.createContact(Object.assign(options, { publicKey }));
     return `The contact "${name}" has been added to your trusted contacts`;
   }
 
-  checkIfAlreadyExists(name, publicKey, url) {
+  checkIfAlreadyExists(name, publicKey, updating = false) {
     let allContacts = this.contactManager.get();
     for (let contact in allContacts) {
       let content = JSON.parse(allContacts[contact].content);
@@ -160,17 +113,11 @@ class Contacts extends require("../Command") {
           throw new Error(
             `The contact "${contact}" is already associated to this public key`
           );
-        } else if (url && content.url === url) {
-          throw new Error(
-            `The contact "${contact}" is already associated to this url`
-          );
-        }
-      } else {
-        if (publicKey && content.publicKey !== publicKey) {
-          throw new Error(
-            `"${contact}" is associated to a different public key. Verify your contact, please`
-          );
         }
+      } else if (!updating && content.publicKey !== publicKey) {
+        throw new Error(
+          `"${contact}" is associated to a different public key. Verify your contact, please`
+        );
       }
     }
   }
@@ -182,48 +129,26 @@ class Contacts extends require("../Command") {
       throw new Error("Contact not found");
     }
     let publicKey;
-    let url;
     if (process.env.NODE_ENV === "test") {
       publicKey = options.publicKey;
-      url = options.url;
     } else {
-      let choice = await this.useSelect({
-        message: "Chose method",
-        choices: ["Public key", "Url on hub"],
-      });
-      if (choice === "Url on hub") {
-        url = await this.useInput(
-          Object.assign(options, {
-            message: `Paste ${name}'s url on hub`,
-          })
-        );
-        if (!url) {
-          throw new Error("Operation canceled");
-        }
-        try {
-          publicKey = await this.getPublicKeyFromUrl(url);
-        } catch (e) {}
-      } else {
-        publicKey = await this.useInput(
-          Object.assign(options, {
-            message: `Paste ${name}'s public key`,
-          })
-        );
-      }
+      publicKey = await this.useInput(
+        Object.assign(options, {
+          message: `Paste ${name}'s public key`,
+        })
+      );
       if (!publicKey) {
-        throw new Error(
-          choice === "Url on hub" ? "Url not active" : "Operation canceled"
-        );
+        throw new Error("Operation canceled");
       }
     }
     if (!publicKey) {
       publicKey = JSON.parse(existingDataIfSo.content).publicKey;
     }
-    this.checkIfAlreadyExists(name, publicKey, url);
+    this.checkIfAlreadyExists(name, publicKey, true);
     if (existingDataIfSo) {
       await this.contactManager.remove(name);
     }
-    await this.createContact(Object.assign(options, { publicKey, url }));
+    await this.createContact(Object.assign(options, { publicKey }));
     return `The contact "${name}" has been updated`;
   }
 
@@ -277,9 +202,6 @@ class Contacts extends require("../Command") {
       chalk.grey("public key: "),
       l[1].publicKey,
     ];
-    if (l[1].url) {
-      result.push("\n", chalk.grey("url: "), l[1].url);
-    }
     return result.join("");
   }
 

package/src/commands/Show.js

@@ -0,0 +1,149 @@
+const QRCode = require("qrcode");
+const { yamlParse, isYaml } = require("@secrez/utils");
+const { Node } = require("@secrez/fs");
+const _ = require("lodash");
+
+class Show extends require("../Command") {
+  setHelpAndCompletion() {
+    this.cliConfig.completion.show = {
+      _func: this.selfCompletion(this),
+      _self: this,
+    };
+    this.cliConfig.completion.help.show = true;
+    this.optionDefinitions = [
+      {
+        name: "help",
+        alias: "h",
+        type: Boolean,
+      },
+      {
+        name: "path",
+        completionType: "file",
+        alias: "p",
+        defaultOption: true,
+        type: String,
+      },
+      {
+        name: "version",
+        alias: "v",
+        type: Boolean,
+      },
+      {
+        name: "qr-code",
+        alias: "q",
+        type: Boolean,
+      },
+      {
+        name: "field",
+        alias: "f",
+        type: String,
+      },
+    ];
+  }
+
+  help() {
+    return {
+      description: ["Show a card field as a QR code."],
+      examples: [
+        [
+          "show -q wallet.yml -f password",
+          "shows the field 'password' of the card 'wallet.yml' as a QR code",
+        ],
+        [
+          "show wallet.yml -f password",
+          "shows the field 'password' of the card 'wallet.yml'",
+        ],
+        [
+          "show ethKeys.yaml -v 8uW3",
+          "asks you to select a field from the version 8uW3 of the file",
+        ],
+      ],
+    };
+  }
+
+  async generateQrCode(content) {
+    return new Promise((resolve, reject) => {
+      QRCode.toString(content, { type: "terminal" }, (err, qrcode) => {
+        if (err) reject(err);
+        else resolve(qrcode);
+      });
+    });
+  }
+
+  async show(options) {
+    let cat = this.prompt.commands.cat;
+    let currentIndex = this.internalFs.treeIndex;
+    let data = await this.internalFs.getTreeIndexAndPath(options.path);
+    /* istanbul ignore if  */
+    if (currentIndex !== data.index) {
+      await this.internalFs.mountTree(data.index, true);
+    }
+    options.path = data.path;
+    let tree = data.tree;
+    let p = tree.getNormalizedPath(options.path);
+    let file = tree.root.getChildFromPath(p);
+    if (Node.isFile(file)) {
+      let entry = (
+        await cat.cat({
+          path: p,
+          version: options.version ? [options.version] : undefined,
+          unformatted: true,
+        })
+      )[0];
+      if (Node.isText(entry)) {
+        let { name, content } = entry;
+        if (isYaml(p)) {
+          let parsed;
+          try {
+            parsed = yamlParse(content);
+          } catch (e) {
+            throw new Error("The yml is malformed.");
+          }
+          if (options.field) {
+            if (parsed[options.field]) {
+              content = parsed[options.field];
+            } else {
+              throw new Error(`Field ${options.field} not found`);
+            }
+          } else {
+            let field = await this.useInput({
+              type: "list",
+              message: "Which field do you want to show?",
+              choices: Object.keys(parsed),
+            });
+            content = parsed[field];
+          }
+          if (options.qrCode) {
+            return this.generateQrCode(content);
+          } else {
+            return content;
+          }
+        }
+      } else {
+        throw new Error("File is not a card.");
+      }
+    } else {
+      throw new Error("Cannot show a folder");
+    }
+  }
+
+  async exec(options = {}) {
+    if (options.help) {
+      return this.showHelp();
+    }
+    try {
+      this.validate(options, {
+        path: true,
+      });
+      const content = await this.show(options);
+      if (content) {
+        this.Logger.reset(content);
+      }
+    } catch (e) {
+      this.Logger.red(e.message);
+    }
+    await this.prompt.run();
+  }
+}
+
+module.exports = Show;

package/src/commands/Whoami.js

@@ -1,6 +1,4 @@
 const chalk = require("chalk");
-const { ConfigUtils } = require("@secrez/core");
-const clipboardy = require("clipboardy");
 
 class Whoami extends require("../Command") {
   setHelpAndCompletion() {
@@ -20,12 +18,12 @@ class Whoami extends require("../Command") {
 
   help() {
     return {
-      description: ["Show data that other users need to chat with you"],
+      description: ["Show your Secrez public key"],
       examples: ["whoami"],
     };
   }
 
-  async customCompletion(options, originalLine, defaultOption) {
+  async customCompletion() {
     return [];
   }
 
@@ -33,24 +31,10 @@ class Whoami extends require("../Command") {
     let result = {
       publicKey: this.secrez.getPublicKey(),
     };
-    const env = (options.env = await ConfigUtils.getEnv(this.secrez.config));
-    if (env.courier) {
-      await this.prompt.commands.courier.preInit(options);
-      if (options.ready) {
-        result.url = env.courier.tunnel.url;
-      }
-    }
     if (options.asIs) {
       return result;
     }
     this.Logger.reset(chalk.grey("Public key: ") + result.publicKey);
-    if (result.url) {
-      this.Logger.reset(chalk.grey("Hub url: ") + result.url);
-      await clipboardy.write(result.url);
-      this.Logger.grey(
-        "For your convenience, the url has been copied to the clipboard."
-      );
-    }
   }
 
   async exec(options = {}) {

package/src/utils/ContactManager.js

@@ -22,7 +22,6 @@ class ContactManager {
       value: options.name,
       content: JSON.stringify({
         publicKey: options.publicKey,
-        url: options.url,
       }),
     });
   }
@@ -38,12 +37,13 @@ class ContactManager {
     }
   }
 
-  async rename(existentName, contact) {
+  async rename(existentName, name) {
     let old = this.get(existentName);
+    let { publicKey } = JSON.parse(old.content);
     if (await this.remove(existentName)) {
       return await this.create({
-        name: contact,
-        content: old.content,
+        name,
+        publicKey,
       });
     }
   }

package/src/commands/Chat.js

@@ -1,148 +0,0 @@
-const path = require("path");
-const chalk = require("chalk");
-const { ConfigUtils } = require("@secrez/core");
-const ChatPrompt = require("../prompts/ChatPrompt");
-
-class Chat extends require("../Command") {
-  setHelpAndCompletion() {
-    this.cliConfig.completion.chat = {
-      _func: this.selfCompletion(this),
-      _self: this,
-    };
-    this.cliConfig.completion.help.chat = true;
-    this.optionDefinitions = [
-      {
-        name: "help",
-        alias: "h",
-        type: Boolean,
-      },
-    ];
-  }
-
-  help() {
-    return {
-      description: ["Enters the Secrez chat"],
-      examples: ["chat"],
-    };
-  }
-
-  async uploadUsersPublicKeysToCourier(options) {
-    const { port, caCrt } = options.env.courier;
-    let contacts = await this.prompt.commands.contacts.contacts({
-      list: true,
-      asIs: true,
-    });
-    this.contactsByPublicKey = {};
-    for (let contact of contacts) {
-      this.contactsByPublicKey[contact[1].publicKey] = contact[0];
-      await this.callCourier(
-        {
-          action: {
-            name: "add",
-            publicKey: contact[1].publicKey,
-            url: contact[1].url,
-          },
-        },
-        port,
-        caCrt,
-        "/admin"
-      );
-    }
-  }
-
-  async readHistoryMessages(options = {}) {
-    /* istanbul ignore if  */
-    if (!options.asIs) {
-      this.chatPrompt.skip = true;
-    }
-    const { minTimestamp, maxTimestamp, from, to } = options;
-    /* istanbul ignore if  */
-    if (!options.asIs) {
-      this.Logger.bold(
-        from || to
-          ? `Messages${from ? ` from ${from}` : ""}${to ? ` to ${to}` : ""}:`
-          : "All message history:"
-      );
-    }
-    let newMessages = await this.prompt.commands.courier.getSomeMessages({
-      payload: {
-        minTimestamp,
-        maxTimestamp,
-        from: this.room[0].publicKey,
-        limit: 1000,
-      },
-    });
-    /* istanbul ignore if  */
-    if (!options.asIs) {
-      let len = newMessages.length;
-      if (len) {
-        this.chatPrompt.onMessages(newMessages, {
-          fromHistory: true,
-          verbose: options.verbose,
-          lastLine: options.asIs
-            ? undefined
-            : chalk.grey(`${len} message${len > 1 ? "s" : ""} found.`),
-        });
-      } else {
-        this.Logger.yellow("None found");
-      }
-      this.chatPrompt.skip = false;
-    } else {
-      return newMessages;
-    }
-  }
-
-  async chat(options) {
-    const env = (options.env = await ConfigUtils.getEnv(this.secrez.config));
-    if (env.courier) {
-      this.courier = await this.prompt.commands.courier;
-      await this.courier.preInit(options);
-      if (options.ready) {
-        await this.uploadUsersPublicKeysToCourier(options);
-        if (process.env.NODE_ENV === "test") {
-          this.chatPrompt = options.chatPrompt;
-        } else {
-          this.chatPrompt = new ChatPrompt();
-        }
-        await this.chatPrompt.init({
-          historyPath: path.join(
-            this.secrez.config.localDataPath,
-            "chatHistory"
-          ),
-          environment: this,
-          secrez: this.secrez,
-        });
-        await this.chatPrompt.run(options);
-      } else {
-        throw new Error("The configured courier is not responding.");
-      }
-    } else {
-      this.Logger.grey(`Chat requires a courier listening locally.
-If you haven't yet, in another terminal install @secrez/courier as 
-
-  npm i -g @secrez/courier
-  
-and launch it as 
-
-  secrez-courier
-  
-It will show the port where it is listening to. Copy it and come back to Secrez. Then run "courier" to configure the connection w/ the courier.`);
-      throw new Error("Courier not found.");
-    }
-  }
-
-  async exec(options = {}) {
-    if (options.help) {
-      return this.showHelp();
-    }
-    try {
-      await this.chat(options);
-    } catch (e) {
-      // console.log(e)
-      this.Logger.red(e.message);
-    }
-    await this.prompt.run();
-  }
-}
-
-module.exports = Chat;