diff --git a/tauri-plugin-ios-shared-token/permissions/autogenerated/reference.md b/tauri-plugin-ios-shared-token/permissions/autogenerated/reference.md index bb9ac5e..21a3431 100644 --- a/tauri-plugin-ios-shared-token/permissions/autogenerated/reference.md +++ b/tauri-plugin-ios-shared-token/permissions/autogenerated/reference.md @@ -1,3 +1,10 @@ +## Default Permission + +Default permissions for the plugin + +#### This default permission set includes the following: + +- `saveToken` ## Permission Table diff --git a/tauri-plugin-ios-shared-token/permissions/default.toml b/tauri-plugin-ios-shared-token/permissions/default.toml index 1d56122..f40789a 100644 --- a/tauri-plugin-ios-shared-token/permissions/default.toml +++ b/tauri-plugin-ios-shared-token/permissions/default.toml @@ -1,3 +1,3 @@ [default] description = "Default permissions for the plugin" -permissions = ["saveToken"] +permissions = ["allow-save-token"] diff --git a/tauri-plugin-ios-shared-token/permissions/schemas/schema.json b/tauri-plugin-ios-shared-token/permissions/schemas/schema.json index 868c220..905e90b 100644 --- a/tauri-plugin-ios-shared-token/permissions/schemas/schema.json +++ b/tauri-plugin-ios-shared-token/permissions/schemas/schema.json @@ -305,6 +305,12 @@ "type": "string", "const": "deny-saveToken", "markdownDescription": "Denies the saveToken command without any pre-configured scope." + }, + { + "description": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `saveToken`", + "type": "string", + "const": "default", + "markdownDescription": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `saveToken`" } ] } diff --git a/tauri-plugin-ios-shared-token/src/commands.rs b/tauri-plugin-ios-shared-token/src/commands.rs index 039f56b..1c62e9d 100644 --- a/tauri-plugin-ios-shared-token/src/commands.rs +++ b/tauri-plugin-ios-shared-token/src/commands.rs @@ -1,13 +1,13 @@ -use tauri::{AppHandle, command, Runtime}; +use tauri::{command, AppHandle, Runtime}; use crate::models::*; -use crate::Result; use crate::IosSharedTokenExt; +use crate::Result; #[command] -pub(crate) async fn ping( +pub(crate) async fn save_token( app: AppHandle, - payload: PingRequest, -) -> Result { - app.ios_shared_token().ping(payload) + payload: SaveTokenRequest, +) -> Result { + app.ios_shared_token().save_token(payload) } diff --git a/tauri-plugin-ios-shared-token/src/desktop.rs b/tauri-plugin-ios-shared-token/src/desktop.rs deleted file mode 100644 index 2e320a0..0000000 --- a/tauri-plugin-ios-shared-token/src/desktop.rs +++ /dev/null @@ -1,22 +0,0 @@ -use serde::de::DeserializeOwned; -use tauri::{plugin::PluginApi, AppHandle, Runtime}; - -use crate::models::*; - -pub fn init( - app: &AppHandle, - _api: PluginApi, -) -> crate::Result> { - Ok(IosSharedToken(app.clone())) -} - -/// Access to the ios-shared-token APIs. -pub struct IosSharedToken(AppHandle); - -impl IosSharedToken { - pub fn ping(&self, payload: PingRequest) -> crate::Result { - Ok(PingResponse { - value: payload.value, - }) - } -} diff --git a/tauri-plugin-ios-shared-token/src/lib.rs b/tauri-plugin-ios-shared-token/src/lib.rs index b0f0c40..25f7c8e 100644 --- a/tauri-plugin-ios-shared-token/src/lib.rs +++ b/tauri-plugin-ios-shared-token/src/lib.rs @@ -1,13 +1,10 @@ use tauri::{ - plugin::{Builder, TauriPlugin}, - Manager, Runtime, + plugin::{Builder, TauriPlugin}, + Manager, Runtime, }; pub use models::*; -#[cfg(desktop)] -mod desktop; -#[cfg(mobile)] mod mobile; mod commands; @@ -16,33 +13,27 @@ mod models; pub use error::{Error, Result}; -#[cfg(desktop)] -use desktop::IosSharedToken; -#[cfg(mobile)] use mobile::IosSharedToken; /// Extensions to [`tauri::App`], [`tauri::AppHandle`] and [`tauri::Window`] to access the ios-shared-token APIs. pub trait IosSharedTokenExt { - fn ios_shared_token(&self) -> &IosSharedToken; + fn ios_shared_token(&self) -> &IosSharedToken; } impl> crate::IosSharedTokenExt for T { - fn ios_shared_token(&self) -> &IosSharedToken { - self.state::>().inner() - } + fn ios_shared_token(&self) -> &IosSharedToken { + self.state::>().inner() + } } /// Initializes the plugin. pub fn init() -> TauriPlugin { - Builder::new("ios-shared-token") - .invoke_handler(tauri::generate_handler![commands::ping]) - .setup(|app, api| { - #[cfg(mobile)] - let ios_shared_token = mobile::init(app, api)?; - #[cfg(desktop)] - let ios_shared_token = desktop::init(app, api)?; - app.manage(ios_shared_token); - Ok(()) - }) - .build() + Builder::new("ios-shared-token") + .invoke_handler(tauri::generate_handler![commands::save_token]) + .setup(|app, api| { + let ios_shared_token = mobile::init(app, api)?; + app.manage(ios_shared_token); + Ok(()) + }) + .build() } diff --git a/tauri-plugin-ios-shared-token/src/mobile.rs b/tauri-plugin-ios-shared-token/src/mobile.rs index 505005c..2b51def 100644 --- a/tauri-plugin-ios-shared-token/src/mobile.rs +++ b/tauri-plugin-ios-shared-token/src/mobile.rs @@ -1,7 +1,7 @@ use serde::de::DeserializeOwned; use tauri::{ - plugin::{PluginApi, PluginHandle}, - AppHandle, Runtime, + plugin::{PluginApi, PluginHandle}, + AppHandle, Runtime, }; use crate::models::*; @@ -11,24 +11,20 @@ tauri::ios_plugin_binding!(init_plugin_ios_shared_token); // initializes the Kotlin or Swift plugin classes pub fn init( - _app: &AppHandle, - api: PluginApi, + _app: &AppHandle, + api: PluginApi, ) -> crate::Result> { - #[cfg(target_os = "android")] - let handle = api.register_android_plugin("", "ExamplePlugin")?; - #[cfg(target_os = "ios")] - let handle = api.register_ios_plugin(init_plugin_ios_shared_token)?; - Ok(IosSharedToken(handle)) + let handle = api.register_ios_plugin(init_plugin_ios_shared_token)?; + Ok(IosSharedToken(handle)) } /// Access to the ios-shared-token APIs. pub struct IosSharedToken(PluginHandle); impl IosSharedToken { - pub fn ping(&self, payload: PingRequest) -> crate::Result { - self - .0 - .run_mobile_plugin("ping", payload) - .map_err(Into::into) - } + pub fn save_token(&self, payload: SaveTokenRequest) -> crate::Result { + self.0 + .run_mobule_plugin("saveToken", payload) + .map_err(Into::into) + } } diff --git a/tauri-plugin-ios-shared-token/src/models.rs b/tauri-plugin-ios-shared-token/src/models.rs index 1b53e9e..9ef6924 100644 --- a/tauri-plugin-ios-shared-token/src/models.rs +++ b/tauri-plugin-ios-shared-token/src/models.rs @@ -2,12 +2,10 @@ use serde::{Deserialize, Serialize}; #[derive(Debug, Deserialize, Serialize)] #[serde(rename_all = "camelCase")] -pub struct PingRequest { - pub value: Option, +pub struct SaveTokenRequest { + pub token: String, } #[derive(Debug, Clone, Default, Deserialize, Serialize)] #[serde(rename_all = "camelCase")] -pub struct PingResponse { - pub value: Option, -} +pub struct SaveTokenResponse {}