@budibase/server 2.2.12-alpha.5 → 2.2.13

package/src/api/routes/tests/{backup.spec.ts → backup.spec.js}

@@ -8,10 +8,10 @@ jest.mock("@budibase/backend-core", () => {
   }
 })
 
-import * as setup from "./utilities"
-import { events } from "@budibase/backend-core"
-import sdk from "../../../sdk"
-import { checkBuilderEndpoint } from "./utilities/TestFunctions"
+const { checkBuilderEndpoint } = require("./utilities/TestFunctions")
+const setup = require("./utilities")
+const { events } = require("@budibase/backend-core")
+
 describe("/backups", () => {
   let request = setup.getRequest()
   let config = setup.getConfig()
@@ -30,7 +30,7 @@ describe("/backups", () => {
         .expect(200)
       expect(res.text).toBeDefined()
       expect(res.headers["content-type"]).toEqual("application/gzip")
-      expect(events.app.exported).toBeCalledTimes(1)
+      expect(events.app.exported.mock.calls.length).toBe(1)
     })
 
     it("should apply authorization to endpoint", async () => {
@@ -41,15 +41,4 @@ describe("/backups", () => {
       })
     })
   })
-
-  describe("calculateBackupStats", () => {
-    it("should be able to calculate the backup statistics", async () => {
-      config.createAutomation()
-      config.createScreen()
-      let res = await sdk.backups.calculateBackupStats(config.getAppId())
-      expect(res.automations).toEqual(1)
-      expect(res.datasources).toEqual(1)
-      expect(res.screens).toEqual(1)
-    })
-  })
-})
+})

package/src/api/routes/tests/{datasource.spec.ts → datasource.spec.js}

@@ -1,16 +1,16 @@
 jest.mock("pg")
-import * as setup from "./utilities"
-import { checkBuilderEndpoint } from "./utilities/TestFunctions"
-import { checkCacheForDynamicVariable } from "../../../threads/utils"
-import { events } from "@budibase/backend-core"
 
+let setup = require("./utilities")
 let { basicDatasource } = setup.structures
+let { checkBuilderEndpoint } = require("./utilities/TestFunctions")
 const pg = require("pg")
+const { checkCacheForDynamicVariable } = require("../../../threads/utils")
+const { events } = require("@budibase/backend-core") 
 
 describe("/datasources", () => {
   let request = setup.getRequest()
   let config = setup.getConfig()
-  let datasource: any
+  let datasource
 
   afterAll(setup.afterAll)
 
@@ -26,7 +26,7 @@ describe("/datasources", () => {
         .post(`/api/datasources`)
         .send(basicDatasource())
         .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
+        .expect('Content-Type', /json/)
         .expect(200)
 
       expect(res.body.datasource.name).toEqual("Test")
@@ -42,7 +42,7 @@ describe("/datasources", () => {
         .put(`/api/datasources/${datasource._id}`)
         .send(datasource)
         .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
+        .expect('Content-Type', /json/)
         .expect(200)
 
       expect(res.body.datasource.name).toEqual("Updated Test")
@@ -51,34 +51,25 @@ describe("/datasources", () => {
     })
 
     describe("dynamic variables", () => {
-      async function preview(
-        datasource: any,
-        fields: { path: string; queryString: string }
-      ) {
+      async function preview(datasource, fields) {
         return config.previewQuery(request, config, datasource, fields)
       }
 
       it("should invalidate changed or removed variables", async () => {
         const { datasource, query } = await config.dynamicVariableDatasource()
         // preview once to cache variables
-        await preview(datasource, {
-          path: "www.test.com",
-          queryString: "test={{ variable3 }}",
-        })
+        await preview(datasource, { path: "www.test.com", queryString: "test={{ variable3 }}" })
         // check variables in cache
-        let contents = await checkCacheForDynamicVariable(
-          query._id,
-          "variable3"
-        )
+        let contents = await checkCacheForDynamicVariable(query._id, "variable3")
         expect(contents.rows.length).toEqual(1)
-
+        
         // update the datasource to remove the variables
         datasource.config.dynamicVariables = []
         const res = await request
           .put(`/api/datasources/${datasource._id}`)
           .send(datasource)
           .set(config.defaultHeaders())
-          .expect("Content-Type", /json/)
+          .expect('Content-Type', /json/)
           .expect(200)
         expect(res.body.errors).toBeUndefined()
 
@@ -94,7 +85,7 @@ describe("/datasources", () => {
       const res = await request
         .get(`/api/datasources`)
         .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
+        .expect('Content-Type', /json/)
         .expect(200)
 
       const datasources = res.body
@@ -169,7 +160,7 @@ describe("/datasources", () => {
       const res = await request
         .get(`/api/datasources`)
         .set(config.defaultHeaders())
-        .expect("Content-Type", /json/)
+        .expect('Content-Type', /json/)
         .expect(200)
 
       expect(res.body.length).toEqual(1)
@@ -183,5 +174,6 @@ describe("/datasources", () => {
         url: `/api/datasources/${datasource._id}/${datasource._rev}`,
       })
     })
+
   })
 })

package/src/api/routes/tests/deployment.spec.ts

@@ -0,0 +1,25 @@
+import * as setup from "./utilities"
+import { events } from "@budibase/backend-core"
+
+describe("/deployments", () => {
+  let request = setup.getRequest()
+  let config = setup.getConfig()
+
+  afterAll(setup.afterAll)
+
+  beforeEach(async () => {
+    await config.init()
+    jest.clearAllMocks()
+  })
+
+  describe("deploy", () => {
+    it("should deploy the application", async () => {
+      await request
+        .post(`/api/deploy`)
+        .set(config.defaultHeaders())
+        .expect("Content-Type", /json/)
+        .expect(200)
+      expect((events.app.published as jest.Mock).mock.calls.length).toBe(1)
+    })
+  })
+})

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

@@ -92,7 +92,7 @@ describe("/permission", () => {
   describe("check public user allowed", () => {
     it("should be able to read the row", async () => {
       // replicate changes before checking permissions
-      await config.publish()
+      await config.deploy()
 
       const res = await request
         .get(`/api/${table._id}/rows`)

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

@@ -9,6 +9,7 @@ const route = "/test"
 // there are checks which are disabled in test env,
 // these checks need to be enabled for this test
 
+
 describe("/routing", () => {
   let request = setup.getRequest()
   let config = setup.getConfig()
@@ -25,7 +26,7 @@ describe("/routing", () => {
     screen2.routing.roleId = BUILTIN_ROLE_IDS.POWER
     screen2.routing.route = route
     screen2 = await config.createScreen(screen2)
-    await config.publish()
+    await config.deploy()
   })
 
   describe("fetch", () => {

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

@@ -10,7 +10,6 @@ const {
   StaticQuotaName,
   MonthlyQuotaName,
 } = require("@budibase/types")
-const { structures } = require("@budibase/backend-core/tests");
 
 describe("/rows", () => {
   let request = setup.getRequest()
@@ -495,13 +494,12 @@ describe("/rows", () => {
   describe("attachments", () => {
     it("should allow enriching attachment rows", async () => {
       const table = await config.createAttachmentTable()
-      const attachmentId = `${structures.uuid()}.csv`
       const row = await config.createRow({
         name: "test",
         description: "test",
         attachment: [
           {
-            key: `${config.getAppId()}/attachments/${attachmentId}`,
+            key: `${config.getAppId()}/attachments/test/thing.csv`,
           },
         ],
         tableId: table._id,
@@ -511,7 +509,7 @@ describe("/rows", () => {
         context.doInAppContext(config.getAppId(), async () => {
           const enriched = await outputProcessing(table, [row])
           expect(enriched[0].attachment[0].url).toBe(
-            `/files/signed/prod-budi-app-assets/${config.getProdAppId()}/attachments/${attachmentId}`
+            `/prod-budi-app-assets/${config.getAppId()}/attachments/test/thing.csv`
           )
         })
       })

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

@@ -1,5 +1,20 @@
+jest.mock("node-fetch")
+jest.mock("aws-sdk", () => ({
+  config: {
+    update: jest.fn(),
+  },
+  DynamoDB: {
+    DocumentClient: jest.fn(),
+  },
+  S3: jest.fn(() => ({
+    getSignedUrl: jest.fn(() => {
+      return "my-url"
+    }),
+  })),
+}))
+
 const setup = require("./utilities")
-const { constants } = require("@budibase/backend-core")
+const { events, constants } = require("@budibase/backend-core")
 
 describe("/static", () => {
   let request = setup.getRequest()
@@ -87,7 +102,7 @@ describe("/static", () => {
           .set(config.defaultHeaders())
           .expect("Content-Type", /json/)
           .expect(200)
-        expect(res.body.signedUrl).toEqual("http://test.com/foo/bar")
+        expect(res.body.signedUrl).toEqual("my-url")
         expect(res.body.publicUrl).toEqual(
           `https://${bucket}.s3.eu-west-1.amazonaws.com/${key}`
         )

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

@@ -51,7 +51,7 @@ describe("/tables", () => {
       table.dataImport.schema = table.schema
 
       const res = await createTable(table)
-
+ 
       expect(events.table.created).toBeCalledTimes(1)
       expect(events.table.created).toBeCalledWith(res.body)
       expect(events.table.imported).toBeCalledTimes(1)
@@ -87,12 +87,6 @@ describe("/tables", () => {
 
     it("updates all the row fields for a table when a schema key is renamed", async () => {
       const testTable = await config.createTable()
-      await config.createView({
-        name: "TestView",
-        field: "Price",
-        calculation: "stats",
-        tableId: testTable._id,
-      })
 
       const testRow = await request
         .post(`/api/${testTable._id}/rows`)
@@ -115,7 +109,7 @@ describe("/tables", () => {
             updated: "updatedName"
           },
           schema: {
-            updatedName: { type: "string" }
+            updatedName: {type: "string"}
           }
         })
         .set(config.defaultHeaders())

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

@@ -90,90 +90,4 @@ describe("/users", () => {
       expect(res.body.tableId).toBeDefined()
     })
   })
-  describe("setFlag", () => {
-    it("should throw an error if a flag is not provided", async () => {
-      await config.createUser()
-      const res = await request
-        .post(`/api/users/flags`)
-        .set(config.defaultHeaders())
-        .send({ value: "test" })
-        .expect(400)
-        .expect("Content-Type", /json/)
-      expect(res.body.message).toEqual("Must supply a 'flag' field in request body.")
-
-    })
-
-    it("should be able to set a flag on the user", async () => {
-      await config.createUser()
-      const res = await request
-        .post(`/api/users/flags`)
-        .set(config.defaultHeaders())
-        .send({ value: "test", flag: "test" })
-        .expect(200)
-        .expect("Content-Type", /json/)
-      expect(res.body.message).toEqual("Flag set successfully")
-    })
-  })
-
-  describe("getFlags", () => {
-    it("should get flags for a specific user", async () => {
-      let flagData = { value: "test", flag: "test" }
-      await config.createUser()
-      await request
-        .post(`/api/users/flags`)
-        .set(config.defaultHeaders())
-        .send(flagData)
-        .expect(200)
-        .expect("Content-Type", /json/)
-
-      const res = await request
-        .get(`/api/users/flags`)
-        .set(config.defaultHeaders())
-        .expect(200)
-        .expect("Content-Type", /json/)
-      expect(res.body[flagData.value]).toEqual(flagData.flag)
-    })
-  })
-
-  describe("setFlag", () => {
-    it("should throw an error if a flag is not provided", async () => {
-      await config.createUser()
-      const res = await request
-        .post(`/api/users/flags`)
-        .set(config.defaultHeaders())
-        .send({ value: "test" })
-        .expect(400)
-        .expect("Content-Type", /json/)
-      expect(res.body.message).toEqual("Must supply a 'flag' field in request body.")
-
-    })
-
-    it("should be able to set a flag on the user", async () => {
-      await config.createUser()
-      const res = await request
-        .post(`/api/users/flags`)
-        .set(config.defaultHeaders())
-        .send({ value: "test", flag: "test" })
-        .expect(200)
-        .expect("Content-Type", /json/)
-      expect(res.body.message).toEqual("Flag set successfully")
-    })
-  })
-
-  describe("syncUser", () => {
-    it("should sync the user", async () => {
-      let user = await config.createUser()
-      await config.createApp('New App')
-      let res = await request
-        .post(`/api/users/metadata/sync/${user._id}`)
-        .set(config.defaultHeaders())
-        .expect(200)
-        .expect("Content-Type", /json/)
-      expect(res.body.message).toEqual('User synced.')
-    })
-  })
-
-
-
-
 })

package/src/api/routes/tests/utilities/index.ts

@@ -63,14 +63,14 @@ export function afterAll() {
 
 export function getRequest() {
   if (!request) {
-    beforeAll()
+    exports.beforeAll()
   }
   return request
 }
 
 export function getConfig() {
   if (!config) {
-    beforeAll()
+    exports.beforeAll()
   }
   return config
 }

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

@@ -113,7 +113,7 @@ describe("/webhooks", () => {
   describe("trigger", () => {
     it("should allow triggering from public", async () => {
       // replicate changes before checking webhook
-      await config.publish()
+      await config.deploy()
 
       const res = await request
         .post(`/api/webhooks/trigger/${config.prodAppId}/${webhook._id}`)

package/src/automations/automationUtils.ts

@@ -5,7 +5,6 @@ import {
 } from "@budibase/string-templates"
 import sdk from "../sdk"
 import { Row } from "@budibase/types"
-import { LoopStep, LoopStepType, LoopInput } from "../definitions/automations"
 
 /**
  * When values are input to the system generally they will be of type string as this is required for template strings.
@@ -124,26 +123,3 @@ export function stringSplit(value: string | string[]) {
   }
   return value
 }
-
-export function typecastForLooping(loopStep: LoopStep, input: LoopInput) {
-  if (!input || !input.binding) {
-    return null
-  }
-  try {
-    switch (loopStep.inputs.option) {
-      case LoopStepType.ARRAY:
-        if (typeof input.binding === "string") {
-          return JSON.parse(input.binding)
-        }
-        break
-      case LoopStepType.STRING:
-        if (Array.isArray(input.binding)) {
-          return input.binding.join(",")
-        }
-        break
-    }
-  } catch (err) {
-    throw new Error("Unable to cast to correct type")
-  }
-  return input.binding
-}

package/src/automations/tests/utilities/index.ts

@@ -31,7 +31,7 @@ export async function runInProd(fn: any) {
   }
 }
 
-export async function runStep(stepId: string, inputs: any, stepContext?: any) {
+export async function runStep(stepId: string, inputs: any) {
   async function run() {
     let step = await getAction(stepId)
     expect(step).toBeDefined()
@@ -39,7 +39,7 @@ export async function runStep(stepId: string, inputs: any, stepContext?: any) {
       throw new Error("No step found")
     }
     return step({
-      context: stepContext || {},
+      context: {},
       inputs,
       appId: config ? config.getAppId() : null,
       // don't really need an API key, mocked out usage quota, not being tested here

package/src/automations/unitTests/automationUtils.spec.js

@@ -0,0 +1,17 @@
+const automationUtils = require("../automationUtils")
+
+describe("automationUtils", () => {
+    test("substituteLoopStep should allow multiple loop binding substitutes", () => {
+        expect(automationUtils.substituteLoopStep(
+            `{{ loop.currentItem._id }} {{ loop.currentItem._id }} {{ loop.currentItem._id }}`, 
+            "step.2"))
+        .toBe(`{{ step.2.currentItem._id }} {{ step.2.currentItem._id }} {{ step.2.currentItem._id }}`)
+    })
+
+    test("substituteLoopStep should handle not subsituting outside of curly braces", () => {
+        expect(automationUtils.substituteLoopStep(
+            `loop {{ loop.currentItem._id }}loop loop{{ loop.currentItem._id }}loop`, 
+            "step.2"))
+        .toBe(`loop {{ step.2.currentItem._id }}loop loop{{ step.2.currentItem._id }}loop`)
+    })
+})

package/src/definitions/openapi.ts

@@ -102,16 +102,6 @@ export interface components {
         lockedBy?: { [key: string]: unknown };
       };
     };
-    deploymentOutput: {
-      data: {
-        /** @description The ID of the deployment. */
-        _id: string;
-        /** @description The status of the deployment. */
-        status: "SUCCESS" | "FAILURE";
-        /** @description The URL by which the published app is accessed. */
-        appUrl?: string;
-      }
-    };
     applicationSearch: {
       data: {
         /** @description The name of the app. */

package/src/environment.ts

@@ -79,6 +79,7 @@ const environment = {
   // flags
   ALLOW_DEV_AUTOMATIONS: process.env.ALLOW_DEV_AUTOMATIONS,
   DISABLE_THREADING: process.env.DISABLE_THREADING,
+  DISABLE_DEVELOPER_LICENSE: process.env.DISABLE_DEVELOPER_LICENSE,
   DISABLE_AUTOMATION_LOGS: process.env.DISABLE_AUTOMATION_LOGS,
   MULTI_TENANCY: process.env.MULTI_TENANCY,
   ENABLE_ANALYTICS: process.env.ENABLE_ANALYTICS,
@@ -118,11 +119,6 @@ for (let [key, value] of Object.entries(environment)) {
     // @ts-ignore
     environment[key] = 0
   }
-  // handle the edge case of "false" to disable an environment variable
-  if (value === "false") {
-    // @ts-ignore
-    environment[key] = 0
-  }
 }
 
 export = environment

package/src/integrations/googlesheets.ts

@@ -284,7 +284,7 @@ class GoogleSheetsIntegration implements DatasourcePlus {
   async createTable(name?: string) {
     try {
       await this.connect()
-      return await this.client.addSheet({ title: name, headerValues: ["test"] })
+      return await this.client.addSheet({ title: name })
     } catch (err) {
       console.error("Error creating new table in google sheets", err)
       throw err

package/src/integrations/index.ts

@@ -98,7 +98,11 @@ export async function getIntegration(integration: string) {
     for (let plugin of plugins) {
       if (plugin.name === integration) {
         // need to use commonJS require due to its dynamic runtime nature
-        const retrieved: any = await getDatasourcePlugin(plugin)
+        const retrieved: any = await getDatasourcePlugin(
+          plugin.name,
+          plugin.jsUrl,
+          plugin.schema?.hash
+        )
         if (retrieved.integration) {
           return retrieved.integration
         } else {

package/src/migrations/functions/backfill/global/configs.ts

@@ -5,7 +5,6 @@ import {
   isGoogleConfig,
   isOIDCConfig,
   isSettingsConfig,
-  ConfigType,
 } from "@budibase/types"
 import env from "./../../../../environment"
 
@@ -32,15 +31,15 @@ export const backfill = async (
       await events.email.SMTPCreated(timestamp)
     }
     if (isGoogleConfig(config)) {
-      await events.auth.SSOCreated(ConfigType.GOOGLE, timestamp)
+      await events.auth.SSOCreated("google", timestamp)
       if (config.config.activated) {
-        await events.auth.SSOActivated(ConfigType.GOOGLE, timestamp)
+        await events.auth.SSOActivated("google", timestamp)
       }
     }
     if (isOIDCConfig(config)) {
-      await events.auth.SSOCreated(ConfigType.OIDC, timestamp)
+      await events.auth.SSOCreated("oidc", timestamp)
       if (config.config.configs[0].activated) {
-        await events.auth.SSOActivated(ConfigType.OIDC, timestamp)
+        await events.auth.SSOActivated("oidc", timestamp)
       }
     }
     if (isSettingsConfig(config)) {

package/src/sdk/app/backups/imports.ts

@@ -26,7 +26,11 @@ type TemplateType = {
 
 function rewriteAttachmentUrl(appId: string, attachment: RowAttachment) {
   // URL looks like: /prod-budi-app-assets/appId/attachments/file.csv
-  const urlParts = attachment.key.split("/")
+  const urlParts = attachment.url.split("/")
+  // drop the first empty element
+  urlParts.shift()
+  // get the prefix
+  const prefix = urlParts.shift()
   // remove the app ID
   urlParts.shift()
   // add new app ID
@@ -35,7 +39,7 @@ function rewriteAttachmentUrl(appId: string, attachment: RowAttachment) {
   return {
     ...attachment,
     key,
-    url: "", // calculated on retrieval using key
+    url: `/${prefix}/${key}`,
   }
 }
 

package/src/sdk/tests/attachments.spec.ts

@@ -69,7 +69,10 @@ describe("should be able to re-write attachment URLs", () => {
     const finalRows = await sdk.rows.getAllInternalRows(db.name)
     for (let rowToCheck of finalRows) {
       expect(rowToCheck.otherCol).toBe(row.otherCol)
-      expect(rowToCheck.photo[0].url).toBe("")
+      expect(rowToCheck.photo[0].url).not.toBe(row.photo[0].url)
+      expect(rowToCheck.photo[0].url).toBe(
+        `/prod-budi-app-assets/${db.name}/attachments/a.png`
+      )
       expect(rowToCheck.photo[0].key).toBe(`${db.name}/attachments/a.png`)
     }
   })

package/src/tests/jestSetup.ts

@@ -19,10 +19,7 @@ import { mocks } from "@budibase/backend-core/tests"
 const tk = require("timekeeper")
 tk.freeze(mocks.date.MOCK_DATE)
 
-if (!process.env.DEBUG) {
-  global.console.log = jest.fn() // console.log are ignored in tests
-  global.console.warn = jest.fn() // console.warn are ignored in tests
-}
+global.console.log = jest.fn() // console.log are ignored in tests
 
 if (!process.env.CI) {
   // set a longer timeout in dev for debugging