MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove array of tenantIds

This commit is contained in:
Martin McKeaveney 2023-03-07 09:56:12 +00:00
parent b839eafbe3
commit fd8488d4d3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/worker/src/api/controllers/global/users.ts
View File

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

9
packages/worker/src/utilities/redis.ts
View File

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