@budibase/server 1.0.80-alpha.3 → 1.0.80

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()
 }