@budibase/worker 3.37.5 → 3.38.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "3.37.5",
+  "version": "3.38.1",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -56,7 +56,7 @@
     "lodash": "4.18.1",
     "marked": "^15.0.11",
     "node-fetch": "2.6.7",
-    "nodemailer": "8.0.6",
+    "nodemailer": "8.0.7",
     "pouchdb": "9.0.0",
     "scim-patch": "^0.8.1",
     "scim2-parse-filter": "^0.2.8",
@@ -80,5 +80,5 @@
     "supertest": "6.3.3",
     "timekeeper": "2.2.0"
   },
-  "gitHead": "1d2debd2fe45dcf8d8c76d9865e3457be3aaebbe"
+  "gitHead": "5c558700d0c4dbc554a935b71b9ac99ec263a654"
 }

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

@@ -59,23 +59,13 @@ import {
   UserCtx,
   UserIdentifier,
 } from "@budibase/types"
-import crypto from "crypto"
 import emailValidator from "email-validator"
 import env from "../../../environment"
 import * as userSdk from "../../../sdk/users"
-import { isEmailConfigured } from "../../../utilities/email"
 import { checkAnyUserExists } from "../../../utilities/users"
 
 const MAX_USERS_UPLOAD_LIMIT = 1000
 
-const generatePassword = (length: number) => {
-  const array = new Uint8Array(length)
-  crypto.getRandomValues(array)
-  return Array.from(array, byte => byte.toString(36).padStart(2, "0"))
-    .join("")
-    .slice(0, length)
-}
-
 const stripUsers = (users: (User | StrippedUser)[]): StrippedUser[] => {
   return users.map(user => ({
     _id: user._id,
@@ -595,40 +585,6 @@ export const accountHolderLookup = async (
   }
 }
 
-/* 
-  Encapsulate the app user onboarding flows here.
-*/
-export const onboardUsers = async (
-  ctx: Ctx<InviteUsersRequest, InviteUsersResponse>
-) => {
-  if (await isEmailConfigured()) {
-    await inviteMultiple(ctx)
-    return
-  }
-
-  let createdPasswords: Record<string, string> = {}
-  const users = ctx.request.body.map<User>(invite => {
-    const password = generatePassword(12)
-    createdPasswords[invite.email] = password
-
-    return {
-      email: invite.email,
-      password,
-      forceResetPassword: true,
-      roles: invite.userInfo.apps || {},
-      admin: { global: !!invite.userInfo.admin },
-      builder: invite.userInfo.builder,
-      tenantId: tenancy.getTenantId(),
-    }
-  })
-
-  let resp = await userSdk.db.bulkCreate(users)
-  for (const user of resp.successful) {
-    user.password = createdPasswords[user.email]
-  }
-  ctx.body = { ...resp, created: true }
-}
-
 export const invite = async (
   ctx: Ctx<InviteUserRequest, InviteUserResponse>
 ) => {

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

@@ -4,32 +4,40 @@ import { Ctx, GetEnvironmentResponse, MaintenanceType } from "@budibase/types"
 import nodeFetch from "node-fetch"
 import env from "../../../environment"
 
-let sqsAvailable: boolean
+let sqsAvailable: boolean | undefined
+let sqsLastChecked: number | undefined
+const SQS_AVAILABLE_CACHE_TTL_MS = 30_000
+
 async function isSqsAvailable() {
-  // We cache this value for the duration of the Node process because we don't
-  // want every page load to be making this relatively expensive check.
-  if (sqsAvailable !== undefined) {
+  const now = Date.now()
+  if (
+    sqsAvailable !== undefined &&
+    sqsLastChecked !== undefined &&
+    now - sqsLastChecked < SQS_AVAILABLE_CACHE_TTL_MS
+  ) {
     return sqsAvailable
   }
 
   try {
-    const { url } = dbCore.getCouchInfo()
-    if (!url) {
+    const { sqlUrl } = dbCore.getCouchInfo()
+    if (!sqlUrl) {
       sqsAvailable = false
+      sqsLastChecked = now
       return false
     }
     await helpers.retry(
       async () => {
-        await nodeFetch(url, { timeout: 2000 })
+        await nodeFetch(sqlUrl, { timeout: 2000 })
       },
       { times: 3 }
     )
-    console.log("connected to SQS")
     sqsAvailable = true
+    sqsLastChecked = now
     return true
   } catch (e) {
     console.warn("failed to connect to SQS", e)
     sqsAvailable = false
+    sqsLastChecked = now
     return false
   }
 }

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

@@ -1372,27 +1372,6 @@ describe("/api/global/users", () => {
     })
   })
 
-  describe("POST /api/global/users/onboard", () => {
-    it("should successfully onboard a user", async () => {
-      const response = await config.api.users.onboardUser([
-        { email: structures.users.newEmail(), userInfo: {} },
-      ])
-      expect(response.successful.length).toBe(1)
-      expect(response.unsuccessful.length).toBe(0)
-    })
-
-    it("should not onboard a user who has been invited", async () => {
-      const email = structures.users.newEmail()
-      await config.api.users.sendUserInvite(sendMailMock, email)
-
-      const response = await config.api.users.onboardUser([
-        { email, userInfo: {} },
-      ])
-      expect(response.successful.length).toBe(0)
-      expect(response.unsuccessful.length).toBe(1)
-    })
-  })
-
   describe("PUT /api/global/users/tenant/owner", () => {
     it("should successfully change tenant owner email for existing user", async () => {
       const originalEmail = `original-${structures.uuid()}@example.com`

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

@@ -103,11 +103,6 @@ builderOrAdminRoutes
     "/api/global/users/invite/:code",
     controller.removeWorkspaceIdFromInvite
   )
-  .post(
-    "/api/global/users/onboard",
-    buildInviteMultipleValidation(),
-    controller.onboardUsers
-  )
   .post(
     "/api/global/users/:userId/permission/:role",
     controller.addUserToWorkspace

package/src/tests/api/users.ts

@@ -4,7 +4,6 @@ import {
   BulkUserResponse,
   CreateAdminUserRequest,
   InviteUsersRequest,
-  InviteUsersResponse,
   SearchUsersRequest,
   User,
 } from "@budibase/types"
@@ -180,26 +179,6 @@ export class UserAPI extends TestAPI {
       .expect(opts?.status ? opts.status : 200)
   }
 
-  onboardUser = async (
-    req: InviteUsersRequest
-  ): Promise<InviteUsersResponse> => {
-    const resp = await this.request
-      .post(`/api/global/users/onboard`)
-      .send(req)
-      .set(this.config.defaultHeaders())
-      .expect("Content-Type", /json/)
-
-    if (resp.status !== 200) {
-      throw new Error(
-        `request failed with status ${resp.status} and body ${JSON.stringify(
-          resp.body
-        )}`
-      )
-    }
-
-    return resp.body as InviteUsersResponse
-  }
-
   changeTenantOwnerEmail = (
     newAccountEmail: string,
     originalEmail: string,