@budibase/worker 2.7.35 → 2.7.36-alpha.1

package/jest.config.ts

@@ -21,11 +21,9 @@ const config: Config.InitialOptions = {
 }
 
 // add pro sources if they exist
-if (fs.existsSync("../pro/packages")) {
-  config.moduleNameMapper!["@budibase/pro/(.*)"] =
-    "<rootDir>/../pro/packages/pro/$1"
-  config.moduleNameMapper!["@budibase/pro"] =
-    "<rootDir>/../pro/packages/pro/src"
+if (fs.existsSync("../pro/src")) {
+  config.moduleNameMapper!["@budibase/pro/(.*)"] = "<rootDir>/../pro/$1"
+  config.moduleNameMapper!["@budibase/pro"] = "<rootDir>/../pro/src"
 }
 
 export default config

package/nodemon.json

@@ -1,5 +1,5 @@
 {
-  "watch": ["src", "../backend-core", "../pro/packages/pro"],
+  "watch": ["src", "../backend-core", "../pro"],
   "ext": "js,ts,json",
   "ignore": [
     "src/**/*.spec.ts",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.7.35",
+  "version": "2.7.36-alpha.1",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -38,21 +38,23 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.7.35",
-    "@budibase/pro": "2.7.35",
-    "@budibase/string-templates": "2.7.35",
-    "@budibase/types": "2.7.35",
+    "@budibase/backend-core": "2.7.36-alpha.1",
+    "@budibase/pro": "2.7.36-alpha.1",
+    "@budibase/string-templates": "2.7.36-alpha.1",
+    "@budibase/types": "2.7.36-alpha.1",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
     "@types/global-agent": "2.1.1",
     "aws-sdk": "2.1030.0",
+    "bcrypt": "5.1.0",
     "bcryptjs": "2.4.3",
     "dd-trace": "3.13.2",
     "dotenv": "8.6.0",
     "elastic-apm-node": "3.38.0",
     "global-agent": "3.0.0",
     "got": "11.8.3",
+    "ical-generator": "4.1.0",
     "joi": "17.6.0",
     "koa": "2.13.4",
     "koa-body": "4.2.0",
@@ -103,5 +105,5 @@
     "typescript": "4.7.3",
     "update-dotenv": "1.1.1"
   },
-  "gitHead": "6db1d089ee2d2df8caf513cf2cb4b22f167b91f1"
+  "gitHead": "8d3bbb718b4e3dea5e1da2dfa30fac231ef4fe22"
 }

package/src/api/controllers/global/auth.ts

@@ -140,7 +140,6 @@ export const datasourcePreAuth = async (ctx: any, next: any) => {
     {
       provider,
       appId: ctx.query.appId,
-      datasourceId: ctx.query.datasourceId,
     },
     Cookie.DatasourceAuth
   )

package/src/api/controllers/global/email.ts

@@ -14,6 +14,7 @@ export async function sendEmail(ctx: BBContext) {
     cc,
     bcc,
     automation,
+    invite,
   } = ctx.request.body
   let user
   if (userId) {
@@ -29,6 +30,7 @@ export async function sendEmail(ctx: BBContext) {
     cc,
     bcc,
     automation,
+    invite,
   })
   ctx.body = {
     ...response,

package/src/api/controllers/global/users.ts

@@ -38,7 +38,7 @@ const MAX_USERS_UPLOAD_LIMIT = 1000
 
 export const save = async (ctx: UserCtx<User, SaveUserResponse>) => {
   try {
-    const currentUserId = ctx.user._id
+    const currentUserId = ctx.user?._id
     const requestUser = ctx.request.body
 
     const user = await userSdk.save(requestUser, { currentUserId })

package/src/api/controllers/system/environment.ts

@@ -1,9 +1,10 @@
-import { BBContext } from "@budibase/types"
+import { Ctx } from "@budibase/types"
 import env from "../../../environment"
 
-export const fetch = async (ctx: BBContext) => {
+export const fetch = async (ctx: Ctx) => {
   ctx.body = {
     multiTenancy: !!env.MULTI_TENANCY,
+    offlineMode: !!env.OFFLINE_MODE,
     cloud: !env.SELF_HOSTED,
     accountPortalUrl: env.ACCOUNT_PORTAL_URL,
     disableAccountPortal: env.DISABLE_ACCOUNT_PORTAL,

package/src/api/routes/global/tests/roles.spec.ts

@@ -19,6 +19,7 @@ jest.mock("@budibase/backend-core", () => {
 
 let appId: string
 let appDb: Database
+const ROLE_NAME = "newRole"
 
 async function addAppMetadata() {
   await appDb.put({
@@ -34,7 +35,7 @@ describe("/api/global/roles", () => {
   const config = new TestConfiguration()
 
   const role = new roles.Role(
-    db.generateRoleID("newRole"),
+    db.generateRoleID(ROLE_NAME),
     roles.BUILTIN_ROLE_IDS.BASIC,
     permissions.BuiltinPermissionID.READ_ONLY
   )
@@ -66,7 +67,7 @@ describe("/api/global/roles", () => {
       const res = await config.api.roles.get()
       expect(res.body).toBeDefined()
       expect(res.body[appId].roles.length).toEqual(5)
-      expect(res.body[appId].roles.map((r: any) => r._id)).toContain(role._id)
+      expect(res.body[appId].roles.map((r: any) => r._id)).toContain(ROLE_NAME)
     })
   })
 

package/src/api/routes/system/tests/environment.spec.ts

@@ -24,6 +24,7 @@ describe("/api/system/environment", () => {
         isDev: false,
         multiTenancy: true,
         baseUrl: "http://localhost:10000",
+        offlineMode: false,
       })
     })
   })

package/src/environment.ts

@@ -61,6 +61,7 @@ const environment = {
   CHECKLIST_CACHE_TTL: parseIntSafe(process.env.CHECKLIST_CACHE_TTL) || 3600,
   SESSION_UPDATE_PERIOD: process.env.SESSION_UPDATE_PERIOD,
   ENCRYPTED_TEST_PUBLIC_API_KEY: process.env.ENCRYPTED_TEST_PUBLIC_API_KEY,
+  OFFLINE_MODE: process.env.OFFLINE_MODE,
   /**
    * Mock the email service in use - links to ethereal hosted emails are logged instead.
    */

package/src/utilities/email.ts

@@ -4,28 +4,11 @@ import { getTemplateByPurpose, EmailTemplates } from "../constants/templates"
 import { getSettingsTemplateContext } from "./templates"
 import { processString } from "@budibase/string-templates"
 import { getResetPasswordCode, getInviteCode } from "./redis"
-import { User, SMTPInnerConfig } from "@budibase/types"
+import { User, SendEmailOpts, SMTPInnerConfig } from "@budibase/types"
 import { configs } from "@budibase/backend-core"
+import ical from "ical-generator"
 const nodemailer = require("nodemailer")
 
-type SendEmailOpts = {
-  // workspaceId If finer grain controls being used then this will lookup config for workspace.
-  workspaceId?: string
-  // user If sending to an existing user the object can be provided, this is used in the context.
-  user: User
-  // from If sending from an address that is not what is configured in the SMTP config.
-  from?: string
-  // contents If sending a custom email then can supply contents which will be added to it.
-  contents?: string
-  // subject A custom subject can be specified if the config one is not desired.
-  subject?: string
-  // info Pass in a structure of information to be stored alongside the invitation.
-  info?: any
-  cc?: boolean
-  bcc?: boolean
-  automation?: boolean
-}
-
 const TEST_MODE = env.ENABLE_EMAIL_TEST_MODE && env.isDev()
 const TYPE = TemplateType.EMAIL
 
@@ -200,6 +183,26 @@ export async function sendEmail(
       context
     )
   }
+  if (opts?.invite) {
+    const calendar = ical({
+      name: "Invite",
+    })
+    calendar.createEvent({
+      start: opts.invite.startTime,
+      end: opts.invite.endTime,
+      summary: opts.invite.summary,
+      location: opts.invite.location,
+      url: opts.invite.url,
+    })
+    message = {
+      ...message,
+      icalEvent: {
+        method: "request",
+        content: calendar.toString(),
+      },
+    }
+  }
+
   const response = await transport.sendMail(message)
   if (TEST_MODE) {
     console.log("Test email URL: " + nodemailer.getTestMessageUrl(response))

package/tsconfig.build.json

@@ -16,7 +16,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": ["../pro/src"]
     }
   },
   "include": ["src/**/*"],