From 24ff5f23eef697488e2a5eee8958598ab38a2eb5 Mon Sep 17 00:00:00 2001
From: Neil <get.neilmolina@gmail.com>
Date: Mon, 15 May 2023 08:03:08 +0800
Subject: [PATCH] Tea cli version tracking (#608)

* bump 0.2.7

* #595 track tea version in sentry

* #595 add teaVersion to sesssion

* bump v0.2.13

---------

Co-authored-by: neil molina <neil@neils-MacBook-Pro.local>
---
 modules/desktop/electron/electron.ts  | 7 ++++---
 modules/desktop/electron/libs/auth.ts | 1 +
 modules/desktop/electron/libs/ipc.ts  | 3 ++-
 modules/desktop/package.json          | 2 +-
 modules/desktop/src/libs/sentry.ts    | 3 ++-
 modules/desktop/src/libs/types.ts     | 1 +
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/desktop/electron/electron.ts b/modules/desktop/electron/electron.ts
index a73c68c..90d1251 100644
--- a/modules/desktop/electron/electron.ts
+++ b/modules/desktop/electron/electron.ts
@@ -14,7 +14,7 @@ import initializePushNotification, {
   syncPackageTopicSubscriptions
 } from "./libs/push-notification";
 
-import init from "./libs/initialize";
+import init, { initializeTeaCli } from "./libs/initialize";
 import { readSessionData } from "./libs/auth";
 
 import { isDev } from "./libs/auto-updater";
@@ -38,10 +38,11 @@ if (app.isPackaged) {
     }
   });
   Sentry.configureScope(async (scope) => {
-    const session = await readSessionData();
+    const [session, cliVersion] = await Promise.all([readSessionData(), initializeTeaCli()]);
     scope.setUser({
       id: session.device_id, // device_id this should exist in our pg db: developer_id is to many device_id
-      username: session?.user?.login || "" // github username or handler
+      username: session?.user?.login || "", // github username or handler
+      tea: cliVersion
     });
   });
   setSentryLogging(Sentry);
diff --git a/modules/desktop/electron/libs/auth.ts b/modules/desktop/electron/libs/auth.ts
index eea06a2..2ea1691 100644
--- a/modules/desktop/electron/libs/auth.ts
+++ b/modules/desktop/electron/libs/auth.ts
@@ -18,6 +18,7 @@ export interface Session {
   key?: string;
   user?: any;
   locale?: string;
+  teaVersion?: string;
 }
 
 let sessionMemory: Session = { device_id: "", locale: "en" };
diff --git a/modules/desktop/electron/libs/ipc.ts b/modules/desktop/electron/libs/ipc.ts
index e72a0ab..3fdd6ab 100644
--- a/modules/desktop/electron/libs/ipc.ts
+++ b/modules/desktop/electron/libs/ipc.ts
@@ -40,7 +40,8 @@ export default function initializeHandlers({ notifyMainWindow }: HandlerOptions)
   ipcMain.handle("get-session", async () => {
     try {
       log.info("getting session");
-      const session = await readSessionData();
+      const [session, cliVersion] = await Promise.all([readSessionData(), initializeTeaCli()]);
+      session.teaVersion = cliVersion;
       log.debug(session ? "found session data" : "no session data found");
       return session;
     } catch (error) {
diff --git a/modules/desktop/package.json b/modules/desktop/package.json
index d7b7a2c..e6f8ca0 100644
--- a/modules/desktop/package.json
+++ b/modules/desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tea",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "private": true,
   "description": "tea gui app",
   "author": "tea.xyz",
diff --git a/modules/desktop/src/libs/sentry.ts b/modules/desktop/src/libs/sentry.ts
index e36ae26..e876131 100644
--- a/modules/desktop/src/libs/sentry.ts
+++ b/modules/desktop/src/libs/sentry.ts
@@ -15,7 +15,8 @@ export async function initSentry(session?: Session) {
       Sentry.configureScope(async (scope) => {
         scope.setUser({
           id: session.device_id, // device_id this should exist in our pg db: developer_id is to many device_id
-          username: session?.user?.login || "" // github username or handler
+          username: session?.user?.login || "", // github username or handler
+          tea: session?.teaVersion || "unknown"
         });
       });
     }
diff --git a/modules/desktop/src/libs/types.ts b/modules/desktop/src/libs/types.ts
index 35071d9..b3679b6 100644
--- a/modules/desktop/src/libs/types.ts
+++ b/modules/desktop/src/libs/types.ts
@@ -57,6 +57,7 @@ export interface Session {
   key?: string;
   user?: Developer;
   locale?: string;
+  teaVersion?: string;
 }
 
 export enum SideMenuOptions {