secrez 1.1.0 → 1.1.2

package/src/PreCommand.js

@@ -1,116 +1,120 @@
-const {chalk} = require('./utils/Logger')
-const Crypto = require('@secrez/crypto')
-const {utils: hubUtils} = require('@secrez/hub')
-const superagent = require('superagent')
+const { chalk } = require("./utils/Logger");
+const Crypto = require("@secrez/crypto");
+const { utils: hubUtils } = require("@secrez/hub");
+const superagent = require("superagent");
 
 class PreCommand {
-
   async useEditor(options) {
-    let message = 'your OS default editor.'
+    let message = "your OS default editor.";
     if (options.internal) {
-      message = 'the minimalistic internal editor.'
+      message = "the minimalistic internal editor.";
     } else if (options.editor) {
-      message = `${options.editor}.`
+      message = `${options.editor}.`;
     }
-    let extraMessage = chalk.dim('Press <enter> to launch ')
-        + message
-        + chalk.reset(
-            options.internal ? chalk.green('\n  Ctrl-d to save the changes. Ctrl-c to abort.') : ''
-        )
-    let {result} = await this.prompt.inquirer.prompt([{
-      type: 'multiEditor',
-      name: 'result',
-      message: 'Editing...',
-      default: options.content,
-      tempDir: this.cliConfig.tmpPath,
-      validate: function (text) {
-        return true
+    let extraMessage =
+      chalk.dim("Press <enter> to launch ") +
+      message +
+      chalk.reset(
+        options.internal
+          ? chalk.green("\n  Ctrl-d to save the changes. Ctrl-c to abort.")
+          : ""
+      );
+    let { result } = await this.prompt.inquirer.prompt([
+      {
+        type: "multiEditor",
+        name: "result",
+        message: "Editing...",
+        default: options.content,
+        tempDir: this.cliConfig.tmpPath,
+        validate: function (text) {
+          return true;
+        },
+        extraMessage,
       },
-      extraMessage
-    }])
-    return result
-
+    ]);
+    return result;
   }
 
-
   async useSelect(options) {
-    let cancel = '(cancel)'
+    let cancel = "(cancel)";
     if (!options.dontCancel) {
-      options.choices = options.choices.concat([cancel])
+      options.choices = options.choices.concat([cancel]);
     }
-    let {result} = await this.prompt.inquirer.prompt([
+    let { result } = await this.prompt.inquirer.prompt([
       {
-        type: 'list',
-        name: 'result',
+        type: "list",
+        name: "result",
         message: options.message,
-        choices: options.choices
-      }
-    ])
+        choices: options.choices,
+      },
+    ]);
     if (result === cancel) {
-      return
+      return;
     } else {
-      return result
+      return result;
     }
-
   }
 
   async useConfirm(options) {
-    let {result} = await this.prompt.inquirer.prompt([
+    let { result } = await this.prompt.inquirer.prompt([
       {
-        type: 'confirm',
-        name: 'result',
+        type: "confirm",
+        name: "result",
         message: options.message,
-        default: options.default
-      }
-    ])
-    return result
-
+        default: options.default,
+      },
+    ]);
+    return result;
   }
 
   async useInput(options) {
-
-    let prompt = this.prompt
-    let exitCode = Crypto.getRandomBase58String(2)
-    let {result} = await prompt.inquirer.prompt([
+    let prompt = this.prompt;
+    let exitCode = Crypto.getRandomBase58String(2);
+    let { result } = await prompt.inquirer.prompt([
       {
-        type: options.type || 'input',
-        name: 'result',
+        type: options.type || "input",
+        name: "result",
         message: options.message,
         default: options.content,
-        validate: val => {
+        validate: (val) => {
           if (val) {
             if (val === exitCode) {
-              return true
+              return true;
             } else if (options.validate) {
-              return options.validate(val, exitCode)
+              return options.validate(val, exitCode);
             } else if (val.length) {
-              return true
+              return true;
             }
           }
-          return chalk.grey(`Please, type the ${options.name}, or cancel typing ${chalk.bold(exitCode)}`)
-        }
-      }
-    ])
+          return chalk.grey(
+            `Please, type the ${options.name}, or cancel typing ${chalk.bold(
+              exitCode
+            )}`
+          );
+        },
+      },
+    ]);
     if (result !== exitCode) {
-      return result
+      return result;
     }
   }
 
   async callCourier(_payload, port, caCrt, pathname) {
-    const {payload, signature} = hubUtils.setPayloadAndSignIt(this.secrez, _payload)
+    const { payload, signature } = hubUtils.setPayloadAndSignIt(
+      this.secrez,
+      _payload
+    );
     try {
       const res = await superagent
-          .get(`https://localhost:${port}${pathname || ''}`)
-          .set('Accept', 'application/json')
-          .query({payload, signature})[caCrt ? 'ca' : 'trustLocalhost'](caCrt)
-      return res.body
+        .get(`https://localhost:${port}${pathname || ""}`)
+        .set("Accept", "application/json")
+        .query({ payload, signature })
+        [caCrt ? "ca" : "trustLocalhost"](caCrt);
+      return res.body;
     } catch (e) {
-      return {error: e.message}
+      return { error: e.message };
     }
   }
-
 }
 
-module.exports = PreCommand
-
-
+module.exports = PreCommand;

package/src/Welcome.js

@@ -1,151 +1,157 @@
-const chalk = require('chalk')
-const inquirer = require('inquirer')
-const fs = require('fs-extra')
-const Crypto = require('@secrez/crypto')
-const Logger = require('./utils/Logger')
-const Fido2Client = require('./utils/Fido2Client')
+const chalk = require("chalk");
+const inquirer = require("inquirer");
+const fs = require("fs-extra");
+const Crypto = require("@secrez/crypto");
+const Logger = require("./utils/Logger");
+const Fido2Client = require("./utils/Fido2Client");
 
 class Welcome {
-
   async start(secrez, options) {
-    this.secrez = secrez
-    this.options = options
-    this.iterations = options.iterations || await this.getIterations()
+    this.secrez = secrez;
+    this.options = options;
+    this.iterations = options.iterations || (await this.getIterations());
     if (await fs.pathExists(this.secrez.config.oldKeysPath)) {
-      const oldConf = require(this.secrez.config.oldKeysPath)
+      const oldConf = require(this.secrez.config.oldKeysPath);
       if (!oldConf.data.why) {
-        Logger.red(chalk.bold(`
+        Logger.red(
+          chalk.bold(`
 Your encrypted db is not compatible with this version of Secrez.
-`))
+`)
+        );
         Logger.reset(`Install secrez-migrate with
 
-  ${chalk.bold('pnpm i -g @secrez/migrate')}
+  ${chalk.bold("pnpm i -g @secrez/migrate")}
 
 and run it to migrate the db. If you specify the container launching secrez, specify it also launching secrez-migrate. 
 If you need to access your secrets now, revert to a compatible version with 
 
-  ${chalk.bold('pnpm i -g secrez@0.10.8')}
+  ${chalk.bold("pnpm i -g secrez@0.10.8")}
   
 and migrate your db later.
-Thanks.`)
+Thanks.`);
         // eslint-disable-next-line no-process-exit
-        process.exit(0)
+        process.exit(0);
       }
     }
 
     if (await fs.pathExists(this.secrez.config.keysPath)) {
-      let errorCode = await this.login()
+      let errorCode = await this.login();
       if (errorCode === 1) {
-        await this.sharedLogin()
+        await this.sharedLogin();
       }
     } else {
-      Logger.grey('Please signup to create your local account')
-      await this.signup()
+      Logger.grey("Please signup to create your local account");
+      await this.signup();
     }
   }
 
   async getIterations() {
     if (await fs.pathExists(this.secrez.config.envPath)) {
-      let env = require(this.secrez.config.envPath)
+      let env = require(this.secrez.config.envPath);
       if (env.iterations) {
-        return env.iterations
+        return env.iterations;
       }
     }
-    let {iterations} = await inquirer.prompt([{
-      name: 'iterations',
-      type: 'input',
-      message: 'Type the number of iterations for password derivation:',
-      validate: value => {
-        if (value.length && parseInt(value) > 0) {
-          return true
-        } else {
-          return 'Please enter a valid number of iterations.'
-        }
-      }
-    }])
-    return parseInt(iterations)
+    let { iterations } = await inquirer.prompt([
+      {
+        name: "iterations",
+        type: "input",
+        message: "Type the number of iterations for password derivation:",
+        validate: (value) => {
+          if (value.length && parseInt(value) > 0) {
+            return true;
+          } else {
+            return "Please enter a valid number of iterations.";
+          }
+        },
+      },
+    ]);
+    return parseInt(iterations);
   }
 
-// chimney piano fabric forest curious black hip axis story stool spoil fold
+  // chimney piano fabric forest curious black hip axis story stool spoil fold
   async saveIterations() {
     if (this.options.saveIterations) {
-      await this.secrez.saveIterations(this.iterations)
+      await this.secrez.saveIterations(this.iterations);
     }
   }
 
   async login() {
-    for (; ;) {
+    for (;;) {
       try {
-        let {password} = await inquirer.prompt([{
-          name: 'password',
-          type: 'password',
-          message: 'Enter your master password:',
-          validate: value => {
-            if (value.length) {
-              return true
-            } else {
-              return 'Please enter your master password.'
-            }
-          }
-        }])
+        let { password } = await inquirer.prompt([
+          {
+            name: "password",
+            type: "password",
+            message: "Enter your master password:",
+            validate: (value) => {
+              if (value.length) {
+                return true;
+              } else {
+                return "Please enter your master password.";
+              }
+            },
+          },
+        ]);
         try {
-          await this.secrez.signin(password, this.iterations)
+          await this.secrez.signin(password, this.iterations);
           if (this.secrez.masterKeyHash) {
-            await this.saveIterations()
+            await this.saveIterations();
           }
-          return 0
+          return 0;
         } catch (e) {
-          if (e.message === 'A second factor is required') {
-            return 1
+          if (e.message === "A second factor is required") {
+            return 1;
           }
-          Logger.red(`${e.message}.Try again or Ctrl - C to exit.`)
+          Logger.red(`${e.message}.Try again or Ctrl - C to exit.`);
         }
       } catch (e) {
-        Logger.red('Unrecognized error. Try again or Ctrl-c to exit.')
+        Logger.red("Unrecognized error. Try again or Ctrl-c to exit.");
       }
     }
   }
 
   async sharedLogin() {
-    let fido2Client = new Fido2Client(this.secrez)
-    let authenticator
-    let list = await fido2Client.getKeys()
-    const conf = await this.secrez.readConf()
-    let choices = []
+    let fido2Client = new Fido2Client(this.secrez);
+    let authenticator;
+    let list = await fido2Client.getKeys();
+    const conf = await this.secrez.readConf();
+    let choices = [];
     for (let authenticator in conf.data.keys) {
-      choices.push(authenticator)
+      choices.push(authenticator);
     }
-    for (; ;) {
+    for (;;) {
       if (list.length === 1) {
-        authenticator = list[0]
+        authenticator = list[0];
       } else {
         let p = await inquirer.prompt([
           {
-            type: 'list',
-            name: 'authenticator',
-            message: 'Which second factor would you like to use?',
-            choices
-          }
-        ])
-        authenticator = p.authenticator
+            type: "list",
+            name: "authenticator",
+            message: "Which second factor would you like to use?",
+            choices,
+          },
+        ]);
+        authenticator = p.authenticator;
       }
-      let secret
+      let secret;
       try {
         try {
           if (fido2Client.keys[authenticator]) {
-            Logger.grey('Touch your fido2 authenticator device now...')
-            secret = await fido2Client.verifySecret(authenticator)
+            Logger.grey("Touch your fido2 authenticator device now...");
+            secret = await fido2Client.verifySecret(authenticator);
           } else {
-            let exitCode = Crypto.getRandomBase58String(2)
-            let p = await inquirer.prompt([{
-              name: 'recoveryCode',
-              type: 'input',
-              message: 'Type or paste your recovery code:',
-              validate: value => {
-                if (value.length) {
-                  return true
-                } else {
-                  return `
+            let exitCode = Crypto.getRandomBase58String(2);
+            let p = await inquirer.prompt([
+              {
+                name: "recoveryCode",
+                type: "input",
+                message: "Type or paste your recovery code:",
+                validate: (value) => {
+                  if (value.length) {
+                    return true;
+                  } else {
+                    return `
             Please
             paste
             a
@@ -157,84 +163,88 @@ Thanks.`)
             to
             choose
             another
-            factor.`
-                }
-              }
-            }])
+            factor.`;
+                  }
+                },
+              },
+            ]);
             if (p.recoveryCode === exitCode) {
-              continue
+              continue;
             }
-            secret = p.recoveryCode
+            secret = p.recoveryCode;
           }
-          let resCode = await this.secrez.sharedSignin(authenticator, secret)
+          let resCode = await this.secrez.sharedSignin(authenticator, secret);
           if (this.secrez.masterKeyHash) {
-            await this.saveIterations()
+            await this.saveIterations();
           }
           if (resCode === 1) {
-            Logger.bold(chalk.red('Your data has been upgraded.'))
-            Logger.red('To avoid conflicts, any registered second factor has been removed.')
-            Logger.grey('Please, register them again, thanks.')
+            Logger.bold(chalk.red("Your data has been upgraded."));
+            Logger.red(
+              "To avoid conflicts, any registered second factor has been removed."
+            );
+            Logger.grey("Please, register them again, thanks.");
           }
-          return
+          return;
         } catch (e) {
           Logger.red(`${e.message}.Try
             again
             or
             Ctrl - C
             to
-            exit.`)
+            exit.`);
         }
       } catch (e) {
-        Logger.red('Unrecognized error. Try again or Ctrl-C to exit.')
+        Logger.red("Unrecognized error. Try again or Ctrl-C to exit.");
       }
     }
   }
 
   async signup() {
-    for (; ;) {
+    for (;;) {
       try {
-        let p = await inquirer.prompt([{
-          name: 'password',
-          type: 'password',
-          message: 'Enter your password:',
-          validate: value => {
-            if (value.length) {
-              return true
-            } else {
-              return 'Please enter your password'
-            }
-          }
-        }, {
-          name: 'retype',
-          type: 'password',
-          message: 'Retype your password:',
-          validate: value => {
-            if (value.length) {
-              return true
-            } else {
-              return 'Please enter your password'
-            }
-          }
-        }])
+        let p = await inquirer.prompt([
+          {
+            name: "password",
+            type: "password",
+            message: "Enter your password:",
+            validate: (value) => {
+              if (value.length) {
+                return true;
+              } else {
+                return "Please enter your password";
+              }
+            },
+          },
+          {
+            name: "retype",
+            type: "password",
+            message: "Retype your password:",
+            validate: (value) => {
+              if (value.length) {
+                return true;
+              } else {
+                return "Please enter your password";
+              }
+            },
+          },
+        ]);
         if (p.password === p.retype) {
           try {
-            await this.secrez.signup(p.password, this.iterations)
-            await this.saveIterations()
-            return
+            await this.secrez.signup(p.password, this.iterations);
+            await this.saveIterations();
+            return;
           } catch (e) {
-            Logger.red(e.message)
-            break
+            Logger.red(e.message);
+            break;
           }
         } else {
-          Logger.red('The two passwords do not match. Try again')
+          Logger.red("The two passwords do not match. Try again");
         }
       } catch (e) {
-        Logger.red('Unrecognized error. Try again or Ctrl-c to exit.')
+        Logger.red("Unrecognized error. Try again or Ctrl-c to exit.");
       }
     }
-
   }
-
 }
 
-module.exports = new Welcome
+module.exports = new Welcome();

package/src/cliConfig.js

@@ -1,9 +1,9 @@
-const TRUE = 1
-const STRING = 2
-const ARRAY = 3
-const NUMBER = 4
-const BOOL = 5
-const OBJECT = 6
+const TRUE = 1;
+const STRING = 2;
+const ARRAY = 3;
+const NUMBER = 4;
+const BOOL = 5;
+const OBJECT = 6;
 
 const completionTypes = {
   TRUE,
@@ -11,17 +11,17 @@ const completionTypes = {
   ARRAY,
   NUMBER,
   BOOL,
-  OBJECT
-}
+  OBJECT,
+};
 
-const cliConfig = Object.assign(require('@secrez/core').config, {
+const cliConfig = Object.assign(require("@secrez/core").config, {
   completion: {
-    help: {}
+    help: {},
   },
   chatCompletion: {
-    help: {}
+    help: {},
   },
-  completionTypes
-})
+  completionTypes,
+});
 
-module.exports = cliConfig
+module.exports = cliConfig;