Merge pull request #914 from trycompai/mariano/comp-166-osquery-agent-integration

[dev] [Marfuen] mariano/comp-166-osquery-agent-integration

Author: Marfuen

.vscode/settings.json

@@ -20,5 +20,8 @@
   },
   "editor.codeActionsOnSave": {
     "source.fixAll": "explicit"
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   }
 }

apps/app/src/app/(app)/[orgId]/people/layout.tsx

@@ -1,3 +1,4 @@
+import { getPostHogClient } from "@/app/posthog";
 import { AppOnboarding } from "@/components/app-onboarding";
 import { auth } from "@/utils/auth";
 import { db } from "@comp/db";
@@ -34,7 +35,10 @@ export default async function Layout({
     return roles.includes("employee");
   });
 
-  const isFleetEnabled = process.env.NEXT_PUBLIC_FLEET_ENABLED === "true";
+  const isFleetEnabled = await getPostHogClient()?.isFeatureEnabled(
+    "is-fleet-enabled",
+    session?.session.userId,
+  );
 
   return (
     <div className="m-auto max-w-[1200px]">

apps/portal/src/app/[locale]/(app)/(home)/[orgId]/components/EmployeeTasksList.tsx

@@ -22,6 +22,7 @@ interface EmployeeTasksListProps {
   member: Member;
   fleetPolicies: FleetPolicy[];
   host: Host;
+  isFleetEnabled: boolean;
 }
 
 export const EmployeeTasksList = ({
@@ -30,6 +31,7 @@ export const EmployeeTasksList = ({
   member,
   fleetPolicies,
   host,
+  isFleetEnabled,
 }: EmployeeTasksListProps) => {
   const [isDownloading, setIsDownloading] = useState(false);
 
@@ -70,14 +72,13 @@ export const EmployeeTasksList = ({
   };
 
   const hasPolicies = fleetPolicies.length;
-  const fleetEnabled = process.env.NEXT_PUBLIC_FLEET_ENABLED === "true";
 
   return (
     <Tabs defaultValue="policies">
       <TabsList className="mb-1 h-auto w-full justify-start rounded-sm border-b-[1px] bg-transparent p-0 pb-4">
         <TabsTrigger value="policies">Policies</TabsTrigger>
         <TabsTrigger value="training">Training</TabsTrigger>
-        {fleetEnabled && <TabsTrigger value="device">Device</TabsTrigger>}
+        {isFleetEnabled && <TabsTrigger value="device">Device</TabsTrigger>}
       </TabsList>
       <TabsContent value="policies" className="py-2">
         <PolicyList policies={policies} member={member} />
@@ -86,7 +87,7 @@ export const EmployeeTasksList = ({
         <VideoCarousel videos={trainingVideos} member={member} />
       </TabsContent>
       <TabsContent value="device" className="py-2">
-        {fleetEnabled && hasPolicies ? (
+        {isFleetEnabled && hasPolicies ? (
           <Card>
             <CardHeader>
               <CardTitle>{host.computer_name}'s Policies</CardTitle>

apps/portal/src/app/[locale]/(app)/(home)/[orgId]/components/OrganizationDashboard.tsx

@@ -15,13 +15,15 @@ interface OrganizationDashboardProps {
   member: MemberWithUserOrg; // Pass the full member object for user info etc.
   fleetPolicies: FleetPolicy[];
   host: Host;
+  isFleetEnabled: boolean;
 }
 
 export async function OrganizationDashboard({
   organizationId,
   member,
   fleetPolicies,
   host,
+  isFleetEnabled,
 }: OrganizationDashboardProps) {
   // Fetch policies specific to the selected organization
   const policies = await db.policy.findMany({
@@ -74,6 +76,7 @@ export async function OrganizationDashboard({
         member={member} // Pass the member object down
         fleetPolicies={fleetPolicies}
         host={host}
+        isFleetEnabled={isFleetEnabled ?? false}
       />
     </div>
   );

apps/portal/src/app/[locale]/(app)/(home)/[orgId]/page.tsx

@@ -5,6 +5,7 @@ import { headers } from "next/headers";
 import { redirect } from "next/navigation";
 import { fleet } from "@/utils/fleet";
 import type { Member } from "@comp/db/types";
+import { getPostHogClient } from "@/app/posthog";
 
 export default async function OrganizationPage({
   params,
@@ -37,6 +38,10 @@ export default async function OrganizationPage({
   }
 
   const { fleetPolicies, device } = await getFleetPolicies(member);
+  const isFleetEnabled = await getPostHogClient()?.isFeatureEnabled(
+    "is-fleet-enabled",
+    session?.user.id,
+  );
 
   return (
     <OrganizationDashboard
@@ -45,6 +50,7 @@ export default async function OrganizationPage({
       member={member}
       fleetPolicies={fleetPolicies}
       host={device}
+      isFleetEnabled={isFleetEnabled ?? false}
     />
   );
 }

apps/portal/src/app/posthog.ts

@@ -0,0 +1,67 @@
+"use server";
+
+import { Properties } from "posthog-js";
+import { PostHog } from "posthog-node";
+
+let posthogInstance: PostHog | null = null;
+
+function getPostHogClient(): PostHog | null {
+  if (posthogInstance) {
+    return posthogInstance;
+  }
+
+  const apiKey = process.env.NEXT_PUBLIC_POSTHOG_KEY;
+  const apiHost = process.env.NEXT_PUBLIC_POSTHOG_HOST;
+
+  if (apiKey && apiHost) {
+    posthogInstance = new PostHog(apiKey, {
+      flushAt: 1,
+      flushInterval: 0,
+    });
+    return posthogInstance;
+  }
+
+  // If keys are not set, warn and return null
+  console.warn(
+    "PostHog keys (NEXT_PUBLIC_POSTHOG_KEY, NEXT_PUBLIC_POSTHOG_HOST) are not set, tracking is disabled.",
+  );
+  return null;
+}
+
+// Export the getter function as the primary way to access the client
+export { getPostHogClient };
+
+export async function track(
+  distinctId: string,
+  eventName: string,
+  properties?: Properties,
+) {
+  const client = getPostHogClient();
+  if (!client) return;
+
+  console.log("[PostHog]: Tracking server side event:", eventName);
+
+  client.capture({
+    distinctId,
+    event: eventName,
+    properties,
+  });
+}
+
+export async function identify(distinctId: string, properties?: Properties) {
+  const client = getPostHogClient();
+  if (!client) return;
+
+  client.identify({
+    distinctId,
+    properties,
+  });
+}
+
+export async function getFeatureFlags(distinctId: string) {
+  const client = getPostHogClient();
+  if (!client) return {};
+
+  const flags = await client.getAllFlags(distinctId);
+  return flags;
+}