Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

Merge origin/main into PAM-517

Andreyf7e7fdf15201
diff --cc backend/src/services/approval-policy/approval-policy-types.ts
index d956ffe243,ea070dc1f9..368185f8b2
--- a/backend/src/services/approval-policy/approval-policy-types.ts
+++ b/backend/src/services/approval-policy/approval-policy-types.ts
@@@ -3,9 -3,9 +3,10 @@@ import { Knex } from "knex"
import { TApprovalPolicies, TApprovalRequestGrants, TApprovalRequests } from "@app/db/schemas";
import { Event } from "@app/ee/services/audit-log/audit-log-types";
import { ResourcePermissionApprovalPolicyActions } from "@app/ee/services/permission/resource-permission";
+ import { TSecretChangeRequestData } from "@app/ee/services/secret-change-global-request-bridge/secret-change-global-request-bridge-types";
import { OrgServiceActor } from "@app/lib/types";
import { TNotification } from "@app/lib/workflow-integrations/types";
+import { TEventInput } from "@app/services/event-outbox/event-outbox-types";
import { NotificationType } from "@app/services/notification/notification-types";
import { SmtpTemplates } from "@app/services/smtp/smtp-service";
import { TPostHogEvent } from "@app/services/telemetry/telemetry-types";
diff --cc backend/src/services/license-client/entitlement-projection.ts
index b377521a65,7204b663b8..1a0f07d5ed
--- a/backend/src/services/license-client/entitlement-projection.ts
+++ b/backend/src/services/license-client/entitlement-projection.ts
@@@ -22,9 -42,8 +42,9 @@@ export const projectV2ToFeatureSet = (b
if (mapping.v1Field === null) {
return;
}
- const raw = entitlements.features[mapping.v2Key];
- if (!raw || raw.value === undefined) {
+ const isLegacyGranted = mapping.legacyV2Keys?.some((key) => entitlements.features[key]?.value === true);
+ const value = isLegacyGranted ? true : entitlements.features[mapping.v2Key]?.value;
- if (value === null || value === undefined) {
++ if (value === undefined) {
return;
}