@saltcorn/server 0.8.5-rc.1 → 0.8.5-rc.2

package/auth/admin.js

@@ -595,7 +595,7 @@ router.get(
       !hostname_matches_baseurl(req, getBaseDomain()) &&
       is_hsts_tld(getBaseDomain());
     let expiry = "";
-    if (has_custom) {
+    if (has_custom && X509Certificate) {
       const cert = getState().getConfig("custom_ssl_certificate", "");
       const { validTo } = new X509Certificate(cert);
       expiry = div({ class: "me-2" }, "Expires: ", validTo);

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@saltcorn/server",
-  "version": "0.8.5-rc.1",
+  "version": "0.8.5-rc.2",
   "description": "Server app for Saltcorn, open-source no-code platform",
   "homepage": "https://saltcorn.com",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@saltcorn/base-plugin": "0.8.5-rc.1",
-    "@saltcorn/builder": "0.8.5-rc.1",
-    "@saltcorn/data": "0.8.5-rc.1",
-    "@saltcorn/admin-models": "0.8.5-rc.1",
-    "@saltcorn/filemanager": "0.8.5-rc.1",
-    "@saltcorn/markup": "0.8.5-rc.1",
-    "@saltcorn/sbadmin2": "0.8.5-rc.1",
+    "@saltcorn/base-plugin": "0.8.5-rc.2",
+    "@saltcorn/builder": "0.8.5-rc.2",
+    "@saltcorn/data": "0.8.5-rc.2",
+    "@saltcorn/admin-models": "0.8.5-rc.2",
+    "@saltcorn/filemanager": "0.8.5-rc.2",
+    "@saltcorn/markup": "0.8.5-rc.2",
+    "@saltcorn/sbadmin2": "0.8.5-rc.2",
     "@socket.io/cluster-adapter": "^0.2.1",
     "@socket.io/sticky": "^1.0.1",
     "adm-zip": "0.5.10",

package/public/saltcorn-common.js

@@ -597,7 +597,8 @@ function initialize_page() {
     const options = parse(el.attr("locale-date-options"));
     el.text(date.toLocaleDateString(locale, options));
   });
-  if ($.fn.historyTabs) $('a[data-bs-toggle="tab"].deeplink').historyTabs();
+  if ($.fn.historyTabs && $.fn.tab)
+    $('a[data-bs-toggle="tab"].deeplink').historyTabs();
   init_bs5_dropdowns();
 
   // Initialize Sliders - https://stackoverflow.com/a/31083391

package/routes/admin.js

@@ -774,7 +774,7 @@ router.get(
       false
     );
     let expiry = "";
-    if (custom_ssl_certificate) {
+    if (custom_ssl_certificate && X509Certificate) {
       const { validTo } = new X509Certificate(custom_ssl_certificate);
       const diffTime = Math.abs(new Date(validTo) - new Date());
       const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));

package/routes/tenant.js

@@ -151,7 +151,11 @@ router.get(
     }
     if (!create_tenant_allowed(req)) {
       const redir = getState().getConfig("tenant_create_unauth_redirect");
+      const redirRoot = getRootState().getConfig(
+        "tenant_create_unauth_redirect"
+      );
       if (redir) res.redirect(redir);
+      else if (redirRoot) res.redirect(redirRoot);
       else res.sendWrap(req.__("Create application"), req.__("Not allowed"));
       return;
     }