CalvinBackup/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-04-03 10:11:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(tauri) whitelist error messages (#833)

Browse Source
This commit is contained in:
Lucas Fernandes Nogueira
2020-07-15 17:53:08 -03:00
committed by GitHub
parent 3788afbda8
commit 956c6d853e
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tauri/src/endpoints.rs
View File

@@ -251,7 +251,11 @@ pub(crate) fn handle<T: 'static>(webview: &mut WebView<'_, T>, arg: &str) -> cra
error,
);
#[cfg(not(cli))]
whitelist_error(webview, error, "cli");
api_error(
webview,
error,
"CLI definition not set under tauri.conf.json > tauri > cli (https://tauri.studio/docs/api/config#tauri)",
);
}
Notification {
options,
@@ -281,19 +285,28 @@ pub(crate) fn handle<T: 'static>(webview: &mut WebView<'_, T>, arg: &str) -> cra
}
}
#[allow(dead_code)]
fn api_error<T: 'static>(webview: &mut WebView<'_, T>, error_fn: String, message: &str) {
let reject_code = tauri_api::rpc::format_callback(error_fn, message);
webview
.eval(&reject_code)
.expect("failed to eval api error")
}
#[allow(dead_code)]
fn whitelist_error<T: 'static>(
webview: &mut WebView<'_, T>,
error_fn: String,
whitelist_key: &str,
) {
let reject_code = tauri_api::rpc::format_callback(
api_error(
webview,
error_fn,
format!(r#""'{}' not whitelisted""#, whitelist_key),
);
webview
.eval(&reject_code)
.expect("failed to eval whitelist error")
&format!(
"{}' not whitelisted (https://tauri.studio/docs/api/config#tauri)",
whitelist_key
),
)
}
#[allow(dead_code)]