@saltcorn/server 0.8.5-rc.1 → 0.8.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/auth/admin.js CHANGED
@@ -595,7 +595,7 @@ router.get(
595
595
  !hostname_matches_baseurl(req, getBaseDomain()) &&
596
596
  is_hsts_tld(getBaseDomain());
597
597
  let expiry = "";
598
- if (has_custom) {
598
+ if (has_custom && X509Certificate) {
599
599
  const cert = getState().getConfig("custom_ssl_certificate", "");
600
600
  const { validTo } = new X509Certificate(cert);
601
601
  expiry = div({ class: "me-2" }, "Expires: ", validTo);
package/package.json CHANGED
@@ -1,18 +1,18 @@
1
1
  {
2
2
  "name": "@saltcorn/server",
3
- "version": "0.8.5-rc.1",
3
+ "version": "0.8.5",
4
4
  "description": "Server app for Saltcorn, open-source no-code platform",
5
5
  "homepage": "https://saltcorn.com",
6
6
  "main": "index.js",
7
7
  "license": "MIT",
8
8
  "dependencies": {
9
- "@saltcorn/base-plugin": "0.8.5-rc.1",
10
- "@saltcorn/builder": "0.8.5-rc.1",
11
- "@saltcorn/data": "0.8.5-rc.1",
12
- "@saltcorn/admin-models": "0.8.5-rc.1",
13
- "@saltcorn/filemanager": "0.8.5-rc.1",
14
- "@saltcorn/markup": "0.8.5-rc.1",
15
- "@saltcorn/sbadmin2": "0.8.5-rc.1",
9
+ "@saltcorn/base-plugin": "0.8.5",
10
+ "@saltcorn/builder": "0.8.5",
11
+ "@saltcorn/data": "0.8.5",
12
+ "@saltcorn/admin-models": "0.8.5",
13
+ "@saltcorn/filemanager": "0.8.5",
14
+ "@saltcorn/markup": "0.8.5",
15
+ "@saltcorn/sbadmin2": "0.8.5",
16
16
  "@socket.io/cluster-adapter": "^0.2.1",
17
17
  "@socket.io/sticky": "^1.0.1",
18
18
  "adm-zip": "0.5.10",
@@ -597,7 +597,8 @@ function initialize_page() {
597
597
  const options = parse(el.attr("locale-date-options"));
598
598
  el.text(date.toLocaleDateString(locale, options));
599
599
  });
600
- if ($.fn.historyTabs) $('a[data-bs-toggle="tab"].deeplink').historyTabs();
600
+ if ($.fn.historyTabs && $.fn.tab)
601
+ $('a[data-bs-toggle="tab"].deeplink').historyTabs();
601
602
  init_bs5_dropdowns();
602
603
 
603
604
  // Initialize Sliders - https://stackoverflow.com/a/31083391
package/routes/admin.js CHANGED
@@ -774,7 +774,7 @@ router.get(
774
774
  false
775
775
  );
776
776
  let expiry = "";
777
- if (custom_ssl_certificate) {
777
+ if (custom_ssl_certificate && X509Certificate) {
778
778
  const { validTo } = new X509Certificate(custom_ssl_certificate);
779
779
  const diffTime = Math.abs(new Date(validTo) - new Date());
780
780
  const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
package/routes/tenant.js CHANGED
@@ -151,7 +151,11 @@ router.get(
151
151
  }
152
152
  if (!create_tenant_allowed(req)) {
153
153
  const redir = getState().getConfig("tenant_create_unauth_redirect");
154
+ const redirRoot = getRootState().getConfig(
155
+ "tenant_create_unauth_redirect"
156
+ );
154
157
  if (redir) res.redirect(redir);
158
+ else if (redirRoot) res.redirect(redirRoot);
155
159
  else res.sendWrap(req.__("Create application"), req.__("Not allowed"));
156
160
  return;
157
161
  }