@saltcorn/cli 0.7.2-beta.0 → 0.7.2-beta.10

package/package.json

@@ -2,7 +2,7 @@
   "name": "@saltcorn/cli",
   "description": "Command-line interface for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
-  "version": "0.7.2-beta.0",
+  "version": "0.7.2-beta.10",
   "author": "Tom Nielsen @glutamate",
   "bin": {
     "saltcorn": "./bin/saltcorn"
@@ -11,10 +11,11 @@
   "dependencies": {
     "@oclif/command": "^1.8.16",
     "@oclif/config": "^1.18.3",
+    "@oclif/plugin-plugins": "^2.1.0",
     "@oclif/plugin-help": "^3.3.1",
-    "@saltcorn/admin-models": "0.7.2-beta.0",
-    "@saltcorn/data": "0.7.2-beta.0",
-    "@saltcorn/server": "0.7.2-beta.0",
+    "@saltcorn/admin-models": "0.7.2-beta.10",
+    "@saltcorn/data": "0.7.2-beta.10",
+    "@saltcorn/server": "0.7.2-beta.10",
     "cli-ux": "^5.6.7",
     "contractis": "^0.1.0",
     "dateformat": "^3.0.3",
@@ -30,7 +31,8 @@
   },
   "devDependencies": {
     "@oclif/dev-cli": "^1.26.10",
-    "globby": "^10.0.2"
+    "globby": "^10.0.2",
+    "ts-node": "^9.1.1"
   },
   "engines": {
     "node": ">=8.0.0"
@@ -50,7 +52,8 @@
     "commands": "./src/commands",
     "bin": "saltcorn",
     "plugins": [
-      "@oclif/plugin-help"
+      "@oclif/plugin-help",
+      "@oclif/plugin-plugins"
     ]
   },
   "repository": "github:saltcorn/saltcorn",
@@ -65,4 +68,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/src/commands/add-schema.js

@@ -15,9 +15,19 @@ class AddSchemaCommand extends Command {
    * @returns {Promise<void>}
    */
   async run() {
+
+    const { flags } = this.parse(AddSchemaCommand);
     const reset = require("@saltcorn/data/db/reset_schema");
+    if(!flags.force){
+      const ans = await cli.confirm(
+        `This add Saltcorn schema to existing database\nContinue (y/n)?`);
+      if (!ans) {
+        console.log(`Success: Command execution canceled`);
+        this.exit(1);
+      }
+    }
     await reset(true);
-
+    console.log(`Success: Command execution successfully`);
     this.exit(0);
   }
 }
@@ -27,4 +37,16 @@ class AddSchemaCommand extends Command {
  */
 AddSchemaCommand.description = `Add Saltcorn schema to existing database`;
 
+/**
+ * @type {string}
+ */
+AddSchemaCommand.help = `Add Saltcorn schema to existing database`;
+
+/**
+ * @type {object}
+ */
+AddSchemaCommand.flags = {
+  force: flags.boolean({ char: "f", description: "force command execution" }),
+};
+
 module.exports = AddSchemaCommand;

package/src/commands/backup.js

@@ -7,13 +7,12 @@ const { execSync } = require("child_process");
 const dateFormat = require("dateformat");
 const os = require("os");
 const { getConnectObject } = require("@saltcorn/data/db/connect");
-const env = process.env;
-var day = dateFormat(new Date(), "yyyymmdd");
+const day = dateFormat(new Date(), "yyyymmdd");
 const connobj = getConnectObject();
 
 const pgdb = connobj.database;
 
-var default_filenm = `${day}-${pgdb}-${os.hostname}.sqlc`;
+const default_filenm = `${day}-${pgdb}-${os.hostname}.sqlc`;
 
 /**
  * BackupCommand Class
@@ -67,6 +66,11 @@ class BackupCommand extends Command {
  */
 BackupCommand.description = `Backup the PostgreSQL database to a file with pg_dump or zip`;
 
+/**
+ * @type {string}
+ */
+BackupCommand.help = `Backup the PostgreSQL database to a file with pg_dump or zip`;
+
 /**
  * @type {object}
  */

package/src/commands/create-user.js

@@ -4,8 +4,9 @@
  */
 const { Command, flags } = require("@oclif/command");
 const { cli } = require("cli-ux");
-const { maybe_as_tenant } = require("../common");
+const { maybe_as_tenant, init_some_tenants } = require("../common");
 
+// todo update logic based on modify-user command
 /**
  * CreateUserCommand Class
  * @extends oclif.Command
@@ -16,6 +17,7 @@ class CreateUserCommand extends Command {
    * @returns {Promise<void>}
    */
   async run() {
+
     const User = require("@saltcorn/data/models/user");
 
     const { flags } = this.parse(CreateUserCommand);
@@ -23,12 +25,10 @@ class CreateUserCommand extends Command {
       console.error("Error: specify at most one of admin and role");
       this.exit(1);
     }
-    const { loadAllPlugins } = require("@saltcorn/server/load_plugins");
-    const { init_multi_tenant } = require("@saltcorn/data/db/state");
-    const { getAllTenants } = require("@saltcorn/admin-models/models/tenant");
-    await loadAllPlugins();
-    const tenants = await getAllTenants();
-    await init_multi_tenant(loadAllPlugins, undefined, tenants);
+    // init tenant
+    await init_some_tenants(flags.tenant);
+
+    // run function as specified tenant
     await maybe_as_tenant(flags.tenant, async () => {
       let role_id = flags.admin ? 1 : 8;
       if (flags.role) {
@@ -43,7 +43,13 @@ class CreateUserCommand extends Command {
       const email = flags.email || (await cli.prompt("Email address"));
       const password =
         flags.password || (await cli.prompt("Password", { type: "hide" }));
-      await User.create({ email, password, role_id });
+      const u = await User.create({ email, password, role_id });
+      if(u instanceof User)
+        console.log(`Success: User ${email} created successfully ${
+          typeof flags.tenant !== "undefined" ? "in tenant " + flags.tenant : ""
+        }`);
+      else
+        console.error(`Error: ${u.error}`);
     });
     this.exit(0);
   }

package/src/commands/delete-tenants.js

@@ -27,27 +27,31 @@ class DeleteTenantsCommand extends Command {
 
     for (const ten of tensExamine) {
       let nusers, ntables, nviews, npages;
-      await db.runWithTenant(ten.subdomain, async () => {
-        nusers = await db.count("users");
-        ntables = await db.count("_sc_tables");
-        nviews = await db.count("_sc_views");
-        npages = await db.count("_sc_pages");
-      });
-      if (nusers < 2 && ntables < 2 && nviews < 1 && npages < 1) {
-        console.log("deleting ", ten.subdomain, {
-          nusers,
-          ntables,
-          nviews,
-          npages,
-        });
-        await deleteTenant(ten.subdomain);
-      } else {
-        console.log("leaving", ten.subdomain, {
-          nusers,
-          ntables,
-          nviews,
-          npages,
+      try {
+        await db.runWithTenant(ten.subdomain, async () => {
+          nusers = await db.count("users");
+          ntables = await db.count("_sc_tables");
+          nviews = await db.count("_sc_views");
+          npages = await db.count("_sc_pages");
         });
+        if (nusers < 2 && ntables < 2 && nviews < 1 && npages < 1) {
+          console.log("deleting ", ten.subdomain, {
+            nusers,
+            ntables,
+            nviews,
+            npages,
+          });
+          await deleteTenant(ten.subdomain);
+        } else {
+          console.log("leaving", ten.subdomain, {
+            nusers,
+            ntables,
+            nviews,
+            npages,
+          });
+        }
+      } catch (e) {
+        console.error("Error in tenant", ten.subdomain, e);
       }
     }
     this.exit(0);

package/src/commands/delete-user.js

@@ -0,0 +1,105 @@
+/**
+ * @category saltcorn-cli
+ * @module commands/delete-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 } = require("../common");
+
+
+/**
+ * DeleteUserCommand Class
+ * @extends oclif.Command
+ * @category saltcorn-cli
+ */
+class DeleteUserCommand extends Command {
+  /**
+   * @returns {Promise<void>}
+   */
+  async run() {
+
+    const User = require("@saltcorn/data/models/user");
+
+    const { args } = this.parse(DeleteUserCommand);
+    const { flags } = this.parse(DeleteUserCommand);
+
+
+    // run function as specified tenant
+    await maybe_as_tenant(flags.tenant, async () => {
+        // 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
+        // todo handle errors
+        if (!flags.force) {
+          const ans = await cli.confirm(
+            `This will delete user ${args.user_email} ${
+              typeof flags.tenant !== "undefined" ? "from " + flags.tenant : ""
+            }.\nContinue (y/n)?`);
+          if (!ans) {
+            console.log(`Success: Command execution canceled`);
+            this.exit(1);
+          }
+
+        }
+
+        // delete user
+        await u.delete();
+        console.log(`Success: User ${args.user_email} deleted  ${
+          typeof flags.tenant !== "undefined" ? "from " + flags.tenant : ""
+          }`);
+
+      }
+
+    );
+    this.exit(0);
+  }
+}
+
+/**
+ * @type {object}
+ */
+DeleteUserCommand.args = [
+  { name: "user_email", required: true, description: "User to delete" },
+];
+
+/**
+ * @type {string}
+ */
+DeleteUserCommand.description = `Delete user.
+
+Command deletes the user specified by USER_EMAIL.
+
+`;
+
+/**
+ * @type {string}
+ */
+DeleteUserCommand.help = `Delete user.
+
+Command deletes the user specified by USER_EMAIL.
+
+`;
+
+/**
+ * @type {object}
+ */
+DeleteUserCommand.flags = {
+  force: flags.boolean({ char: "f", description: "force command execution" }),
+  tenant: flags.string({
+    char: "t",
+    description: "tenant",
+  }),
+};
+
+module.exports = DeleteUserCommand;

package/src/commands/get-cfg.js

@@ -0,0 +1,63 @@
+/**
+ * @category saltcorn-cli
+ * @module commands/set-cfg
+ */
+const { Command, flags } = require("@oclif/command");
+const { cli } = require("cli-ux");
+const { maybe_as_tenant, init_some_tenants } = require("../common");
+
+/**
+ * SetCfgCommand Class
+ * @extends oclif.Command
+ * @category saltcorn-cli
+ */
+class SetCfgCommand extends Command {
+  /**
+   * @returns {Promise<void>}
+   */
+  async run() {
+    const { args, flags } = this.parse(SetCfgCommand);
+    await init_some_tenants(flags.tenant);
+
+    await maybe_as_tenant(flags.tenant, async () => {
+      if (flags.plugin) {
+        const Plugin = require("@saltcorn/data/models/plugin");
+        const plugin = await Plugin.findOne({ name: flags.plugin });
+        console.log(JSON.stringify(plugin.configuration[args.key], null, 2));
+        await plugin.upsert();
+      } else {
+        const { getState } = require("@saltcorn/data/db/state");
+        console.log(JSON.stringify(getState().getConfig(args.key), null, 2));
+      }
+    });
+    this.exit(0);
+  }
+}
+
+/**
+ * @type {string}
+ */
+SetCfgCommand.description = `Get a configuration value`;
+
+/**
+ * @type {object[]}
+ */
+SetCfgCommand.args = [
+  { name: "key", required: true, description: "Configuration key" },
+];
+
+/**
+ * @type {object}
+ */
+SetCfgCommand.flags = {
+  tenant: flags.string({
+    char: "t",
+    description: "tenant",
+  }),
+  plugin: flags.string({
+    char: "p",
+    description: "plugin",
+  }),
+};
+
+module.exports = SetCfgCommand;

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}
  */