@saltcorn/server 0.6.2-beta.2 → 0.6.2-beta.3

package/auth/admin.js

@@ -320,6 +320,7 @@ const user_settings_form = (req) =>
       "verification_view",
       "elevate_verified",
       "min_role_upload",
+      "min_role_apikeygen",
       "timeout",
       "email_mask",
       "allow_forgot",
@@ -616,7 +617,7 @@ router.get(
               ),
               // button for reset or generate api token
               div(
-                { class: "mt-4" },
+                { class: "mt-4 d-inline-block" },
                 post_btn(
                   `/useradmin/gen-api-token/${user.id}`,
                   user.api_token ? req.__("Reset") : req.__("Generate"),
@@ -626,7 +627,7 @@ router.get(
               // button for remove api token
               user.api_token &&
                 div(
-                  { class: "mt-4" },
+                  { class: "mt-4 ml-2 d-inline-block" },
                   post_btn(
                     `/useradmin/remove-api-token/${user.id}`,
                     // TBD localization

package/auth/routes.js

@@ -12,10 +12,15 @@ const Form = require("@saltcorn/data/models/form");
 const File = require("@saltcorn/data/models/file");
 
 const { send_verification_email } = require("@saltcorn/data/models/email");
-const { error_catcher, loggedIn, csrfField } = require("../routes/utils.js");
+const {
+  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,
@@ -28,7 +33,10 @@ const {
   form,
   select,
   option,
+  span,
   i,
+  div,
+  code,
 } = require("@saltcorn/markup/tags");
 const {
   available_languages,
@@ -425,6 +433,7 @@ router.get(
  */
 router.post(
   "/create_from_restore",
+  setTenant, // TODO why is this needed?????
   error_catcher(async (req, res) => {
     const hasUsers = await User.nonEmpty();
     if (!hasUsers) {
@@ -1075,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"),
@@ -1103,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

package/locales/en.json

@@ -833,5 +833,15 @@
 	"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"
+	"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/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.6.2-beta.2",
+  "version": "0.6.2-beta.3",
   "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.2",
-    "@saltcorn/builder": "0.6.2-beta.2",
-    "@saltcorn/data": "0.6.2-beta.2",
+    "@saltcorn/base-plugin": "0.6.2-beta.3",
+    "@saltcorn/builder": "0.6.2-beta.3",
+    "@saltcorn/data": "0.6.2-beta.3",
     "greenlock-express": "^4.0.3",
-    "@saltcorn/markup": "0.6.2-beta.2",
-    "@saltcorn/sbadmin2": "0.6.2-beta.2",
+    "@saltcorn/markup": "0.6.2-beta.3",
+    "@saltcorn/sbadmin2": "0.6.2-beta.3",
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/sticky": "^1.0.1",
     "connect-flash": "^0.1.1",

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);