Merge branch 'main' of github.com:hydralauncher/hydra into feature/seed-completed-downloads

src/main/services/hydra-analytics.ts

@@ -1,34 +0,0 @@
-import { userSubscriptionRepository } from "@main/repository";
-import axios from "axios";
-import { appVersion } from "@main/constants";
-
-export class HydraAnalytics {
-  private static instance = axios.create({
-    baseURL: import.meta.env.MAIN_VITE_ANALYTICS_API_URL,
-    headers: { "User-Agent": `Hydra Launcher v${appVersion}` },
-  });
-
-  private static async hasActiveSubscription() {
-    const userSubscription = await userSubscriptionRepository.findOne({
-      where: { id: 1 },
-    });
-
-    return (
-      userSubscription?.expiresAt && userSubscription.expiresAt > new Date()
-    );
-  }
-
-  static async postDownload(hash: string) {
-    const hasSubscription = await this.hasActiveSubscription();
-
-    return this.instance
-      .post("/track", {
-        event: "download",
-        attributes: {
-          hash,
-          hasSubscription,
-        },
-      })
-      .then((response) => response.data);
-  }
-}

src/main/services/hydra-api.ts

@@ -12,6 +12,7 @@ import { UserNotLoggedInError, SubscriptionRequiredError } from "@shared";
 import { omit } from "lodash-es";
 import { appVersion } from "@main/constants";
 import { getUserData } from "./user/get-user-data";
+import { isFuture, isToday } from "date-fns";
 
 interface HydraApiOptions {
   needsAuth?: boolean;
@@ -45,10 +46,8 @@ export class HydraApi {
   }
 
   private static hasActiveSubscription() {
-    return (
-      this.userAuth.subscription?.expiresAt &&
-      this.userAuth.subscription.expiresAt > new Date()
-    );
+    const expiresAt = this.userAuth.subscription?.expiresAt;
+    return expiresAt && (isFuture(expiresAt) || isToday(expiresAt));
   }
 
   static async handleExternalAuth(uri: string) {
@@ -112,6 +111,8 @@ export class HydraApi {
       expirationTimestamp: 0,
       subscription: null,
     };
+
+    this.post("/auth/logout", {}, { needsAuth: false }).catch(() => {});
   }
 
   static async setupApi() {