@saltcorn/server 0.9.5-beta.9 → 0.9.6-beta.0

package/auth/routes.js

@@ -45,6 +45,7 @@ const {
   p,
   script,
   domReady,
+  button,
 } = require("@saltcorn/markup/tags");
 const {
   available_languages,
@@ -237,13 +238,7 @@ const loginWithJwt = async (email, password, saltcornApp, res, req) => {
         const token = jwt.sign(
           {
             sub: email,
-            user: {
-              id: user.id,
-              email: user.email,
-              role_id: user.role_id,
-              language: user.language ? user.language : "en",
-              disabled: user.disabled,
-            },
+            user: user.session_object,
             iss: "saltcorn@saltcorn",
             aud: "saltcorn-mobile-app",
             iat: now.valueOf(),
@@ -1362,6 +1357,57 @@ const userSettings = async ({ req, res, pwform, user }) => {
           ),
       ],
     };
+  let themeCfgCard;
+  const layoutPlugin = getState().getLayoutPlugin(user);
+  const modNames = getState().plugin_module_names;
+  const pluginName = layoutPlugin.plugin_name;
+  let safeName = pluginName;
+  for (const [k, v] of Object.entries(modNames)) {
+    if (v === pluginName) safeName = k;
+  }
+
+  const hasUserConfigs =
+    layoutPlugin.user_config_form &&
+    (await layoutPlugin.user_config_form(
+      getState().plugin_cfgs[pluginName] || {}
+    )) !== null;
+  themeCfgCard = {
+    type: "card",
+    title: req.__("Layout"),
+    contents: [
+      div(
+        hasUserConfigs
+          ? req.__("Adjust the the theme for this user")
+          : req.__("The current theme has no user specific settings")
+      ),
+      hasUserConfigs
+        ? div(
+            {
+              class: "mt-4",
+            },
+
+            a(
+              {
+                class: "btn btn-primary",
+                role: "button",
+                href: `/plugins/user_configure/${encodeURIComponent(safeName)}`,
+                title: req.__("Configure theme"),
+              },
+              req.__("Configure")
+            ),
+            button(
+              {
+                class: "btn btn-primary ms-2",
+                onclick: "ajax_post('/plugins/remove_user_layout')",
+                title: req.__("Remove all user specific theme settings"),
+              },
+              req.__("Reset")
+            )
+          )
+        : "",
+    ],
+  };
+
   return {
     above: [
       {
@@ -1434,6 +1480,7 @@ const userSettings = async ({ req, res, pwform, user }) => {
           ]
         : []),
       ...(apikeycard ? [apikeycard] : []),
+      ...(themeCfgCard ? [themeCfgCard] : []),
     ],
   };
 };

package/help/Android App Signing.tmd

@@ -0,0 +1,22 @@
+To build an Android app for the Play Store, you need to create an Android Application Bundle (.aab file) and sign the app with a certificate. A keystore file, a keystore alias, and a keystore password are needed for this. 
+
+*Note: The builder creates .aab files for the release Build type and .apk files for debug.*
+
+- **Keystore file:** A self-signed certificate that includes the private key used to sign your app. When you upload the app, you must sign it. However, before you publish it, you can use another key controlled by the Google Play App Signing feature.
+- **Keystore alias:** A unique name to identify the key within the keystore file.
+- **Keystore password:** The password to access the keystore file.
+
+*Note: You need a [Play Console developer account](https://support.google.com/googleplay/android-developer/answer/6112435?hl=en&ref_topic=3450769&sjid=11090022771305927482-EU) to publish your app on the Play Store.*
+
+### Create a Keysore file
+On any Unix-based system, you can use the `keytool` command to create the keystore file. For example:
+```sh
+keytool -genkey -v -keystore my-app-key.jks 
+  -keyalg RSA -keysize 2048 -validity 3650 
+  -alias my-key-alias
+  -storepass mypassword
+```
+genereates a keystore file named **keystore my-app-key.jks** with the alias **my-key-alias** and with **mypassword** as password.
+
+You will be prompted for additional information. Once this is done, upload **my-app-key.jks** into the keystore_files directory of your Saltcorn installation, and it shows up.
+

package/help/Provisioning Profile.tmd

@@ -0,0 +1,60 @@
+To build and publish your iOS app, you need to set up a Provisioning Profile. 
+Follow these steps to configure it correctly and optionally upload it to the App Store.
+
+*Note: You need an enrolled [Apple Developer Account](https://developer.apple.com/programs/).*
+
+## Apple Developer Account
+In your Apple Developer Account create an App ID, a Certificate, and a Provisioning Profile.
+
+- **App ID:** Identifies your app in provisioning profiles. Use the ID from this builder dialog.
+- **Certificate:** Used to sign your app, verifying the creator and ensuring the source hasn't been altered.
+- **Provisioning Profile:** Combines the App ID and Certificate, along with other configurations, to build iOS apps.
+
+## App Store Connect
+To publish your app, you must create a new app in your App Store Connect account and upload the IPA file from this build.
+## Step-by-Step Instructions
+
+### 1. Register App ID
+1. Navigate to the [Identifiers](https://developer.apple.com/account/resources/identifiers/list) section.
+2. Click the plus button and select 'App IDs' followed by 'App' in the subsequent dialog.
+3. Enter a description and the actual App ID (same as in the builder dialog).
+4. Click **Continue**, review your entries, and finish by clicking **Register**.
+
+### 2. Create Certificate
+1. Go to the [Certificates](https://developer.apple.com/account/resources/certificates/list) section and click the plus button.
+2. Select 'Apple Distribution'.
+3. Generate and upload a Certificate Signing Request from your local machine.
+
+##### 2.1 Certificate Signing Request
+1. Open the Keychain Access tool via Launchpad.
+2. Navigate to **Keychain Access > Certificate Assistant** and select **Request a Certificate from a Certificate Authority**.
+3. Fill out 'User Email Address' and 'Common Name', leaving 'CA Email Address' empty, and select 'Saved to disk'.
+4. Save the file and upload it through your browser. 
+5. Click **Continue**, download the generated Certificate, and double-click the file to install it locally.
+
+After that, the Certificate and its private key are installed locally.
+
+##### 2.2 Permit Access to the Certificate
+You have to permit using the Certificate's private key; otherwise, the build blocks with a confirm dialog on your local Mac.
+1. Open Keychain Access and select the login default keychain (left corner of the window).
+2. Locate your certificate, it will look something like   
+```Apple Distribution: [your name] ([Team ID])```
+3. Expand it to view the private key, then double-click to open its properties.
+4. Go to the **Access Control** tab and activate 'Allow all applications to access this item'.
+
+**Note:** You can also select 'Always allow' when the confirmation dialog appears on your local Mac.
+
+### 3. Create a Provisioning Profile
+1. Go to the [Profiles](https://developer.apple.com/account/resources/profiles/list) section and click the plus button.
+2. Choose 'App Store Connect'.
+3. In the following steps, use the App ID and Certificate you created.
+4. Choose any name for the profile, click **Generate**, and download the file.
+5. Double-click the downloaded file to install the Provisioning Profile on your local Mac.
+
+Finally, upload the Provisioning Profile into the 'provisioning_files' directory of your Saltcorn installation, so you can select it here.
+### 4 Upload to App Store Connect
+When you run a build with a valid provisioning profile, the builder generates an .ipa file. 
+You can download this file and upload it to [App Store Connect](https://appstoreconnect.apple.com/apps) 
+using the Transporter tool on your Mac. 
+
+**Note:** Ensure that your App Store Connect account has an app that matches your App ID before uploading the file.

package/help/xcodebuild.tmd

@@ -0,0 +1 @@
+xcodebuild

package/load_plugins.js

@@ -35,6 +35,10 @@ const loadPlugin = async (plugin, force) => {
       res.name
     );
   } catch (error) {
+    getState().log(
+      3,
+      `Error loading plugin ${plugin.name}: ${error.message || error}`
+    );
     if (force) {
       // remove the install dir and try again
       await loader.remove();
@@ -48,6 +52,7 @@ const loadPlugin = async (plugin, force) => {
       );
     }
   }
+  if (res.plugin_module.user_config_form) getState().refreshUserLayouts();
   if (res.plugin_module.onLoad) {
     try {
       await res.plugin_module.onLoad(plugin.configuration);
@@ -83,6 +88,7 @@ const loadAllPlugins = async (force) => {
       console.error(e);
     }
   }
+  await getState().refreshUserLayouts();
   await getState().refresh(true);
 };
 

package/locales/en.json

@@ -1391,5 +1391,30 @@
 	"refresh": "refresh",
 	"installed": "installed",
 	"Include table history in backup": "Include table history in backup",
-	"The plugin was corrupted and had to be repaired. We recommend restarting your server.": "The plugin was corrupted and had to be repaired. We recommend restarting your server."
-}
+	"The plugin was corrupted and had to be repaired. We recommend restarting your server.": "The plugin was corrupted and had to be repaired. We recommend restarting your server.",
+	"%s code page": "%s code page",
+	"Constants and function code": "Constants and function code",
+	"Delete code page": "Delete code page",
+	"Adjust the the theme for this user": "Adjust the the theme for this user",
+	"Configure theme": "Configure theme",
+	"Remove all user specific theme settings": "Remove all user specific theme settings",
+	"Configure %s Plugin for %s": "Configure %s Plugin for %s",
+	"The current theme has no user specific settings": "The current theme has no user specific settings",
+	"Some themes support only one level of menu nesting.": "Some themes support only one level of menu nesting.",
+	"Apple Team ID": "Apple Team ID",
+	"Please enter your Apple Team ID": "Please enter your Apple Team ID",
+	"To see changes for '%s' in show-if-formulas, users need to relogin": "To see changes for '%s' in show-if-formulas, users need to relogin",
+	"Server host": "Server host",
+	"Username": "Username",
+	"Port": "Port",
+	"All tenants": "All tenants",
+	"Also backup all tenants": "Also backup all tenants",
+	"Retain local directory": "Retain local directory",
+	"Retain a local backup copy in this directory (optional)": "Retain a local backup copy in this directory (optional)",
+	"Do not wrap response in a success object": "Do not wrap response in a success object",
+	"Use table description instead of name as header": "Use table description instead of name as header",
+	"Description header": "Description header",
+	"Lazy load views": "Lazy load views",
+	"Log IP address": "Log IP address",
+	"Record the request IP address in log messages": "Record the request IP address in log messages"
+}