@budibase/server 1.0.185-alpha.5 → 1.0.185

package/dist/utilities/budibaseDir.js

@@ -1,3 +1,9 @@
 "use strict";
+const { join } = require("./centralPath");
+const { homedir } = require("os");
+const env = require("../environment");
 const { budibaseTempDir } = require("@budibase/backend-core/objectStore");
+module.exports.budibaseAppsDir = function () {
+    return env.BUDIBASE_DIR || join(homedir(), ".budibase");
+};
 module.exports.budibaseTempDir = budibaseTempDir;

package/dist/utilities/redis.js

@@ -51,7 +51,7 @@ exports.getAllLocks = () => __awaiter(void 0, void 0, void 0, function* () {
 exports.updateLock = (devAppId, user) => __awaiter(void 0, void 0, void 0, function* () {
     // make sure always global user ID
     const globalId = getGlobalIDFromUserMetadataID(user._id);
-    const inputUser = Object.assign(Object.assign({}, user), { userId: globalId, _id: globalId, lockedAt: new Date().getTime() });
+    const inputUser = Object.assign(Object.assign({}, user), { userId: globalId, _id: globalId });
     yield devAppClient.store(devAppId, inputUser, APP_DEV_LOCK_SECONDS);
 });
 exports.clearLock = (devAppId, user) => __awaiter(void 0, void 0, void 0, function* () {

package/docker_run.sh

@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 if [ -z $CLUSTER_MODE ]; then
   yarn run:docker
 else

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.185-alpha.5",
+  "version": "1.0.185",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -70,10 +70,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.185-alpha.5",
-    "@budibase/client": "^1.0.185-alpha.5",
-    "@budibase/pro": "1.0.185-alpha.4",
-    "@budibase/string-templates": "^1.0.185-alpha.5",
+    "@budibase/backend-core": "^1.0.185",
+    "@budibase/client": "^1.0.185",
+    "@budibase/pro": "1.0.184",
+    "@budibase/string-templates": "^1.0.185",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
@@ -184,5 +184,5 @@
   "optionalDependencies": {
     "oracledb": "^5.3.0"
   },
-  "gitHead": "53bd156d41ed2c4f2ec8c0b29bde42371887e7d7"
+  "gitHead": "9bdb67f67219b1227e4878c4a8751f0548f3ec7d"
 }

package/scripts/likeCypress.ts

@@ -9,6 +9,7 @@ const SERVER_PORT = "4100"
 const WORKER_PORT = "4200"
 
 // @ts-ignore
+process.env.BUDIBASE_API_KEY = "6BE826CB-6B30-4AEC-8777-2E90464633DE"
 process.env.NODE_ENV = "cypress"
 process.env.ENABLE_ANALYTICS = "false"
 process.env.JWT_SECRET = "budibase"

package/src/api/controllers/templates.js

@@ -1,13 +1,12 @@
 const fetch = require("node-fetch")
 const { downloadTemplate } = require("../../utilities/fileSystem")
-const env = require("../../environment")
 
 // development flag, can be used to test against templates exported locally
 const DEFAULT_TEMPLATES_BUCKET =
   "prod-budi-templates.s3-eu-west-1.amazonaws.com"
 
 exports.fetch = async function (ctx) {
-  let type = env.TEMPLATE_REPOSITORY
+  const { type = "app" } = ctx.query
   let response,
     error = false
   try {

package/src/api/controllers/view/exporters.js

@@ -6,7 +6,7 @@ exports.csv = function (headers, rows) {
       .map(header => {
         let val = row[header]
         val =
-          typeof val === "object" && !(val instanceof Date)
+          typeof val === "object"
             ? `"${JSON.stringify(val).replace(/"/g, "'")}"`
             : `"${val}"`
         return val.trim()

package/src/automations/steps/queryRows.js

@@ -50,7 +50,6 @@ exports.definition = {
         limit: {
           type: "number",
           title: "Limit",
-          customType: "queryLimit",
         },
       },
       required: ["tableId"],

package/src/automations/steps/sendSmtpEmail.js

@@ -53,7 +53,6 @@ exports.run = async function ({ inputs }) {
   if (!contents) {
     contents = "<h1>No content</h1>"
   }
-  to = to || undefined
   try {
     let response = await sendSmtpEmail(to, from, subject, contents, true)
     return {

package/src/environment.js

@@ -43,12 +43,15 @@ module.exports = {
   COUCH_DB_URL: process.env.COUCH_DB_URL,
   MINIO_URL: process.env.MINIO_URL,
   WORKER_URL: process.env.WORKER_URL,
+  SELF_HOSTED: process.env.SELF_HOSTED,
   AWS_REGION: process.env.AWS_REGION,
+  ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
   MINIO_SECRET_KEY: process.env.MINIO_SECRET_KEY,
   REDIS_URL: process.env.REDIS_URL,
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
   INTERNAL_API_KEY: process.env.INTERNAL_API_KEY,
+  MULTI_TENANCY: process.env.MULTI_TENANCY,
   HTTP_MIGRATIONS: process.env.HTTP_MIGRATIONS,
   API_REQ_LIMIT_PER_SEC: process.env.API_REQ_LIMIT_PER_SEC,
   GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
@@ -58,27 +61,28 @@ module.exports = {
   JEST_WORKER_ID: process.env.JEST_WORKER_ID,
   BUDIBASE_ENVIRONMENT: process.env.BUDIBASE_ENVIRONMENT,
   DISABLE_ACCOUNT_PORTAL: process.env.DISABLE_ACCOUNT_PORTAL,
-  TEMPLATE_REPOSITORY: process.env.TEMPLATE_REPOSITORY || "app",
   DISABLE_AUTO_PROD_APP_SYNC: process.env.DISABLE_AUTO_PROD_APP_SYNC,
   // minor
   SALT_ROUNDS: process.env.SALT_ROUNDS,
   LOGGER: process.env.LOGGER,
   LOG_LEVEL: process.env.LOG_LEVEL,
+  AUTOMATION_DIRECTORY: process.env.AUTOMATION_DIRECTORY,
+  AUTOMATION_BUCKET: process.env.AUTOMATION_BUCKET,
   AUTOMATION_MAX_ITERATIONS: process.env.AUTOMATION_MAX_ITERATIONS,
   SENDGRID_API_KEY: process.env.SENDGRID_API_KEY,
   DYNAMO_ENDPOINT: process.env.DYNAMO_ENDPOINT,
   POSTHOG_TOKEN: process.env.POSTHOG_TOKEN,
   QUERY_THREAD_TIMEOUT: parseIntSafe(process.env.QUERY_THREAD_TIMEOUT),
-  SQL_MAX_ROWS: process.env.SQL_MAX_ROWS,
-  // flags
+  // old - to remove
+  CLIENT_ID: process.env.CLIENT_ID,
+  BUDIBASE_DIR: process.env.BUDIBASE_DIR,
+  DEPLOYMENT_DB_URL: process.env.DEPLOYMENT_DB_URL,
+  BUDIBASE_API_KEY: process.env.BUDIBASE_API_KEY,
+  USERID_API_KEY: process.env.USERID_API_KEY,
+  DEPLOYMENT_CREDENTIALS_URL: process.env.DEPLOYMENT_CREDENTIALS_URL,
   ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
   DISABLE_THREADING: process.env.DISABLE_THREADING,
-  DISABLE_DEVELOPER_LICENSE: process.env.DISABLE_DEVELOPER_LICENSE,
-  MULTI_TENANCY: process.env.MULTI_TENANCY,
-  ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
-  SELF_HOSTED: process.env.SELF_HOSTED,
-  // old
-  CLIENT_ID: process.env.CLIENT_ID,
+  SQL_MAX_ROWS: process.env.SQL_MAX_ROWS,
   _set(key, value) {
     process.env[key] = value
     module.exports[key] = value

package/src/middleware/builder.js

@@ -6,7 +6,7 @@ const {
   setDebounce,
 } = require("../utilities/redis")
 const { doWithDB } = require("@budibase/backend-core/db")
-const { DocumentTypes, getGlobalIDFromUserMetadataID } = require("../db/utils")
+const { DocumentTypes } = require("../db/utils")
 const { PermissionTypes } = require("@budibase/backend-core/permissions")
 const { app: appCache } = require("@budibase/backend-core/cache")
 
@@ -51,9 +51,6 @@ async function updateAppUpdatedAt(ctx) {
   await doWithDB(appId, async db => {
     const metadata = await db.get(DocumentTypes.APP_METADATA)
     metadata.updatedAt = new Date().toISOString()
-
-    metadata.updatedBy = getGlobalIDFromUserMetadataID(ctx.user.userId)
-
     const response = await db.put(metadata)
     metadata._rev = response.rev
     await appCache.invalidateAppMetadata(appId, metadata)
@@ -70,15 +67,7 @@ module.exports = async (ctx, permType) => {
   }
   const isBuilderApi = permType === PermissionTypes.BUILDER
   const referer = ctx.headers["referer"]
-
-  const overviewPath = "/builder/portal/overview/"
-  const overviewContext = !referer ? false : referer.includes(overviewPath)
-  if (overviewContext) {
-    return
-  }
-
-  const hasAppId = !referer ? false : referer.includes(appId)
-  const editingApp = referer ? hasAppId : false
+  const editingApp = referer ? referer.includes(appId) : false
   // check this is a builder call and editing
   if (!isBuilderApi || !editingApp) {
     return

package/src/utilities/budibaseDir.js

@@ -1,3 +1,10 @@
+const { join } = require("./centralPath")
+const { homedir } = require("os")
+const env = require("../environment")
 const { budibaseTempDir } = require("@budibase/backend-core/objectStore")
 
+module.exports.budibaseAppsDir = function () {
+  return env.BUDIBASE_DIR || join(homedir(), ".budibase")
+}
+
 module.exports.budibaseTempDir = budibaseTempDir

package/src/utilities/redis.js

@@ -48,9 +48,7 @@ exports.updateLock = async (devAppId, user) => {
     ...user,
     userId: globalId,
     _id: globalId,
-    lockedAt: new Date().getTime(),
   }
-
   await devAppClient.store(devAppId, inputUser, APP_DEV_LOCK_SECONDS)
 }