2025-05-20 07:26:58 -04:00
12 changed files with 18 additions and 68 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -6,7 +6,6 @@
    "clientgpversion",
    "clientos",
    "gpcommon",
    "gpgui",
    "gpservice",
    "Immer",
    "jnlp",
--- a/README.md
+++ b/README.md
@ -1,29 +1,9 @@
 ## Development
 ### Build the service
 ```sh
 # Build the client first
 cargo build -p gpclient
 # Build the service
 cargo build -p gpservice
 ```
 ### Start the service
 ```sh
 sudo ./target/debug/gpservice
 ```
 ### Start the GUI
-```sh
+```
 cd gpgui
 pnpm install
 pnpm tauri dev
 ```
 ### Open the DevTools
 Right-click on the GUI window and select "Inspect Element".
--- a/gpgui/index.html
+++ b/gpgui/index.html
@ -3,15 +3,10 @@
  <head>
    <meta charset="UTF-8" />
    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>Vite + React + TS</title>
  </head>
-  <body data-tauri-drag-region>
+  <body>
    <script>
      var htmlFontSize = getComputedStyle(document.documentElement).fontSize;
      var ratio = parseInt(htmlFontSize) / 16;
      document.documentElement.style.fontSize = (16 / ratio) + 'px';
    </script>
    <div id="root"></div>
    <script type="module" src="/src/main.tsx"></script>
  </body>
--- a/gpgui/src-tauri/src/main.rs
+++ b/gpgui/src-tauri/src/main.rs
@ -44,18 +44,6 @@ fn setup(app: &mut tauri::App) -> Result<(), Box<dyn std::error::Error>> {
    });
    app.manage(client);
    match std::env::var("XDG_CURRENT_DESKTOP") {
        Ok(desktop) => {
            if desktop == "KDE" {
                if let Some(main_window) = app.get_window("main") {
                    let _ = main_window.set_decorations(false);
                }
            }
        }
        Err(_) => (),
    }
    Ok(())
 }
--- a/gpgui/src-tauri/tauri.conf.json
+++ b/gpgui/src-tauri/tauri.conf.json
@ -68,13 +68,11 @@
    },
    "windows": [
      {
        "title": "GlobalProtect",
        "label": "main",
        "fullscreen": false,
        "width": 260,
        "height": 360,
        "resizable": false,
-        "fileDropEnabled": false
+        "title": "GlobalProtect",
        "width": 260
      }
    ]
  }
--- a/gpgui/src/App.tsx
+++ b/gpgui/src/App.tsx
@ -41,7 +41,7 @@ export default function App() {
  const ready = useAtomValue(statusReadyAtom);
  return (
-    <Box data-tauri-drag-region padding={2} paddingBottom={0}>
+    <Box padding={2} paddingBottom={0}>
      {ready ? <MainContent /> : <Loading />}
      <Notification />
    </Box>
--- a/gpgui/src/components/ConnectionStatus/StatusIcon.tsx
+++ b/gpgui/src/components/ConnectionStatus/StatusIcon.tsx
@ -93,17 +93,11 @@ function InnerStatusIcon() {
  return <DisconnectedIcon />;
 }
 const DragRegion = styled(Box)(({ theme }) => ({
  position: "absolute",
  inset: 0,
 }));
 export default function StatusIcon() {
  return (
    <IconContainer>
      <BackgroundIcon />
      <InnerStatusIcon />
      <DragRegion data-tauri-drag-region />
    </IconContainer>
  );
 }
--- a/gpgui/src/components/ConnectionStatus/StatusText.tsx
+++ b/gpgui/src/components/ConnectionStatus/StatusText.tsx
@ -7,7 +7,6 @@ export default function StatusText() {
  return (
    <Typography
      data-tauri-drag-region
      textAlign="center"
      mt={1.5}
      variant="subtitle1"
--- a/gpgui/src/components/ConnectionStatus/index.tsx
+++ b/gpgui/src/components/ConnectionStatus/index.tsx
@ -4,7 +4,7 @@ import StatusText from "./StatusText";
 export default function ConnectionStatus() {
  return (
-    <Box data-tauri-drag-region>
+    <Box>
      <StatusIcon />
      <StatusText />
    </Box>
--- a/gpgui/src/components/Notification/index.tsx
+++ b/gpgui/src/components/Notification/index.tsx
@ -1,4 +1,4 @@
-import { Alert, AlertTitle, Box, Slide, SlideProps, Snackbar } from "@mui/material";
+import { Alert, AlertTitle, Slide, SlideProps, Snackbar } from "@mui/material";
 import { useAtom, useAtomValue } from "jotai";
 import {
  closeNotificationAtom,
@ -35,7 +35,6 @@ export default function Notification() {
      }}
    >
      <Alert
        data-tauri-drag-region
        severity={severity}
        icon={false}
        sx={{
@ -43,8 +42,8 @@ export default function Notification() {
          borderRadius: 0,
        }}
      >
-        {title && <AlertTitle data-tauri-drag-region>{title}</AlertTitle>}
+        {title && <AlertTitle>{title}</AlertTitle>}
-        {message && <Box data-tauri-drag-region>{message}</Box>}
+        {message}
      </Alert>
    </Snackbar>
  );
--- a/gpgui/src/services/gatewayService.ts
+++ b/gpgui/src/services/gatewayService.ts
@ -45,7 +45,7 @@ class GatewayService {
    });
    if (!response.ok) {
-      throw new Error(`Gateway login failed: ${response.status}`);
+      throw new Error("Login failed");
    }
    return this.parseLoginResponse(response.data);
--- a/gpgui/src/services/portalService.ts
+++ b/gpgui/src/services/portalService.ts
@ -36,9 +36,8 @@ export type PortalCredential = {
 class PortalService {
  async prelogin(portal: string): Promise<Prelogin> {
    const preloginUrl = `https://${portal}/global-protect/prelogin.esp`;
    let response;
    try {
-      response = await fetch<string>(preloginUrl, {
+      const response = await fetch<string>(preloginUrl, {
        method: "POST",
        headers: {
          "User-Agent": "PAN GlobalProtect",
@ -58,15 +57,14 @@ class PortalService {
          // "host-id": "TODO, mac address?",
        }),
      });
    } catch (err) {
      console.error("Failed to prelogin: Network error", err);
      throw new Error("Failed to prelogin: Network error");
    }
      if (!response.ok) {
        throw new Error(`Failed to prelogin: ${response.status}`);
      }
      return this.parsePrelogin(response.data);
    } catch (err) {
      throw new Error(`Failed to prelogin: Network error`);
    }
  }
  private parsePrelogin(response: string): Prelogin {