@budibase/worker 1.2.58-alpha.4 → 1.2.58

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

@@ -1,12 +1,11 @@
 // mock the email system
 jest.mock("nodemailer")
-import { TestConfiguration, structures, mocks, API } from "../../../../tests"
+const { config, structures, mocks, request } = require("../../../tests")
 mocks.email.mock()
-import { Configs, events } from "@budibase/backend-core"
+const { Configs } = require("@budibase/backend-core/constants")
+const { events } = require("@budibase/backend-core")
 
 describe("configs", () => {
-  const config = new TestConfiguration()
-  const api = new API(config)
 
   beforeAll(async () => {
     await config.beforeAll()
@@ -21,33 +20,35 @@ describe("configs", () => {
   })
 
   describe("post /api/global/configs", () => {
-    const saveConfig = async (conf: any, _id?: string, _rev?: string) => {
+
+    const saveConfig = async (conf, _id, _rev) => {
       const data = {
         ...conf,
         _id,
-        _rev,
+        _rev
       }
 
-      const res = await api.configs.saveConfig(data)
+      const res = await request
+        .post(`/api/global/configs`)
+        .send(data)
+        .set(config.defaultHeaders())
+        .expect("Content-Type", /json/)
+        .expect(200)
 
       return {
         ...data,
-        ...res.body,
+        ...res.body
       }
     }
 
     describe("google", () => {
-      const saveGoogleConfig = async (
-        conf?: any,
-        _id?: string,
-        _rev?: string
-      ) => {
+      const saveGoogleConfig = async (conf, _id, _rev) => {
         const googleConfig = structures.configs.google(conf)
         return saveConfig(googleConfig, _id, _rev)
       }
-
+  
       describe("create", () => {
-        it("should create activated google config", async () => {
+        it ("should create activated google config", async () => {
           await saveGoogleConfig()
           expect(events.auth.SSOCreated).toBeCalledTimes(1)
           expect(events.auth.SSOCreated).toBeCalledWith(Configs.GOOGLE)
@@ -57,7 +58,7 @@ describe("configs", () => {
           await config.deleteConfig(Configs.GOOGLE)
         })
 
-        it("should create deactivated google config", async () => {
+        it ("should create deactivated google config", async () => {
           await saveGoogleConfig({ activated: false })
           expect(events.auth.SSOCreated).toBeCalledTimes(1)
           expect(events.auth.SSOCreated).toBeCalledWith(Configs.GOOGLE)
@@ -68,14 +69,10 @@ describe("configs", () => {
       })
 
       describe("update", () => {
-        it("should update google config to deactivated", async () => {
+        it ("should update google config to deactivated", async () => {
           const googleConf = await saveGoogleConfig()
           jest.clearAllMocks()
-          await saveGoogleConfig(
-            { ...googleConf.config, activated: false },
-            googleConf._id,
-            googleConf._rev
-          )
+          await saveGoogleConfig({ ...googleConf.config, activated: false }, googleConf._id, googleConf._rev)
           expect(events.auth.SSOUpdated).toBeCalledTimes(1)
           expect(events.auth.SSOUpdated).toBeCalledWith(Configs.GOOGLE)
           expect(events.auth.SSOActivated).not.toBeCalled()
@@ -84,14 +81,10 @@ describe("configs", () => {
           await config.deleteConfig(Configs.GOOGLE)
         })
 
-        it("should update google config to activated", async () => {
+        it ("should update google config to activated", async () => {
           const googleConf = await saveGoogleConfig({ activated: false })
           jest.clearAllMocks()
-          await saveGoogleConfig(
-            { ...googleConf.config, activated: true },
-            googleConf._id,
-            googleConf._rev
-          )
+          await saveGoogleConfig({ ...googleConf.config, activated: true}, googleConf._id, googleConf._rev)
           expect(events.auth.SSOUpdated).toBeCalledTimes(1)
           expect(events.auth.SSOUpdated).toBeCalledWith(Configs.GOOGLE)
           expect(events.auth.SSODeactivated).not.toBeCalled()
@@ -99,21 +92,17 @@ describe("configs", () => {
           expect(events.auth.SSOActivated).toBeCalledWith(Configs.GOOGLE)
           await config.deleteConfig(Configs.GOOGLE)
         })
-      })
+      })     
     })
 
     describe("oidc", () => {
-      const saveOIDCConfig = async (
-        conf?: any,
-        _id?: string,
-        _rev?: string
-      ) => {
+      const saveOIDCConfig = async (conf, _id, _rev) => {
         const oidcConfig = structures.configs.oidc(conf)
         return saveConfig(oidcConfig, _id, _rev)
       }
 
       describe("create", () => {
-        it("should create activated OIDC config", async () => {
+        it ("should create activated OIDC config", async () => {
           await saveOIDCConfig()
           expect(events.auth.SSOCreated).toBeCalledTimes(1)
           expect(events.auth.SSOCreated).toBeCalledWith(Configs.OIDC)
@@ -123,7 +112,7 @@ describe("configs", () => {
           await config.deleteConfig(Configs.OIDC)
         })
 
-        it("should create deactivated OIDC config", async () => {
+        it ("should create deactivated OIDC config", async () => {
           await saveOIDCConfig({ activated: false })
           expect(events.auth.SSOCreated).toBeCalledTimes(1)
           expect(events.auth.SSOCreated).toBeCalledWith(Configs.OIDC)
@@ -134,14 +123,10 @@ describe("configs", () => {
       })
 
       describe("update", () => {
-        it("should update OIDC config to deactivated", async () => {
+        it ("should update OIDC config to deactivated", async () => {
           const oidcConf = await saveOIDCConfig()
           jest.clearAllMocks()
-          await saveOIDCConfig(
-            { ...oidcConf.config.configs[0], activated: false },
-            oidcConf._id,
-            oidcConf._rev
-          )
+          await saveOIDCConfig({ ...oidcConf.config.configs[0], activated: false }, oidcConf._id, oidcConf._rev)
           expect(events.auth.SSOUpdated).toBeCalledTimes(1)
           expect(events.auth.SSOUpdated).toBeCalledWith(Configs.OIDC)
           expect(events.auth.SSOActivated).not.toBeCalled()
@@ -150,14 +135,10 @@ describe("configs", () => {
           await config.deleteConfig(Configs.OIDC)
         })
 
-        it("should update OIDC config to activated", async () => {
+        it ("should update OIDC config to activated", async () => {
           const oidcConf = await saveOIDCConfig({ activated: false })
           jest.clearAllMocks()
-          await saveOIDCConfig(
-            { ...oidcConf.config.configs[0], activated: true },
-            oidcConf._id,
-            oidcConf._rev
-          )
+          await saveOIDCConfig({ ...oidcConf.config.configs[0], activated: true}, oidcConf._id, oidcConf._rev)
           expect(events.auth.SSOUpdated).toBeCalledTimes(1)
           expect(events.auth.SSOUpdated).toBeCalledWith(Configs.OIDC)
           expect(events.auth.SSODeactivated).not.toBeCalled()
@@ -166,20 +147,17 @@ describe("configs", () => {
           await config.deleteConfig(Configs.OIDC)
         })
       })
+
     })
 
     describe("smtp", () => {
-      const saveSMTPConfig = async (
-        conf?: any,
-        _id?: string,
-        _rev?: string
-      ) => {
+      const saveSMTPConfig = async (conf, _id, _rev) => {
         const smtpConfig = structures.configs.smtp(conf)
         return saveConfig(smtpConfig, _id, _rev)
       }
 
       describe("create", () => {
-        it("should create SMTP config", async () => {
+        it ("should create SMTP config", async () => {
           await config.deleteConfig(Configs.SMTP)
           await saveSMTPConfig()
           expect(events.email.SMTPUpdated).not.toBeCalled()
@@ -189,7 +167,7 @@ describe("configs", () => {
       })
 
       describe("update", () => {
-        it("should update SMTP config", async () => {
+        it ("should update SMTP config", async () => {
           const smtpConf = await saveSMTPConfig()
           jest.clearAllMocks()
           await saveSMTPConfig(smtpConf.config, smtpConf._id, smtpConf._rev)
@@ -201,19 +179,15 @@ describe("configs", () => {
     })
 
     describe("settings", () => {
-      const saveSettingsConfig = async (
-        conf?: any,
-        _id?: string,
-        _rev?: string
-      ) => {
+      const saveSettingsConfig = async (conf, _id, _rev) => {
         const settingsConfig = structures.configs.settings(conf)
         return saveConfig(settingsConfig, _id, _rev)
       }
 
       describe("create", () => {
-        it("should create settings config with default settings", async () => {
+        it ("should create settings config with default settings", async () => {
           await config.deleteConfig(Configs.SETTINGS)
-
+          
           await saveSettingsConfig()
 
           expect(events.org.nameUpdated).not.toBeCalled()
@@ -221,43 +195,35 @@ describe("configs", () => {
           expect(events.org.platformURLUpdated).not.toBeCalled()
         })
 
-        it("should create settings config with non-default settings", async () => {
-          config.modeSelf()
+        it ("should create settings config with non-default settings", async () => {
           await config.deleteConfig(Configs.SETTINGS)
           const conf = {
             company: "acme",
             logoUrl: "http://example.com",
-            platformUrl: "http://example.com",
+            platformUrl: "http://example.com"
           }
 
           await saveSettingsConfig(conf)
-
+          
           expect(events.org.nameUpdated).toBeCalledTimes(1)
           expect(events.org.logoUpdated).toBeCalledTimes(1)
           expect(events.org.platformURLUpdated).toBeCalledTimes(1)
-          config.modeAccount()
         })
       })
 
       describe("update", () => {
-        it("should update settings config", async () => {
-          config.modeSelf()
+        it ("should update settings config", async () => {
           await config.deleteConfig(Configs.SETTINGS)
           const settingsConfig = await saveSettingsConfig()
           settingsConfig.config.company = "acme"
           settingsConfig.config.logoUrl = "http://example.com"
           settingsConfig.config.platformUrl = "http://example.com"
 
-          await saveSettingsConfig(
-            settingsConfig.config,
-            settingsConfig._id,
-            settingsConfig._rev
-          )
+          await saveSettingsConfig(settingsConfig.config, settingsConfig._id, settingsConfig._rev)
 
           expect(events.org.nameUpdated).toBeCalledTimes(1)
           expect(events.org.logoUpdated).toBeCalledTimes(1)
           expect(events.org.platformURLUpdated).toBeCalledTimes(1)
-          config.modeAccount()
         })
       })
     })
@@ -266,7 +232,12 @@ describe("configs", () => {
   it("should return the correct checklist status based on the state of the budibase installation", async () => {
     await config.saveSmtpConfig()
 
-    const res = await api.configs.getConfigChecklist()
+    const res = await request
+      .get(`/api/global/configs/checklist`)
+      .set(config.defaultHeaders())
+      .expect("Content-Type", /json/)
+      .expect(200)
+
     const checklist = res.body
 
     expect(checklist.apps.checked).toBeFalsy()

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

@@ -1,11 +1,12 @@
 jest.mock("nodemailer")
-import { TestConfiguration, mocks, API } from "../../../../tests"
+const { config, mocks, structures, request } = require("../../../tests")
 const sendMailMock = mocks.email.mock()
-import { EmailTemplatePurpose } from "../../../../constants"
+
+const { EmailTemplatePurpose } = require("../../../constants")
+
+const TENANT_ID = structures.TENANT_ID
 
 describe("/api/global/email", () => {
-  const config = new TestConfiguration()
-  const api = new API(config)
 
   beforeAll(async () => {
     await config.beforeAll()
@@ -19,9 +20,16 @@ describe("/api/global/email", () => {
     // initially configure settings
     await config.saveSmtpConfig()
     await config.saveSettingsConfig()
-
-    const res = await api.emails.sendEmail(EmailTemplatePurpose.INVITATION)
-
+    const res = await request
+      .post(`/api/global/email/send`)
+      .send({
+        email: "test@test.com",
+        purpose: EmailTemplatePurpose.INVITATION,
+        tenantId: TENANT_ID,
+      })
+      .set(config.defaultHeaders())
+      .expect("Content-Type", /json/)
+      .expect(200)
     expect(res.body.message).toBeDefined()
     expect(sendMailMock).toHaveBeenCalled()
     const emailCall = sendMailMock.mock.calls[0][0]

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

@@ -1,5 +1,5 @@
-import { TestConfiguration, API } from "../../../../tests"
-import { EmailTemplatePurpose } from "../../../../constants"
+const { config, request } = require("../../../tests")
+const { EmailTemplatePurpose } = require("../../../constants")
 const nodemailer = require("nodemailer")
 const fetch = require("node-fetch")
 
@@ -7,8 +7,6 @@ const fetch = require("node-fetch")
 jest.setTimeout(30000)
 
 describe("/api/global/email", () => {
-  const config = new TestConfiguration()
-  const api = new API(config)
 
   beforeAll(async () => {
     await config.beforeAll()
@@ -18,24 +16,27 @@ describe("/api/global/email", () => {
     await config.afterAll()
   })
 
-  async function sendRealEmail(purpose: string) {
+  async function sendRealEmail(purpose) {
     let response, text
     try {
-      const timeout = () =>
-        new Promise((resolve, reject) =>
-          setTimeout(
-            () =>
-              reject({
-                status: 301,
-                errno: "ETIME",
-              }),
-            20000
-          )
-        )
+      const timeout = () => new Promise((resolve, reject) =>
+        setTimeout(() => reject({
+          status: 301,
+          errno: "ETIME"
+        }), 20000)
+      )
       await Promise.race([config.saveEtherealSmtpConfig(), timeout()])
       await Promise.race([config.saveSettingsConfig(), timeout()])
-
-      const res = await api.emails.sendEmail(purpose).timeout(20000)
+      const user = await config.getUser("test@test.com")
+      const res = await request
+        .post(`/api/global/email/send`)
+        .send({
+          email: "test@test.com",
+          purpose,
+          userId: user._id,
+        })
+        .set(config.defaultHeaders())
+        .timeout(20000)
       // ethereal hiccup, can't test right now
       if (res.status >= 300) {
         return
@@ -46,7 +47,7 @@ describe("/api/global/email", () => {
       expect(testUrl).toBeDefined()
       response = await fetch(testUrl)
       text = await response.text()
-    } catch (err: any) {
+    } catch (err) {
       // ethereal hiccup, can't test right now
       if (parseInt(err.status) >= 300 || (err && err.errno === "ETIME")) {
         return
@@ -80,4 +81,4 @@ describe("/api/global/email", () => {
   it("should be able to send a password recovery email", async () => {
     await sendRealEmail(EmailTemplatePurpose.PASSWORD_RECOVERY)
   })
-})
+})

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

@@ -1,10 +1,8 @@
 jest.mock("nodemailer")
-import { TestConfiguration, API } from "../../../../tests"
-import { events } from "@budibase/backend-core"
+const { config, request } = require("../../../tests")
+const { events } = require("@budibase/backend-core")
 
 describe("/api/global/self", () => {
-  const config = new TestConfiguration()
-  const api = new API(config)
 
   beforeAll(async () => {
     await config.beforeAll()
@@ -18,13 +16,23 @@ describe("/api/global/self", () => {
     jest.clearAllMocks()
   })
 
+  const updateSelf = async (user) => {
+    const res = await request
+      .post(`/api/global/self`)
+      .send(user)
+      .set(config.defaultHeaders())
+      .expect("Content-Type", /json/)
+      .expect(200)
+    return res
+  }
+
   describe("update", () => {
+
     it("should update self", async () => {
       const user = await config.createUser()
-      await config.createSession(user)
 
       delete user.password
-      const res = await api.self.updateSelf(user)
+      const res = await updateSelf(user)
 
       expect(res.body._id).toBe(user._id)
       expect(events.user.updated).toBeCalledTimes(1)
@@ -34,10 +42,10 @@ describe("/api/global/self", () => {
 
     it("should update password", async () => {
       const user = await config.createUser()
-      await config.createSession(user)
+      const password = "newPassword" 
+      user.password = password
 
-      user.password = "newPassword"
-      const res = await api.self.updateSelf(user)
+      const res = await updateSelf(user)
 
       delete user.password
       expect(res.body._id).toBe(user._id)
@@ -47,4 +55,4 @@ describe("/api/global/self", () => {
       expect(events.user.passwordUpdated).toBeCalledWith(user)
     })
   })
-})
+})