fix userid in claim

Author: sentaur-athena

src/sentry/api/endpoints/organization_intercom_jwt.py

@@ -69,10 +69,12 @@ def get(
         user = request.user
         now = int(datetime.datetime.now(datetime.UTC).timestamp())
         exp = now + JWT_VALIDITY_WINDOW_SECONDS
+        # intercom creates chat history based on this ID so we need one per (org, user) pair
+        intercom_user_id = f"{user.id}-{organization.id}"
 
         # Build JWT claims - user_id is required by Intercom
         claims = {
-            "user_id": str(user.id),
+            "user_id": intercom_user_id,
             "email": user.email,
             "iat": now,
             "exp": exp,
@@ -90,7 +92,7 @@ def get(
             created_at = int(user.last_active.timestamp())
 
         user_data = {
-            "userId": f"{user.id}-{organization.id}",
+            "userId": intercom_user_id,
             "email": user.email,
             "name": user.get_display_name(),
             "createdAt": created_at,

tests/sentry/api/endpoints/test_organization_intercom_jwt.py

@@ -27,6 +27,7 @@ def test_get_jwt_without_secret_configured(self) -> None:
     def test_get_jwt_success(self) -> None:
         """With feature flag and secret configured, should return JWT and user data."""
         test_secret = "test-intercom-secret-key"
+        intercom_user_id = f"{self.user.id}-{self.organization.id}"
 
         with (
             self.feature("organizations:intercom-support"),
@@ -39,7 +40,7 @@ def test_get_jwt_success(self) -> None:
 
         # Verify user data
         user_data = response.data["userData"]
-        assert user_data["userId"] == str(self.user.id)
+        assert user_data["userId"] == intercom_user_id
         assert user_data["email"] == self.user.email
         assert user_data["organizationId"] == str(self.organization.id)
         assert user_data["organizationName"] == self.organization.name
@@ -49,7 +50,7 @@ def test_get_jwt_success(self) -> None:
         token = response.data["jwt"]
         decoded = jwt.decode(token, test_secret, algorithms=["HS256"], audience=False)
 
-        assert decoded["user_id"] == str(self.user.id)
+        assert decoded["user_id"] == intercom_user_id
         assert decoded["email"] == self.user.email
         assert "iat" in decoded
         assert "exp" in decoded