fix: rename organizationSlug to organizationId in telemetry and related files

Author: alepane21

cli/src/core/telemetry.ts

@@ -2,7 +2,7 @@ import crypto from 'node:crypto';
 import os from 'node:os';
 import { PostHog } from 'posthog-node';
 import { EnumStatusCode } from '@wundergraph/cosmo-connect/dist/common/common_pb';
-import { config, getBaseHeaders, getLoginDetails } from './config.js';
+import { config, getBaseHeaders } from './config.js';
 import { CreateClient } from './client/client.js';
 
 // Environment variables to allow opting out of telemetry
@@ -32,7 +32,7 @@ type PostHogFetchResponse = {
 
 type TelemetryIdentity = {
   userEmail?: string;
-  organizationSlug: string;
+  organizationId: string;
 };
 
 const buildPostHogOkResponse = () => ({
@@ -125,7 +125,7 @@ const getIdentity = async (): Promise<TelemetryIdentity> => {
   try {
     if (!apiClient) {
       return {
-        organizationSlug: 'anonymous',
+        organizationId: 'anonymous',
       };
     }
 
@@ -138,7 +138,7 @@ const getIdentity = async (): Promise<TelemetryIdentity> => {
 
     if (resp.response?.code === EnumStatusCode.OK) {
       return {
-        organizationSlug: resp.organizationSlug,
+        organizationId: resp.organizationId || 'anonymous',
         userEmail: resp.userEmail || undefined,
       };
     }
@@ -149,7 +149,7 @@ const getIdentity = async (): Promise<TelemetryIdentity> => {
     }
   }
   return {
-    organizationSlug: 'anonymous',
+    organizationId: 'anonymous',
   };
 };
 
@@ -166,9 +166,9 @@ export const capture = async (eventName: string, properties: Record<string, any>
     const metadata = getMetadata();
 
     client.capture({
-      distinctId: identity.userEmail ?? identity.organizationSlug,
+      distinctId: identity.userEmail ?? identity.organizationId,
       groups: {
-        orgslug: identity.organizationSlug,
+        cosmo_organization: identity.organizationId ?? '',
       },
       event: eventName,
       properties: {

connect/src/wg/cosmo/platform/v1/platform_pb.ts

@@ -9273,6 +9273,11 @@ export class WhoAmIResponse extends Message<WhoAmIResponse> {
    */
   organizationSlug = "";
 
+  /**
+   * @generated from field: string organizationId = 5;
+   */
+  organizationId = "";
+
   constructor(data?: PartialMessage<WhoAmIResponse>) {
     super();
     proto3.util.initPartial(data, this);
@@ -9285,6 +9290,7 @@ export class WhoAmIResponse extends Message<WhoAmIResponse> {
     { no: 2, name: "organizationName", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 3, name: "userEmail", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
     { no: 4, name: "organizationSlug", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 5, name: "organizationId", kind: "scalar", T: 9 /* ScalarType.STRING */ },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): WhoAmIResponse {

controlplane/src/core/bufservices/organization/whoAmI.ts

@@ -29,13 +29,15 @@ export function whoAmI(
         },
         organizationName: '',
         organizationSlug: '',
+        organizationId: '',
       };
     }
 
     return {
       response: {
         code: EnumStatusCode.OK,
       },
+      organizationId: organization.id,
       organizationName: organization.name,
       organizationSlug: organization.slug,
     };

proto/wg/cosmo/platform/v1/platform.proto

@@ -1235,6 +1235,7 @@ message WhoAmIResponse {
   string organizationName = 2;
   optional string userEmail = 3;
   string organizationSlug = 4;
+  string organizationId = 5;
 }
 
 message RouterToken {

studio/src/lib/track.ts

@@ -64,20 +64,19 @@ const identify = ({
       id: organizationId,
       slug: organizationSlug,
       name: organizationName,
-      plan: plan
+      plan: plan,
     });
     return;
   }
-  
+
   posthog.identify(email, {
     id,
-    email,
   });
   posthog.group('cosmo_organization', organizationId, {
     id: organizationId,
     slug: organizationSlug,
     name: organizationName,
-    plan: plan
+    plan: plan,
   });
 };