@budibase/server 1.0.219-alpha.7 → 1.0.219

package/src/threads/index.ts

@@ -77,7 +77,7 @@ export class Thread {
     })
   }
 
-  static stopThreads() {
+  static shutdown() {
     return new Promise<void>(resolve => {
       if (Thread.workerRefs.length === 0) {
         resolve()
@@ -95,8 +95,4 @@ export class Thread {
       Thread.workerRefs = []
     })
   }
-
-  static async shutdown() {
-    await Thread.stopThreads()
-  }
 }

package/src/threads/query.js

@@ -4,13 +4,6 @@ const ScriptRunner = require("../utilities/scriptRunner")
 const { integrations } = require("../integrations")
 const { processStringSync } = require("@budibase/string-templates")
 const { doInAppContext, getAppDB } = require("@budibase/backend-core/context")
-const {
-  refreshOAuthToken,
-  updateUserOAuth,
-} = require("@budibase/backend-core/auth")
-const { user: userCache } = require("@budibase/backend-core/cache")
-const { getGlobalIDFromUserMetadataID } = require("../db/utils")
-
 const { isSQL } = require("../integrations/utils")
 const {
   enrichQueryFields,
@@ -28,56 +21,29 @@ class QueryRunner {
     this.queryId = input.queryId
     this.noRecursiveQuery = flags.noRecursiveQuery
     this.cachedVariables = []
-    // Additional context items for enrichment
-    this.ctx = input.ctx
     // allows the response from a query to be stored throughout this
     // execution so that if it needs to be re-used for another variable
     // it can be
     this.queryResponse = {}
     this.hasRerun = false
-    this.hasRefreshedOAuth = false
   }
 
   async execute() {
     let { datasource, fields, queryVerb, transformer } = this
-
     const Integration = integrations[datasource.source]
     if (!Integration) {
       throw "Integration type does not exist."
     }
-
-    if (datasource.config.authConfigs) {
-      datasource.config.authConfigs = datasource.config.authConfigs.map(
-        config => {
-          return enrichQueryFields(config, this.ctx)
-        }
-      )
-    }
-
     const integration = new Integration(datasource.config)
 
     // pre-query, make sure datasource variables are added to parameters
     const parameters = await this.addDatasourceVariables()
-
-    // Enrich the parameters with the addition context items.
-    // 'user' is now a reserved variable key in mapping parameters
-    const enrichedParameters = enrichQueryFields(parameters, this.ctx)
-    const enrichedContext = { ...enrichedParameters, ...this.ctx }
-
-    // Parse global headers
-    if (datasource.config.defaultHeaders) {
-      datasource.config.defaultHeaders = enrichQueryFields(
-        datasource.config.defaultHeaders,
-        enrichedContext
-      )
-    }
-
     let query
     // handle SQL injections by interpolating the variables
     if (isSQL(datasource)) {
-      query = interpolateSQL(fields, enrichedParameters, integration)
+      query = interpolateSQL(fields, parameters, integration)
     } else {
-      query = enrichQueryFields(fields, enrichedContext)
+      query = enrichQueryFields(fields, parameters)
     }
 
     // Add pagination values for REST queries
@@ -101,24 +67,20 @@ class QueryRunner {
     if (transformer) {
       const runner = new ScriptRunner(transformer, {
         data: rows,
-        params: enrichedParameters,
+        params: parameters,
       })
       rows = runner.execute()
     }
 
     // if the request fails we retry once, invalidating the cached value
-    if (info && info.code >= 400 && !this.hasRerun) {
-      if (
-        this.ctx.user?.provider &&
-        info.code === 401 &&
-        !this.hasRefreshedOAuth
-      ) {
-        await this.refreshOAuth2(this.ctx)
-        // Attempt to refresh the access token from the provider
-        this.hasRefreshedOAuth = true
-      }
-
+    if (
+      info &&
+      info.code >= 400 &&
+      this.cachedVariables.length > 0 &&
+      !this.hasRerun
+    ) {
       this.hasRerun = true
+      // invalidate the cache value
       await threadUtils.invalidateDynamicVariables(this.cachedVariables)
       return this.execute()
     }
@@ -164,37 +126,6 @@ class QueryRunner {
     ).execute()
   }
 
-  async refreshOAuth2(ctx) {
-    const { oauth2, providerType, _id } = ctx.user
-    const { configId } = ctx.auth
-
-    if (!providerType || !oauth2?.refreshToken) {
-      throw new Error("No refresh token found for authenticated user")
-    }
-
-    const resp = await refreshOAuthToken(
-      oauth2.refreshToken,
-      providerType,
-      configId
-    )
-
-    // Refresh session flow. Should be in same location as refreshOAuthToken
-    // There are several other properties available in 'resp'
-    if (!resp.err) {
-      const globalUserId = getGlobalIDFromUserMetadataID(_id)
-      await updateUserOAuth(globalUserId, resp)
-      this.ctx.user = await userCache.getUser(globalUserId)
-    } else {
-      // In this event the user may have oAuth issues that
-      // could require re-authenticating with their provider.
-      throw new Error(
-        "OAuth2 access token could not be refreshed: " + resp.err.toString()
-      )
-    }
-
-    return resp
-  }
-
   async getDynamicVariable(variable) {
     let { parameters } = this
     const queryId = variable.queryId,

package/src/utilities/fileSystem/index.js

@@ -21,7 +21,6 @@ const env = require("../../environment")
 const {
   USER_METDATA_PREFIX,
   LINK_USER_METADATA_PREFIX,
-  TABLE_ROW_PREFIX,
 } = require("../../db/utils")
 const MemoryStream = require("memorystream")
 const { getAppId } = require("@budibase/backend-core/context")
@@ -110,23 +109,6 @@ exports.apiFileReturn = contents => {
   return fs.createReadStream(path)
 }
 
-exports.defineFilter = excludeRows => {
-  if (excludeRows) {
-    return doc =>
-      !(
-        doc._id.includes(USER_METDATA_PREFIX) ||
-        doc._id.includes(LINK_USER_METADATA_PREFIX) ||
-        doc._id.includes(TABLE_ROW_PREFIX)
-      )
-  } else if (!excludeRows) {
-    return doc =>
-      !(
-        doc._id.includes(USER_METDATA_PREFIX) ||
-        doc._id.includes(LINK_USER_METADATA_PREFIX)
-      )
-  }
-}
-
 /**
  * Local utility to back up the database state for an app, excluding global user
  * data or user relationships.
@@ -134,10 +116,14 @@ exports.defineFilter = excludeRows => {
  * @param {object} config Config to send to export DB
  * @returns {*} either a string or a stream of the backup
  */
-const backupAppData = async (appId, config, includeRows) => {
+const backupAppData = async (appId, config) => {
   return await exports.exportDB(appId, {
     ...config,
-    filter: exports.defineFilter(includeRows),
+    filter: doc =>
+      !(
+        doc._id.includes(USER_METDATA_PREFIX) ||
+        doc._id.includes(LINK_USER_METADATA_PREFIX)
+      ),
   })
 }
 
@@ -156,8 +142,8 @@ exports.performBackup = async (appId, backupName) => {
  * @param {string} appId The ID of the app which is to be backed up.
  * @returns {*} a readable stream of the backup which is written in real time
  */
-exports.streamBackup = async (appId, includeRows) => {
-  return await backupAppData(appId, { stream: true }, includeRows)
+exports.streamBackup = async appId => {
+  return await backupAppData(appId, { stream: true })
 }
 
 /**