@budibase/server 1.0.219-alpha.8 → 1.0.220-alpha.0

package/dist/utilities/workerRequests.js

@@ -120,3 +120,11 @@ exports.readGlobalUser = (ctx) => __awaiter(void 0, void 0, void 0, function* ()
     request(ctx, { method: "GET" }));
     return checkResponse(response, "get user", { ctx });
 });
+exports.createAdminUser = (email, password, tenantId) => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + "/api/global/users/init"), request(null, { method: "POST", body: { email, password, tenantId } }));
+    return checkResponse(response, "create admin user");
+});
+exports.getChecklist = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield fetch(checkSlashesInUrl(env.WORKER_URL + "/api/global/configs/checklist"), request(null, { method: "GET" }));
+    return checkResponse(response, "get checklist");
+});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.219-alpha.8",
+  "version": "1.0.220-alpha.0",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,10 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^1.0.219-alpha.8",
-    "@budibase/client": "^1.0.219-alpha.8",
-    "@budibase/pro": "1.0.219-alpha.7",
-    "@budibase/string-templates": "^1.0.219-alpha.8",
-    "@budibase/types": "^1.0.219-alpha.8",
+    "@budibase/backend-core": "^1.0.220-alpha.0",
+    "@budibase/client": "^1.0.220-alpha.0",
+    "@budibase/pro": "1.0.219",
+    "@budibase/string-templates": "^1.0.220-alpha.0",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -152,6 +151,7 @@
     "@babel/core": "7.17.4",
     "@babel/preset-env": "7.16.11",
     "@budibase/standard-components": "^0.9.139",
+    "@budibase/types": "^1.0.220-alpha.0",
     "@jest/test-sequencer": "24.9.0",
     "@types/apidoc": "0.50.0",
     "@types/bson": "4.2.0",
@@ -195,5 +195,5 @@
   "optionalDependencies": {
     "oracledb": "5.3.0"
   },
-  "gitHead": "d006763b9f509ee4693f6c15ed9660d94b96d475"
+  "gitHead": "00cefe45cc19f1151ad2a4590d6a5aed0afa0ea7"
 }

package/scripts/dev/manage.js

@@ -56,6 +56,8 @@ async function init() {
       DISABLE_THREADING: 1,
       SERVICE: "app-service",
       DEPLOYMENT_ENVIRONMENT: "development",
+      BB_ADMIN_USER_EMAIL: "",
+      BB_ADMIN_USER_PASSWORD: "",
     }
     let envFile = ""
     Object.keys(envFileJson).forEach(key => {

package/specs/openapi.json

@@ -2137,6 +2137,10 @@
                   "query": {
                     "type": "object",
                     "properties": {
+                      "allOr": {
+                        "type": "boolean",
+                        "description": "Specifies that a row should be returned if it satisfies any of the specified options, rather than requiring it to fulfill all the search parameters. This defaults to false, meaning AND logic will be used."
+                      },
                       "string": {
                         "type": "object",
                         "example": {
@@ -2155,12 +2159,12 @@
                       },
                       "range": {
                         "type": "object",
-                        "description": "Searches within a range, the format of this must be columnName -> [low, high].",
+                        "description": "Searches within a range, the format of this must be in the format of an object with a \"low\" and \"high\" property.",
                         "example": {
-                          "columnName1": [
-                            10,
-                            20
-                          ]
+                          "columnName1": {
+                            "low": 10,
+                            "high": 20
+                          }
                         }
                       },
                       "equal": {

package/specs/openapi.yaml

@@ -1551,6 +1551,12 @@ paths:
                 query:
                   type: object
                   properties:
+                    allOr:
+                      type: boolean
+                      description: Specifies that a row should be returned if it satisfies any of the
+                        specified options, rather than requiring it to fulfill
+                        all the search parameters. This defaults to false,
+                        meaning AND logic will be used.
                     string:
                       type: object
                       example:
@@ -1566,12 +1572,12 @@ paths:
                       description: A fuzzy search, only supported by internal tables.
                     range:
                       type: object
-                      description: Searches within a range, the format of this must be columnName ->
-                        [low, high].
+                      description: Searches within a range, the format of this must be in the format
+                        of an object with a "low" and "high" property.
                       example:
                         columnName1:
-                          - 10
-                          - 20
+                          low: 10
+                          high: 20
                     equal:
                       type: object
                       description: Searches for rows that have a column value that is exactly the

package/src/api/controllers/public/applications.ts

@@ -1,6 +1,6 @@
 const { getAllApps } = require("@budibase/backend-core/db")
 const { updateAppId } = require("@budibase/backend-core/context")
-import { search as stringSearch } from "./utils"
+import { search as stringSearch, addRev } from "./utils"
 import * as controller from "../application"
 import { Application } from "../../../definitions/common"
 
@@ -47,7 +47,7 @@ export async function read(ctx: any, next: any) {
 }
 
 export async function update(ctx: any, next: any) {
-  ctx.request.body = fixAppID(ctx.request.body, ctx.params)
+  ctx.request.body = await addRev(fixAppID(ctx.request.body, ctx.params))
   updateAppId(ctx.params.appId)
   await controller.update(ctx)
   await setResponseApp(ctx)

package/src/api/controllers/public/utils.ts

@@ -1,5 +1,6 @@
 const { getAppDB } = require("@budibase/backend-core/context")
 import { isExternalTable } from "../../../integrations/utils"
+import { APP_PREFIX, DocumentTypes } from "../../../db/utils"
 
 export async function addRev(
   body: { _id?: string; _rev?: string },
@@ -8,9 +9,15 @@ export async function addRev(
   if (!body._id || (tableId && isExternalTable(tableId))) {
     return body
   }
+  let id = body._id
+  if (body._id.startsWith(APP_PREFIX)) {
+    id = DocumentTypes.APP_METADATA
+  }
   const db = getAppDB()
-  const dbDoc = await db.get(body._id)
+  const dbDoc = await db.get(id)
   body._rev = dbDoc._rev
+  // update ID in case it is an app ID
+  body._id = id
   return body
 }
 

package/src/api/controllers/query/index.ts

@@ -166,14 +166,19 @@ export async function preview(ctx: any) {
   }
 }
 
-async function execute(ctx: any, opts = { rowsOnly: false }) {
+async function execute(
+  ctx: any,
+  opts: any = { rowsOnly: false, isAutomation: false }
+) {
   const db = getAppDB()
 
   const query = await db.get(ctx.params.queryId)
   const datasource = await db.get(query.datasourceId)
 
-  const authConfigCtx: any = getAuthConfig(ctx)
-
+  let authConfigCtx: any = {}
+  if (!opts.isAutomation) {
+    authConfigCtx = getAuthConfig(ctx)
+  }
   const enrichedParameters = ctx.request.body.parameters || {}
   // make sure parameters are fully enriched with defaults
   if (query && query.parameters) {
@@ -217,8 +222,11 @@ export async function executeV1(ctx: any) {
   return execute(ctx, { rowsOnly: true })
 }
 
-export async function executeV2(ctx: any) {
-  return execute(ctx, { rowsOnly: false })
+export async function executeV2(
+  ctx: any,
+  { isAutomation }: { isAutomation?: boolean } = {}
+) {
+  return execute(ctx, { rowsOnly: false, isAutomation })
 }
 
 const removeDynamicVariables = async (queryId: any) => {

package/src/api/controllers/row/internalSearch.js

@@ -10,6 +10,7 @@ const { getAppId } = require("@budibase/backend-core/context")
 class QueryBuilder {
   constructor(base) {
     this.query = {
+      allOr: false,
       string: {},
       fuzzy: {},
       range: {},
@@ -146,8 +147,22 @@ class QueryBuilder {
 
   buildSearchQuery() {
     const builder = this
-    let query = "*:*"
+    let allOr = this.query && this.query.allOr
+    let query = allOr ? "" : "*:*"
     const allPreProcessingOpts = { escape: true, lowercase: true, wrap: true }
+    let tableId
+    if (this.query.equal.tableId) {
+      tableId = this.query.equal.tableId
+      delete this.query.equal.tableId
+    }
+
+    const equal = (key, value) => {
+      // 0 evaluates to false, which means we would return all rows if we don't check it
+      if (!value && value !== 0) {
+        return null
+      }
+      return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`
+    }
 
     function build(structure, queryFn) {
       for (let [key, value] of Object.entries(structure)) {
@@ -158,7 +173,10 @@ class QueryBuilder {
         if (expression == null) {
           continue
         }
-        query += ` AND ${expression}`
+        if (query.length > 0) {
+          query += ` ${allOr ? "OR" : "AND"} `
+        }
+        query += expression
       }
     }
 
@@ -204,13 +222,7 @@ class QueryBuilder {
       })
     }
     if (this.query.equal) {
-      build(this.query.equal, (key, value) => {
-        // 0 evaluates to false, which means we would return all rows if we don't check it
-        if (!value && value !== 0) {
-          return null
-        }
-        return `${key}:${builder.preprocess(value, allPreProcessingOpts)}`
-      })
+      build(this.query.equal, equal)
     }
     if (this.query.notEqual) {
       build(this.query.notEqual, (key, value) => {
@@ -248,6 +260,12 @@ class QueryBuilder {
         return `${key}:(${orStatement})`
       })
     }
+    // make sure table ID is always added as an AND
+    if (tableId) {
+      query = `(${query})`
+      allOr = false
+      build({ tableId }, equal)
+    }
     return query
   }
 

package/src/api/routes/public/rows.ts

@@ -150,6 +150,11 @@ read.push(new Endpoint("get", "/tables/:tableId/rows/:rowId", controller.read))
  *               query:
  *                 type: object
  *                 properties:
+ *                   allOr:
+ *                     type: boolean
+ *                     description: Specifies that a row should be returned if it satisfies
+ *                       any of the specified options, rather than requiring it to fulfill all
+ *                       the search parameters. This defaults to false, meaning AND logic will be used.
  *                   string:
  *                     type: object
  *                     example:
@@ -167,9 +172,9 @@ read.push(new Endpoint("get", "/tables/:tableId/rows/:rowId", controller.read))
  *                   range:
  *                     type: object
  *                     description: Searches within a range, the format of this must be
- *                       columnName -> [low, high].
+ *                       in the format of an object with a "low" and "high" property.
  *                     example:
- *                       columnName1: [10, 20]
+ *                       columnName1: { low: 10, high: 20 }
  *                   equal:
  *                     type: object
  *                     description: Searches for rows that have a column value that is

package/src/api/routes/tests/query.spec.js

@@ -218,7 +218,6 @@ describe("/queries", () => {
       expect(res.body.schemaFields).toEqual(["a", "b"])
       expect(res.body.rows.length).toEqual(1)
       expect(events.query.previewed).toBeCalledTimes(1)
-      datasource.config = { schema: "public" }
       expect(events.query.previewed).toBeCalledWith(datasource, query)
     })
 

package/src/api/routes/utils/validators.js

@@ -58,6 +58,7 @@ function filterObject() {
     oneOf: Joi.object().optional(),
     contains: Joi.object().optional(),
     notContains: Joi.object().optional(),
+    allOr: Joi.boolean().optional(),
   }).unknown(true)
 }
 

package/src/app.ts

@@ -18,7 +18,9 @@ const { logAlert } = require("@budibase/backend-core/logging")
 const { Thread } = require("./threads")
 import redis from "./utilities/redis"
 import * as migrations from "./migrations"
-import { events, installation } from "@budibase/backend-core"
+import { events, installation, tenancy } from "@budibase/backend-core"
+import { createAdminUser, getChecklist } from "./utilities/workerRequests"
+import { tenantSucceeded } from "@budibase/backend-core/dist/src/events/publishers/backfill"
 
 const app = new Koa()
 
@@ -110,6 +112,33 @@ module.exports = server.listen(env.PORT || 0, async () => {
     }
   }
 
+  // check and create admin user if required
+  if (
+    env.SELF_HOSTED &&
+    !env.MULTI_TENANCY &&
+    env.BB_ADMIN_USER_EMAIL &&
+    env.BB_ADMIN_USER_PASSWORD
+  ) {
+    const checklist = await getChecklist()
+    if (!checklist?.adminUser?.checked) {
+      try {
+        const tenantId = tenancy.getTenantId()
+        await createAdminUser(
+          env.BB_ADMIN_USER_EMAIL,
+          env.BB_ADMIN_USER_PASSWORD,
+          tenantId
+        )
+        console.log(
+          "Admin account automatically created for",
+          env.BB_ADMIN_USER_EMAIL
+        )
+      } catch (e) {
+        logAlert("Error creating initial admin user. Exiting.", e)
+        shutdown()
+      }
+    }
+  }
+
   // check for version updates
   await installation.checkInstallVersion()
 

package/src/automations/steps/executeQuery.js

@@ -72,7 +72,7 @@ exports.run = async function ({ inputs, appId, emitter }) {
   })
 
   try {
-    await queryController.executeV2(ctx)
+    await queryController.executeV2(ctx, { isAutomation: true })
     const { data, ...rest } = ctx.body
     return {
       response: data,