Merge release/1.5.2 into main

nix/package.nix

@@ -6,7 +6,7 @@
   makeDesktopItem,
 }: let
   pname = "defguard-client";
-  version = "1.5.1"; # TODO: Get this from Cargo.toml or git
+  version = "1.5.2"; # TODO: Get this from Cargo.toml or git
 
   desktopItem = makeDesktopItem {
     name = pname;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "defguard-client",
   "private": false,
-  "version": "1.5.1",
+  "version": "1.5.2",
   "type": "module",
   "scripts": {
     "dev": "npm-run-all --parallel vite typesafe-i18n",
@@ -132,4 +132,4 @@
   "volta": {
     "node": "20.5.1"
   }
-}
+}

resources-linux/postinst

@@ -5,10 +5,10 @@ GROUP_NAME="defguard"
 SERVICE_NAME="defguard-service"
 
 case "$1" in
-    configure)
+    1|configure)
         # Create the group if it doesn't exist
         if ! getent group "$GROUP_NAME" >/dev/null; then
-            addgroup --system "$GROUP_NAME"
+            groupadd --system "$GROUP_NAME"
             echo "Created group $GROUP_NAME"
         fi
 

resources-linux/postrm

@@ -5,18 +5,18 @@ GROUP_NAME="defguard"
 SERVICE_NAME="defguard-service"
 
 case "$1" in
-    remove)
+    0|1|remove)
         # Service file still exists, just disable it
         if [ -d /run/systemd/system ]; then
             systemctl disable "$SERVICE_NAME" || true
             systemctl daemon-reload
         fi
         ;;
 
-    purge)
+    0|purge)
         # Complete removal - clean up group too
         if getent group "$GROUP_NAME" >/dev/null; then
-            delgroup "$GROUP_NAME" || true
+            groupdel "$GROUP_NAME" || true
         fi
         ;;
 esac

resources-linux/prerm

@@ -4,7 +4,7 @@ set -e
 SERVICE_NAME="defguard-service"
 
 case "$1" in
-    remove|upgrade|deconfigure)
+    0|1|remove|upgrade|deconfigure)
         if [ -d /run/systemd/system ]; then
             # Stop the service before removal/upgrade
             systemctl stop "$SERVICE_NAME" || true

src-tauri/Cargo.toml

@@ -31,7 +31,7 @@ edition = "2021"
 homepage = "https://github.com/DefGuard/client"
 license-file = "../LICENSE.md"
 rust-version = "1.80"
-version = "1.5.1"
+version = "1.5.2"
 
 [package]
 name = "defguard-client"

src-tauri/tauri.conf.json

@@ -72,7 +72,7 @@
   "productName": "defguard-client",
   "mainBinaryName": "defguard-client",
   "identifier": "net.defguard",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "app": {
     "security": {
       "capabilities": [
@@ -107,4 +107,4 @@
       }
     }
   }
-}
+}

src/pages/client/pages/ClientInstancePage/components/LocationsList/modals/MFAModal/MFAModal.tsx

@@ -571,7 +571,6 @@ const MFACodeForm = ({ description, token, proxyUrl, resetState }: MFACodeForm)
     if (response.ok) {
       closeModal();
       const data = (await response.json()) as MFAFinishResponse;
-      error(`ARSE ${location.connection_type}`);
       await connect({
         locationId: location?.id,
         connectionType: location.connection_type,