Skip to content

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

Merge origin/main into PAM-517

Andrey9fb65ca9878c
diff --cc frontend/src/components/license/UpgradeGate/index.ts
index 0000000000,8f5fe8e1c5..3c30a2e5e3
mode 000000,100644..100644
--- a/frontend/src/components/license/UpgradeGate/index.ts
+++ b/frontend/src/components/license/UpgradeGate/index.ts
@@@ -1,0 -1,69 +1,69 @@@
+ export type { CapabilityUpgradeIntent } from "./capability-upgrade-intents";
+ export {
+ AgentVaultSessionLogsUpgradeIntent,
+ AuditLogStreamsUpgradeIntent,
+ AuditLogsUpgradeIntent,
+ AuditRetentionUpgradeIntent,
+ CustomRolesUpgradeIntent,
+ EnterpriseAppConnectionsUpgradeIntent,
+ ExternalKmsUpgradeIntent,
+ GatewayPoolsUpgradeIntent,
+ GithubSyncUpgradeIntent,
+ GroupsUpgradeIntent,
+ HsmConnectorsUpgradeIntent,
+ IdentityAuthUpgradeIntent,
+ InstanceHsmUpgradeIntent,
+ InstanceUserManagementUpgradeIntent,
+ KmipUpgradeIntent,
+ LdapUpgradeIntent,
+ MachineIdentityTemplatesUpgradeIntent,
+ MfaEnforcementUpgradeIntent,
+ OidcSsoUpgradeIntent,
+ ProjectLimitUpgradeIntent,
+ ProjectTemplatesUpgradeIntent,
+ SamlSsoUpgradeIntent,
+ ScimUpgradeIntent,
+ SsoEnforcementUpgradeIntent,
+ SubOrganizationsUpgradeIntent
+ } from "./capability-upgrade-intents";
+ export { hasEnvironmentCapacity } from "./environment-limit";
+ export type { UpgradeIntent } from "./upgrade-intents";
+ export {
+ BillingPlan,
+ BillingProduct,
+ buildUpgradeReturnPath,
+ CertificateApprovalPoliciesUpgradeIntent,
+ CertificateAuthoritiesUpgradeIntent,
+ CertificateDiscoveryUpgradeIntent,
+ CertificateEnrollmentUpgradeIntent,
+ CertificateEnterpriseAlertingUpgradeIntent,
+ CertificateIssuanceLimitsUpgradeIntent,
+ CertificateManagementUpgradeIntent,
+ CertificateRevocationListsUpgradeIntent,
+ CertificateSyncsUpgradeIntent,
+ CodeSigningUpgradeIntent,
+ CrossProjectSecretSharingUpgradeIntent,
+ DynamicSecretsUpgradeIntent,
+ EnterprisePamAccountsUpgradeIntent,
+ EnterpriseSecretSyncsUpgradeIntent,
+ EnvironmentLimitUpgradeIntent,
+ ExternalCertificateAuthoritiesUpgradeIntent,
+ FolderAccessControlsUpgradeIntent,
+ getSafeUpgradeReturnPath,
+ HoneyTokensUpgradeIntent,
+ PamAccountLimitUpgradeIntent,
- PamSlackNotificationsUpgradeIntent,
++ PamEnterpriseAlertingUpgradeIntent,
+ PamUpgradeIntent,
+ PointInTimeRecoveryUpgradeIntent,
+ PostQuantumCertificatesUpgradeIntent,
+ SecretAccessInsightsUpgradeIntent,
+ SecretAccessRequestsUpgradeIntent,
+ SecretApprovalPoliciesUpgradeIntent,
+ SecretImportReplicationUpgradeIntent,
+ SecretRotationsUpgradeIntent,
+ SecretsBrokeringUpgradeIntent,
+ SecretScanningUpgradeIntent,
+ UpgradeFeature
+ } from "./upgrade-intents";
+ export { UpgradeGate } from "./UpgradeGate";
+ export { useUpgradeGate } from "./useUpgradeGate";
diff --cc frontend/src/components/license/UpgradeGate/upgrade-intents.ts
index 0000000000,a6441391b3..6e07d794f7
mode 000000,100644..100644
--- a/frontend/src/components/license/UpgradeGate/upgrade-intents.ts
+++ b/frontend/src/components/license/UpgradeGate/upgrade-intents.ts
@@@ -1,0 -1,385 +1,385 @@@
+ export const BillingProduct = {
+ SecretsManagement: "secrets_management",
+ CertificateManagement: "cert_management",
+ Pam: "pam"
+ } as const;
+
+ export const BillingPlan = {
+ Pro: "pro",
+ Advanced: "advanced",
+ Enterprise: "enterprise"
+ } as const;
+
+ export const UpgradeFeature = {
+ DynamicSecrets: "dynamic-secrets",
+ SecretRotations: "secret-rotations",
+ HoneyTokens: "honey-tokens",
+ SecretsBrokering: "secrets-brokering",
+ PointInTimeRecovery: "point-in-time-recovery",
+ FolderAccessControls: "folder-access-controls",
+ SecretImportReplication: "secret-import-replication",
+ SecretAccessInsights: "secret-access-insights",
+ EnterpriseSecretSyncs: "enterprise-secret-syncs",
+ SecretApprovalPolicies: "secret-approval-policies",
+ SecretAccessRequests: "secret-access-requests",
+ CrossProjectSecretSharing: "cross-project-secret-sharing",
+ EnvironmentLimit: "environment-limit",
+ SecretScanning: "secret-scanning",
+ CertificateManagement: "certificate-management",
+ CertificateSyncs: "certificate-syncs",
+ CertificateApprovalPolicies: "certificate-approval-policies",
+ CertificateRevocationLists: "certificate-revocation-lists",
+ CodeSigning: "code-signing",
+ CertificateDiscovery: "certificate-discovery",
+ CertificateEnrollment: "certificate-enrollment",
+ CertificateEnterpriseAlerting: "certificate-enterprise-alerting",
+ CertificateAuthorities: "certificate-authorities",
+ ExternalCertificateAuthorities: "external-certificate-authorities",
+ PostQuantumCertificates: "post-quantum-certificates",
+ CertificateIssuanceLimits: "certificate-issuance-limits",
+ Pam: "pam",
+ PamAccountLimit: "pam-account-limit",
- PamSlackNotifications: "pam-slack-notifications",
++ PamEnterpriseAlerting: "pam-enterprise-alerting",
+ EnterprisePamAccounts: "enterprise-pam-accounts"
+ } as const;
+
+ export type UpgradeIntent = {
+ featureKey: (typeof UpgradeFeature)[keyof typeof UpgradeFeature];
+ productKey: (typeof BillingProduct)[keyof typeof BillingProduct];
+ planKey: (typeof BillingPlan)[keyof typeof BillingPlan];
+ upgradeLabel?: string;
+ title: string;
+ description: string;
+ quotaNotice?: string;
+ quota?: { used: number; limit: number };
+ };
+
+ export const DynamicSecretsUpgradeIntent = {
+ featureKey: UpgradeFeature.DynamicSecrets,
+ productKey: BillingProduct.SecretsManagement,
+ planKey: BillingPlan.Advanced,
+ upgradeLabel: "Unlock Dynamic Secrets",
+ title: "Add Dynamic Secrets",
+ description:
+ "Dynamic secrets are included with Secrets Management Advanced. Review the plan or start a free trial to continue."
+ } satisfies UpgradeIntent;
+
+ export const EnvironmentLimitUpgradeIntent = {
+ featureKey: UpgradeFeature.EnvironmentLimit,
+ productKey: BillingProduct.SecretsManagement,
+ planKey: BillingPlan.Pro,
+ upgradeLabel: "Unlock More Environments",
+ title: "Create Environment",
+ description: "Compare Secrets Management plans to increase your project's environment allowance."
+ } satisfies UpgradeIntent;
+
+ export const SecretScanningUpgradeIntent = {
+ featureKey: UpgradeFeature.SecretScanning,
+ productKey: BillingProduct.SecretsManagement,
+ planKey: BillingPlan.Enterprise,
+ upgradeLabel: "Unlock Secret Scanning",
+ title: "Add Secret Scanning Data Source",
+ description: "Review Secrets Management plans to enable secret scanning data sources."
+ } satisfies UpgradeIntent;
+
+ export const SecretRotationsUpgradeIntent = {
+ featureKey: UpgradeFeature.SecretRotations,
+ productKey: BillingProduct.SecretsManagement,
+ planKey: BillingPlan.Pro,
+ upgradeLabel: "Unlock Secret Rotations",
+ title: "Add Secret Rotation",
+ description:
+ "Secret rotations are included with Secrets Management Pro. Review the plan or start a free trial to continue."
+ } satisfies UpgradeIntent;
+
+ export const HoneyTokensUpgradeIntent = {
+ featureKey: UpgradeFeature.HoneyTokens,
+ productKey: BillingProduct.SecretsManagement,
+ planKey: BillingPlan.Pro,
+ upgradeLabel: "Unlock Honey Tokens",
+ title: "Add Honey Token",
+ description:
+ "Honey tokens are included with Secrets Management Pro. Review the plan or start a free trial to continue."
+ } satisfies UpgradeIntent;
+
+ export const SecretsBrokeringUpgradeIntent = {
+ featureKey: UpgradeFeature.SecretsBrokering,
+ productKey: BillingProduct.SecretsManagement,
+ planKey: BillingPlan.Enterprise,
+ upgradeLabel: "Unlock Secrets Brokering",
+ title: "Add Proxied Service",
+ description:
+ "Secrets brokering is included with Secrets Management Enterprise. Review the plan to continue."
+ } satisfies UpgradeIntent;
+
+ export const PointInTimeRecoveryUpgradeIntent = {
+ featureKey: UpgradeFeature.PointInTimeRecovery,
+ productKey: BillingProduct.SecretsManagement,
+ planKey: BillingPlan.Pro,
+ upgradeLabel: "Unlock Point-in-Time Recovery",
+ title: "View Commit History",
+ description:
+ "Point-in-time recovery is included with Secrets Management Pro. Review the plan or start a free trial to continue."
+ } satisfies UpgradeIntent;
+
+ export const FolderAccessControlsUpgradeIntent = {
+ featureKey: UpgradeFeature.FolderAccessControls,
+ productKey: BillingProduct.SecretsManagement,
+ planKey: BillingPlan.Pro,
+ upgradeLabel: "Unlock Folder Access Controls",
+ title: "Manage Folder Access",
+ description:
+ "Folder-level access controls are included with Secrets Management Pro. Review the plan or start a free trial to continue."
+ } satisfies UpgradeIntent;
+
+ export const SecretImportReplicationUpgradeIntent = {
+ featureKey: UpgradeFeature.SecretImportReplication,
+ productKey: BillingProduct.SecretsManagement,
+ planKey: BillingPlan.Pro,
+ upgradeLabel: "Unlock Secret Import Replication",
+ title: "Replicate Secret Import",
+ description:
+ "Secret import replication is included with Secrets Management Pro. Review the plan or start a free trial to continue."
+ } satisfies UpgradeIntent;
+
+ export const SecretAccessInsightsUpgradeIntent = {
+ featureKey: UpgradeFeature.SecretAccessInsights,
+ productKey: BillingProduct.SecretsManagement,
+ planKey: BillingPlan.Pro,
+ upgradeLabel: "Unlock Secret Access Insights",
+ title: "View Secret Access",
+ description:
+ "Secret access insights are included with Secrets Management Pro. Review the plan or start a free trial to continue."
+ } satisfies UpgradeIntent;
+
+ export const EnterpriseSecretSyncsUpgradeIntent = {
+ featureKey: UpgradeFeature.EnterpriseSecretSyncs,
+ productKey: BillingProduct.SecretsManagement,
+ planKey: BillingPlan.Enterprise,
+ upgradeLabel: "Unlock Enterprise Secret Syncs",
+ title: "Choose Enterprise Secret Sync",
+ description:
+ "Enterprise Secret Sync destinations are included with Secrets Management Enterprise. Review the plan to continue."
+ } satisfies UpgradeIntent;
+
+ export const SecretApprovalPoliciesUpgradeIntent = {
+ featureKey: UpgradeFeature.SecretApprovalPolicies,
+ productKey: BillingProduct.SecretsManagement,
+ planKey: BillingPlan.Pro,
+ upgradeLabel: "Unlock Approval Policies",
+ title: "Add Approval Policy",
+ description:
+ "Approval policies are included with Secrets Management Pro. Review the plans to continue."
+ } satisfies UpgradeIntent;
+
+ export const SecretAccessRequestsUpgradeIntent = {
+ featureKey: UpgradeFeature.SecretAccessRequests,
+ productKey: BillingProduct.SecretsManagement,
+ planKey: BillingPlan.Pro,
+ upgradeLabel: "Unlock Access Requests",
+ title: "Request Secret Access",
+ description:
+ "Access requests are included with Secrets Management Pro. Review the plans to continue."
+ } satisfies UpgradeIntent;
+
+ export const CrossProjectSecretSharingUpgradeIntent = {
+ featureKey: UpgradeFeature.CrossProjectSecretSharing,
+ productKey: BillingProduct.SecretsManagement,
+ planKey: BillingPlan.Pro,
+ upgradeLabel: "Unlock Cross-Project Secret Sharing",
+ title: "Share Secrets Across Projects",
+ description:
+ "Cross-project secret sharing is included with Secrets Management Pro. Review the plans to continue."
+ } satisfies UpgradeIntent;
+
+ export const CertificateManagementUpgradeIntent = {
+ featureKey: UpgradeFeature.CertificateManagement,
+ productKey: BillingProduct.CertificateManagement,
+ planKey: BillingPlan.Pro,
+ upgradeLabel: "Unlock Certificate Management",
+ title: "Open Certificate Management",
+ description:
+ "Certificate Management is included with the Pro plan. Review the plans or start a free trial to continue."
+ } satisfies UpgradeIntent;
+
+ export const CertificateSyncsUpgradeIntent = {
+ featureKey: UpgradeFeature.CertificateSyncs,
+ productKey: BillingProduct.CertificateManagement,
+ planKey: BillingPlan.Enterprise,
+ upgradeLabel: "Unlock Certificate Syncs",
+ title: "Add Certificate Sync",
+ description:
+ "Certificate Syncs are included with the Enterprise plan. Review the plan to continue."
+ } satisfies UpgradeIntent;
+
+ export const CertificateApprovalPoliciesUpgradeIntent = {
+ featureKey: UpgradeFeature.CertificateApprovalPolicies,
+ productKey: BillingProduct.CertificateManagement,
+ planKey: BillingPlan.Enterprise,
+ upgradeLabel: "Unlock Approval Policies",
+ title: "Create Approval Policy",
+ description:
+ "Certificate approval policies are included with the Enterprise plan. Review the plan to continue."
+ } satisfies UpgradeIntent;
+
+ export const CertificateRevocationListsUpgradeIntent = {
+ featureKey: UpgradeFeature.CertificateRevocationLists,
+ productKey: BillingProduct.CertificateManagement,
+ planKey: BillingPlan.Enterprise,
+ upgradeLabel: "Unlock CRL Distribution Points",
+ title: "Add CRL Distribution Point",
+ description:
+ "Custom CRL distribution points are included with the Enterprise plan. Review the plan to continue."
+ } satisfies UpgradeIntent;
+
+ export const CodeSigningUpgradeIntent = {
+ featureKey: UpgradeFeature.CodeSigning,
+ productKey: BillingProduct.CertificateManagement,
+ planKey: BillingPlan.Enterprise,
+ upgradeLabel: "Unlock Code Signing",
+ title: "Create Code Signer",
+ description: "Code signing is included with the Enterprise plan. Review the plan to continue."
+ } satisfies UpgradeIntent;
+
+ export const CertificateDiscoveryUpgradeIntent = {
+ featureKey: UpgradeFeature.CertificateDiscovery,
+ productKey: BillingProduct.CertificateManagement,
+ planKey: BillingPlan.Enterprise,
+ upgradeLabel: "Unlock Certificate Discovery",
+ title: "Add Discovery Job",
+ description:
+ "Certificate discovery is included with the Enterprise plan. Review the plan to continue."
+ } satisfies UpgradeIntent;
+
+ export const CertificateEnrollmentUpgradeIntent = {
+ featureKey: UpgradeFeature.CertificateEnrollment,
+ productKey: BillingProduct.CertificateManagement,
+ planKey: BillingPlan.Enterprise,
+ upgradeLabel: "Unlock Certificate Enrollment",
+ title: "Manage Certificate Enrollment",
+ description:
+ "Advanced certificate enrollment methods are included with the Enterprise plan. Review the plan to continue."
+ } satisfies UpgradeIntent;
+
+ export const CertificateEnterpriseAlertingUpgradeIntent = {
+ featureKey: UpgradeFeature.CertificateEnterpriseAlerting,
+ productKey: BillingProduct.CertificateManagement,
+ planKey: BillingPlan.Enterprise,
+ upgradeLabel: "Unlock Enterprise Alert Channels",
+ title: "Add Enterprise Alert Channel",
+ description:
+ "Webhook, Slack, and PagerDuty certificate alert channels are included with the Enterprise plan. Review the plan to continue."
+ } satisfies UpgradeIntent;
+
+ export const CertificateAuthoritiesUpgradeIntent = {
+ featureKey: UpgradeFeature.CertificateAuthorities,
+ productKey: BillingProduct.CertificateManagement,
+ planKey: BillingPlan.Pro,
+ upgradeLabel: "Unlock More Certificate Authorities",
+ title: "Create Certificate Authority",
+ description:
+ "Compare Certificate Management plans to increase your certificate authority allowance."
+ } satisfies UpgradeIntent;
+
+ export const ExternalCertificateAuthoritiesUpgradeIntent = {
+ featureKey: UpgradeFeature.ExternalCertificateAuthorities,
+ productKey: BillingProduct.CertificateManagement,
+ planKey: BillingPlan.Enterprise,
+ upgradeLabel: "Unlock External Certificate Authorities",
+ title: "Configure External Certificate Authority",
+ description:
+ "External certificate authority integrations are included with the Enterprise plan. Review the plan to continue."
+ } satisfies UpgradeIntent;
+
+ export const PostQuantumCertificatesUpgradeIntent = {
+ featureKey: UpgradeFeature.PostQuantumCertificates,
+ productKey: BillingProduct.CertificateManagement,
+ planKey: BillingPlan.Enterprise,
+ upgradeLabel: "Unlock Post-Quantum Certificates",
+ title: "Select Post-Quantum Algorithm",
+ description:
+ "Post-quantum certificate algorithms are included with the Enterprise plan. Review the plan to continue."
+ } satisfies UpgradeIntent;
+
+ export const CertificateIssuanceLimitsUpgradeIntent = {
+ featureKey: UpgradeFeature.CertificateIssuanceLimits,
+ productKey: BillingProduct.CertificateManagement,
+ planKey: BillingPlan.Pro,
+ upgradeLabel: "Unlock Certificate Issuance",
+ title: "Configure Certificate Names",
+ description:
+ "Compare Certificate Management plans to increase certificate and subject alternative name allowances."
+ } satisfies UpgradeIntent;
+
+ export const PamUpgradeIntent = {
+ featureKey: UpgradeFeature.Pam,
+ productKey: BillingProduct.Pam,
+ planKey: BillingPlan.Pro,
+ upgradeLabel: "Unlock Privileged Access Management",
+ title: "Open Privileged Access Management",
+ description:
+ "Privileged Access Management is included with the Pro plan. Review the plans or start a free trial to continue."
+ } satisfies UpgradeIntent;
+
+ export const PamAccountLimitUpgradeIntent = {
+ featureKey: UpgradeFeature.PamAccountLimit,
+ productKey: BillingProduct.Pam,
+ planKey: BillingPlan.Pro,
+ upgradeLabel: "Unlock More PAM Accounts",
+ title: "Add PAM Account",
+ description: "Compare PAM plans to increase your organization-wide account allowance."
+ } satisfies UpgradeIntent;
+
-export const PamSlackNotificationsUpgradeIntent = {
- featureKey: UpgradeFeature.PamSlackNotifications,
++export const PamEnterpriseAlertingUpgradeIntent = {
++ featureKey: UpgradeFeature.PamEnterpriseAlerting,
+ productKey: BillingProduct.Pam,
+ planKey: BillingPlan.Enterprise,
- upgradeLabel: "Unlock Slack Notifications",
- title: "Configure Slack Notifications",
++ upgradeLabel: "Unlock Enterprise Alert Channels",
++ title: "Add Enterprise Alert Channel",
+ description:
- "PAM Slack notifications are included with the Enterprise plan. Review the plan to continue."
++ "Webhook, Slack, and PagerDuty PAM alert channels are included with the Enterprise plan. Review the plan to continue."
+ } satisfies UpgradeIntent;
+
+ export const EnterprisePamAccountsUpgradeIntent = {
+ featureKey: UpgradeFeature.EnterprisePamAccounts,
+ productKey: BillingProduct.Pam,
+ planKey: BillingPlan.Enterprise,
+ upgradeLabel: "Unlock Enterprise Accounts",
+ title: "Add Enterprise Account",
+ description:
+ "Enterprise account types are included with the Enterprise plan. Review the plan to continue."
+ } satisfies UpgradeIntent;
+
+ export const buildUpgradeReturnPath = (location: Location) => {
+ const search = new URLSearchParams(location.search);
+ search.delete("checkout");
+ search.delete("card");
+ search.delete("upgradeContinuation");
+ search.delete("upgradeEnvironment");
+ search.delete("upgradeFolderPath");
+ const query = search.toString();
+ const fullPath = `${location.pathname}${query ? `?${query}` : ""}${location.hash}`;
+ return fullPath.length <= 2048 ? fullPath : location.pathname;
+ };
+
+ export const getSafeUpgradeReturnPath = (returnPath: string | null, origin: string) => {
+ if (!returnPath || returnPath.length > 2048 || !returnPath.startsWith("/")) {
+ return null;
+ }
+
+ const hasUnsafeCharacter = [...returnPath].some((character) => {
+ const codePoint = character.charCodeAt(0);
+ return codePoint <= 31 || codePoint === 127 || character === "\\";
+ });
+ if (hasUnsafeCharacter) {
+ return null;
+ }
+
+ try {
+ const url = new URL(returnPath, origin);
+ if (url.origin !== new URL(origin).origin || url.pathname.includes("//")) return null;
+ return `${url.pathname}${url.search}${url.hash}`;
+ } catch {
+ return null;
+ }
+ };
diff --cc frontend/src/hooks/api/alerts/types.ts
index 144d08f47d,a75883b7f6..f2ad2a4396
--- a/frontend/src/hooks/api/alerts/types.ts
+++ b/frontend/src/hooks/api/alerts/types.ts
@@@ -1,5 -1,5 +1,6 @@@
import { z } from "zod";
++import { UpgradeIntent } from "@app/components/license/UpgradeGate";
import { CertSource } from "@app/hooks/api/certificates/enums";
export enum AlertResourceType {
@@@ -99,22 -76,7 +100,22 @@@ export const ALERT_EVENT_TYPE_DESCRIPTI
[AlertEventType.IdentityAuthenticationExpiry]:
"Notify a set number of days before a Universal Auth client secret or Token Auth access token expires.",
[AlertEventType.IdentityAuthMethodChanged]:
- "Notify whenever an auth method is added, updated, or removed, or one of its credentials is created, updated, or revoked."
+ "Notify whenever an auth method is added, updated, or removed, or one of its credentials is created, updated, or revoked.",
+ [AlertEventType.PamAccessRequested]:
+ "Notify when someone requests access to an account in this folder.",
+ [AlertEventType.PamAccessRequestApproved]:
+ "Notify when an access request in this folder is approved.",
+ [AlertEventType.PamAccessRequestDenied]:
+ "Notify when an access request in this folder is denied.",
+ [AlertEventType.PamAccessRequestBypassed]:
+ "Notify when someone uses break-glass to access an account in this folder without approval."
+};
+
+// Channel types a plan doesn't include, and the paywall shown when one is picked.
+export type TAlertChannelPaywall = {
+ lockedChannelTypes: AlertChannelType[];
++ intent: UpgradeIntent;
+ paywallKey: string;
- text: string;
};
export const ALERT_CHANNEL_TYPE_LABELS: Record<AlertChannelType, string> = {
diff --cc frontend/src/pages/pam/PamAccountsPage/components/FolderApprovalsTab.tsx
index be44c279d9,cfaa7d81b6..76d2a81a3e
--- a/frontend/src/pages/pam/PamAccountsPage/components/FolderApprovalsTab.tsx
+++ b/frontend/src/pages/pam/PamAccountsPage/components/FolderApprovalsTab.tsx
@@@ -10,6 -10,10 +10,7 @@@ import
} from "lucide-react";
import { twMerge } from "tailwind-merge";
-import {
- PamSlackNotificationsUpgradeIntent,
- useUpgradeGate
-} from "@app/components/license/UpgradeGate";
++import { PamEnterpriseAlertingUpgradeIntent } from "@app/components/license/UpgradeGate";
import { createNotification } from "@app/components/notifications";
import { DeleteActionModal } from "@app/components/v2";
import {
@@@ -535,38 -551,7 +536,38 @@@ export const FolderApprovalsTab = ({ fo
</CardContent>
</Card>
- {isPamSlackEnabled ? (
+ <Card>
+ <CardHeader>
+ <CardTitle>Alerts</CardTitle>
+ <CardDescription>
+ Notify email, Slack, webhook, or PagerDuty channels about access request activity for
+ accounts in this folder.
+ </CardDescription>
+ <CardAction>
+ <AlertAction
+ resourceType={AlertResourceType.PamFolder}
+ resourceId={folderId}
+ projectId={currentProject.id}
+ renderPermissionGate={(render) => render(true)}
+ channelPaywall={
+ subscription?.pamEnterpriseAlerting
+ ? undefined
+ : {
+ lockedChannelTypes: [
+ AlertChannelType.Slack,
+ AlertChannelType.Webhook,
+ AlertChannelType.PagerDuty
+ ],
- paywallKey: "pam.folder-alert-channels",
- text: "Slack, webhook, and PagerDuty alert channels for PAM are available on the Enterprise plan."
++ intent: PamEnterpriseAlertingUpgradeIntent,
++ paywallKey: "pam.folder-alert-channels"
+ }
+ }
+ />
+ </CardAction>
+ </CardHeader>
+ </Card>
+
+ {savedNotificationConfigs.length > 0 && (
<FolderNotificationsSection
configs={notificationConfigs}
integrationSlugById={integrationSlugById}
diff --cc frontend/src/views/Alerts/ChannelsField.tsx
index bc074746da,f87fd4633e..888efec88f
--- a/frontend/src/views/Alerts/ChannelsField.tsx
+++ b/frontend/src/views/Alerts/ChannelsField.tsx
@@@ -1,7 -1,5 +1,6 @@@
- import { useState } from "react";
import { useFieldArray, useFormContext } from "react-hook-form";
- import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal";
++import { useUpgradeGate } from "@app/components/license/UpgradeGate";
import { Label } from "@app/components/v3";
import {
ALERT_CHANNEL_TYPE_LABELS,
@@@ -43,8 -39,7 +42,8 @@@ export const buildNextChannel = (existi
return buildNewChannel(channelType, name);
};
-export const ChannelsField = ({ projectId, resourceType, resourceId }: Props) => {
+export const ChannelsField = ({ projectId, resourceType, resourceId, channelPaywall }: Props) => {
- const [isUpgradeOpen, setIsUpgradeOpen] = useState(false);
++ const { openUpgradeGate, upgradeGate } = useUpgradeGate();
const {
control,
getValues,
@@@ -68,21 -63,7 +67,19 @@@
</Label>
<span className="text-xs text-muted">Add at least one delivery channel.</span>
</div>
- <AddChannelMenu onAdd={appendChannel} />
+ <AddChannelMenu
+ onAdd={appendChannel}
+ lockedChannelTypes={channelPaywall?.lockedChannelTypes}
- onLockedSelect={() => setIsUpgradeOpen(true)}
++ onLockedSelect={() =>
++ channelPaywall &&
++ openUpgradeGate({
++ intent: channelPaywall.intent,
++ paywallKey: channelPaywall.paywallKey
++ })
++ }
+ contentClassName={channelPaywall ? "min-w-56" : undefined}
+ />
- {channelPaywall && (
- <UpgradePlanModal
- isOpen={isUpgradeOpen}
- onOpenChange={setIsUpgradeOpen}
- paywallKey={channelPaywall.paywallKey}
- text={channelPaywall.text}
- isEnterpriseFeature
- />
- )}
++ {upgradeGate}
</div>
{rootError && <p className="text-xs text-danger">{rootError}</p>}