@budibase/server 1.0.19-alpha.1 → 1.0.22

package/dist/utilities/index.js

@@ -142,13 +142,3 @@ exports.doesDatabaseExist = (dbName) => __awaiter(void 0, void 0, void 0, functi
         return false;
     }
 });
-exports.formatBytes = bytes => {
-    const units = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
-    const byteIncrements = 1024;
-    let unit = 0;
-    let size = parseInt(bytes, 10) || 0;
-    while (size >= byteIncrements && ++unit) {
-        size /= byteIncrements;
-    }
-    return `${size.toFixed(size < 10 && unit > 0 ? 1 : 0)}${units[unit]}`;
-};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.19-alpha.1",
+  "version": "1.0.22",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -69,10 +69,9 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/auth": "^1.0.19-alpha.1",
-    "@budibase/client": "^1.0.19-alpha.1",
-    "@budibase/string-templates": "^1.0.19-alpha.1",
+    "@budibase/auth": "^1.0.22",
+    "@budibase/client": "^1.0.22",
+    "@budibase/string-templates": "^1.0.22",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
@@ -86,14 +85,12 @@
     "bull": "^3.22.4",
     "chmodr": "1.2.0",
     "csvtojson": "2.0.10",
-    "curlconverter": "^3.21.0",
     "dotenv": "8.2.0",
     "download": "8.0.0",
     "fix-path": "3.0.0",
     "fs-extra": "8.1.0",
     "jimp": "0.16.1",
     "joi": "17.2.1",
-    "js-yaml": "^4.1.0",
     "jsonschema": "1.4.0",
     "knex": "^0.95.6",
     "koa": "2.7.0",
@@ -149,7 +146,6 @@
     "eslint": "^6.8.0",
     "jest": "^27.0.5",
     "nodemon": "^2.0.4",
-    "openapi-types": "^9.3.1",
     "path-to-regexp": "^6.2.0",
     "prettier": "^2.3.1",
     "rimraf": "^3.0.2",
@@ -162,5 +158,5 @@
   "optionalDependencies": {
     "oracledb": "^5.3.0"
   },
-  "gitHead": "5623634c9caf89d0694e57e726b654fbf7ccb69a"
+  "gitHead": "c3a7a9d1220b90bf44ca3fdc233d3d3c68e00c10"
 }

package/src/api/controllers/{query/index.js → query.js}

@@ -1,14 +1,12 @@
 const { processString } = require("@budibase/string-templates")
-const CouchDB = require("../../../db")
+const CouchDB = require("../../db")
 const {
   generateQueryID,
   getQueryParams,
   isProdAppID,
-} = require("../../../db/utils")
-const { BaseQueryVerbs } = require("../../../constants")
-const { Thread, ThreadType } = require("../../../threads")
-const { save: saveDatasource } = require("../datasource")
-const { RestImporter } = require("./import")
+} = require("../../db/utils")
+const { BaseQueryVerbs } = require("../../constants")
+const { Thread, ThreadType } = require("../../threads")
 
 const Runner = new Thread(ThreadType.QUERY, { timeoutMs: 10000 })
 
@@ -32,49 +30,9 @@ exports.fetch = async function (ctx) {
       include_docs: true,
     })
   )
-
   ctx.body = enrichQueries(body.rows.map(row => row.doc))
 }
 
-exports.import = async ctx => {
-  const body = ctx.request.body
-  const data = body.data
-
-  const importer = new RestImporter(data)
-  await importer.init()
-
-  let datasourceId
-  if (!body.datasourceId) {
-    // construct new datasource
-    const info = await importer.getInfo()
-    let datasource = {
-      type: "datasource",
-      source: "REST",
-      config: {
-        url: info.url,
-        defaultHeaders: [],
-      },
-      name: info.name,
-    }
-    // save the datasource
-    const datasourceCtx = { ...ctx }
-    datasourceCtx.request.body.datasource = datasource
-    await saveDatasource(datasourceCtx)
-    datasourceId = datasourceCtx.body.datasource._id
-  } else {
-    // use existing datasource
-    datasourceId = body.datasourceId
-  }
-
-  const importResult = await importer.importQueries(ctx.appId, datasourceId)
-
-  ctx.body = {
-    ...importResult,
-    datasourceId,
-  }
-  ctx.status = 200
-}
-
 exports.save = async function (ctx) {
   const db = new CouchDB(ctx.appId)
   const query = ctx.request.body
@@ -123,7 +81,7 @@ async function enrichQueryFields(fields, parameters = {}) {
           enrichedQuery.requestBody
       )
     } catch (err) {
-      // no json found, ignore
+      throw { message: `JSON Invalid - error: ${err}` }
     }
     delete enrichedQuery.customData
   }
@@ -151,7 +109,7 @@ exports.preview = async function (ctx) {
   const enrichedQuery = await enrichQueryFields(fields, parameters)
 
   try {
-    const { rows, keys, info, extra } = await Runner.run({
+    const { rows, keys } = await Runner.run({
       datasource,
       queryVerb,
       query: enrichedQuery,
@@ -161,8 +119,6 @@ exports.preview = async function (ctx) {
     ctx.body = {
       rows,
       schemaFields: [...new Set(keys)],
-      info,
-      extra,
     }
   } catch (err) {
     ctx.throw(400, err)

package/src/api/controllers/user.js

@@ -2,7 +2,6 @@ const CouchDB = require("../../db")
 const {
   generateUserMetadataID,
   getUserMetadataParams,
-  generateUserFlagID,
 } = require("../../db/utils")
 const { InternalTables } = require("../../db/utils")
 const { getGlobalUsers, getRawGlobalUser } = require("../../utilities/global")
@@ -196,35 +195,3 @@ exports.destroyMetadata = async function (ctx) {
 exports.findMetadata = async function (ctx) {
   ctx.body = await getFullUser(ctx, ctx.params.id)
 }
-
-exports.setFlag = async function (ctx) {
-  const userId = ctx.user._id
-  const { flag, value } = ctx.request.body
-  if (!flag) {
-    ctx.throw(400, "Must supply a 'flag' field in request body.")
-  }
-  const flagDocId = generateUserFlagID(userId)
-  const db = new CouchDB(ctx.appId)
-  let doc
-  try {
-    doc = await db.get(flagDocId)
-  } catch (err) {
-    doc = { _id: flagDocId }
-  }
-  doc[flag] = value || true
-  await db.put(doc)
-  ctx.body = { message: "Flag set successfully" }
-}
-
-exports.getFlags = async function (ctx) {
-  const userId = ctx.user._id
-  const docId = generateUserFlagID(userId)
-  const db = new CouchDB(ctx.appId)
-  let doc
-  try {
-    doc = await db.get(docId)
-  } catch (err) {
-    doc = { _id: docId }
-  }
-  ctx.body = doc
-}

package/src/api/controllers/webhook.js

@@ -65,10 +65,6 @@ exports.buildSchema = async ctx => {
     let automation = await db.get(webhook.action.target)
     const autoOutputs = automation.definition.trigger.schema.outputs
     let properties = webhook.bodySchema.properties
-    // reset webhook outputs
-    autoOutputs.properties = {
-      body: autoOutputs.properties.body,
-    }
     for (let prop of Object.keys(properties)) {
       autoOutputs.properties[prop] = {
         type: properties[prop].type,

package/src/api/routes/query.js

@@ -1,23 +1,53 @@
 const Router = require("@koa/router")
 const queryController = require("../controllers/query")
 const authorized = require("../../middleware/authorized")
+const Joi = require("joi")
 const {
   PermissionLevels,
   PermissionTypes,
   BUILDER,
 } = require("@budibase/auth/permissions")
+const joiValidator = require("../../middleware/joi-validator")
 const {
   bodyResource,
   bodySubResource,
   paramResource,
 } = require("../../middleware/resourceId")
-const {
-  generateQueryPreviewValidation,
-  generateQueryValidation,
-} = require("../controllers/query/validation")
 
 const router = Router()
 
+function generateQueryValidation() {
+  // prettier-ignore
+  return joiValidator.body(Joi.object({
+    _id: Joi.string(),
+    _rev: Joi.string(),
+    name: Joi.string().required(),
+    fields: Joi.object().required(),
+    datasourceId: Joi.string().required(),
+    readable: Joi.boolean(),
+    parameters: Joi.array().items(Joi.object({
+      name: Joi.string(),
+      default: Joi.string().allow(""),
+    })),
+    queryVerb: Joi.string().allow().required(),
+    extra: Joi.object().optional(),
+    schema: Joi.object({}).required().unknown(true),
+    transformer: Joi.string().optional(),
+  }))
+}
+
+function generateQueryPreviewValidation() {
+  // prettier-ignore
+  return joiValidator.body(Joi.object({
+    fields: Joi.object().required(),
+    queryVerb: Joi.string().allow().required(),
+    extra: Joi.object().optional(),
+    datasourceId: Joi.string().required(),
+    transformer: Joi.string().optional(),
+    parameters: Joi.object({}).required().unknown(true)
+  }))
+}
+
 router
   .get("/api/queries", authorized(BUILDER), queryController.fetch)
   .post(
@@ -27,7 +57,6 @@ router
     generateQueryValidation(),
     queryController.save
   )
-  .post("/api/queries/import", authorized(BUILDER), queryController.import)
   .post(
     "/api/queries/preview",
     bodyResource("datasourceId"),

package/src/api/routes/user.js

@@ -39,15 +39,5 @@ router
     authorized(PermissionTypes.USER, PermissionLevels.WRITE),
     controller.syncUser
   )
-  .post(
-    "/api/users/flags",
-    authorized(PermissionTypes.USER, PermissionLevels.WRITE),
-    controller.setFlag
-  )
-  .get(
-    "/api/users/flags",
-    authorized(PermissionTypes.USER, PermissionLevels.READ),
-    controller.getFlags
-  )
 
 module.exports = router

package/src/db/utils.js

@@ -40,7 +40,6 @@ const DocumentTypes = {
   DEPLOYMENTS: "deployments",
   METADATA: "metadata",
   MEM_VIEW: "view",
-  USER_FLAG: "flag",
 }
 
 const ViewNames = {
@@ -340,14 +339,6 @@ exports.getQueryParams = (datasourceId = null, otherProps = {}) => {
   )
 }
 
-/**
- * Generates a new flag document ID.
- * @returns {string} The ID of the flag document that was generated.
- */
-exports.generateUserFlagID = userId => {
-  return `${DocumentTypes.USER_FLAG}${SEPARATOR}${userId}`
-}
-
 exports.generateMetadataID = (type, entityId) => {
   return `${DocumentTypes.METADATA}${SEPARATOR}${type}${SEPARATOR}${entityId}`
 }

package/src/definitions/common.ts

@@ -1,6 +1,6 @@
-export { Query, Datasource } from "./datasource"
+import { SourceNames } from "./datasource"
 
-export interface Base {
+interface Base {
   _id?: string
   _rev?: string
 }
@@ -93,3 +93,17 @@ export interface Automation extends Base {
     trigger?: AutomationStep
   }
 }
+
+export interface Datasource extends Base {
+  type: string
+  name: string
+  source: SourceNames
+  // the config is defined by the schema
+  config: {
+    [key: string]: string | number | boolean
+  }
+  plus: boolean
+  entities?: {
+    [key: string]: Table
+  }
+}

package/src/definitions/datasource.ts

@@ -1,4 +1,4 @@
-import { Row, Table, Base } from "./common"
+import { Row, Table } from "./common"
 
 export enum Operation {
   CREATE = "CREATE",
@@ -181,52 +181,3 @@ export interface SqlQuery {
 export interface QueryOptions {
   disableReturning?: boolean
 }
-
-export interface Datasource extends Base {
-  type: string
-  name: string
-  source: SourceNames
-  // the config is defined by the schema
-  config: {
-    [key: string]: string | number | boolean
-  }
-  plus: boolean
-  entities?: {
-    [key: string]: Table
-  }
-}
-
-export interface QueryParameter {
-  name: string
-  default: string
-}
-
-export interface RestQueryFields {
-  path: string
-  queryString?: string
-  headers: { [key: string]: any }
-  disabledHeaders: { [key: string]: any }
-  requestBody: any
-  bodyType: string
-  json: object
-  method: string
-}
-
-export interface RestConfig {
-  url: string
-  defaultHeaders: {
-    [key: string]: any
-  }
-}
-
-export interface Query {
-  _id?: string
-  datasourceId: string
-  name: string
-  parameters: QueryParameter[]
-  fields: RestQueryFields | any
-  transformer: string | null
-  schema: any
-  readable: boolean
-  queryVerb: string
-}

package/src/integrations/base/IntegrationBase.ts

@@ -1,6 +1,6 @@
 export interface IntegrationBase {
-  create?(query: any): Promise<any[]|any>
-  read?(query: any): Promise<any[]|any>
-  update?(query: any): Promise<any[]|any>
-  delete?(query: any): Promise<any[]|any>
+  create?(query: any): Promise<any[]>
+  read?(query: any): Promise<any[]>
+  update?(query: any): Promise<any[]>
+  delete?(query: any): Promise<any[]>
 }

package/src/integrations/oracle.ts

@@ -450,7 +450,7 @@ module OracleModule {
             })
             return lastRow.rows
           } else {
-            return [{ [operation.toLowerCase()]: true }]
+            return [{ [ operation.toLowerCase() ]: true }]
           }
         }
       }