calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-06-17 21:01:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: update resource rule routes to use shared policy rules

Browse Source
This commit is contained in:
copilot-swe-agent[bot]
2026-06-16 23:48:46 +00:00
committed by GitHub
parent b6862093d1
commit 0d960181a2
5 changed files with 103 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/routers/resource/deleteResourceRule.ts
View File

@@ -2,7 +2,7 @@ import { Request, Response, NextFunction } from "express";
import { z } from "zod";
import { db } from "@server/db";
import { resourceRules, resourcePolicyRules, resources } from "@server/db";
import { eq } from "drizzle-orm";
import { and, eq } from "drizzle-orm";
import response from "@server/lib/response";
import HttpCode from "@server/types/HttpCode";
import createHttpError from "http-errors";
@@ -73,14 +73,16 @@ export async function deleteResourceRule(
);
}
const isInlinePolicy =
resource.resourcePolicyId === null &&
resource.defaultResourcePolicyId !== null;
if (isInlinePolicy) {
if (resource.resourcePolicyId !== null) {
const policyId = resource.resourcePolicyId;
const [deletedRule] = await db
.delete(resourcePolicyRules)
.where(eq(resourcePolicyRules.ruleId, ruleId))
.where(
and(
eq(resourcePolicyRules.ruleId, ruleId),
eq(resourcePolicyRules.resourcePolicyId, policyId)
)
)
.returning();
if (!deletedRule) {