fix: use webview's resources table (#1191)

* fix: use webview's resources table

* fix clipboard into_img usage

* fix mobile

Author: amrbashir

.changes/scoped-resources-table.md

@@ -0,0 +1,8 @@
+---
+"fs": "patch"
+"http": "patch"
+"updater": "patch"
+"clipboard-manager": "patch"
+---
+
+Internally use the webview scoped resources table instead of the app one, so other webviews can't access other webviews resources.

.changes/tauri-beta-15.md

@@ -0,0 +1,8 @@
+---
+"fs": patch
+"http": patch
+"updater": patch
+"clipboard-manager": patch
+---
+
+Update for tauri 2.0.0-beta.15.

Cargo.lock

@@ -5983,6 +5983,13 @@
             "webview:allow-set-webview-size"
           ]
         },
+        {
+          "description": "webview:allow-set-webview-zoom -> Enables the set_webview_zoom command without any pre-configured scope.",
+          "type": "string",
+          "enum": [
+            "webview:allow-set-webview-zoom"
+          ]
+        },
         {
           "description": "webview:allow-webview-close -> Enables the webview_close command without any pre-configured scope.",
           "type": "string",
@@ -6060,6 +6067,13 @@
             "webview:deny-set-webview-size"
           ]
         },
+        {
+          "description": "webview:deny-set-webview-zoom -> Denies the set_webview_zoom command without any pre-configured scope.",
+          "type": "string",
+          "enum": [
+            "webview:deny-set-webview-zoom"
+          ]
+        },
         {
           "description": "webview:deny-webview-close -> Denies the webview_close command without any pre-configured scope.",
           "type": "string",

examples/api/src-tauri/gen/schemas/desktop-schema.json

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use tauri::{command, AppHandle, Manager, ResourceId, Runtime, State};
+use tauri::{command, AppHandle, Manager, ResourceId, Runtime, State, Webview};
 
 use crate::{ClipKind, Clipboard, ClipboardContents, Result};
 
@@ -17,11 +17,12 @@ pub(crate) async fn write_text<R: Runtime>(
 
 #[command]
 pub(crate) async fn write_image<R: Runtime>(
-    _app: AppHandle<R>,
+    webview: Webview<R>,
     clipboard: State<'_, Clipboard<R>>,
     data: ClipKind,
 ) -> Result<()> {
-    clipboard.write_image(data)
+    let resources_table = webview.resources_table();
+    clipboard.write_image_inner(data, &resources_table)
 }
 
 #[command]
@@ -34,11 +35,11 @@ pub(crate) async fn read_text<R: Runtime>(
 
 #[command]
 pub(crate) async fn read_image<R: Runtime>(
-    app: AppHandle<R>,
+    webview: Webview<R>,
     clipboard: State<'_, Clipboard<R>>,
 ) -> Result<ResourceId> {
     let image = clipboard.read_image()?.to_owned();
-    let mut resources_table = app.resources_table();
+    let mut resources_table = webview.resources_table();
     let rid = resources_table.add(image);
     Ok(rid)
 }

plugins/clipboard-manager/src/commands.rs

@@ -5,7 +5,7 @@
 use arboard::ImageData;
 use image::ImageEncoder;
 use serde::de::DeserializeOwned;
-use tauri::{image::Image, plugin::PluginApi, AppHandle, Runtime};
+use tauri::{image::Image, plugin::PluginApi, AppHandle, Manager, ResourceTable, Runtime};
 
 use crate::models::*;
 
@@ -39,11 +39,15 @@ impl<R: Runtime> Clipboard<R> {
         }
     }
 
-    pub fn write_image(&self, kind: ClipKind) -> crate::Result<()> {
+    pub(crate) fn write_image_inner(
+        &self,
+        kind: ClipKind,
+        resources_table: &ResourceTable,
+    ) -> crate::Result<()> {
         match kind {
             ClipKind::Image { image, .. } => match &self.clipboard {
                 Ok(clipboard) => {
-                    let image = image.into_img(&self.app)?;
+                    let image = image.into_img(resources_table)?;
                     clipboard
                         .lock()
                         .unwrap()
@@ -60,6 +64,11 @@ impl<R: Runtime> Clipboard<R> {
         }
     }
 
+    pub fn write_image(&self, kind: ClipKind) -> crate::Result<()> {
+        let resources_table = self.app.resources_table();
+        self.write_image_inner(kind, &resources_table)
+    }
+
     pub fn read_text(&self) -> crate::Result<ClipboardContents> {
         match &self.clipboard {
             Ok(clipboard) => {

plugins/clipboard-manager/src/desktop.rs

@@ -37,6 +37,16 @@ impl<R: Runtime> Clipboard<R> {
         self.0.run_mobile_plugin("write", kind).map_err(Into::into)
     }
 
+    pub(crate) fn write_image_inner(
+        &self,
+        kind: ClipKind,
+        resources_table: &tauri::ResourceTable,
+    ) -> crate::Result<()> {
+        Err(crate::Error::Clipboard(
+            "Unsupported on this platform".to_string(),
+        ))
+    }
+
     pub fn write_image(&self, kind: ClipKind) -> crate::Result<()> {
         Err(crate::Error::Clipboard(
             "Unsupported on this platform".to_string(),

plugins/clipboard-manager/src/mobile.rs

@@ -8,7 +8,6 @@ pnpm-debug.log*
 lerna-debug.log*
 
 node_modules
-dist
 dist-ssr
 *.local