@saltcorn/cli 0.7.1-beta.3 → 0.7.2-beta.10

package/src/commands/modify-user.js

@@ -0,0 +1,163 @@
+/**
+ * @category saltcorn-cli
+ * @module commands/modify-user
+ */
+
+// todo support for  users without emails (using user.id)
+const { Command, flags } = require("@oclif/command");
+const { cli } = require("cli-ux");
+const { maybe_as_tenant, init_some_tenants } = require("../common");
+
+
+/**
+ * ModifyUserCommand Class
+ * @extends oclif.Command
+ * @category saltcorn-cli
+ */
+class ModifyUserCommand extends Command {
+  /**
+   * @returns {Promise<void>}
+   */
+  async run() {
+
+    const User = require("@saltcorn/data/models/user");
+
+    const { args } = this.parse(ModifyUserCommand);
+    const { flags } = this.parse(ModifyUserCommand);
+
+    if (flags.admin && flags.role && flags.role !== "admin") {
+      console.error("Error: specify at most one of admin and role");
+      this.exit(1);
+    }
+
+    // init tenant
+    await init_some_tenants(flags.tenant);
+
+    // run function as specified tenant
+    await maybe_as_tenant(flags.tenant, async () => {
+      // role_id
+      let role_id; // = flags.admin ? 1 : 8;
+      if (flags.admin) role_id = 1;
+      else if (flags.role) {
+        const roles = await User.get_roles();
+        const role = roles.find((r) => r.role === flags.role);
+        if (!role) {
+          console.error(`Error: role ${flags.role} not found`);
+          this.exit(1);
+        }
+        role_id = role.id;
+      }
+      // email
+      let email;
+      if (flags.email) email = flags.email;
+      else if (flags.imode) email = await cli.prompt("New Email address", { default : args.user_email });
+      if(email === args.user_email) email = undefined; // little trick - we won't update email if it already same
+      if (email)
+        if (!User.valid_email(email)){
+          console.error(`Error: Email is invalid`);
+          this.exit(1);
+        }
+
+      // password
+      // todo check for repeated passwords
+      let password;
+      if (flags.password) password = flags.password;
+      else if (flags.imode) password = await cli.prompt("New Password", { type: "hide" });
+      if (password)
+        if (User.unacceptable_password_reason(password)){
+          console.error(`Error: ${User.unacceptable_password_reason(password)}`);
+          this.exit(1);
+        }
+      // check that user with new email does not exists
+      const u_new_email = await User.findOne({ email });
+      if(u_new_email !== null&&args.user_email!==email){
+        console.error(`Error: Cannot change email from ${args.user_email} to ${email}. User with email ${email} exists`);
+        this.exit(1);
+      }
+      // try to find user
+      const u = await User.findOne({ email: args.user_email });
+      if(u === null){
+        console.error(`Error: User ${args.user_email} is not found`);
+        this.exit(1);
+      }
+      if(!u instanceof User){
+        console.error(`Error: ${u.error}`);
+        this.exit(1);
+      }
+
+      // make changes
+      if (email && role_id)
+        await u.update({ email, role_id });
+      else if(email)
+        await u.update({ email });
+      else if(role_id)
+        await u.update({ role_id });
+
+      if (password)
+        await u.changePasswordTo(password, false);
+
+      console.log(`Success: User ${email?email:args.user_email} updated successfully ${
+          typeof flags.tenant !== "undefined" ? "in tenant " + flags.tenant : ""
+        }`);
+
+    });
+    this.exit(0);
+  }
+}
+
+/**
+ * @type {object}
+ */
+ModifyUserCommand.args = [
+  { name: "user_email", required: true, description: "User to modify" },
+];
+
+/**
+ * @type {string}
+ */
+ModifyUserCommand.description = `Modify (update) user.
+
+Command changes the user specified by USER_EMAIL.
+
+You can change the user group, password and email.
+
+NOTE that -a and -r role (--role=role) can give conflict.
+`;
+
+/**
+ * @type {string}
+ */
+ModifyUserCommand.help = `Modify (update) user.
+
+Command changes the user specified by USER_EMAIL.
+
+You can change the user group, password and email.
+
+NOTE that -a and -r role (--role=role) can give conflict.
+`;
+
+/**
+ * @type {object}
+ */
+ModifyUserCommand.flags = {
+  admin: flags.boolean({ char: "a", description: "make user be Admin" }),
+  tenant: flags.string({
+    char: "t",
+    description: "tenant",
+  }),
+  email: flags.string({
+    char: "e",
+    description: "new email",
+  }),
+  role: flags.string({
+    char: "r",
+    description: "new role (can conflict with -a option)",
+  }),
+  password: flags.string({
+    char: "p",
+    description: "new password",
+  }),
+  imode: flags.boolean({ char: "i", description: "interactive mode" }),
+};
+
+module.exports = ModifyUserCommand;

package/src/commands/release.js

@@ -24,6 +24,7 @@ class ReleaseCommand extends Command {
       "@saltcorn/e2e": { dir: "e2e" },
       "@saltcorn/db-common": { dir: "db-common", publish: true },
       "@saltcorn/sqlite": { dir: "sqlite", publish: true },
+      "@saltcorn/sqlite-mobile": { dir: "sqlite-mobile", publish: true },
       "@saltcorn/postgres": { dir: "postgres", publish: true },
       "@saltcorn/types": { dir: "saltcorn-types", publish: true },
       "@saltcorn/builder": { dir: "saltcorn-builder", publish: true },
@@ -37,28 +38,38 @@ class ReleaseCommand extends Command {
       "@saltcorn/base-plugin": { dir: "saltcorn-base-plugin", publish: true },
       //"saltcorn-cli", publish: true},
       "@saltcorn/markup": { dir: "saltcorn-markup", publish: true },
+      "@saltcorn/mobile-app": { dir: "saltcorn-mobile-app", publish: true },
+      "@saltcorn/mobile-builder": {
+        dir: "saltcorn-mobile-builder",
+        publish: true,
+      },
       "@saltcorn/sbadmin2": { dir: "saltcorn-sbadmin2", publish: true },
     };
 
+    const updateDependencies = (json, dpkgnm, version) => {
+      if (json.dependencies && json.dependencies[dpkgnm])
+        json.dependencies[dpkgnm] = version;
+      if (json.devDependencies && json.devDependencies[dpkgnm])
+        json.devDependencies[dpkgnm] = version;
+      if (json.optionalDependencies && json.optionalDependencies[dpkgnm])
+        json.optionalDependencies[dpkgnm] = version;
+    };
+
     const updatePkgJson = (dir) => {
       const json = require(`../../../${dir}/package.json`);
       json.version = version;
       if (json.dependencies || json.devDependencies)
         Object.keys(pkgs).forEach((dpkgnm) => {
-          if (json.dependencies && json.dependencies[dpkgnm])
-            json.dependencies[dpkgnm] = version;
-          if (json.devDependencies && json.devDependencies[dpkgnm])
-            json.devDependencies[dpkgnm] = version;
-          if (json.optionalDependencies && json.optionalDependencies[dpkgnm])
-            json.optionalDependencies[dpkgnm] = version;
+          updateDependencies(json, dpkgnm, version);
         });
+      updateDependencies(json, "@saltcorn/cli", version);
       fs.writeFileSync(
         `packages/${dir}/package.json`,
         JSON.stringify(json, null, 2)
       );
     };
     const compileTsFiles = () => {
-      spawnSync("npm", ["install"], {
+      spawnSync("npm", ["install", "--legacy-peer-deps"], {
         stdio: "inherit",
         cwd: ".",
       });
@@ -78,7 +89,7 @@ class ReleaseCommand extends Command {
     // 1. update version
     // 2. update dependencies for other packages
     // 3. publish
-    spawnSync("npm", ["install"], {
+    spawnSync("npm", ["install", "--legacy-peer-deps"], {
       stdio: "inherit",
       cwd: `packages/saltcorn-cli/`,
     });
@@ -93,7 +104,7 @@ class ReleaseCommand extends Command {
     // 3. run npm update
     // 3. publish
     updatePkgJson("saltcorn-cli");
-    spawnSync("npm", ["update"], {
+    spawnSync("npm", ["update","--legacy-peer-deps"], {
       stdio: "inherit",
       cwd: `packages/saltcorn-cli/`,
     });

package/src/commands/reset-schema.js

@@ -17,7 +17,7 @@ class ResetCommand extends Command {
    */
   async run() {
     const reset = require("@saltcorn/data/db/reset_schema");
-    const db = require("@saltcorn/data/db/");
+    const db = require("@saltcorn/data/db");
     const { flags } = this.parse(ResetCommand);
     await maybe_as_tenant(flags.tenant, async () => {
       const schema = db.getTenantSchema();
@@ -32,6 +32,7 @@ class ResetCommand extends Command {
         if (ans) await reset(false, schema);
       }
     });
+    console.log(`Success: Command execution successfully`);
     this.exit(0);
   }
 }
@@ -44,11 +45,19 @@ ResetCommand.description = `Reset the database
 This will delete all existing information
 `;
 
+/**
+ * @type {string}
+ */
+ResetCommand.help = `Reset the database
+...
+This will delete all existing information
+`;
+
 /**
  * @type {object}
  */
 ResetCommand.flags = {
-  force: flags.boolean({ char: "f", description: "force" }),
+  force: flags.boolean({ char: "f", description: "force command execution" }),
   tenant: flags.string({
     char: "t",
     description: "tenant",

package/src/commands/restore.js

@@ -91,6 +91,11 @@ RestoreCommand.args = [
  */
 RestoreCommand.description = `Restore a previously backed up database (zip or sqlc format)`;
 
+/**
+ * @type {string}
+ */
+RestoreCommand.help = `Restore a previously backed up database (zip or sqlc format)`;
+
 /**
  * @type {object}
  */

package/src/commands/rm-tenant.js

@@ -3,6 +3,7 @@
  * @module commands/rm-tenant
  */
 const { Command, flags } = require("@oclif/command");
+const {cli} = require("cli-ux");
 
 /**
  * RmTenantCommand Class
@@ -14,9 +15,23 @@ class RmTenantCommand extends Command {
    * @returns {Promise<void>}
    */
   async run() {
-    const { args } = this.parse(RmTenantCommand);
+
+
+    const { flags } = this.parse(RmTenantCommand);
+
     const { deleteTenant } = require("@saltcorn/admin-models/models/tenant");
-    await deleteTenant(args.tenant);
+
+    if (!flags.force) {
+      const ans = await cli.confirm(
+        `This will delete tenant ${flags.tenant}. Attention! All tenant data will be lost!\nContinue (y/n)?`);
+      if (!ans) {
+        console.log(`Success: Command execution canceled`);
+        this.exit(1);
+      }
+    }
+    // make changes
+    await deleteTenant(flags.tenant);
+
     this.exit(0);
   }
 }
@@ -24,18 +39,36 @@ class RmTenantCommand extends Command {
 /**
  * @type {object}
  */
-RmTenantCommand.args = [
+RmTenantCommand.args = []; /*[
   { name: "tenant", required: true, description: "Tenant to remove" },
 ];
-
+*/
 /**
  * @type {string}
  */
-RmTenantCommand.description = `Remove a tenant`;
+RmTenantCommand.description = `Remove a tenant.
+Attention! All tenant data will be lost!
+It recommended to make backup of tenant before perform this command.
+`;
+
+/**
+ * @type {object}
+ */
+RmTenantCommand.help = `Remove a tenant.
+Attention! All tenant data will be lost!
+It recommended to make backup of tenant before perform this command.
+`;
 
 /**
  * @type {object}
  */
-RmTenantCommand.flags = {};
+RmTenantCommand.flags = {
+  force: flags.boolean({ char: "f", description: "force command execution" }),
+  tenant: flags.string({
+    char: "t",
+    description: "tenant",
+    required: true,
+  }),
+};
 
 module.exports = RmTenantCommand;

package/src/commands/run-tests.js

@@ -32,26 +32,34 @@ class RunTestsCommand extends Command {
     return res;
   }
 
-  /**
-   *
-   * @param {*} env
-   * @returns {Promise<void>}
-   */
-  async e2etest(env) {
+  async prepareTestServer(env, port) {
+    let serverEnv = JSON.parse(JSON.stringify(env));
+    serverEnv.SQLITE_FILEPATH = "/tmp/sctestdb_server";
     spawnSync("packages/saltcorn-cli/bin/saltcorn", ["fixtures", "-r"], {
       stdio: "inherit",
-      env,
+      env: serverEnv,
     });
 
     const server = spawn(
       "packages/saltcorn-cli/bin/saltcorn",
-      ["serve", "-p", "2987"],
+      ["serve", "-p", port],
       {
         stdio: "inherit",
-        env,
+        env: serverEnv,
       }
     );
     await sleep(2000);
+    return server;
+  }
+
+  /**
+   *
+   * @param {*} env
+   * @returns {Promise<void>}
+   */
+  async e2etest(env) {
+    const port = 2987;
+    const server = await this.prepareTestServer(env, port);
     const res = await this.do_test(
       "npm",
       ["run", "gotest"],
@@ -63,6 +71,23 @@ class RunTestsCommand extends Command {
     if (res.status !== 0) this.exit(res.status);
   }
 
+  /**
+   *
+   * @param {*} env
+   */
+  async remoteQueryTest(env, jestParams) {
+    const port = 3000;
+    env.jwt_secret = require("@saltcorn/data/db").connectObj.jwt_secret;
+    const server = await this.prepareTestServer(env, port);
+    const res = await this.do_test(
+      "npm",
+      ["run", "remote-queries-test", ...jestParams],
+      env,
+      "packages/saltcorn-data"
+    );
+    server.kill();
+    if (res.status !== 0) this.exit(res.status);
+  }
   /**
    *
    * @param {object} args
@@ -91,9 +116,6 @@ class RunTestsCommand extends Command {
     this.validateCall(args, flags);
     var env;
 
-    spawnSync("npm", ["run", "tsc"], {
-      stdio: "inherit",
-    });
     const db = require("@saltcorn/data/db");
     if (db.isSQLite) {
       const testdbpath = "/tmp/sctestdb";
@@ -103,6 +125,9 @@ class RunTestsCommand extends Command {
       await db.changeConnection({ database: "saltcorn_test" });
       env = { ...process.env, PGDATABASE: "saltcorn_test" };
     }
+    spawnSync("npm", ["run", "tsc"], {
+      stdio: "inherit",
+    });
     const fixtures = require("@saltcorn/data/db/fixtures");
     const reset = require("@saltcorn/data/db/reset_schema");
     await reset();
@@ -123,17 +148,20 @@ class RunTestsCommand extends Command {
     }
     if (args.package === "core") {
       await this.do_test("npm", ["run", "test", ...jestParams], env);
+    } else if (args.package === "view-queries") {
+      await this.remoteQueryTest(env, jestParams);
     } else if (args.package === "e2e") {
       await this.e2etest(env);
     } else if (args.package) {
       const cwd = "packages/" + args.package;
       await this.do_test("npm", ["run", "test", ...jestParams], env, cwd);
     } else {
-      const lerna = process.platform === "win32" ? "lerna.cmd" : "lerna";
+      const cwd = ".";
       await this.do_test(
-        lerna,
-        ["run", "test", "--stream", ...jestParams],
-        env
+        "npm",
+        ["--workspaces", "run", "test", ...jestParams],
+        env,
+        cwd
       );
       //await this.e2etest(env);
     }

package/src/commands/setup.js

@@ -1,4 +1,5 @@
 /**
+ * Set up new saltcorn configuration
  * @category saltcorn-cli
  * @module commands/setup
  */
@@ -14,22 +15,32 @@ const { is } = require("contractis");
 const path = require("path");
 const fs = require("fs");
 const inquirer = require("inquirer");
-var tcpPortUsed = require("tcp-port-used");
+const tcpPortUsed = require("tcp-port-used");
 const { spawnSync } = require("child_process");
-var sudo = require("sudo");
+const sudo = require("sudo");
+const crypto = require("crypto");
 
 /**
- * 
+ * Generate password for user
  * @returns {string}
  */
+// todo deduplicate code - the same function in User
 const gen_password = () => {
   const s = is.str.generate().replace(" ", "");
   if (s.length > 7) return s;
   else return gen_password();
 };
+/**
+ * Generate jwt secret
+ * @returns {string}
+ */
+const genJwtSecret = () => {
+  return crypto.randomBytes(64).toString("hex");
+};
 
 /**
- * 
+ * Ask for platform run mode (dev - run manually, server - run as system service)
+ *
  * @returns {Promise<object>}
  */
 const askDevServer = async () => {
@@ -58,8 +69,8 @@ const askDevServer = async () => {
 };
 
 /**
- * 
- * @param {*} mod 
+ * Unload module
+ * @param {*} mod
  */
 const unloadModule = (mod) => {
   var name = require.resolve(mod);
@@ -67,13 +78,19 @@ const unloadModule = (mod) => {
 };
 
 /**
+ * Set up platform run mode (dev - run manually, server - run as system service)
  * @returns {Promise<void>}
  */
 const setupDevMode = async () => {
   const dbPath = path.join(defaultDataPath, "scdb.sqlite");
   fs.promises.mkdir(defaultDataPath, { recursive: true });
   const session_secret = gen_password();
-  await write_connection_config({ sqlite_path: dbPath, session_secret });
+  const jwt_secret = genJwtSecret();
+  await write_connection_config({
+    sqlite_path: dbPath,
+    session_secret,
+    jwt_secret,
+  });
 
   if (!fs.existsSync(dbPath)) {
     unloadModule("@saltcorn/data/db");
@@ -85,6 +102,8 @@ const setupDevMode = async () => {
 };
 
 /**
+ * Check for locally running database (ip 127.0.0.1, port 5432)
+ *
  * @returns {Promise<void>}
  */
 const check_db = async () => {
@@ -115,8 +134,8 @@ const check_db = async () => {
 };
 
 /**
- * 
- * @param {*} args 
+ * Execute Linux commands
+ * @param {*} args
  * @returns {Promise<void>}
  */
 const asyncSudo = (args) => {
@@ -136,8 +155,8 @@ const asyncSudo = (args) => {
 };
 
 /**
- * 
- * @param {*} args 
+ * Execute Postgres commands
+ * @param {*} args
  * @returns {Promise<void>}
  */
 const asyncSudoPostgres = (args) => {
@@ -145,8 +164,8 @@ const asyncSudoPostgres = (args) => {
 };
 
 /**
- * 
- * @param {string} for_who 
+ * Ask for passworf
+ * @param {string} for_who
  * @returns {Promise<string>}
  */
 const get_password = async (for_who) => {
@@ -163,6 +182,7 @@ const get_password = async (for_who) => {
 };
 
 /**
+ * Install Database
  * @returns {Promise<void>}
  */
 const install_db = async () => {
@@ -204,6 +224,7 @@ const install_db = async () => {
     `ALTER SCHEMA public OWNER TO ${user};`,
   ]);
   const session_secret = await get_password("session secret");
+  const jwt_secret = genJwtSecret();
   await write_connection_config({
     host: "localhost",
     port: 5432,
@@ -211,12 +232,13 @@ const install_db = async () => {
     user,
     password: scpass,
     session_secret,
+    jwt_secret,
     multi_tenant: false,
   });
 };
 
 /**
- * 
+ * Ask for Database parameters
  * @returns {Promise<object>}
  */
 const prompt_connection = async () => {
@@ -236,6 +258,7 @@ const prompt_connection = async () => {
     required: true,
   });
   const session_secret = await get_password("session secret");
+  const jwt_secret = genJwtSecret();
   return {
     host: host || "localhost",
     port: port || 5432,
@@ -243,11 +266,13 @@ const prompt_connection = async () => {
     user: user || "saltcorn",
     password: password,
     session_secret,
+    jwt_secret,
     multi_tenant: false,
   };
 };
 
 /**
+ * Write platform config
  * @returns {Promise<void>}
  */
 const setup_connection_config = async () => {
@@ -256,8 +281,8 @@ const setup_connection_config = async () => {
 };
 
 /**
- * 
- * @param {object} connobj 
+ *
+ * @param {object} connobj
  * @returns {Promise<void>}
  */
 const write_connection_config = async (connobj) => {
@@ -290,16 +315,16 @@ const setup_connection = async () => {
 };
 
 /**
- * 
- * @param {object} db 
- * @param {string} tblname 
+ *
+ * @param {object} db
+ * @param {string} tblname
  * @returns {Promise<boolean>}
  */
 const table_exists = async (db, tblname) => {
-  const { rows } = await db.query(`SELECT EXISTS 
+  const { rows } = await db.query(`SELECT EXISTS
     (
         SELECT 1
-        FROM information_schema.tables 
+        FROM information_schema.tables
         WHERE table_schema = 'public'
         AND table_name = '${tblname}'
     );`);
@@ -346,7 +371,7 @@ class SetupCommand extends Command {
    * @returns {Promise<void>}
    */
   async run() {
-    console.log("Run setip");
+    console.log("Run setup");
     const mode = await askDevServer();
     if (mode == "server") {
       // check if i already know how to connect
@@ -367,7 +392,7 @@ class SetupCommand extends Command {
  */
 SetupCommand.description = `Set up a new system
 ...
-This will attempt to install or connect a database, and set up a 
+This will attempt to install or connect a database, and set up a
 configuration file
 `;