diff --git a/nix/package.nix b/nix/package.nix index cad9c48b..0ec4456a 100644 --- a/nix/package.nix +++ b/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; diff --git a/package.json b/package.json index ee8a6109..f3cd54b6 100644 --- a/package.json +++ b/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" } -} +} \ No newline at end of file diff --git a/resources-linux/postinst b/resources-linux/postinst index 580264af..64779ffd 100644 --- a/resources-linux/postinst +++ b/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 diff --git a/resources-linux/postrm b/resources-linux/postrm index 645f3f87..924e6eb0 100644 --- a/resources-linux/postrm +++ b/resources-linux/postrm @@ -5,7 +5,7 @@ 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 @@ -13,10 +13,10 @@ case "$1" in 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 diff --git a/resources-linux/prerm b/resources-linux/prerm index 3c602373..40dbc1e3 100644 --- a/resources-linux/prerm +++ b/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 diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index dd6fcaff..f9647ce4 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -909,7 +909,7 @@ dependencies = [ [[package]] name = "common" -version = "1.5.1" +version = "1.5.2" dependencies = [ "nix", ] @@ -1263,7 +1263,7 @@ checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376" [[package]] name = "defguard-client" -version = "1.5.1" +version = "1.5.2" dependencies = [ "anyhow", "base64 0.22.1", @@ -1321,7 +1321,7 @@ dependencies = [ [[package]] name = "defguard-dg" -version = "1.5.1" +version = "1.5.2" dependencies = [ "clap", "common", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index e7ec0f43..466a0b5d 100644 --- a/src-tauri/Cargo.toml +++ b/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" diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index a9a3ed85..8c9b8904 100644 --- a/src-tauri/tauri.conf.json +++ b/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 @@ } } } -} +} \ No newline at end of file diff --git a/src/pages/client/pages/ClientInstancePage/components/LocationsList/modals/MFAModal/MFAModal.tsx b/src/pages/client/pages/ClientInstancePage/components/LocationsList/modals/MFAModal/MFAModal.tsx index 032e03b0..2307f534 100644 --- a/src/pages/client/pages/ClientInstancePage/components/LocationsList/modals/MFAModal/MFAModal.tsx +++ b/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,