@saltcorn/server 0.6.2-beta.1 → 0.6.2-beta.5

package/auth/routes.js

@@ -13,14 +13,14 @@ const File = require("@saltcorn/data/models/file");
 
 const { send_verification_email } = require("@saltcorn/data/models/email");
 const {
-  setTenant,
   error_catcher,
   loggedIn,
   csrfField,
+  setTenant,
 } = require("../routes/utils.js");
 const { getState } = require("@saltcorn/data/db/state");
 const { send_reset_email } = require("./resetpw");
-const { renderForm } = require("@saltcorn/markup");
+const { renderForm, post_btn } = require("@saltcorn/markup");
 const passport = require("passport");
 const {
   a,
@@ -33,7 +33,10 @@ const {
   form,
   select,
   option,
+  span,
   i,
+  div,
+  code,
 } = require("@saltcorn/markup/tags");
 const {
   available_languages,
@@ -62,8 +65,8 @@ const router = new Router();
 module.exports = router;
 
 /**
- * @param {object} req 
- * @param {boolean} isCreating 
+ * @param {object} req
+ * @param {boolean} isCreating
  * @returns {Form}
  */
 const loginForm = (req, isCreating) => {
@@ -104,7 +107,7 @@ const loginForm = (req, isCreating) => {
 };
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Form}
  */
 const forgotForm = (req) =>
@@ -128,8 +131,8 @@ const forgotForm = (req) =>
   });
 
 /**
- * @param {object} body 
- * @param {object} req 
+ * @param {object} body
+ * @param {object} req
  * @returns {Form}
  */
 const resetForm = (body, req) => {
@@ -159,8 +162,8 @@ const resetForm = (body, req) => {
 };
 
 /**
- * @param {string} current 
- * @param {boolean} noMethods 
+ * @param {string} current
+ * @param {boolean} noMethods
  * @returns {object}
  */
 const getAuthLinks = (current, noMethods) => {
@@ -193,7 +196,6 @@ const getAuthLinks = (current, noMethods) => {
  */
 router.get(
   "/login",
-  setTenant,
   error_catcher(async (req, res) => {
     const login_form_name = getState().getConfig("login_form", "");
     if (login_form_name) {
@@ -219,7 +221,7 @@ router.get(
  * @function
  * @memberof module:auth/routes~routesRouter
  */
-router.get("/logout", setTenant, (req, res, next) => {
+router.get("/logout", (req, res, next) => {
   req.logout();
   if (req.session.destroy)
     req.session.destroy((err) => {
@@ -241,7 +243,6 @@ router.get("/logout", setTenant, (req, res, next) => {
  */
 router.get(
   "/forgot",
-  setTenant,
   error_catcher(async (req, res) => {
     if (getState().getConfig("allow_forgot", false)) {
       res.sendAuthWrap(
@@ -266,7 +267,6 @@ router.get(
  */
 router.get(
   "/reset",
-  setTenant,
   error_catcher(async (req, res) => {
     const form = resetForm(req.query, req);
     res.sendAuthWrap(req.__(`Reset password`), form, {});
@@ -280,7 +280,6 @@ router.get(
  */
 router.get(
   "/verify",
-  setTenant,
   error_catcher(async (req, res) => {
     const { token, email } = req.query;
     const result = await User.verifyWithToken({
@@ -304,7 +303,6 @@ router.get(
  */
 router.post(
   "/reset",
-  setTenant,
   error_catcher(async (req, res) => {
     const result = await User.resetPasswordWithToken({
       email: req.body.email,
@@ -330,7 +328,6 @@ router.post(
  */
 router.post(
   "/forgot",
-  setTenant,
   error_catcher(async (req, res) => {
     if (getState().getConfig("allow_forgot")) {
       const { email } = req.body;
@@ -364,7 +361,6 @@ router.post(
  */
 router.get(
   "/signup",
-  setTenant,
   error_catcher(async (req, res) => {
     if (!getState().getConfig("allow_signup")) {
       req.flash("danger", req.__("Signups not enabled"));
@@ -408,7 +404,6 @@ router.get(
  */
 router.get(
   "/create_first_user",
-  setTenant,
   error_catcher(async (req, res) => {
     const hasUsers = await User.nonEmpty();
     if (!hasUsers) {
@@ -438,7 +433,7 @@ router.get(
  */
 router.post(
   "/create_from_restore",
-  setTenant,
+  setTenant, // TODO why is this needed?????
   error_catcher(async (req, res) => {
     const hasUsers = await User.nonEmpty();
     if (!hasUsers) {
@@ -467,7 +462,6 @@ router.post(
  */
 router.post(
   "/create_first_user",
-  setTenant,
   error_catcher(async (req, res) => {
     const hasUsers = await User.nonEmpty();
     if (!hasUsers) {
@@ -510,9 +504,9 @@ router.post(
 );
 
 /**
- * @param {string} new_user_view_name 
- * @param {object} req 
- * @param {boolean} askEmail 
+ * @param {string} new_user_view_name
+ * @param {object} req
+ * @param {boolean} askEmail
  * @returns {Promise<Form>}
  * @throws {InvalidConfiguration}
  */
@@ -588,9 +582,9 @@ const getNewUserForm = async (new_user_view_name, req, askEmail) => {
 };
 
 /**
- * @param {object} u 
- * @param {object} req 
- * @param {object} res 
+ * @param {object} u
+ * @param {object} req
+ * @param {object} res
  * @returns {void}
  */
 const signup_login_with_user = (u, req, res) =>
@@ -620,7 +614,6 @@ const signup_login_with_user = (u, req, res) =>
  */
 router.get(
   "/signup_final_ext",
-  setTenant,
   error_catcher(async (req, res) => {
     const new_user_form = getState().getConfig("new_user_form");
     if (!req.user || req.user.id || !new_user_form) {
@@ -642,7 +635,6 @@ router.get(
  */
 router.post(
   "/signup_final_ext",
-  setTenant,
   error_catcher(async (req, res) => {
     const new_user_form = getState().getConfig("new_user_form");
     if (!req.user || req.user.id || !new_user_form) {
@@ -695,7 +687,6 @@ router.post(
  */
 router.post(
   "/signup_final",
-  setTenant,
   error_catcher(async (req, res) => {
     if (getState().getConfig("allow_signup")) {
       const new_user_form = getState().getConfig("new_user_form");
@@ -757,7 +748,6 @@ router.post(
  */
 router.post(
   "/signup",
-  setTenant,
   error_catcher(async (req, res) => {
     if (!getState().getConfig("allow_signup")) {
       req.flash("danger", req.__("Signups not enabled"));
@@ -868,8 +858,8 @@ router.post(
 );
 
 /**
- * @param {object} req 
- * @param {object} res 
+ * @param {object} req
+ * @param {object} res
  * @returns {void}
  */
 function handler(req, res) {
@@ -888,7 +878,7 @@ function handler(req, res) {
 
 /**
  * try to find a unique user id in login submit
- * @param {object} body 
+ * @param {object} body
  * @returns {string}
  */
 const userIdKey = (body) => {
@@ -920,7 +910,6 @@ const userLimiter = rateLimit({
  */
 router.post(
   "/login",
-  setTenant,
   ipLimiter,
   userLimiter,
   passport.authenticate("local", {
@@ -954,7 +943,6 @@ router.post(
  */
 router.get(
   "/login-with/:method",
-  setTenant,
   error_catcher(async (req, res, next) => {
     const { method } = req.params;
     const auth = getState().auth_methods[method];
@@ -977,7 +965,6 @@ router.get(
  */
 router.post(
   "/login-with/:method",
-  setTenant,
   error_catcher(async (req, res, next) => {
     const { method } = req.params;
     const auth = getState().auth_methods[method];
@@ -999,8 +986,8 @@ router.post(
 );
 
 /**
- * @param {object}} req 
- * @param {object} res 
+ * @param {object}} req
+ * @param {object} res
  * @returns {void}
  */
 const loginCallback = (req, res) => () => {
@@ -1024,7 +1011,6 @@ const loginCallback = (req, res) => () => {
  */
 router.get(
   "/callback/:method",
-  setTenant,
   error_catcher(async (req, res, next) => {
     const { method } = req.params;
     const auth = getState().auth_methods[method];
@@ -1039,7 +1025,7 @@ router.get(
 );
 
 /**
- * @param {object} req 
+ * @param {object} req
  * @returns {Form}
  */
 const changPwForm = (req) =>
@@ -1064,8 +1050,8 @@ const changPwForm = (req) =>
   });
 
 /**
- * @param {object} req 
- * @param {object} user 
+ * @param {object} req
+ * @param {object} user
  * @returns {Form}
  */
 const setLanguageForm = (req, user) =>
@@ -1098,21 +1084,67 @@ const setLanguageForm = (req, user) =>
  * @returns {Promise<object>}
  */
 const userSettings = async ({ req, res, pwform, user }) => {
-  let usersets;
+  let usersets, userSetsName;
   const user_settings_form = getState().getConfig("user_settings_form", "");
   if (user_settings_form) {
     const view = await View.findOne({ name: user_settings_form });
     if (view) {
       usersets = await view.run({ id: user.id }, { req, res });
+      userSetsName = view.name;
     }
   }
-
+  let apikeycard;
+  const min_role_apikeygen = +getState().getConfig("min_role_apikeygen", 1);
+  if (user.role_id <= min_role_apikeygen)
+    apikeycard = {
+      type: "card",
+      title: req.__("API token"),
+      contents: [
+        // api token for user
+        div(
+          user.api_token
+            ? span({ class: "mr-1" }, req.__("API token for this user: ")) +
+                code(user.api_token)
+            : req.__("No API token issued")
+        ),
+        // button for reset or generate api token
+        div(
+          { class: "mt-4 d-inline-block" },
+          post_btn(
+            `/auth/gen-api-token`,
+            user.api_token ? req.__("Reset") : req.__("Generate"),
+            req.csrfToken()
+          )
+        ),
+        // button for remove api token
+        user.api_token &&
+          div(
+            { class: "mt-4 ml-2 d-inline-block" },
+            post_btn(
+              `/auth/remove-api-token`,
+              // TBD localization
+              user.api_token ? req.__("Remove") : req.__("Generate"),
+              req.csrfToken(),
+              { req: req, confirm: true }
+            )
+          ),
+      ],
+    };
   return {
     above: [
       {
         type: "breadcrumbs",
         crumbs: [{ text: req.__("User") }, { text: req.__("Settings") }],
       },
+      ...(usersets
+        ? [
+            {
+              type: "card",
+              title: userSetsName,
+              contents: usersets,
+            },
+          ]
+        : []),
       {
         type: "card",
         title: req.__("User"),
@@ -1126,24 +1158,52 @@ const userSettings = async ({ req, res, pwform, user }) => {
           )
         ),
       },
-      ...(usersets
-        ? [
-            {
-              type: "card",
-              title: req.__("User Settings"),
-              contents: usersets,
-            },
-          ]
-        : []),
       {
         type: "card",
         title: req.__("Change password"),
         contents: renderForm(pwform, req.csrfToken()),
       },
+      ...(apikeycard ? [apikeycard] : []),
     ],
   };
 };
+/**
+ * Get new api token
+ * @name post/gen-api-token/:id
+ * @function
+ * @memberof module:auth/admin~auth/adminRouter
+ */
+router.post(
+  "/gen-api-token",
+  error_catcher(async (req, res) => {
+    const min_role_apikeygen = +getState().getConfig("min_role_apikeygen", 1);
+    if (req.user.role_id <= min_role_apikeygen) {
+      const u = await User.findOne({ id: req.user.id });
+      await u.getNewAPIToken();
+      req.flash("success", req.__(`New API token generated`));
+    }
+    res.redirect(`/auth/settings`);
+  })
+);
 
+/**
+ * Remove api token
+ * @name post/remove-api-token/:id
+ * @function
+ * @memberof module:auth/admin~auth/adminRouter
+ */
+router.post(
+  "/remove-api-token",
+  error_catcher(async (req, res) => {
+    const min_role_apikeygen = +getState().getConfig("min_role_apikeygen", 1);
+    if (req.user.role_id <= min_role_apikeygen) {
+      const u = await User.findOne({ id: req.user.id });
+      await u.removeAPIToken();
+      req.flash("success", req.__(`API token removed`));
+    }
+    res.redirect(`/auth/settings`);
+  })
+);
 /**
  * Set language
  * @name post/setlanguage
@@ -1152,7 +1212,6 @@ const userSettings = async ({ req, res, pwform, user }) => {
  */
 router.post(
   "/setlanguage",
-  setTenant,
   loggedIn,
   error_catcher(async (req, res) => {
     const u = await User.findOne({ id: req.user.id });
@@ -1191,7 +1250,6 @@ router.post(
  */
 router.get(
   "/settings",
-  setTenant,
   loggedIn,
   error_catcher(async (req, res) => {
     const user = await User.findOne({ id: req.user.id });
@@ -1232,7 +1290,6 @@ const setEmailForm = (req) =>
  */
 router.get(
   "/set-email",
-  setTenant,
   error_catcher(async (req, res) => {
     res.sendWrap(
       req.__("Set Email"),
@@ -1249,7 +1306,6 @@ router.get(
  */
 router.post(
   "/set-email",
-  setTenant,
   error_catcher(async (req, res) => {
     const form = setEmailForm(req);
     form.validate(req.body);
@@ -1299,7 +1355,6 @@ router.post(
  */
 router.post(
   "/settings",
-  setTenant,
   loggedIn,
   error_catcher(async (req, res) => {
     const user = await User.findOne({ id: req.user.id });
@@ -1350,7 +1405,6 @@ router.post(
  */
 router.all(
   "/verification-flow",
-  setTenant,
   loggedIn,
   error_catcher(async (req, res) => {
     const verifier = await (getState().verifier || (() => null))(req.user);

package/locales/en.json

@@ -814,5 +814,34 @@
 	"Number of columns (1-12) allocated to the list view": "Number of columns (1-12) allocated to the list view",
 	"New tenant template": "New tenant template",
 	"Copy site structure for new tenants from this tenant": "Copy site structure for new tenants from this tenant",
-	"Use this link: <a href=\"%s\">%s</a> to revisit your application at any time.": "Use this link: <a href=\"%s\">%s</a> to revisit your application at any time."
+	"Use this link: <a href=\"%s\">%s</a> to revisit your application at any time.": "Use this link: <a href=\"%s\">%s</a> to revisit your application at any time.",
+	"Use Amazon S3": "Use Amazon S3",
+	"Use Amazon S3 (or compatible) service to store files. If disabled, Saltcorn uses local disk. WARNING: Changing this may break your uploaded files!": "Use Amazon S3 (or compatible) service to store files. If disabled, Saltcorn uses local disk. WARNING: Changing this may break your uploaded files!",
+	"Amazon S3 Bucket": "Amazon S3 Bucket",
+	"Name you selected for your S3 bucket in AWS.": "Name you selected for your S3 bucket in AWS.",
+	"Amazon S3 Path Prefix": "Amazon S3 Path Prefix",
+	"Prefix you selected for your S3 bucket in AWS.": "Prefix you selected for your S3 bucket in AWS.",
+	"Amazon S3 Endpoint": "Amazon S3 Endpoint",
+	"Hostname of your S3 Compatible Storage provider. Defaults to 's3.amazonaws.com'.": "Hostname of your S3 Compatible Storage provider. Defaults to 's3.amazonaws.com'.",
+	"Amazon S3 Region": "Amazon S3 Region",
+	"AWS region you selected when creating your S3 bucket. Default ti 'us-east-1'.": "AWS region you selected when creating your S3 bucket. Default ti 'us-east-1'.",
+	"Amazon S3 Access Key ID": "Amazon S3 Access Key ID",
+	"Only required if you do not want to authenticate to S3 using an IAM role. Enter the Access Key ID provided by your Amazon EC2 administrator.": "Only required if you do not want to authenticate to S3 using an IAM role. Enter the Access Key ID provided by your Amazon EC2 administrator.",
+	"Amazon S3 Secret Access Key": "Amazon S3 Secret Access Key",
+	"The secret access key associated with your Amazon S3 Access Key ID.": "The secret access key associated with your Amazon S3 Access Key ID.",
+	"Use Amazon S3 Secure Connection.": "Use Amazon S3 Secure Connection.",
+	"Connect to Amazon S3 (or compatible) securely.": "Connect to Amazon S3 (or compatible) securely.",
+	"Storage settings": "Storage settings",
+	"Storage": "Storage",
+	"Storage settings updated": "Storage settings updated",
+	"Label formula": "Label formula",
+	"Include formula": "Include formula",
+	"If specified, only include in menu rows that evaluate to true": "If specified, only include in menu rows that evaluate to true",
+	"URL formula": "URL formula",
+	"Order field": "Order field",
+	"Section field": "Section field",
+	"Optional. String type with options, each of which will become a menu section": "Optional. String type with options, each of which will become a menu section",
+	"Role to generate API keys": "Role to generate API keys",
+	"User should have this role or higher to generate API keys in their user settings": "User should have this role or higher to generate API keys in their user settings",
+	"API token removed": "API token removed"
 }

package/markup/admin.js

@@ -213,6 +213,22 @@ const send_users_page = (args) => {
   });
 };
 
+/**
+ * @param {object} args
+ * @returns {void}
+ */
+const send_files_page = (args) => {
+  return send_settings_page({
+    main_section: "Files",
+    main_section_href: "/files",
+    sub_sections: [
+      { text: "Files", href: "/files" },
+      { text: "Storage", href: "/files/storage" },
+    ],
+    ...args,
+  });
+};
+
 /**
  * @param {object} args
  * @returns {void}
@@ -464,6 +480,7 @@ module.exports = {
   send_users_page,
   send_events_page,
   send_admin_page,
+  send_files_page,
   save_config_from_form,
   flash_restart_if_required,
   flash_restart,

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.6.2-beta.1",
+  "version": "0.6.2-beta.5",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.6.2-beta.1",
-    "@saltcorn/builder": "0.6.2-beta.1",
-    "@saltcorn/data": "0.6.2-beta.1",
+    "@saltcorn/base-plugin": "0.6.2-beta.5",
+    "@saltcorn/builder": "0.6.2-beta.5",
+    "@saltcorn/data": "0.6.2-beta.5",
     "greenlock-express": "^4.0.3",
-    "@saltcorn/markup": "0.6.2-beta.1",
-    "@saltcorn/sbadmin2": "0.6.2-beta.1",
+    "@saltcorn/markup": "0.6.2-beta.5",
+    "@saltcorn/sbadmin2": "0.6.2-beta.5",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "connect-flash": "^0.1.1",
@@ -40,7 +40,12 @@
     "pg": "^8.2.1",
     "pluralize": "^8.0.0",
     "socket.io": "4.2.0",
-    "tmp-promise": "^3.0.2"
+    "tmp-promise": "^3.0.2",
+    "multer-s3": "^2.10.0",
+    "multer": "^1.4.3",
+    "aws-sdk": "^2.1037.0",
+    "uuid": "^8.2.0",
+    "content-disposition": "^0.5.3"
   },
   "optionalDependencies": {
     "sd-notify": "^2.8.0"
@@ -67,7 +72,11 @@
       "/plugin_packages/"
     ],
     "moduleNameMapper": {
-      "@saltcorn/sqlite/(.*)": "@saltcorn/sqlite/dist/$1"
+      "@saltcorn/sqlite/(.*)": "@saltcorn/sqlite/dist/$1",
+      "@saltcorn/db-common/(.*)": "@saltcorn/db-common/dist/$1",
+      "@saltcorn/data/(.*)": "@saltcorn/data/dist/$1",
+      "@saltcorn/markup$": "@saltcorn/markup/dist",
+      "@saltcorn/markup/(.*)": "@saltcorn/markup/dist/$1"
     }
   },
   "publishConfig": {

package/public/ckeditor/adapters/jquery.js

@@ -0,0 +1,10 @@
+/*
+ Copyright (c) 2003-2021, CKSource - Frederico Knabben. All rights reserved.
+ For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+*/
+(function(a){if("undefined"==typeof a)throw Error("jQuery should be loaded before CKEditor jQuery adapter.");if("undefined"==typeof CKEDITOR)throw Error("CKEditor should be loaded before CKEditor jQuery adapter.");CKEDITOR.config.jqueryOverrideVal="undefined"==typeof CKEDITOR.config.jqueryOverrideVal?!0:CKEDITOR.config.jqueryOverrideVal;a.extend(a.fn,{ckeditorGet:function(){var a=this.eq(0).data("ckeditorInstance");if(!a)throw"CKEditor is not initialized yet, use ckeditor() with a callback.";return a},
+ckeditor:function(g,e){if(!CKEDITOR.env.isCompatible)throw Error("The environment is incompatible.");if(!a.isFunction(g)){var m=e;e=g;g=m}var k=[];e=e||{};this.each(function(){var b=a(this),c=b.data("ckeditorInstance"),f=b.data("_ckeditorInstanceLock"),h=this,l=new a.Deferred;k.push(l.promise());if(c&&!f)g&&g.apply(c,[this]),l.resolve();else if(f)c.once("instanceReady",function(){setTimeout(function d(){c.element?(c.element.$==h&&g&&g.apply(c,[h]),l.resolve()):setTimeout(d,100)},0)},null,null,9999);
+else{if(e.autoUpdateElement||"undefined"==typeof e.autoUpdateElement&&CKEDITOR.config.autoUpdateElement)e.autoUpdateElementJquery=!0;e.autoUpdateElement=!1;b.data("_ckeditorInstanceLock",!0);c=a(this).is("textarea")?CKEDITOR.replace(h,e):CKEDITOR.inline(h,e);b.data("ckeditorInstance",c);c.on("instanceReady",function(e){var d=e.editor;setTimeout(function n(){if(d.element){e.removeListener();d.on("dataReady",function(){b.trigger("dataReady.ckeditor",[d])});d.on("setData",function(a){b.trigger("setData.ckeditor",
+[d,a.data])});d.on("getData",function(a){b.trigger("getData.ckeditor",[d,a.data])},999);d.on("destroy",function(){b.trigger("destroy.ckeditor",[d])});d.on("save",function(){a(h.form).submit();return!1},null,null,20);if(d.config.autoUpdateElementJquery&&b.is("textarea")&&a(h.form).length){var c=function(){b.ckeditor(function(){d.updateElement()})};a(h.form).submit(c);a(h.form).bind("form-pre-serialize",c);b.bind("destroy.ckeditor",function(){a(h.form).unbind("submit",c);a(h.form).unbind("form-pre-serialize",
+c)})}d.on("destroy",function(){b.removeData("ckeditorInstance")});b.removeData("_ckeditorInstanceLock");b.trigger("instanceReady.ckeditor",[d]);g&&g.apply(d,[h]);l.resolve()}else setTimeout(n,100)},0)},null,null,9999)}});var f=new a.Deferred;this.promise=f.promise();a.when.apply(this,k).then(function(){f.resolve()});this.editor=this.eq(0).data("ckeditorInstance");return this}});CKEDITOR.config.jqueryOverrideVal&&(a.fn.val=CKEDITOR.tools.override(a.fn.val,function(g){return function(e){if(arguments.length){var m=
+this,k=[],f=this.each(function(){var b=a(this),c=b.data("ckeditorInstance");if(b.is("textarea")&&c){var f=new a.Deferred;c.setData(e,function(){f.resolve()});k.push(f.promise());return!0}return g.call(b,e)});if(k.length){var b=new a.Deferred;a.when.apply(this,k).done(function(){b.resolveWith(m)});return b.promise()}return f}var f=a(this).eq(0),c=f.data("ckeditorInstance");return f.is("textarea")&&c?c.getData():g.call(f)}}))})(window.jQuery);