fix: address review comments - add organizationId to rotation events, remove redundant orgId, rename gatewayId

devin-ai-integration[bot] · 0xArshdeep · devin-ai-integration[bot] · commit 2da6f50302d3 · 2026-03-17T02:26:43.000Z
Co-Authored-By: arsh &lt;arshsb1998@gmail.com&gt;
diff --git a/backend/src/ee/routes/v1/gateway-router.ts b/backend/src/ee/routes/v1/gateway-router.ts
@@ -88,9 +88,8 @@ export const registerGatewayRouter = async (server: FastifyZodProvider) => {
           distinctId: getTelemetryDistinctId(req),
           organizationId: req.permission.orgId,
           properties: {
-            gatewayId: gatewayCertificates.serialNumber,
-            identityId: req.permission.id,
-            orgId: req.permission.orgId
+            certificateSerialNumber: gatewayCertificates.serialNumber,
+            identityId: req.permission.id
           }
         })
         .catch(() => {});
diff --git a/backend/src/ee/routes/v1/ldap-router.ts b/backend/src/ee/routes/v1/ldap-router.ts
@@ -230,7 +230,6 @@ export const registerLdapRouter = async (server: FastifyZodProvider) => {
           distinctId: getTelemetryDistinctId(req),
           organizationId: req.body.organizationId,
           properties: {
-            orgId: req.body.organizationId,
             provider: "ldap",
             action: "create"
           }
@@ -292,7 +291,6 @@ export const registerLdapRouter = async (server: FastifyZodProvider) => {
           distinctId: getTelemetryDistinctId(req),
           organizationId: req.body.organizationId,
           properties: {
-            orgId: req.body.organizationId,
             provider: "ldap",
             action: "update"
           }
diff --git a/backend/src/ee/routes/v1/oidc-router.ts b/backend/src/ee/routes/v1/oidc-router.ts
@@ -286,7 +286,6 @@ export const registerOidcRouter = async (server: FastifyZodProvider) => {
           distinctId: getTelemetryDistinctId(req),
           organizationId: req.body.organizationId,
           properties: {
-            orgId: req.body.organizationId,
             provider: "oidc",
             action: "update"
           }
@@ -424,7 +423,6 @@ export const registerOidcRouter = async (server: FastifyZodProvider) => {
           distinctId: getTelemetryDistinctId(req),
           organizationId: req.body.organizationId,
           properties: {
-            orgId: req.body.organizationId,
             provider: "oidc",
             action: "create"
           }
diff --git a/backend/src/ee/routes/v1/saml-router.ts b/backend/src/ee/routes/v1/saml-router.ts
@@ -389,7 +389,6 @@ export const registerSamlRouter = async (server: FastifyZodProvider) => {
           distinctId: getTelemetryDistinctId(req),
           organizationId: req.body.organizationId,
           properties: {
-            orgId: req.body.organizationId,
             provider: authProvider,
             action: "create"
           }
@@ -456,7 +455,6 @@ export const registerSamlRouter = async (server: FastifyZodProvider) => {
             distinctId: getTelemetryDistinctId(req),
             organizationId: req.body.organizationId,
             properties: {
-              orgId: req.body.organizationId,
               provider: authProvider,
               action: "update"
             }
diff --git a/backend/src/ee/routes/v2/secret-rotation-v2-routers/secret-rotation-v2-endpoints.ts b/backend/src/ee/routes/v2/secret-rotation-v2-routers/secret-rotation-v2-endpoints.ts
@@ -262,6 +262,7 @@ export const registerSecretRotationEndpoints = <
         .sendPostHogEvents({
           event: PostHogEventTypes.SecretRotationV2Created,
           distinctId: getTelemetryDistinctId(req),
+          organizationId: req.permission.orgId,
           properties: {
             rotationId: secretRotation.id,
             type,
@@ -379,6 +380,7 @@ export const registerSecretRotationEndpoints = <
         .sendPostHogEvents({
           event: PostHogEventTypes.SecretRotationV2Deleted,
           distinctId: getTelemetryDistinctId(req),
+          organizationId: req.permission.orgId,
           properties: {
             rotationId,
             type,
@@ -482,6 +484,7 @@ export const registerSecretRotationEndpoints = <
         .sendPostHogEvents({
           event: PostHogEventTypes.SecretRotationV2Executed,
           distinctId: getTelemetryDistinctId(req),
+          organizationId: req.permission.orgId,
           properties: {
             rotationId,
             type,
diff --git a/backend/src/server/routes/v1/app-connection-routers/app-connection-endpoints.ts b/backend/src/server/routes/v1/app-connection-routers/app-connection-endpoints.ts
@@ -331,8 +331,7 @@ export const registerAppConnectionEndpoints = <T extends TAppConnection, I exten
           properties: {
             appConnectionId: appConnection.id,
             app,
-            method: method as string,
-            orgId: req.permission.orgId
+            method: method as string
           }
         })
         .catch(() => {});
@@ -454,8 +453,7 @@ export const registerAppConnectionEndpoints = <T extends TAppConnection, I exten
           organizationId: req.permission.orgId,
           properties: {
             appConnectionId: connectionId,
-            app,
-            orgId: req.permission.orgId
+            app
           }
         })
         .catch(() => {});
diff --git a/backend/src/services/telemetry/telemetry-types.ts b/backend/src/services/telemetry/telemetry-types.ts
@@ -554,7 +554,6 @@ export type TDynamicSecretLeaseRenewedEvent = {
 export type TSSOConfiguredEvent = {
   event: PostHogEventTypes.SSOConfigured;
   properties: {
-    orgId: string;
     provider: string;
     action: "create" | "update";
   };
@@ -566,7 +565,6 @@ export type TAppConnectionCreatedEvent = {
     appConnectionId: string;
     app: string;
     method: string;
-    orgId: string;
   };
 };
 
@@ -575,7 +573,6 @@ export type TAppConnectionDeletedEvent = {
   properties: {
     appConnectionId: string;
     app: string;
-    orgId: string;
   };
 };
 
@@ -611,9 +608,8 @@ export type TSecretRotationV2ExecutedEvent = {
 export type TGatewayCreatedEvent = {
   event: PostHogEventTypes.GatewayCreated;
   properties: {
-    gatewayId: string;
+    certificateSerialNumber: string;
     identityId: string;
-    orgId: string;
   };
 };
 
