@budibase/server 2.6.19-alpha.0 → 2.6.20

package/src/sdk/app/datasources/datasources.ts

@@ -13,7 +13,6 @@ import {
 import { cloneDeep } from "lodash/fp"
 import { getEnvironmentVariables } from "../../utils"
 import { getDefinitions, getDefinition } from "../../../integrations"
-import _ from "lodash"
 
 const ENV_VAR_PREFIX = "env."
 
@@ -42,7 +41,7 @@ async function enrichDatasourceWithValues(datasource: Datasource) {
     { onlyFound: true }
   ) as Datasource
   const definition = await getDefinition(processed.source)
-  processed.config = checkDatasourceTypes(definition!, processed.config)
+  processed.config = checkDatasourceTypes(definition, processed.config)
   return {
     datasource: processed,
     envVars: env as Record<string, string>,
@@ -148,11 +147,6 @@ export function mergeConfigs(update: Datasource, old: Datasource) {
       }
     }
   }
-
-  if (old.config?.auth) {
-    update.config = _.merge(old.config, update.config)
-  }
-
   // update back to actual passwords for everything else
   for (let [key, value] of Object.entries(update.config)) {
     if (value !== PASSWORD_REPLACEMENT) {

package/src/sdk/users/utils.ts

@@ -7,7 +7,7 @@ import {
   InternalTables,
 } from "../../db/utils"
 import { isEqual } from "lodash"
-import { ContextUser, UserMetadata, User } from "@budibase/types"
+import { ContextUser, UserMetadata, User, Database } from "@budibase/types"
 
 export function combineMetadataAndUser(
   user: ContextUser,
@@ -51,8 +51,10 @@ export function combineMetadataAndUser(
   return null
 }
 
-export async function rawUserMetadata() {
-  const db = context.getAppDB()
+export async function rawUserMetadata(db?: Database) {
+  if (!db) {
+    db = context.getAppDB()
+  }
   return (
     await db.allDocs(
       getUserMetadataParams(null, {
@@ -64,30 +66,36 @@ export async function rawUserMetadata() {
 
 export async function syncGlobalUsers() {
   // sync user metadata
-  const db = context.getAppDB()
-  const resp = await Promise.all([getGlobalUsers(), rawUserMetadata()])
-  const users = resp[0] as User[]
-  const metadata = resp[1] as UserMetadata[]
-  const toWrite = []
-  for (let user of users) {
-    const combined = combineMetadataAndUser(user, metadata)
-    if (combined) {
-      toWrite.push(combined)
-    }
-  }
-  let foundEmails: string[] = []
-  for (let data of metadata) {
-    if (!data._id) {
+  const dbs = [context.getDevAppDB(), context.getProdAppDB()]
+  for (let db of dbs) {
+    if (!(await db.exists())) {
       continue
     }
-    const alreadyExisting = data.email && foundEmails.indexOf(data.email) !== -1
-    const globalId = getGlobalIDFromUserMetadataID(data._id)
-    if (!users.find(user => user._id === globalId) || alreadyExisting) {
-      toWrite.push({ ...data, _deleted: true })
+    const resp = await Promise.all([getGlobalUsers(), rawUserMetadata(db)])
+    const users = resp[0] as User[]
+    const metadata = resp[1] as UserMetadata[]
+    const toWrite = []
+    for (let user of users) {
+      const combined = combineMetadataAndUser(user, metadata)
+      if (combined) {
+        toWrite.push(combined)
+      }
     }
-    if (data.email) {
-      foundEmails.push(data.email)
+    let foundEmails: string[] = []
+    for (let data of metadata) {
+      if (!data._id) {
+        continue
+      }
+      const alreadyExisting =
+        data.email && foundEmails.indexOf(data.email) !== -1
+      const globalId = getGlobalIDFromUserMetadataID(data._id)
+      if (!users.find(user => user._id === globalId) || alreadyExisting) {
+        toWrite.push({ ...data, _deleted: true })
+      }
+      if (data.email) {
+        foundEmails.push(data.email)
+      }
     }
+    await db.bulkDocs(toWrite)
   }
-  await db.bulkDocs(toWrite)
 }

package/src/utilities/global.ts

@@ -122,11 +122,8 @@ export async function getGlobalUsers(
       delete user.forceResetPassword
       return user
     })
-  if (!appId) {
-    return globalUsers
-  }
 
-  if (opts?.noProcessing) {
+  if (opts?.noProcessing || !appId) {
     return globalUsers
   } else {
     // pass in the groups, meaning we don't actually need to retrieve them for

package/tsconfig.json

@@ -11,7 +11,7 @@
       "@budibase/backend-core": ["../backend-core/src"],
       "@budibase/backend-core/*": ["../backend-core/*"],
       "@budibase/shared-core": ["../shared-core/src"],
-      "@budibase/pro": ["../pro/packages/pro/src"]
+      "@budibase/pro": ["../../../budibase-pro/packages/pro/src"]
     }
   },
   "ts-node": {

package/src/automations/tests/make.spec.ts

@@ -1,54 +0,0 @@
-import { getConfig, afterAll, runStep, actions } from "./utilities"
-
-describe("test the outgoing webhook action", () => {
-  let config = getConfig()
-
-  beforeAll(async () => {
-    await config.init()
-  })
-
-  afterAll()
-
-  it("should be able to run the action", async () => {
-    const res = await runStep(actions.integromat.stepId, {
-      value1: "test",
-      url: "http://www.test.com",
-    })
-    expect(res.response.url).toEqual("http://www.test.com")
-    expect(res.response.method).toEqual("post")
-    expect(res.success).toEqual(true)
-  })
-
-  it("should add the payload props when a JSON string is provided", async () => {
-    const payload = `{"value1":1,"value2":2,"value3":3,"value4":4,"value5":5,"name":"Adam","age":9}`
-    const res = await runStep(actions.integromat.stepId, {
-      value1: "ONE",
-      value2: "TWO",
-      value3: "THREE",
-      value4: "FOUR",
-      value5: "FIVE",
-      body: {
-        value: payload,
-      },
-      url: "http://www.test.com",
-    })
-    expect(res.response.url).toEqual("http://www.test.com")
-    expect(res.response.method).toEqual("post")
-    expect(res.response.body).toEqual(payload)
-    expect(res.success).toEqual(true)
-  })
-
-  it("should return a 400 if the JSON payload string is malformed", async () => {
-    const payload = `{ value1 1 }`
-    const res = await runStep(actions.integromat.stepId, {
-      value1: "ONE",
-      body: {
-        value: payload,
-      },
-      url: "http://www.test.com",
-    })
-    expect(res.httpStatus).toEqual(400)
-    expect(res.response).toEqual("Invalid payload JSON")
-    expect(res.success).toEqual(false)
-  })
-})

package/src/automations/tests/zapier.spec.ts

@@ -1,56 +0,0 @@
-import { getConfig, afterAll, runStep, actions } from "./utilities"
-
-describe("test the outgoing webhook action", () => {
-  let config = getConfig()
-
-  beforeAll(async () => {
-    await config.init()
-  })
-
-  afterAll()
-
-  it("should be able to run the action", async () => {
-    const res = await runStep(actions.zapier.stepId, {
-      value1: "test",
-      url: "http://www.test.com",
-    })
-    expect(res.response.url).toEqual("http://www.test.com")
-    expect(res.response.method).toEqual("post")
-    expect(res.success).toEqual(true)
-  })
-
-  it("should add the payload props when a JSON string is provided", async () => {
-    const payload = `{ "value1": 1, "value2": 2, "value3": 3, "value4": 4, "value5": 5, "name": "Adam", "age": 9 }`
-    const res = await runStep(actions.zapier.stepId, {
-      value1: "ONE",
-      value2: "TWO",
-      value3: "THREE",
-      value4: "FOUR",
-      value5: "FIVE",
-      body: {
-        value: payload,
-      },
-      url: "http://www.test.com",
-    })
-    expect(res.response.url).toEqual("http://www.test.com")
-    expect(res.response.method).toEqual("post")
-    expect(res.response.body).toEqual(
-      `{"platform":"budibase","value1":1,"value2":2,"value3":3,"value4":4,"value5":5,"name":"Adam","age":9}`
-    )
-    expect(res.success).toEqual(true)
-  })
-
-  it("should return a 400 if the JSON payload string is malformed", async () => {
-    const payload = `{ value1 1 }`
-    const res = await runStep(actions.zapier.stepId, {
-      value1: "ONE",
-      body: {
-        value: payload,
-      },
-      url: "http://www.test.com",
-    })
-    expect(res.httpStatus).toEqual(400)
-    expect(res.response).toEqual("Invalid payload JSON")
-    expect(res.success).toEqual(false)
-  })
-})