calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-06-05 15:26:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include the new policy tables in the data

Browse Source
This commit is contained in:
Owen
2026-06-01 17:04:33 -07:00
parent 605dd2f3c9
commit 1625dd1add
4 changed files with 34 additions and 1603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
server/routers/resource/getUserResources.ts
View File

@@ -5,6 +5,8 @@ import {
resources,
userResources,
roleResources,
userPolicies,
rolePolicies,
userOrgRoles,
userOrgs,
resourcePassword,
@@ -80,6 +82,30 @@ export async function getUserResources(
.where(inArray(roleResources.roleId, userRoleIds))
: Promise.resolve([]);
const directPolicyResourcesQuery = db
.select({ resourceId: resources.resourceId })
.from(resources)
.innerJoin(
userPolicies,
eq(resources.resourcePolicyId, userPolicies.resourcePolicyId)
)
.where(eq(userPolicies.userId, userId));
const rolePolicyResourcesQuery =
userRoleIds.length > 0
? db
.select({ resourceId: resources.resourceId })
.from(resources)
.innerJoin(
rolePolicies,
eq(
resources.resourcePolicyId,
rolePolicies.resourcePolicyId
)
)
.where(inArray(rolePolicies.roleId, userRoleIds))
: Promise.resolve([]);
const directSiteResourcesQuery = db
.select({ siteResourceId: userSiteResources.siteResourceId })
.from(userSiteResources)
@@ -98,11 +124,15 @@ export async function getUserResources(
const [
directResources,
roleResourceResults,
directPolicyResourceResults,
rolePolicyResourceResults,
directSiteResourceResults,
roleSiteResourceResults
] = await Promise.all([
directResourcesQuery,
roleResourcesQuery,
directPolicyResourcesQuery,
rolePolicyResourcesQuery,
directSiteResourcesQuery,
roleSiteResourcesQuery
]);
@@ -110,7 +140,9 @@ export async function getUserResources(
// Combine all accessible resource IDs
const accessibleResourceIds = [
...directResources.map((r) => r.resourceId),
...roleResourceResults.map((r) => r.resourceId)
...roleResourceResults.map((r) => r.resourceId),
...directPolicyResourceResults.map((r) => r.resourceId),
...rolePolicyResourceResults.map((r) => r.resourceId)
];
// Combine all accessible site resource IDs