@budibase/worker 2.3.21 → 2.3.23

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.3.21",
+  "version": "2.3.23",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.3.21",
-    "@budibase/pro": "2.3.21-alpha.1",
-    "@budibase/string-templates": "^2.3.21",
-    "@budibase/types": "^2.3.21",
+    "@budibase/backend-core": "^2.3.23",
+    "@budibase/pro": "2.3.22",
+    "@budibase/string-templates": "^2.3.23",
+    "@budibase/types": "^2.3.23",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -101,5 +101,5 @@
     "typescript": "4.7.3",
     "update-dotenv": "1.1.1"
   },
-  "gitHead": "787d52bed1db701a6bb76dd26708ebedd495dafb"
+  "gitHead": "138bf63a3e1582064ec855e83108bed05861bd77"
 }

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

@@ -341,7 +341,7 @@ export const getUserInvites = async (ctx: any) => {
   let invites
   try {
     // Restricted to the currently authenticated tenant
-    invites = await getInviteCodes([ctx.user.tenantId])
+    invites = await getInviteCodes()
   } catch (e) {
     ctx.throw(400, "There was a problem fetching invites")
   }

package/src/utilities/redis.ts

@@ -1,4 +1,5 @@
-import { redis, utils } from "@budibase/backend-core"
+import { redis, utils, tenancy } from "@budibase/backend-core"
+import env from "../environment"
 
 function getExpirySecondsForDB(db: string) {
   switch (db) {
@@ -129,10 +130,9 @@ export async function checkInviteCode(
 }
 
 /** 
-  Get all currently available user invitations.
-  @return {Object[]} A list of all objects containing invite metadata
+  Get all currently available user invitations for the current tenant.
 **/
-export async function getInviteCodes(tenantIds?: string[]) {
+export async function getInviteCodes() {
   const client = await getClient(redis.utils.Databases.INVITATIONS)
   const invites: any[] = await client.scan()
 
@@ -142,12 +142,9 @@ export async function getInviteCodes(tenantIds?: string[]) {
       code: invite.key,
     }
   })
-  return results.reduce((acc, invite) => {
-    if (tenantIds?.length && tenantIds.includes(invite.info.tenantId)) {
-      acc.push(invite)
-    } else {
-      acc.push(invite)
-    }
-    return acc
-  }, [])
+  if (!env.MULTI_TENANCY) {
+    return results
+  }
+  const tenantId = tenancy.getTenantId()
+  return results.filter(invite => tenantId === invite.info.tenantId)
 }