fix: attempt to use tauri's shell open

Signed-off-by: Martichou <[email protected]>
Martichou · Aug 13, 2024 · fa63e82 · fa63e82
1 parent c35a06c
commit fa63e82
Show file tree

Hide file tree

Showing 17 changed files with 867 additions and 868 deletions.
diff --git a/app/legacy/src-tauri/Cargo.lock b/app/legacy/src-tauri/Cargo.lock
diff --git a/app/legacy/src-tauri/Cargo.toml b/app/legacy/src-tauri/Cargo.toml
@@ -17,7 +17,6 @@ fern = { version = "0.6", features = ["colored"] }
 humantime = "2.1"
 log = "0.4"
 notify-rust = "4.10"
-open = "5.0"
 rqs_lib = { path = "../../../core_lib", features = ["experimental"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

diff --git a/app/legacy/src-tauri/src/cmds/mod.rs b/app/legacy/src-tauri/src/cmds/mod.rs
@@ -6,8 +6,6 @@ mod discovery;
 pub use discovery::*;
 mod get_hostname;
 pub use get_hostname::*;
-mod open_url;
-pub use open_url::*;
 mod send_payload;
 pub use send_payload::*;
 mod send_to_rs;

diff --git a/app/legacy/src-tauri/src/cmds/open_url.rs b/app/legacy/src-tauri/src/cmds/open_url.rs
diff --git a/app/legacy/src-tauri/src/main.rs b/app/legacy/src-tauri/src/main.rs
@@ -71,7 +71,6 @@ async fn main() -> Result<(), anyhow::Error> {
             cmds::start_discovery,
             cmds::stop_discovery,
             cmds::get_hostname,
-            cmds::open_url,
             cmds::send_payload,
             cmds::send_to_rs,
         ])

diff --git a/app/legacy/src-tauri/tauri.conf.json b/app/legacy/src-tauri/tauri.conf.json
@@ -50,7 +50,10 @@
       "active": false
     },
     "allowlist": {
-      "all": true
+      "all": true,
+      "shell": {
+        "open": ".*"
+      }
     },
     "windows": [
       {

diff --git a/app/legacy/src/components/HomePage.vue b/app/legacy/src/components/HomePage.vue
@@ -353,6 +353,7 @@ import { ref, nextTick } from 'vue'
 import { UnlistenFn, listen } from '@tauri-apps/api/event'
 import { Store } from 'tauri-plugin-store-api';
 import { invoke } from '@tauri-apps/api/tauri'
+import { open } from '@tauri-apps/api/shell';
 import { getVersion } from '@tauri-apps/api/app';
 import { isPermissionGranted, requestPermission } from '@tauri-apps/api/notification';
 import { getCurrent } from '@tauri-apps/api/window';
@@ -587,7 +588,7 @@ export default {
 		},
 		openUrl: async function(url: string) {
 			try {
-				await invoke('open_url', { message: url });
+				await open(url);
 			} catch (e) {
 				this.toastStore.addToast("Error opening URL, it may not be a valid URI", ToastType.Error);
 				console.error("Error opening URL", e);

diff --git a/app/main/package.json b/app/main/package.json
@@ -23,7 +23,8 @@
     "@tauri-apps/plugin-dialog": "2.0.0-rc.0",
     "@tauri-apps/plugin-notification": "2.0.0-rc.0",
     "@tauri-apps/plugin-store": "2.0.0-rc.0",
-    "pinia": "^2.2.1",
+    "@tauri-apps/plugin-shell": "2.0.0-rc.0",
+    "pinia": "^2.2.0",
     "semver": "^7.6.3",
     "vue": "3.4.37"
   },

diff --git a/app/main/pnpm-lock.yaml b/app/main/pnpm-lock.yaml