@budibase/server 1.0.79-alpha.9 → 1.0.79

package/src/integrations/oracle.ts

@@ -1,24 +1,24 @@
 import {
-  DatasourceFieldTypes,
   Integration,
-  Operation,
-  QueryJson,
+  DatasourceFieldTypes,
   QueryTypes,
   SqlQuery,
+  QueryJson,
+  Operation,
 } from "../definitions/datasource"
 import {
-  buildExternalTableId,
-  convertSqlType,
   finaliseExternalTables,
   getSqlQuery,
+  buildExternalTableId,
+  convertSqlType,
   SqlClients,
 } from "./utils"
 import oracledb, {
-  BindParameters,
-  Connection,
-  ConnectionAttributes,
   ExecuteOptions,
   Result,
+  Connection,
+  ConnectionAttributes,
+  BindParameters,
 } from "oracledb"
 import Sql from "./base/sql"
 import { Table } from "../definitions/common"
@@ -137,7 +137,6 @@ module OracleModule {
 
   class OracleIntegration extends Sql implements DatasourcePlus {
     private readonly config: OracleConfig
-    private index: number = 1
 
     public tables: Record<string, Table> = {}
     public schemaErrors: Record<string, string> = {}
@@ -175,10 +174,6 @@ module OracleModule {
       this.config = config
     }
 
-    getBindingIdentifier(): string {
-      return `:${this.index++}`
-    }
-
     /**
      * Map the flat tabular columns and constraints data into a nested object
      */
@@ -238,14 +233,20 @@ module OracleModule {
       return oracleTables
     }
 
-    private static isSupportedColumn(column: OracleColumn) {
-      return !UNSUPPORTED_TYPES.includes(column.type)
+    private isSupportedColumn(column: OracleColumn) {
+      if (UNSUPPORTED_TYPES.includes(column.type)) {
+        return false
+      }
+
+      return true
     }
 
-    private static isAutoColumn(column: OracleColumn) {
-      return !!(
-        column.default && column.default.toLowerCase().includes("nextval")
-      )
+    private isAutoColumn(column: OracleColumn) {
+      if (column.default && column.default.toLowerCase().includes("nextval")) {
+        return true
+      }
+
+      return false
     }
 
     /**
@@ -253,7 +254,7 @@ module OracleModule {
      * This matches the default behaviour for generating DDL used in knex.
      */
     private isBooleanType(column: OracleColumn): boolean {
-      return (
+      if (
         column.type.toLowerCase() === "number" &&
         Object.values(column.constraints).filter(c => {
           if (
@@ -272,7 +273,11 @@ module OracleModule {
           }
           return false
         }).length > 0
-      )
+      ) {
+        return true
+      }
+
+      return false
     }
 
     private internalConvertType(column: OracleColumn): string {
@@ -312,9 +317,7 @@ module OracleModule {
         // iterate each column on the table
         Object.values(oracleTable.columns)
           // remove columns that we can't read / save
-          .filter(oracleColumn =>
-            OracleIntegration.isSupportedColumn(oracleColumn)
-          )
+          .filter(oracleColumn => this.isSupportedColumn(oracleColumn))
           // match the order of the columns in the db
           .sort((c1, c2) => c1.id - c2.id)
           .forEach(oracleColumn => {
@@ -322,7 +325,7 @@ module OracleModule {
             let fieldSchema = table.schema[columnName]
             if (!fieldSchema) {
               fieldSchema = {
-                autocolumn: OracleIntegration.isAutoColumn(oracleColumn),
+                autocolumn: this.isAutoColumn(oracleColumn),
                 name: columnName,
                 type: this.internalConvertType(oracleColumn),
               }
@@ -348,13 +351,18 @@ module OracleModule {
     private async internalQuery<T>(query: SqlQuery): Promise<Result<T>> {
       let connection
       try {
-        this.index = 1
         connection = await this.getConnection()
 
         const options: ExecuteOptions = { autoCommit: true }
         const bindings: BindParameters = query.bindings || []
 
-        return await connection.execute<T>(query.sql, bindings, options)
+        const result: Result<T> = await connection.execute<T>(
+          query.sql,
+          bindings,
+          options
+        )
+
+        return result
       } finally {
         if (connection) {
           try {

package/src/integrations/postgres.ts

@@ -103,11 +103,30 @@ module PostgresModule {
     },
   }
 
+  async function internalQuery(client: any, query: SqlQuery) {
+    // need to handle a specific issue with json data types in postgres,
+    // new lines inside the JSON data will break it
+    if (query && query.sql) {
+      const matches = query.sql.match(JSON_REGEX)
+      if (matches && matches.length > 0) {
+        for (let match of matches) {
+          const escaped = escapeDangerousCharacters(match)
+          query.sql = query.sql.replace(match, escaped)
+        }
+      }
+    }
+    try {
+      return await client.query(query.sql, query.bindings || [])
+    } catch (err) {
+      // @ts-ignore
+      throw new Error(err)
+    }
+  }
+
   class PostgresIntegration extends Sql implements DatasourcePlus {
     static pool: any
     private readonly client: any
     private readonly config: PostgresConfig
-    private index: number = 1
     public tables: Record<string, Table> = {}
     public schemaErrors: Record<string, string> = {}
 
@@ -144,32 +163,6 @@ module PostgresModule {
       this.setSchema()
     }
 
-    getBindingIdentifier(): string {
-      return `$${this.index++}`
-    }
-
-    async internalQuery(query: SqlQuery) {
-      const client = this.client
-      this.index = 1
-      // need to handle a specific issue with json data types in postgres,
-      // new lines inside the JSON data will break it
-      if (query && query.sql) {
-        const matches = query.sql.match(JSON_REGEX)
-        if (matches && matches.length > 0) {
-          for (let match of matches) {
-            const escaped = escapeDangerousCharacters(match)
-            query.sql = query.sql.replace(match, escaped)
-          }
-        }
-      }
-      try {
-        return await client.query(query.sql, query.bindings || [])
-      } catch (err) {
-        // @ts-ignore
-        throw new Error(err)
-      }
-    }
-
     setSchema() {
       if (!this.config.schema) {
         this.config.schema = "public"
@@ -248,22 +241,22 @@ module PostgresModule {
     }
 
     async create(query: SqlQuery | string) {
-      const response = await this.internalQuery(getSqlQuery(query))
+      const response = await internalQuery(this.client, getSqlQuery(query))
       return response.rows.length ? response.rows : [{ created: true }]
     }
 
     async read(query: SqlQuery | string) {
-      const response = await this.internalQuery(getSqlQuery(query))
+      const response = await internalQuery(this.client, getSqlQuery(query))
       return response.rows
     }
 
     async update(query: SqlQuery | string) {
-      const response = await this.internalQuery(getSqlQuery(query))
+      const response = await internalQuery(this.client, getSqlQuery(query))
       return response.rows.length ? response.rows : [{ updated: true }]
     }
 
     async delete(query: SqlQuery | string) {
-      const response = await this.internalQuery(getSqlQuery(query))
+      const response = await internalQuery(this.client, getSqlQuery(query))
       return response.rows.length ? response.rows : [{ deleted: true }]
     }
 
@@ -273,11 +266,11 @@ module PostgresModule {
       if (Array.isArray(input)) {
         const responses = []
         for (let query of input) {
-          responses.push(await this.internalQuery(query))
+          responses.push(await internalQuery(this.client, query))
         }
         return responses
       } else {
-        const response = await this.internalQuery(input)
+        const response = await internalQuery(this.client, input)
         return response.rows.length ? response.rows : [{ [operation]: true }]
       }
     }

package/src/integrations/tests/mysql.spec.js

@@ -19,7 +19,7 @@ describe("MySQL Integration", () => {
     await config.integration.create({
       sql
     })
-    expect(config.integration.client.query).toHaveBeenCalledWith(sql, {}, expect.any(Function))
+    expect(config.integration.client.query).toHaveBeenCalledWith(sql, [])
   })
 
   it("calls the read method with the correct params", async () => {
@@ -27,7 +27,7 @@ describe("MySQL Integration", () => {
     await config.integration.read({
       sql
     })
-    expect(config.integration.client.query).toHaveBeenCalledWith(sql, {}, expect.any(Function))
+    expect(config.integration.client.query).toHaveBeenCalledWith(sql, [])
   })
 
   it("calls the update method with the correct params", async () => {
@@ -35,7 +35,7 @@ describe("MySQL Integration", () => {
     await config.integration.update({
       sql
     })
-    expect(config.integration.client.query).toHaveBeenCalledWith(sql, {}, expect.any(Function))
+    expect(config.integration.client.query).toHaveBeenCalledWith(sql, [])
   })
 
   it("calls the delete method with the correct params", async () => {
@@ -43,7 +43,7 @@ describe("MySQL Integration", () => {
     await config.integration.delete({
       sql
     })
-    expect(config.integration.client.query).toHaveBeenCalledWith(sql, {}, expect.any(Function))
+    expect(config.integration.client.query).toHaveBeenCalledWith(sql, [])
   })
 
   describe("no rows returned", () => {

package/src/integrations/utils.ts

@@ -40,7 +40,7 @@ const SQL_TYPE_MAP = {
 export enum SqlClients {
   MS_SQL = "mssql",
   POSTGRES = "pg",
-  MY_SQL = "mysql",
+  MY_SQL = "mysql2",
   ORACLE = "oracledb",
 }
 

package/src/tests/utilities/TestConfiguration.js

@@ -25,8 +25,6 @@ const { createASession } = require("@budibase/backend-core/sessions")
 const { user: userCache } = require("@budibase/backend-core/cache")
 const newid = require("../../db/newid")
 const context = require("@budibase/backend-core/context")
-const { generateDevInfoID, SEPARATOR } = require("@budibase/backend-core/db")
-const { encrypt } = require("@budibase/backend-core/encryption")
 
 const GLOBAL_USER_ID = "us_uuid1"
 const EMAIL = "babs@babs.com"
@@ -49,10 +47,6 @@ class TestConfiguration {
     return this.request
   }
 
-  getApp() {
-    return this.app
-  }
-
   getAppId() {
     return this.appId
   }
@@ -89,20 +83,6 @@ class TestConfiguration {
     }
   }
 
-  async generateApiKey(userId = GLOBAL_USER_ID) {
-    const db = getGlobalDB(TENANT_ID)
-    const id = generateDevInfoID(userId)
-    let devInfo
-    try {
-      devInfo = await db.get(id)
-    } catch (err) {
-      devInfo = { _id: id, userId }
-    }
-    devInfo.apiKey = encrypt(`${TENANT_ID}${SEPARATOR}${newid()}`)
-    await db.put(devInfo)
-    return devInfo.apiKey
-  }
-
   async globalUser({
     id = GLOBAL_USER_ID,
     builder = true,
@@ -155,7 +135,7 @@ class TestConfiguration {
     cleanup(this.allApps.map(app => app.appId))
   }
 
-  defaultHeaders(extras = {}) {
+  defaultHeaders() {
     const auth = {
       userId: GLOBAL_USER_ID,
       sessionId: "sessionid",
@@ -174,7 +154,6 @@ class TestConfiguration {
         `${Cookies.CurrentApp}=${appToken}`,
       ],
       [Headers.CSRF_TOKEN]: CSRF_TOKEN,
-      ...extras,
     }
     if (this.appId) {
       headers[Headers.APP_ID] = this.appId
@@ -247,7 +226,7 @@ class TestConfiguration {
 
   async getTable(tableId = null) {
     tableId = tableId || this.table._id
-    return this._req(null, { tableId }, controllers.table.find)
+    return this._req(null, { id: tableId }, controllers.table.find)
   }
 
   async createLinkedTable(relationshipType = null, links = ["link"]) {

package/src/threads/query.js

@@ -2,12 +2,8 @@ const threadUtils = require("./utils")
 threadUtils.threadSetup()
 const ScriptRunner = require("../utilities/scriptRunner")
 const { integrations } = require("../integrations")
-const {
-  processStringSync,
-  findHBSBlocks,
-} = require("@budibase/string-templates")
+const { processStringSync } = require("@budibase/string-templates")
 const { doInAppContext, getAppDB } = require("@budibase/backend-core/context")
-const { isSQL } = require("../integrations/utils")
 
 class QueryRunner {
   constructor(input, flags = { noRecursiveQuery: false }) {
@@ -27,47 +23,23 @@ class QueryRunner {
     this.hasRerun = false
   }
 
-  interpolateSQL(fields, parameters, integration) {
-    let sql = fields.sql
-    if (!sql) {
-      return fields
-    }
-    const bindings = findHBSBlocks(sql)
-    let variables = []
-    for (let binding of bindings) {
-      let variable = integration.getBindingIdentifier()
-      variables.push(binding)
-      sql = sql.replace(binding, variable)
-    }
-    // replicate the knex structure
-    fields.sql = sql
-    fields.bindings = this.enrichQueryFields(variables, parameters)
-    return fields
-  }
-
   async execute() {
     let { datasource, fields, queryVerb, transformer } = this
-    const Integration = integrations[datasource.source]
-    if (!Integration) {
-      throw "Integration type does not exist."
-    }
-    const integration = new Integration(datasource.config)
-
     // pre-query, make sure datasource variables are added to parameters
     const parameters = await this.addDatasourceVariables()
-    let query
-    // handle SQL injections by interpolating the variables
-    if (isSQL(datasource)) {
-      query = this.interpolateSQL(fields, parameters, integration)
-    } else {
-      query = this.enrichQueryFields(fields, parameters)
-    }
+    let query = this.enrichQueryFields(fields, parameters)
 
     // Add pagination values for REST queries
     if (this.pagination) {
       query.paginationValues = this.pagination
     }
 
+    const Integration = integrations[datasource.source]
+    if (!Integration) {
+      throw "Integration type does not exist."
+    }
+    const integration = new Integration(datasource.config)
+
     let output = threadUtils.formatResponse(await integration[queryVerb](query))
     let rows = output,
       info = undefined,
@@ -207,7 +179,7 @@ class QueryRunner {
   }
 
   enrichQueryFields(fields, parameters = {}) {
-    const enrichedQuery = Array.isArray(fields) ? [] : {}
+    const enrichedQuery = {}
 
     // enrich the fields with dynamic parameters
     for (let key of Object.keys(fields)) {

package/src/utilities/workerRequests.js

@@ -26,31 +26,11 @@ function request(ctx, request) {
     delete request.body
   }
   if (ctx && ctx.headers) {
-    request.headers = ctx.headers
+    request.headers.cookie = ctx.headers.cookie
   }
   return request
 }
 
-async function checkResponse(response, errorMsg, { ctx } = {}) {
-  if (response.status !== 200) {
-    let error
-    try {
-      error = await response.json()
-    } catch (err) {
-      error = await response.text()
-    }
-    const msg = `Unable to ${errorMsg} - ${
-      error.message ? error.message : error
-    }`
-    if (ctx) {
-      ctx.throw(400, msg)
-    } else {
-      throw msg
-    }
-  }
-  return response.json()
-}
-
 exports.request = request
 
 // have to pass in the tenant ID as this could be coming from an automation
@@ -70,17 +50,25 @@ exports.sendSmtpEmail = async (to, from, subject, contents, automation) => {
       },
     })
   )
-  return checkResponse(response, "send email")
+
+  if (response.status !== 200) {
+    const error = await response.text()
+    throw `Unable to send email - ${error}`
+  }
+  return response.json()
 }
 
 exports.getGlobalSelf = async (ctx, appId = null) => {
-  const endpoint = `/api/global/self`
+  const endpoint = `/api/global/users/self`
   const response = await fetch(
     checkSlashesInUrl(env.WORKER_URL + endpoint),
     // we don't want to use API key when getting self
     request(ctx, { method: "GET" })
   )
-  let json = await checkResponse(response, "get self globally", { ctx })
+  if (response.status !== 200) {
+    ctx.throw(400, "Unable to get self globally.")
+  }
+  let json = await response.json()
   if (appId) {
     json = updateAppRole(json)
   }
@@ -95,45 +83,8 @@ exports.removeAppFromUserRoles = async (ctx, appId) => {
       method: "DELETE",
     })
   )
-  return checkResponse(response, "remove app role")
-}
-
-exports.allGlobalUsers = async ctx => {
-  const response = await fetch(
-    checkSlashesInUrl(env.WORKER_URL + "/api/global/users"),
-    // we don't want to use API key when getting self
-    request(ctx, { method: "GET" })
-  )
-  return checkResponse(response, "get users", { ctx })
-}
-
-exports.saveGlobalUser = async ctx => {
-  const response = await fetch(
-    checkSlashesInUrl(env.WORKER_URL + "/api/global/users"),
-    // we don't want to use API key when getting self
-    request(ctx, { method: "POST", body: ctx.request.body })
-  )
-  return checkResponse(response, "save user", { ctx })
-}
-
-exports.deleteGlobalUser = async ctx => {
-  const response = await fetch(
-    checkSlashesInUrl(
-      env.WORKER_URL + `/api/global/users/${ctx.params.userId}`
-    ),
-    // we don't want to use API key when getting self
-    request(ctx, { method: "DELETE" })
-  )
-  return checkResponse(response, "delete user", { ctx, body: ctx.request.body })
-}
-
-exports.readGlobalUser = async ctx => {
-  const response = await fetch(
-    checkSlashesInUrl(
-      env.WORKER_URL + `/api/global/users/${ctx.params.userId}`
-    ),
-    // we don't want to use API key when getting self
-    request(ctx, { method: "GET" })
-  )
-  return checkResponse(response, "get user", { ctx })
+  if (response.status !== 200) {
+    throw "Unable to remove app role"
+  }
+  return response.json()
 }