calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-09-04 10:19:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Always pull all of the users for the blueprints

Browse Source
This commit is contained in:
Owen
2026-09-03 12:02:41 -04:00
parent be0dd65557
commit 1bc5fbbf0f
3 changed files with 73 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/lib/blueprints/findOrgUser.ts
+11 -8
View File
@@ -1,12 +1,12 @@
import { and, asc, eq, or } from "drizzle-orm";
import { Transaction, User, userOrgs, users } from "@server/db";
export async function findOrgUserByIdentifier(
export async function findOrgUsersByIdentifier(
trx: Transaction,
orgId: string,
identifier: string
): Promise<User | null> {
const [match] = await trx
): Promise<User[]> {
const matches = await trx
.select()
.from(users)
.innerJoin(userOrgs, eq(users.userId, userOrgs.userId))
@@ -16,10 +16,9 @@ export async function findOrgUserByIdentifier(
eq(userOrgs.orgId, orgId)
)
)
.orderBy(asc(users.dateCreated), asc(users.userId))
.limit(1);
.orderBy(asc(users.dateCreated), asc(users.userId));
return match?.user ?? null;
return matches.map((match) => match.user);
}
export async function resolveOrgUserIds(
@@ -29,8 +28,12 @@ export async function resolveOrgUserIds(
): Promise<string[]> {
const userIds = new Set<string>();
for (const identifier of identifiers) {
const user = await findOrgUserByIdentifier(trx, orgId, identifier);
if (user) {
const matchedUsers = await findOrgUsersByIdentifier(
trx,
orgId,
identifier
);
for (const user of matchedUsers) {
userIds.add(user.userId);
}
}
server/lib/blueprints/publicResources.ts
+33 -21
View File
@@ -51,7 +51,7 @@ import { tierMatrix } from "../billing/tierMatrix";
import { isValidCIDR, isValidIP, isValidUrlGlobPattern } from "../validators";
import { Config, isTargetsOnlyResource, TargetData } from "./types";
import { getOrCreateLabelIds, syncResourceLabels } from "./labels";
import { findOrgUserByIdentifier } from "./findOrgUser";
import { findOrgUsersByIdentifier } from "./findOrgUser";
import { LimitId } from "../billing";
import { usageService } from "../billing/usageService";
import { syncInferenceAiConfig } from "./aiProviders";
@@ -1564,21 +1564,27 @@ async function syncUserResources(
.where(eq(userResources.resourceId, resourceId));
for (const username of ssoUsers) {
const user = await findOrgUserByIdentifier(trx, orgId, username);
const matchedUsers = await findOrgUsersByIdentifier(
trx,
orgId,
username
);
if (!user) {
if (matchedUsers.length === 0) {
throw new Error(`User not found: ${username} in org ${orgId}`);
}
const existingUserResource = existingUserResources.find(
(rr) => rr.userId === user.userId
);
for (const user of matchedUsers) {
const existingUserResource = existingUserResources.find(
(rr) => rr.userId === user.userId
);
if (!existingUserResource) {
await trx.insert(userResources).values({
userId: user.userId,
resourceId: resourceId
});
if (!existingUserResource) {
await trx.insert(userResources).values({
userId: user.userId,
resourceId: resourceId
});
}
}
}
@@ -1946,21 +1952,27 @@ async function syncUserPolicies(
.where(eq(userPolicies.resourcePolicyId, policyId));
for (const username of ssoUsers) {
const user = await findOrgUserByIdentifier(trx, orgId, username);
const matchedUsers = await findOrgUsersByIdentifier(
trx,
orgId,
username
);
if (!user) {
if (matchedUsers.length === 0) {
throw new Error(`User not found: ${username} in org ${orgId}`);
}
const existingUserPolicy = existingUserPoliciesList.find(
(up) => up.userId === user.userId
);
for (const user of matchedUsers) {
const existingUserPolicy = existingUserPoliciesList.find(
(up) => up.userId === user.userId
);
if (!existingUserPolicy) {
await trx.insert(userPolicies).values({
userId: user.userId,
resourcePolicyId: policyId
});
if (!existingUserPolicy) {
await trx.insert(userPolicies).values({
userId: user.userId,
resourcePolicyId: policyId
});
}
}
}
server/lib/blueprints/resourcePolicies.ts
+29 -17
View File
@@ -22,7 +22,7 @@ import { idpExistsForOrg } from "@server/lib/idp/idpExistsForOrg";
import { isValidCIDR, isValidIP, isValidUrlGlobPattern } from "../validators";
import { isLicensedOrSubscribed } from "#dynamic/lib/isLicencedOrSubscribed";
import { tierMatrix } from "../billing/tierMatrix";
import { findOrgUserByIdentifier } from "./findOrgUser";
import { findOrgUsersByIdentifier } from "./findOrgUser";
export type ResourcePoliciesResults = {
resourcePolicyId: number;
@@ -467,24 +467,30 @@ async function syncUserPolicies(
.where(eq(userPolicies.resourcePolicyId, policyId));
for (const username of ssoUsers) {
const user = await findOrgUserByIdentifier(trx, orgId, username);
const matchedUsers = await findOrgUsersByIdentifier(
trx,
orgId,
username
);
if (!user) {
if (matchedUsers.length === 0) {
logger.warn(
`User '${username}' not found in org '${orgId}', skipping`
);
continue;
}
const alreadyExists = existingUserPolicies.some(
(up) => up.userId === user.userId
);
for (const user of matchedUsers) {
const alreadyExists = existingUserPolicies.some(
(up) => up.userId === user.userId
);
if (!alreadyExists) {
await trx.insert(userPolicies).values({
userId: user.userId,
resourcePolicyId: policyId
});
if (!alreadyExists) {
await trx.insert(userPolicies).values({
userId: user.userId,
resourcePolicyId: policyId
});
}
}
}
@@ -527,19 +533,25 @@ async function addUserPolicies(
trx: Transaction
) {
for (const username of ssoUsers) {
const user = await findOrgUserByIdentifier(trx, orgId, username);
const matchedUsers = await findOrgUsersByIdentifier(
trx,
orgId,
username
);
if (!user) {
if (matchedUsers.length === 0) {
logger.warn(
`User '${username}' not found in org '${orgId}', skipping`
);
continue;
}
await trx.insert(userPolicies).values({
userId: user.userId,
resourcePolicyId: policyId
});
for (const user of matchedUsers) {
await trx.insert(userPolicies).values({
userId: user.userId,
resourcePolicyId: policyId
});
}
}
}