@budibase/worker 2.2.26 → 2.2.27-alpha.1

package/src/tests/api/index.ts

@@ -10,7 +10,10 @@ import { MigrationAPI } from "./migrations"
 import { StatusAPI } from "./status"
 import { RestoreAPI } from "./restore"
 import { TenantAPI } from "./tenants"
-
+import { GroupsAPI } from "./groups"
+import { RolesAPI } from "./roles"
+import { TemplatesAPI } from "./templates"
+import { LicenseAPI } from "./license"
 export default class API {
   accounts: AccountAPI
   auth: AuthAPI
@@ -23,6 +26,10 @@ export default class API {
   status: StatusAPI
   restore: RestoreAPI
   tenants: TenantAPI
+  groups: GroupsAPI
+  roles: RolesAPI
+  templates: TemplatesAPI
+  license: LicenseAPI
 
   constructor(config: TestConfiguration) {
     this.accounts = new AccountAPI(config)
@@ -36,5 +43,9 @@ export default class API {
     this.status = new StatusAPI(config)
     this.restore = new RestoreAPI(config)
     this.tenants = new TenantAPI(config)
+    this.groups = new GroupsAPI(config)
+    this.roles = new RolesAPI(config)
+    this.templates = new TemplatesAPI(config)
+    this.license = new LicenseAPI(config)
   }
 }

package/src/tests/api/license.ts

@@ -0,0 +1,17 @@
+import TestConfiguration from "../TestConfiguration"
+import { TestAPI } from "./base"
+
+export class LicenseAPI extends TestAPI {
+  constructor(config: TestConfiguration) {
+    super(config)
+  }
+
+  activate = async (licenseKey: string) => {
+    return this.request
+      .post("/api/global/license/activate")
+      .send({ licenseKey: licenseKey })
+      .set(this.config.defaultHeaders())
+      .expect("Content-Type", /json/)
+      .expect(200)
+  }
+}

package/src/tests/api/roles.ts

@@ -0,0 +1,32 @@
+import TestConfiguration from "../TestConfiguration"
+import { TestAPI, TestAPIOpts } from "./base"
+
+export class RolesAPI extends TestAPI {
+  constructor(config: TestConfiguration) {
+    super(config)
+  }
+
+  get = (opts?: TestAPIOpts) => {
+    return this.request
+      .get(`/api/global/roles`)
+      .set(this.config.defaultHeaders())
+      .expect("Content-Type", /json/)
+      .expect(opts?.status ? opts.status : 200)
+  }
+
+  find = (appId: string, opts?: TestAPIOpts) => {
+    return this.request
+      .get(`/api/global/roles/${appId}`)
+      .set(this.config.defaultHeaders())
+      .expect("Content-Type", /json/)
+      .expect(opts?.status ? opts.status : 200)
+  }
+
+  remove = (appId: string, opts?: TestAPIOpts) => {
+    return this.request
+      .delete(`/api/global/roles/${appId}`)
+      .set(this.config.defaultHeaders())
+      .expect("Content-Type", /json/)
+      .expect(opts?.status ? opts.status : 200)
+  }
+}

package/src/tests/api/templates.ts

@@ -0,0 +1,30 @@
+import TestConfiguration from "../TestConfiguration"
+import { TestAPI, TestAPIOpts } from "./base"
+
+export class TemplatesAPI extends TestAPI {
+  constructor(config: TestConfiguration) {
+    super(config)
+  }
+
+  definitions = (opts?: TestAPIOpts) => {
+    return this.request
+      .get(`/api/global/template/definitions`)
+      .set(opts?.headers ? opts.headers : this.config.defaultHeaders())
+      .expect(opts?.status ? opts.status : 200)
+  }
+
+  getTemplate = (opts?: TestAPIOpts) => {
+    return this.request
+      .get(`/api/global/template`)
+      .set(opts?.headers ? opts.headers : this.config.defaultHeaders())
+      .expect(opts?.status ? opts.status : 200)
+  }
+
+  saveTemplate = (data: any, opts?: TestAPIOpts) => {
+    return this.request
+      .post(`/api/global/template`)
+      .send(data)
+      .set(opts?.headers ? opts.headers : this.config.defaultHeaders())
+      .expect(opts?.status ? opts.status : 200)
+  }
+}

package/src/tests/api/users.ts

@@ -5,7 +5,7 @@ import {
   User,
   CreateAdminUserRequest,
 } from "@budibase/types"
-import * as structures from "../structures"
+import structures from "../structures"
 import { generator } from "@budibase/backend-core/tests"
 import TestConfiguration from "../TestConfiguration"
 import { TestAPI, TestAPIOpts } from "./base"
@@ -26,8 +26,8 @@ export class UserAPI extends TestAPI {
         email,
       })
       .set(this.config.defaultHeaders())
-      .expect("Content-Type", /json/)
       .expect(status)
+      .expect("Content-Type", /json/)
 
     if (status !== 200) {
       return { code: undefined, res }
@@ -48,6 +48,7 @@ export class UserAPI extends TestAPI {
       .send({
         password: "newpassword",
         inviteCode: code,
+        firstName: "Ted",
       })
       .expect("Content-Type", /json/)
       .expect(200)
@@ -99,7 +100,7 @@ export class UserAPI extends TestAPI {
       request = {
         email: structures.email(),
         password: generator.string(),
-        tenantId: structures.uuid(),
+        tenantId: structures.tenant.id(),
       }
     }
     const res = await this.request

package/src/tests/index.ts

@@ -1,18 +1,6 @@
-import mocks from "./mocks"
-import { generator } from "@budibase/backend-core/tests"
-import TestConfiguration from "./TestConfiguration"
-import structures from "./structures"
-import API from "./api"
-import { v4 as uuid } from "uuid"
-
-const pkg = {
-  structures,
-  generator,
-  uuid,
-  TENANT_1: structures.TENANT_1,
-  mocks,
-  TestConfiguration,
-  API,
-}
-
-export = pkg
+export { default as mocks } from "./mocks"
+export { generator } from "@budibase/backend-core/tests"
+export { default as TestConfiguration } from "./TestConfiguration"
+export { default as structures } from "./structures"
+export { default as API } from "./api"
+export { v4 as uuid } from "uuid"

package/src/tests/jestEnv.ts

@@ -0,0 +1,11 @@
+process.env.SELF_HOSTED = "0"
+process.env.NODE_ENV = "jest"
+process.env.JWT_SECRET = "test-jwtsecret"
+process.env.LOG_LEVEL = "silent"
+process.env.MULTI_TENANCY = "1"
+process.env.MINIO_URL = "http://localhost"
+process.env.MINIO_ACCESS_KEY = "test"
+process.env.MINIO_SECRET_KEY = "test"
+process.env.PLATFORM_URL = "http://localhost:10000"
+process.env.INTERNAL_API_KEY = "tet"
+process.env.DISABLE_ACCOUNT_PORTAL = "0"

package/src/tests/jestSetup.ts

@@ -1,18 +1,7 @@
-import env from "../environment"
-
-env._set("SELF_HOSTED", "0")
-env._set("NODE_ENV", "jest")
-env._set("JWT_SECRET", "test-jwtsecret")
-env._set("LOG_LEVEL", "silent")
-env._set("MULTI_TENANCY", true)
-env._set("MINIO_URL", "http://localhost")
-env._set("MINIO_ACCESS_KEY", "test")
-env._set("MINIO_SECRET_KEY", "test")
-env._set("PLATFORM_URL", "http://localhost:10000")
-env._set("INTERNAL_API_KEY", "test")
-env._set("DISABLE_ACCOUNT_PORTAL", false)
+import { mocks, testContainerUtils } from "@budibase/backend-core/tests"
 
-import { mocks } from "@budibase/backend-core/tests"
+import env from "../environment"
+import { env as coreEnv } from "@budibase/backend-core"
 
 // must explicitly enable fetch mock
 mocks.fetch.enable()
@@ -22,10 +11,14 @@ mocks.fetch.enable()
 const tk = require("timekeeper")
 tk.freeze(mocks.date.MOCK_DATE)
 
-global.console.log = jest.fn() // console.log are ignored in tests
+if (!process.env.DEBUG) {
+  global.console.log = jest.fn() // console.log are ignored in tests
+}
 
 if (!process.env.CI) {
   // set a longer timeout in dev for debugging
   // 100 seconds
   jest.setTimeout(100000)
 }
+
+testContainerUtils.setupEnv(env, coreEnv)

package/src/tests/mocks/{email.js → email.ts}

@@ -1,4 +1,4 @@
-exports.mock = () => {
+export function mock() {
   // mock the email system
   const sendMailMock = jest.fn()
   const nodemailer = require("nodemailer")

package/src/tests/mocks/index.ts

@@ -1,7 +1,7 @@
-const email = require("./email")
-import { mocks as coreMocks } from "@budibase/backend-core/tests"
+import * as email from "./email"
+import { mocks } from "@budibase/backend-core/tests"
 
-export = {
+export default {
   email,
-  ...coreMocks,
+  ...mocks,
 }

package/src/tests/structures/configs.ts

@@ -1,5 +1,5 @@
-const { Config } = require("../../constants")
-const { utils } = require("@budibase/backend-core")
+import { Config } from "../../constants"
+import { utils } from "@budibase/backend-core"
 
 export function oidc(conf?: any) {
   return {

package/src/tests/structures/groups.ts

@@ -4,7 +4,7 @@ export const UserGroup = () => {
     color: "var(--spectrum-global-color-blue-600)",
     icon: "UserGroup",
     name: "New group",
-    roles: {},
+    roles: { app_uuid1: "ADMIN", app_uuid2: "POWER" },
     users: [],
   }
   return group

package/src/tests/structures/index.ts

@@ -4,9 +4,8 @@ import * as users from "./users"
 import * as groups from "./groups"
 import { v4 as uuid } from "uuid"
 
-const TENANT_ID = "default"
-const TENANT_1 = "tenant1"
-const CSRF_TOKEN = "e3727778-7af0-4226-b5eb-f43cbe60a306"
+export const TENANT_ID = "default"
+export const CSRF_TOKEN = "e3727778-7af0-4226-b5eb-f43cbe60a306"
 
 const pkg = {
   ...structures,
@@ -14,9 +13,8 @@ const pkg = {
   configs,
   users,
   TENANT_ID,
-  TENANT_1,
   CSRF_TOKEN,
   groups,
 }
 
-export = pkg
+export default pkg

package/src/tests/structures/users.ts

@@ -10,7 +10,7 @@ export const user = (userProps?: any): User => {
   return {
     email: newEmail(),
     password: "test",
-    roles: {},
+    roles: { app_test: "admin" },
     ...userProps,
   }
 }

package/src/utilities/appService.ts

@@ -1,7 +1,8 @@
 import fetch from "node-fetch"
-import { constants, tenancy } from "@budibase/backend-core"
+import { constants, tenancy, logging } from "@budibase/backend-core"
 import { checkSlashesInUrl } from "../utilities"
 import env from "../environment"
+import { SyncUserRequest, User } from "@budibase/types"
 
 async function makeAppRequest(url: string, method: string, body: any) {
   if (env.isTest()) {
@@ -17,14 +18,22 @@ async function makeAppRequest(url: string, method: string, body: any) {
     request.body = JSON.stringify(body)
   }
   request.method = method
+
+  // add x-budibase-correlation-id header
+  logging.correlation.setHeader(request.headers)
+
   return fetch(checkSlashesInUrl(env.APPS_URL + url), request)
 }
 
-export async function syncUserInApps(userId: string) {
+export async function syncUserInApps(userId: string, previousUser?: User) {
+  const body: SyncUserRequest = {
+    previousUser,
+  }
+
   const response = await makeAppRequest(
     `/api/users/metadata/sync/${userId}`,
     "POST",
-    {}
+    body
   )
   if (response && response.status !== 200) {
     throw "Unable to sync user."

package/tsconfig.json

@@ -13,7 +13,8 @@
     }
   },
   "ts-node": {
-    "require": ["tsconfig-paths/register"]
+    "require": ["tsconfig-paths/register"],
+    "swc": true
   },
   "references": [
     { "path": "../types" },
@@ -25,7 +26,6 @@
     "package.json"
   ],
   "exclude": [
-    "node_modules",
     "dist"
   ]
 }