@budibase/worker 2.5.6-alpha.3 → 2.5.6-alpha.30

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.5.6-alpha.3",
+  "version": "2.5.6-alpha.30",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,10 +37,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "2.5.6-alpha.3",
-    "@budibase/pro": "2.5.6-alpha.2",
-    "@budibase/string-templates": "2.5.6-alpha.3",
-    "@budibase/types": "2.5.6-alpha.3",
+    "@budibase/backend-core": "2.5.6-alpha.30",
+    "@budibase/pro": "2.5.6-alpha.29",
+    "@budibase/string-templates": "2.5.6-alpha.30",
+    "@budibase/types": "2.5.6-alpha.30",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -102,5 +102,5 @@
     "typescript": "4.7.3",
     "update-dotenv": "1.1.1"
   },
-  "gitHead": "38b2a2407eeb58c3f143c1d91d517e38b27cdd89"
+  "gitHead": "07ceb334c7ea3962f7268038653450a7be3a5ca8"
 }

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

@@ -329,6 +329,7 @@ export const checkInvite = async (ctx: any) => {
   try {
     invite = await checkInviteCode(code, false)
   } catch (e) {
+    console.warn("Error getting invite from code", e)
     ctx.throw(400, "There was a problem with the invite")
   }
   ctx.body = {
@@ -415,8 +416,8 @@ export const inviteAccept = async (
     })
 
     ctx.body = {
-      _id: user._id,
-      _rev: user._rev,
+      _id: user._id!,
+      _rev: user._rev!,
       email: user.email,
     }
   } catch (err: any) {

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

@@ -1,7 +1,7 @@
-import { Account, AccountMetadata } from "@budibase/types"
+import { Account, AccountMetadata, Ctx } from "@budibase/types"
 import * as accounts from "../../../sdk/accounts"
 
-export const save = async (ctx: any) => {
+export const save = async (ctx: Ctx<Account, AccountMetadata>) => {
   const account = ctx.request.body as Account
   let metadata: AccountMetadata = {
     _id: accounts.metadata.formatAccountMetadataId(account.accountId),

package/src/constants/templates/core.hbs

@@ -16,7 +16,8 @@
               cellspacing="0"
             >
               <img
-                width="32px"
+                width="32"
+                height="32"
                 style="margin-right:16px; vertical-align: middle;"
                 alt="Budibase Logo"
                 src="https://i.imgur.com/Xhdt1YP.png"

package/src/sdk/users/users.ts

@@ -20,7 +20,6 @@ import {
 import {
   AccountMetadata,
   AllDocsResponse,
-  BulkUserResponse,
   CloudAccount,
   InviteUsersRequest,
   InviteUsersResponse,
@@ -31,6 +30,8 @@ import {
   RowResponse,
   User,
   SaveUserOpts,
+  BulkUserCreated,
+  BulkUserDeleted,
   Account,
 } from "@budibase/types"
 import { sendEmail } from "../../utilities/email"
@@ -196,6 +197,8 @@ export async function isPreventPasswordActions(user: User, account?: Account) {
   return !!(account && account.email === user.email && isSSOAccount(account))
 }
 
+// TODO: The single save should re-use the bulk insert with a single
+// user so that we don't need to duplicate logic
 export const save = async (
   user: User,
   opts: SaveUserOpts = {}
@@ -242,53 +245,56 @@ export const save = async (
     }
   }
 
-  await validateUniqueUser(email, tenantId)
+  const change = dbUser ? 0 : 1 // no change if there is existing user
+  return pro.quotas.addUsers(change, async () => {
+    await validateUniqueUser(email, tenantId)
 
-  let builtUser = await buildUser(user, opts, tenantId, dbUser)
-  // don't allow a user to update its own roles/perms
-  if (opts.currentUserId && opts.currentUserId === dbUser?._id) {
-    builtUser.builder = dbUser.builder
-    builtUser.admin = dbUser.admin
-    builtUser.roles = dbUser.roles
-  }
+    let builtUser = await buildUser(user, opts, tenantId, dbUser)
+    // don't allow a user to update its own roles/perms
+    if (opts.currentUserId && opts.currentUserId === dbUser?._id) {
+      builtUser.builder = dbUser.builder
+      builtUser.admin = dbUser.admin
+      builtUser.roles = dbUser.roles
+    }
 
-  if (!dbUser && roles?.length) {
-    builtUser.roles = { ...roles }
-  }
+    if (!dbUser && roles?.length) {
+      builtUser.roles = { ...roles }
+    }
 
-  // make sure we set the _id field for a new user
-  // Also if this is a new user, associate groups with them
-  let groupPromises = []
-  if (!_id) {
-    _id = builtUser._id!
+    // make sure we set the _id field for a new user
+    // Also if this is a new user, associate groups with them
+    let groupPromises = []
+    if (!_id) {
+      _id = builtUser._id!
 
-    if (userGroups.length > 0) {
-      for (let groupId of userGroups) {
-        groupPromises.push(pro.groups.addUsers(groupId, [_id]))
+      if (userGroups.length > 0) {
+        for (let groupId of userGroups) {
+          groupPromises.push(pro.groups.addUsers(groupId, [_id]))
+        }
       }
     }
-  }
 
-  try {
-    // save the user to db
-    let response = await db.put(builtUser)
-    builtUser._rev = response.rev
+    try {
+      // save the user to db
+      let response = await db.put(builtUser)
+      builtUser._rev = response.rev
 
-    await eventHelpers.handleSaveEvents(builtUser, dbUser)
-    await platform.users.addUser(tenantId, builtUser._id!, builtUser.email)
-    await cache.user.invalidateUser(response.id)
+      await eventHelpers.handleSaveEvents(builtUser, dbUser)
+      await platform.users.addUser(tenantId, builtUser._id!, builtUser.email)
+      await cache.user.invalidateUser(response.id)
 
-    await Promise.all(groupPromises)
+      await Promise.all(groupPromises)
 
-    // finally returned the saved user from the db
-    return db.get(builtUser._id!)
-  } catch (err: any) {
-    if (err.status === 409) {
-      throw "User exists already"
-    } else {
-      throw err
+      // finally returned the saved user from the db
+      return db.get(builtUser._id!)
+    } catch (err: any) {
+      if (err.status === 409) {
+        throw "User exists already"
+      } else {
+        throw err
+      }
     }
-  }
+  })
 }
 
 const getExistingTenantUsers = async (emails: string[]): Promise<User[]> => {
@@ -374,7 +380,7 @@ const searchExistingEmails = async (emails: string[]) => {
 export const bulkCreate = async (
   newUsersRequested: User[],
   groups: string[]
-): Promise<BulkUserResponse["created"]> => {
+): Promise<BulkUserCreated> => {
   const tenantId = tenancy.getTenantId()
 
   let usersToSave: any[] = []
@@ -402,54 +408,56 @@ export const bulkCreate = async (
   }
 
   const account = await accountSdk.api.getAccountByTenantId(tenantId)
-  // create the promises array that will be called by bulkDocs
-  newUsers.forEach((user: any) => {
-    usersToSave.push(
-      buildUser(
-        user,
-        {
-          hashPassword: true,
-          requirePassword: user.requirePassword,
-        },
-        tenantId,
-        undefined, // no dbUser
-        account
+  return pro.quotas.addUsers(newUsers.length, async () => {
+    // create the promises array that will be called by bulkDocs
+    newUsers.forEach((user: any) => {
+      usersToSave.push(
+        buildUser(
+          user,
+          {
+            hashPassword: true,
+            requirePassword: user.requirePassword,
+          },
+          tenantId,
+          undefined, // no dbUser
+          account
+        )
       )
-    )
-  })
-
-  const usersToBulkSave = await Promise.all(usersToSave)
-  await usersCore.bulkUpdateGlobalUsers(usersToBulkSave)
+    })
 
-  // Post-processing of bulk added users, e.g. events and cache operations
-  for (const user of usersToBulkSave) {
-    // TODO: Refactor to bulk insert users into the info db
-    // instead of relying on looping tenant creation
-    await platform.users.addUser(tenantId, user._id, user.email)
-    await eventHelpers.handleSaveEvents(user, undefined)
-  }
+    const usersToBulkSave = await Promise.all(usersToSave)
+    await usersCore.bulkUpdateGlobalUsers(usersToBulkSave)
 
-  const saved = usersToBulkSave.map(user => {
-    return {
-      _id: user._id,
-      email: user.email,
+    // Post-processing of bulk added users, e.g. events and cache operations
+    for (const user of usersToBulkSave) {
+      // TODO: Refactor to bulk insert users into the info db
+      // instead of relying on looping tenant creation
+      await platform.users.addUser(tenantId, user._id, user.email)
+      await eventHelpers.handleSaveEvents(user, undefined)
     }
-  })
 
-  // now update the groups
-  if (Array.isArray(saved) && groups) {
-    const groupPromises = []
-    const createdUserIds = saved.map(user => user._id)
-    for (let groupId of groups) {
-      groupPromises.push(pro.groups.addUsers(groupId, createdUserIds))
+    const saved = usersToBulkSave.map(user => {
+      return {
+        _id: user._id,
+        email: user.email,
+      }
+    })
+
+    // now update the groups
+    if (Array.isArray(saved) && groups) {
+      const groupPromises = []
+      const createdUserIds = saved.map(user => user._id)
+      for (let groupId of groups) {
+        groupPromises.push(pro.groups.addUsers(groupId, createdUserIds))
+      }
+      await Promise.all(groupPromises)
     }
-    await Promise.all(groupPromises)
-  }
 
-  return {
-    successful: saved,
-    unsuccessful,
-  }
+    return {
+      successful: saved,
+      unsuccessful,
+    }
+  })
 }
 
 /**
@@ -474,10 +482,10 @@ const getAccountHolderFromUserIds = async (
 
 export const bulkDelete = async (
   userIds: string[]
-): Promise<BulkUserResponse["deleted"]> => {
+): Promise<BulkUserDeleted> => {
   const db = tenancy.getGlobalDB()
 
-  const response: BulkUserResponse["deleted"] = {
+  const response: BulkUserDeleted = {
     successful: [],
     unsuccessful: [],
   }
@@ -511,6 +519,8 @@ export const bulkDelete = async (
     _deleted: true,
   }))
   const dbResponse = await usersCore.bulkUpdateGlobalUsers(toDelete)
+
+  await pro.quotas.removeUsers(toDelete.length)
   for (let user of usersToDelete) {
     await bulkDeleteProcessing(user)
   }
@@ -540,6 +550,8 @@ export const bulkDelete = async (
   return response
 }
 
+// TODO: The single delete should re-use the bulk delete with a single
+// user so that we don't need to duplicate logic
 export const destroy = async (id: string) => {
   const db = tenancy.getGlobalDB()
   const dbUser = (await db.get(id)) as User
@@ -562,6 +574,7 @@ export const destroy = async (id: string) => {
 
   await db.remove(userId, dbUser._rev)
 
+  await pro.quotas.removeUsers(1)
   await eventHelpers.handleDeleteEvents(dbUser)
   await cache.user.invalidateUser(userId)
   await sessions.invalidateSessions(userId, { reason: "deletion" })

package/src/utilities/email.ts

@@ -62,8 +62,8 @@ function createSMTPTransport(config?: SMTPInnerConfig) {
       host: "smtp.ethereal.email",
       secure: false,
       auth: {
-        user: "wyatt.zulauf29@ethereal.email",
-        pass: "tEwDtHBWWxusVWAPfa",
+        user: "seamus99@ethereal.email",
+        pass: "5ghVteZAqj6jkKJF9R",
       },
     }
   }

package/tsconfig.json

@@ -21,11 +21,6 @@
     { "path": "../backend-core" },
     { "path": "../../../budibase-pro/packages/pro" }
   ],
-  "include": [
-    "src/**/*",
-    "package.json"
-  ],
-  "exclude": [
-    "dist"
-  ]
-}
+  "include": ["src/**/*"],
+  "exclude": ["dist"]
+}