Merge pull request #380 from DefGuard/main

Sync dev with newest main changes (post 1.2)

Author: t-aleksander

package.json

@@ -1,7 +1,7 @@
 {
   "name": "defguard-client",
   "private": false,
-  "version": "1.1.2",
+  "version": "1.2.0",
   "type": "module",
   "scripts": {
     "dev": "npm-run-all --parallel vite typesafe-i18n",

src-tauri/Cargo.lock

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

src-tauri/Cargo.toml

@@ -1,8 +1,9 @@
 use core::fmt;
+#[cfg(not(windows))]
+use std::os::unix::fs::PermissionsExt;
 use std::{
     fs::{create_dir, OpenOptions},
     net::IpAddr,
-    os::unix::fs::PermissionsExt,
     path::{Path, PathBuf},
     str::FromStr,
     sync::Arc,
@@ -154,9 +155,9 @@ async fn connect(config: CliConfig, trigger: Arc<Notify>) -> Result<(), CliError
 
     // let wgapi = setup_wgapi(&ifname).expect("Failed to setup WireGuard API");
     #[cfg(not(target_os = "macos"))]
-    let wgapi = WGApi::<Kernel>::new(ifname.to_string())?;
+    let wgapi = WGApi::<Kernel>::new(ifname.to_string()).expect("Failed to setup WireGuard API");
     #[cfg(target_os = "macos")]
-    let wgapi = WGApi::<Userspace>::new(ifname.to_string())?;
+    let wgapi = WGApi::<Userspace>::new(ifname.to_string()).expect("Failed to setup WireGuard API");
 
     #[cfg(not(windows))]
     {

src-tauri/cli/src/bin/dg.rs

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "defguard-client",
-    "version": "1.1.2"
+    "version": "1.2.0"
   },
   "tauri": {
     "systemTray": {

src-tauri/tauri.conf.json

@@ -241,7 +241,7 @@ const MFACodeForm = ({ description, token, proxyUrl, resetState }: MFACodeForm)
   const finishMFA = async (code: string) => {
     if (!location) return toaster.error(localLL.errors.mfaStartGeneric());
 
-    const data = { token, code: Number(code) };
+    const data = { token, code: code };
 
     const response = await fetch<MFAFinishResponse>(proxyUrl + '/finish', {
       method: 'POST',