2025-11-05 16:36:16 +00:00
10 changed files with 99 additions and 119 deletions
--- a/src/backend/database/database.ts
+++ b/src/backend/database/database.ts
@@ -68,7 +68,7 @@ app.use(
        return callback(null, true);
      }

-      callback(null, true);
+      callback(new Error("Not allowed by CORS"));
    },
    credentials: true,
    methods: ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],
@@ -77,6 +77,8 @@ app.use(
      "Authorization",
      "User-Agent",
      "X-Electron-App",
+      "Accept",
+      "Origin",
    ],
  }),
 );
--- a/src/backend/utils/user-agent-parser.ts
+++ b/src/backend/utils/user-agent-parser.ts
@@ -44,10 +44,10 @@ function parseElectronUserAgent(userAgent: string): DeviceInfo {
  let os = "Unknown OS";
  let version = "Unknown";

-  const termixMatch = userAgent.match(/Termix-Desktop\/([\d.]+) \(([^;]+);/);
+  const termixMatch = userAgent.match(/Termix-Desktop\/([\d.]+)\s*\(([^;)]+)/);
  if (termixMatch) {
    version = termixMatch[1];
-    os = termixMatch[2];
+    os = termixMatch[2].trim();
  } else {
    if (userAgent.includes("Windows")) {
      os = parseWindowsVersion(userAgent);
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -5,6 +5,7 @@ import "./index.css";
 import DesktopApp from "@/ui/desktop/DesktopApp.tsx";
 import { MobileApp } from "@/ui/mobile/MobileApp.tsx";
 import { ThemeProvider } from "@/components/theme-provider";
+import { ElectronVersionCheck } from "@/ui/desktop/user/ElectronVersionCheck.tsx";
 import "./i18n/i18n";
 import { isElectron } from "./ui/main-axios.ts";

@@ -55,20 +56,57 @@ function useWindowWidth() {
 function RootApp() {
  const width = useWindowWidth();
  const isMobile = width < 768;
+  const [showVersionCheck, setShowVersionCheck] = useState(true);

  const userAgent =
    navigator.userAgent || navigator.vendor || (window as any).opera || "";
  const isTermixMobile = /Termix-Mobile/.test(userAgent);

-  if (isElectron()) {
-    return <DesktopApp />;
-  }
+  const renderApp = () => {
+    if (isElectron()) {
+      return <DesktopApp />;
+    }

-  if (isTermixMobile) {
-    return <MobileApp key="mobile" />;
-  }
+    if (isTermixMobile) {
+      return <MobileApp key="mobile" />;
+    }

-  return isMobile ? <MobileApp key="mobile" /> : <DesktopApp key="desktop" />;
+    return isMobile ? <MobileApp key="mobile" /> : <DesktopApp key="desktop" />;
+  };
+
+  return (
+    <>
+      {isElectron() && (
+        <div
+          className="fixed inset-0 pointer-events-none"
+          style={{
+            backgroundColor: "#09090b",
+            backgroundImage: `linear-gradient(
+              135deg,
+              transparent 0%,
+              transparent 49%,
+              rgba(255, 255, 255, 0.03) 49%,
+              rgba(255, 255, 255, 0.03) 51%,
+              transparent 51%,
+              transparent 100%
+            )`,
+            backgroundSize: "80px 80px",
+            zIndex: 0,
+          }}
+        />
+      )}
+      <div className="relative min-h-screen" style={{ zIndex: 1 }}>
+        {isElectron() && showVersionCheck ? (
+          <ElectronVersionCheck
+            onContinue={() => setShowVersionCheck(false)}
+            isAuthenticated={false}
+          />
+        ) : (
+          renderApp()
+        )}
+      </div>
+    </>
+  );
 }

 createRoot(document.getElementById("root")!).render(
--- a/src/ui/desktop/DesktopApp.tsx
+++ b/src/ui/desktop/DesktopApp.tsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react";
 import { LeftSidebar } from "@/ui/desktop/navigation/LeftSidebar.tsx";
 import { Dashboard } from "@/ui/desktop/apps/dashboard/Dashboard.tsx";
 import { AppView } from "@/ui/desktop/navigation/AppView.tsx";
-import { HostManager } from "@/ui/desktop/apps/host manager/HostManager.tsx";
+import { HostManager } from "@/ui/desktop/apps/host-manager/HostManager.tsx";
 import {
  TabProvider,
  useTabs,
@@ -11,7 +11,6 @@ import { TopNavbar } from "@/ui/desktop/navigation/TopNavbar.tsx";
 import { AdminSettings } from "@/ui/desktop/admin/AdminSettings.tsx";
 import { UserProfile } from "@/ui/desktop/user/UserProfile.tsx";
 import { Toaster } from "@/components/ui/sonner.tsx";
-import { VersionCheckModal } from "@/components/ui/version-check-modal.tsx";
 import { getUserInfo } from "@/ui/main-axios.ts";

 function AppContent() {
@@ -19,7 +18,6 @@ function AppContent() {
  const [username, setUsername] = useState<string | null>(null);
  const [isAdmin, setIsAdmin] = useState(false);
  const [authLoading, setAuthLoading] = useState(true);
-  const [showVersionCheck, setShowVersionCheck] = useState(true);
  const [isTopbarOpen, setIsTopbarOpen] = useState<boolean>(() => {
    const saved = localStorage.getItem("topNavbarOpen");
    return saved !== null ? JSON.parse(saved) : true;
@@ -31,9 +29,16 @@ function AppContent() {
      setAuthLoading(true);
      getUserInfo()
        .then((meRes) => {
-          setIsAuthenticated(true);
-          setIsAdmin(!!meRes.is_admin);
-          setUsername(meRes.username || null);
+          // Check if response is actually HTML (Vite dev server page)
+          if (typeof meRes === "string" || !meRes.username) {
+            setIsAuthenticated(false);
+            setIsAdmin(false);
+            setUsername(null);
+          } else {
+            setIsAuthenticated(true);
+            setIsAdmin(!!meRes.is_admin);
+            setUsername(meRes.username || null);
+          }
        })
        .catch((err) => {
          setIsAuthenticated(false);
@@ -45,7 +50,9 @@ function AppContent() {
            console.warn("Session expired - please log in again");
          }
        })
-        .finally(() => setAuthLoading(false));
+        .finally(() => {
+          setAuthLoading(false);
+        });
    };

    checkAuth();
@@ -84,35 +91,7 @@ function AppContent() {

  return (
    <div>
-      {showVersionCheck && (
-        <VersionCheckModal
-          onDismiss={() => setShowVersionCheck(false)}
-          onContinue={() => setShowVersionCheck(false)}
-          isAuthenticated={isAuthenticated}
-        />
-      )}
-
-      {!isAuthenticated && !authLoading && !showVersionCheck && (
-        <div>
-          <div
-            className="absolute inset-0"
-            style={{
-              backgroundImage: `linear-gradient(
-                            135deg,
-                            transparent 0%,
-                            transparent 49%,
-                            rgba(255, 255, 255, 0.03) 49%,
-                            rgba(255, 255, 255, 0.03) 51%,
-                            transparent 51%,
-                            transparent 100%
-                        )`,
-              backgroundSize: "80px 80px",
-            }}
-          />
-        </div>
-      )}
-
-      {!isAuthenticated && !authLoading && !showVersionCheck && (
+      {!isAuthenticated && !authLoading && (
        <div className="fixed inset-0 flex items-center justify-center z-[10000]">
          <Dashboard
            onSelectView={handleSelectView}
--- a/src/ui/desktop/apps/host-manager/HostManager.tsx
+++ b/src/ui/desktop/apps/host-manager/HostManager.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useRef } from "react";
-import { HostManagerViewer } from "@/ui/desktop/apps/host manager/HostManagerViewer.tsx";
+import { HostManagerViewer } from "@/ui/desktop/apps/host-manager/HostManagerViewer.tsx";
 import {
  Tabs,
  TabsContent,
@@ -7,7 +7,7 @@ import {
  TabsTrigger,
 } from "@/components/ui/tabs.tsx";
 import { Separator } from "@/components/ui/separator.tsx";
-import { HostManagerEditor } from "@/ui/desktop/apps/host manager/HostManagerEditor.tsx";
+import { HostManagerEditor } from "@/ui/desktop/apps/host-manager/HostManagerEditor.tsx";
 import { CredentialsManager } from "@/ui/desktop/apps/credentials/CredentialsManager.tsx";
 import { CredentialEditor } from "@/ui/desktop/apps/credentials/CredentialEditor.tsx";
 import { useSidebar } from "@/components/ui/sidebar.tsx";
--- a/src/ui/desktop/apps/host-manager/HostManagerEditor.tsx
+++ b/src/ui/desktop/apps/host-manager/HostManagerEditor.tsx
--- a/src/ui/desktop/apps/host-manager/HostManagerViewer.tsx
+++ b/src/ui/desktop/apps/host-manager/HostManagerViewer.tsx
--- a/src/ui/desktop/authentication/Auth.tsx
+++ b/src/ui/desktop/authentication/Auth.tsx
@@ -104,20 +104,12 @@ export function Auth({
  }, [loggedIn]);

  useEffect(() => {
-    if (isInElectronWebView()) {
-      return;
-    }
-
    getRegistrationAllowed().then((res) => {
      setRegistrationAllowed(res.allowed);
    });
  }, []);

  useEffect(() => {
-    if (isInElectronWebView()) {
-      return;
-    }
-
    getPasswordLoginAllowed()
      .then((res) => {
        setPasswordLoginAllowed(res.allowed);
@@ -130,10 +122,6 @@ export function Auth({
  }, []);

  useEffect(() => {
-    if (isInElectronWebView()) {
-      return;
-    }
-
    getOIDCConfig()
      .then((response) => {
        if (response) {
--- a/src/ui/desktop/user/ElectronVersionCheck.tsx
+++ b/src/ui/desktop/user/ElectronVersionCheck.tsx
@@ -9,7 +9,7 @@ interface VersionCheckModalProps {
  isAuthenticated?: boolean;
 }

-export function VersionCheckModal({
+export function ElectronVersionCheck({
  onContinue,
  isAuthenticated = false,
 }: VersionCheckModalProps) {
@@ -35,7 +35,26 @@ export function VersionCheckModal({
      const updateInfo = await checkElectronUpdate();
      setVersionInfo(updateInfo);

+      // Get current app version
+      const currentVersion = await (window as any).electronAPI?.getAppVersion();
+      const dismissedVersion = localStorage.getItem(
+        "electron-version-check-dismissed",
+      );
+
+      // If this version was already dismissed, skip the modal
+      if (dismissedVersion === currentVersion) {
+        onContinue();
+        return;
+      }
+
      if (updateInfo?.status === "up_to_date") {
+        // Store this version as checked (but don't show modal since up to date)
+        if (currentVersion) {
+          localStorage.setItem(
+            "electron-version-check-dismissed",
+            currentVersion,
+          );
+        }
        onContinue();
        return;
      }
@@ -53,7 +72,12 @@ export function VersionCheckModal({
    }
  };

-  const handleContinue = () => {
+  const handleContinue = async () => {
+    // Store the current version as dismissed
+    const currentVersion = await (window as any).electronAPI?.getAppVersion();
+    if (currentVersion) {
+      localStorage.setItem("electron-version-check-dismissed", currentVersion);
+    }
    onContinue();
  };

@@ -64,23 +88,6 @@ export function VersionCheckModal({
  if (versionChecking && !versionInfo) {
    return (
      <div className="fixed inset-0 flex items-center justify-center z-50">
-        {!isAuthenticated && (
-          <div
-            className="absolute inset-0"
-            style={{
-              backgroundImage: `linear-gradient(
-                135deg,
-                transparent 0%,
-                transparent 49%,
-                rgba(255, 255, 255, 0.03) 49%,
-                rgba(255, 255, 255, 0.03) 51%,
-                transparent 51%,
-                transparent 100%
-              )`,
-              backgroundSize: "80px 80px",
-            }}
-          />
-        )}
        <div className="bg-dark-bg border-2 border-dark-border rounded-lg p-6 max-w-md w-full mx-4 relative z-10">
          <div className="flex items-center justify-center mb-4">
            <div className="w-8 h-8 border-2 border-primary border-t-transparent rounded-full animate-spin" />
@@ -96,23 +103,6 @@ export function VersionCheckModal({
  if (!versionInfo || versionDismissed) {
    return (
      <div className="fixed inset-0 flex items-center justify-center z-50">
-        {!isAuthenticated && (
-          <div
-            className="absolute inset-0"
-            style={{
-              backgroundImage: `linear-gradient(
-                135deg,
-                transparent 0%,
-                transparent 49%,
-                rgba(255, 255, 255, 0.03) 49%,
-                rgba(255, 255, 255, 0.03) 51%,
-                transparent 51%,
-                transparent 100%
-              )`,
-              backgroundSize: "80px 80px",
-            }}
-          />
-        )}
        <div className="bg-dark-bg border-2 border-dark-border rounded-lg p-6 max-w-md w-full mx-4 relative z-10">
          <div className="mb-4">
            <h2 className="text-lg font-semibold">
@@ -141,23 +131,6 @@ export function VersionCheckModal({

  return (
    <div className="fixed inset-0 flex items-center justify-center z-50">
-      {!isAuthenticated && (
-        <div
-          className="absolute inset-0"
-          style={{
-            backgroundImage: `linear-gradient(
-              135deg,
-              transparent 0%,
-              transparent 49%,
-              rgba(255, 255, 255, 0.03) 49%,
-              rgba(255, 255, 255, 0.03) 51%,
-              transparent 51%,
-              transparent 100%
-            )`,
-            backgroundSize: "80px 80px",
-          }}
-        />
-      )}
      <div className="bg-dark-bg border-2 border-dark-border rounded-lg p-6 max-w-md w-full mx-4 relative z-10">
        <div className="mb-4">
          <h2 className="text-lg font-semibold">
--- a/src/ui/main-axios.ts
+++ b/src/ui/main-axios.ts
@@ -484,12 +484,7 @@ function getApiUrl(path: string, defaultPort: number): string {
  const devMode = isDev();
  const electronMode = isElectron();

-  if (devMode) {
-    const protocol = window.location.protocol === "https:" ? "https" : "http";
-    const sslPort = protocol === "https" ? 8443 : defaultPort;
-    const url = `${protocol}://${apiHost}:${sslPort}${path}`;
-    return url;
-  } else if (electronMode) {
+  if (electronMode) {
    if (configuredServerUrl) {
      const baseUrl = configuredServerUrl.replace(/\/$/, "");
      const url = `${baseUrl}${path}`;
@@ -497,6 +492,11 @@ function getApiUrl(path: string, defaultPort: number): string {
    }
    console.warn("Electron mode but no server configured!");
    return "http://no-server-configured";
+  } else if (devMode) {
+    const protocol = window.location.protocol === "https:" ? "https" : "http";
+    const sslPort = protocol === "https" ? 8443 : defaultPort;
+    const url = `${protocol}://${apiHost}:${sslPort}${path}`;
+    return url;
  } else {
    return path;
  }