fix: pr changes

backend/src/ee/services/event/event-sse-stream.ts

@@ -66,19 +66,24 @@ export type EventStreamClient = {
 };
 
 export function createEventStreamClient(redis: Redis, options: IEventStreamClientOpts): EventStreamClient {
-  const rules = options.registered.map((r) => ({
+  const rules = options.registered.map((r) => {
-    subject: options.type,
+    const secretPath = r.conditions?.secretPath;
-    action: "subscribe",
+    const hasConditions = r.conditions?.environmentSlug || r.conditions?.secretPath;
-    conditions: {
+
-      eventType: r.event,
+    return {
-      ...(r.conditions
+      subject: options.type,
-        ? {
+      action: "subscribe",
-            secretPath: r.conditions?.secretPath,
+      conditions: {
-            environment: r.conditions?.environmentSlug
+        eventType: r.event,
-          }
+        ...(hasConditions
-        : {})
+          ? {
-    }
+              environment: r.conditions?.environmentSlug ?? "",
-  }));
+              secretPath: r.conditions?.recursive ? { $glob: `${secretPath}/**` } : secretPath
+            }
+          : {})
+      }
+    };
+  });
 
   const id = `sse-${nanoid()}`;
   const control = new AbortController();

backend/src/ee/services/event/types.ts

@@ -117,7 +117,8 @@ export const EventRegisterSchema = z.object({
   conditions: z
     .object({
       secretPath: z.string().optional().default("/"),
-      environmentSlug: z.string()
+      environmentSlug: z.string(),
+      recursive: z.boolean().optional().default(false)
     })
     .optional()
 });

backend/src/server/routes/v1/event-router.ts

@@ -80,13 +80,15 @@ export const registerEventRouter = async (server: FastifyZodProvider) => {
             }
 
             req.body.register.forEach((r) => {
+              const fields = {
+                environment: r.conditions?.environmentSlug ?? "",
+                secretPath: r.conditions?.secretPath ?? "/",
+                eventType: r.event
+              };
+
               const allowed = info.permission.can(
                 ProjectPermissionSecretActions.Subscribe,
-                subject(ProjectPermissionSub.Secrets, {
+                subject(ProjectPermissionSub.Secrets, fields)
-                  environment: r.conditions?.environmentSlug ?? "",
-                  secretPath: r.conditions?.secretPath ?? "/",
-                  eventType: r.event
-                })
               );
 
               if (!allowed) {
@@ -94,9 +96,9 @@ export const registerEventRouter = async (server: FastifyZodProvider) => {
                   name: "PermissionDenied",
                   message: `You are not allowed to subscribe on secrets`,
                   details: {
-                    event: r.event,
+                    event: fields.eventType,
-                    environmentSlug: r.conditions?.environmentSlug,
+                    environmentSlug: fields.environment,
-                    secretPath: r.conditions?.secretPath ?? "/"
+                    secretPath: fields.secretPath
                   }
                 });
               }

docs/documentation/platform/event-subscriptions.mdx

@@ -5,20 +5,12 @@ description: "Subscribe to events in Infisical for real-time updates"
 ---
 
 <Info>
-  <strong>Note:</strong> Event Subscriptions is a paid feature.
+  **Note:** Event Subscriptions is a paid feature. - **Infisical Cloud users:** Event Subscriptions is
-  <br />
+  available under the **Enterprise Tier**. - **Self-Hosted Infisical:** Please
-  <br />
+  contact [[email protected]](mailto:[email protected]) to purchase an
-  On Infisical Cloud, this feature is available on the <strong>
-    Pro
-  </strong> and <strong>Enterprise</strong> tiers, with each tier providing
-  different event retention periods.
-  <br />
-  For self-hosted deployments, please contact{" "}
-  <a href="mailto:[email protected]">[email protected]</a> to purchase an
   enterprise license.
 </Info>
 
-## Introduction
 
 Event Subscriptions in Infisical allow you to receive real-time notifications when specific actions occur within your account or organization. These notifications can include changes to secrets, users, teams, and other important resources.
 
@@ -30,9 +22,10 @@ You can currently subscribe to notifications for the following event types:
 - `secret:updated`: Triggered when a secret is updated.
 - `secret:deleted`: Triggered when a secret is deleted.
 
+
 ## Permissions Setup
 
-Proper permissions are required to configure event subscriptions. Follow these steps to set up the necessary permissions:
+In order to receive events on a supported resource, the identity is required to have a Subscribe permission on that resource. Follow these steps to set up the necessary permissions:
 
 <Steps>
   <Step title="Select a project and copy the 'Project ID'">