Merge pull request #1217 from hydralauncher/feat/intercom-userid

feat: add userid to intercom and post to logout

src/main/constants.ts

@@ -5,12 +5,12 @@ export const LUDUSAVI_MANIFEST_URL = "https://cdn.losbroxas.org/manifest.yaml";
 
 export const defaultDownloadsPath = app.getPath("downloads");
 
+export const isStaging = import.meta.env.MAIN_VITE_API_URL.includes("staging");
+
 export const databaseDirectory = path.join(app.getPath("appData"), "hydra");
 export const databasePath = path.join(
   databaseDirectory,
-  import.meta.env.MAIN_VITE_API_URL.includes("staging")
-    ? "hydra_test.db"
-    : "hydra.db"
+  isStaging ? "hydra_test.db" : "hydra.db"
 );
 
 export const logsPath = path.join(app.getPath("appData"), "hydra", "logs");
@@ -25,4 +25,4 @@ export const achievementSoundPath = app.isPackaged
 
 export const backupsPath = path.join(app.getPath("userData"), "Backups");
 
-export const appVersion = app.getVersion();
+export const appVersion = app.getVersion() + (isStaging ? "-staging" : "");

src/main/events/misc/open-checkout.ts

@@ -1,10 +1,16 @@
 import { shell } from "electron";
 import { registerEvent } from "../register-event";
-import { userAuthRepository } from "@main/repository";
+import {
+  userAuthRepository,
+  userPreferencesRepository,
+} from "@main/repository";
 import { HydraApi } from "@main/services";
 
 const openCheckout = async (_event: Electron.IpcMainInvokeEvent) => {
-  const userAuth = await userAuthRepository.findOne({ where: { id: 1 } });
+  const [userAuth, userPreferences] = await Promise.all([
+    userAuthRepository.findOne({ where: { id: 1 } }),
+    userPreferencesRepository.findOne({ where: { id: 1 } }),
+  ]);
 
   if (!userAuth) {
     return;
@@ -16,6 +22,7 @@ const openCheckout = async (_event: Electron.IpcMainInvokeEvent) => {
 
   const params = new URLSearchParams({
     token: paymentToken,
+    lng: userPreferences?.language || "en",
   });
 
   shell.openExternal(

src/main/services/hydra-api.ts

@@ -112,6 +112,8 @@ export class HydraApi {
       expirationTimestamp: 0,
       subscription: null,
     };
+
+    this.post("/auth/logout", {}, { needsAuth: false }).catch(() => {});
   }
 
   static async setupApi() {

src/renderer/src/app.tsx

@@ -36,8 +36,6 @@ export interface AppProps {
   children: React.ReactNode;
 }
 
-console.log(import.meta.env);
-
 Intercom({
   app_id: import.meta.env.RENDERER_VITE_INTERCOM_APP_ID,
 });