@budibase/worker 3.27.4 → 3.27.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "3.27.4",
+  "version": "3.27.5",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -107,5 +107,5 @@
       }
     }
   },
-  "gitHead": "d0d77e2d7618885095e00c73cefcfefd8ad54877"
+  "gitHead": "46316dfbbf8e41a547bc8a4977ccd819a7515b9a"
 }

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

@@ -589,11 +589,12 @@ export const inviteMultiple = async (
 export const removeMultipleInvites = async (
   ctx: Ctx<DeleteInviteUsersRequest, DeleteInviteUsersResponse>
 ) => {
+  const tenantId = context.getTenantId()
   const inviteCodesToRemove = ctx.request.body.map(
     (invite: DeleteInviteUserRequest) => invite.code
   )
   for (const code of inviteCodesToRemove) {
-    await cache.invite.deleteCode(code)
+    await cache.invite.deleteCode(code, tenantId)
   }
   ctx.body = {
     message: "User invites successfully removed.",
@@ -602,9 +603,13 @@ export const removeMultipleInvites = async (
 
 export const checkInvite = async (ctx: UserCtx<void, CheckInviteResponse>) => {
   const { code } = ctx.params
+  const tenantId =
+    typeof ctx.request.query.tenantId === "string"
+      ? ctx.request.query.tenantId
+      : undefined
   let invite
   try {
-    invite = await cache.invite.getCode(code)
+    invite = await cache.invite.getCode(code, tenantId)
   } catch (e) {
     console.warn("Error getting invite from code", e)
     ctx.throw(400, "There was a problem with the invite")
@@ -637,7 +642,8 @@ export const addWorkspaceIdToInvite = async (
   const prodWorkspaceId = db.getProdWorkspaceID(workspaceId)
 
   try {
-    const invite = await cache.invite.getCode(code)
+    const tenantId = context.getTenantId()
+    const invite = await cache.invite.getCode(code, tenantId)
     invite.info.apps ??= {}
     invite.info.apps[prodWorkspaceId] = role
 
@@ -660,7 +666,8 @@ export const removeWorkspaceIdFromInvite = async (
   const prodWorkspaceId = db.getProdWorkspaceID(workspaceId)
 
   try {
-    const invite = await cache.invite.getCode(code)
+    const tenantId = context.getTenantId()
+    const invite = await cache.invite.getCode(code, tenantId)
     invite.info.apps ??= {}
     delete invite.info.apps[prodWorkspaceId]
 
@@ -674,7 +681,13 @@ export const removeWorkspaceIdFromInvite = async (
 export const inviteAccept = async (
   ctx: Ctx<AcceptUserInviteRequest, AcceptUserInviteResponse>
 ) => {
-  const { inviteCode, password, firstName, lastName } = ctx.request.body
+  const { inviteCode, password, firstName, lastName, tenantId } =
+    ctx.request.body
+  const queryTenantId =
+    typeof ctx.request.query.tenantId === "string"
+      ? ctx.request.query.tenantId
+      : undefined
+  const resolvedTenantId = tenantId || queryTenantId
   try {
     await locks.doWithLock(
       {
@@ -685,7 +698,10 @@ export const inviteAccept = async (
       },
       async () => {
         // info is an extension of the user object that was stored by global
-        const { email, info } = await cache.invite.getCode(inviteCode)
+        const { email, info } = await cache.invite.getCode(
+          inviteCode,
+          resolvedTenantId
+        )
         const user = await tenancy.doInTenant(info.tenantId, async () => {
           let request: any = {
             firstName,
@@ -715,7 +731,7 @@ export const inviteAccept = async (
           return saved
         })
 
-        await cache.invite.deleteCode(inviteCode)
+        await cache.invite.deleteCode(inviteCode, resolvedTenantId)
 
         // make sure onboarding flow is cleared
         ctx.cookies.set(BpmStatusKey.ONBOARDING, BpmStatusValue.COMPLETED, {

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

@@ -51,6 +51,7 @@ function buildInviteAcceptValidation() {
     password: Joi.string().optional(),
     firstName: Joi.string().optional(),
     lastName: Joi.string().optional(),
+    tenantId: Joi.string().optional(),
   }).required().unknown(true))
 }
 

package/src/tests/api/users.ts

@@ -46,6 +46,7 @@ export class UserAPI extends TestAPI {
         password: "newpassword1",
         inviteCode: code,
         firstName: "Ted",
+        tenantId: this.config.getTenantId(),
       })
       .expect("Content-Type", /json/)
       .expect(200)