From b9cd4b2d4f200acbd28b135b98db131a80c0e531 Mon Sep 17 00:00:00 2001
From: Siddhant Khare <siddhant@gitpod.io>
Date: Wed, 18 Sep 2024 09:03:05 +0000
Subject: [PATCH 1/2] TEST- DO NOT MERGE

---
 components/server/src/analytics-controller.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/components/server/src/analytics-controller.ts b/components/server/src/analytics-controller.ts
index 48456cac0fca5c..b8498d5edb8f08 100644
--- a/components/server/src/analytics-controller.ts
+++ b/components/server/src/analytics-controller.ts
@@ -37,7 +37,7 @@ export class AnalyticsController {
                 }
                 const clientHeaderFields = toClientHeaderFields(req);
                 const event = req.body as RemoteTrackMessage;
-                this.trackEvent(req.user?.id, event, clientHeaderFields);
+                this.trackEvent(req.user?.id, event, clientHeaderFields, req, res);
                 res.sendStatus(200);
             } catch (e) {
                 console.error("failed to track event", e);
@@ -84,6 +84,8 @@ export class AnalyticsController {
         userId: string | undefined,
         event: RemoteTrackMessage,
         clientHeaderFields: ClientHeaderFields,
+        req: express.Request,
+        res: express.Response,
     ): void {
         // Beware: DO NOT just event... the message, but consume it individually as the message is coming from
         //         the wire and we have no idea what's in it. Even passing the context and properties directly
@@ -106,6 +108,7 @@ export class AnalyticsController {
                 anonymousId: anonymousId,
                 ...msg,
             });
+            this.setHashedUserIdCookie(userId, req, res);
         } else if (anonymousId) {
             this.analytics.track({
                 anonymousId: anonymousId as string | number,
@@ -203,7 +206,7 @@ export class AnalyticsController {
             res.cookie("gitpod_hashed_user_id", hashedUserId, {
                 domain: domain,
                 maxAge: oneYearInSeconds * 1000, // Convert to milliseconds
-                httpOnly: true,
+                httpOnly: false,
                 secure: true,
                 sameSite: "lax",
             });

From c009383f21211d6e3ac99532c8a89c87e097ce79 Mon Sep 17 00:00:00 2001
From: Siddhant Khare <siddhant@gitpod.io>
Date: Wed, 18 Sep 2024 09:20:50 +0000
Subject: [PATCH 2/2] trigger ci