From 5a5821fa5445e57430cc77dfbe16c33d537657d9 Mon Sep 17 00:00:00 2001
From: Christinarlong <christina.long@sentry.io>
Date: Thu, 17 Oct 2024 10:51:18 -0700
Subject: [PATCH] remove redundant fields and track refresh tokens

---
 src/sentry/mediators/token_exchange/refresher.py       | 10 +++++++---
 .../sentry_apps/token_exchange/grant_exchanger.py      |  5 +++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/sentry/mediators/token_exchange/refresher.py b/src/sentry/mediators/token_exchange/refresher.py
index 27879ceddfa10..f9c4eb47f7a90 100644
--- a/src/sentry/mediators/token_exchange/refresher.py
+++ b/src/sentry/mediators/token_exchange/refresher.py
@@ -34,17 +34,21 @@ def call(self):
             {
                 "user_id": self.user.id,
                 "install_id": self.install.id,
-                "client_id": self.client_id,
                 "org_id": self.install.organization_id,
                 "sentry_app_id": self.sentry_app.id,
-                "sentry_app_slug": self.sentry_app.slug,
                 "application_id": self.application.id,
+                "refreh_token": self.refresh_token[-4:],
             },
         )
 
         self._validate()
         self._delete_token()
-        self._create_new_token()
+        token = self._create_new_token()
+
+        sentry_sdk.set_context(
+            "token-exchange.refresh", {"new_refresh_token": token.refresh_token[-4:]}
+        )
+        return token
 
     def record_analytics(self):
         analytics.record(
diff --git a/src/sentry/sentry_apps/token_exchange/grant_exchanger.py b/src/sentry/sentry_apps/token_exchange/grant_exchanger.py
index fe606b8945ff4..68deff989da6f 100644
--- a/src/sentry/sentry_apps/token_exchange/grant_exchanger.py
+++ b/src/sentry/sentry_apps/token_exchange/grant_exchanger.py
@@ -38,16 +38,17 @@ def run(self):
                 {
                     "user_id": self.user.id,
                     "install_id": self.install.id,
-                    "client_id": self.client_id,
                     "org_id": self.install.organization_id,
                     "sentry_app_id": self.sentry_app.id,
-                    "sentry_app_slug": self.sentry_app.slug,
                     "application_id": self.application.id,
                     "grant_id": self.grant.id,
                 },
             )
             self._validate()
             token = self._create_token()
+            sentry_sdk.set_context(
+                "token-exchange.refresh", {"new_refresh_token": token.refresh_token[-4:]}
+            )
 
             # Once it's exchanged it's no longer valid and should not be
             # exchangeable, so we delete it.