diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 87ebec0..5858219 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,5 +1,7 @@ + + diff --git a/build.rs b/build.rs index 730d157..a486007 100644 --- a/build.rs +++ b/build.rs @@ -1,4 +1,9 @@ -const COMMANDS: &[&str] = &["cek_izin", "minta_izin", "daftar_perangkat", "kirim"]; +const COMMANDS: &[&str] = &[ + "check_permissions", + "request_permissions", + "daftar_perangkat", + "kirim", +]; fn main() { tauri_plugin::Builder::new(COMMANDS) diff --git a/guest-js/index.ts b/guest-js/index.ts index 349f377..982b5dd 100644 --- a/guest-js/index.ts +++ b/guest-js/index.ts @@ -1,14 +1,6 @@ import { invoke } from "@tauri-apps/api/core"; import { SBlueclasMuatanKirim, SBlueclasResponDaftarPerangkat } from "./models"; -export async function cekIzin(): Promise { - return await invoke("plugin:bluclas|cek_izin").then((res: string) => res); -} - -export async function mintaIzin(): Promise { - return await invoke("plugin:bluclas|minta_izin"); -} - export async function daftarPerangkat(): Promise< SBlueclasResponDaftarPerangkat[] > { diff --git a/package.json b/package.json index 10b933c..3a9cc51 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@segubi/tauri-plugin-bluclas-api", - "version": "0.1.1", + "version": "0.1.5", "author": "Rizky Denianto", "description": "", "type": "module", diff --git a/permissions/autogenerated/commands/cek_izin.toml b/permissions/autogenerated/commands/cek_izin.toml deleted file mode 100644 index 0e4fefe..0000000 --- a/permissions/autogenerated/commands/cek_izin.toml +++ /dev/null @@ -1,13 +0,0 @@ -# Automatically generated - DO NOT EDIT! - -"$schema" = "../../schemas/schema.json" - -[[permission]] -identifier = "allow-cek-izin" -description = "Enables the cek_izin command without any pre-configured scope." -commands.allow = ["cek_izin"] - -[[permission]] -identifier = "deny-cek-izin" -description = "Denies the cek_izin command without any pre-configured scope." -commands.deny = ["cek_izin"] diff --git a/permissions/autogenerated/commands/check_permissions.toml b/permissions/autogenerated/commands/check_permissions.toml new file mode 100644 index 0000000..f5af08b --- /dev/null +++ b/permissions/autogenerated/commands/check_permissions.toml @@ -0,0 +1,13 @@ +# Automatically generated - DO NOT EDIT! + +"$schema" = "../../schemas/schema.json" + +[[permission]] +identifier = "allow-check-permissions" +description = "Enables the check_permissions command without any pre-configured scope." +commands.allow = ["check_permissions"] + +[[permission]] +identifier = "deny-check-permissions" +description = "Denies the check_permissions command without any pre-configured scope." +commands.deny = ["check_permissions"] diff --git a/permissions/autogenerated/commands/minta_izin.toml b/permissions/autogenerated/commands/minta_izin.toml deleted file mode 100644 index e406f3f..0000000 --- a/permissions/autogenerated/commands/minta_izin.toml +++ /dev/null @@ -1,13 +0,0 @@ -# Automatically generated - DO NOT EDIT! - -"$schema" = "../../schemas/schema.json" - -[[permission]] -identifier = "allow-minta-izin" -description = "Enables the minta_izin command without any pre-configured scope." -commands.allow = ["minta_izin"] - -[[permission]] -identifier = "deny-minta-izin" -description = "Denies the minta_izin command without any pre-configured scope." -commands.deny = ["minta_izin"] diff --git a/permissions/autogenerated/commands/request_permissions.toml b/permissions/autogenerated/commands/request_permissions.toml new file mode 100644 index 0000000..02dcd62 --- /dev/null +++ b/permissions/autogenerated/commands/request_permissions.toml @@ -0,0 +1,13 @@ +# Automatically generated - DO NOT EDIT! + +"$schema" = "../../schemas/schema.json" + +[[permission]] +identifier = "allow-request-permissions" +description = "Enables the request_permissions command without any pre-configured scope." +commands.allow = ["request_permissions"] + +[[permission]] +identifier = "deny-request-permissions" +description = "Denies the request_permissions command without any pre-configured scope." +commands.deny = ["request_permissions"] diff --git a/permissions/autogenerated/reference.md b/permissions/autogenerated/reference.md index c96eeaf..0d7056b 100644 --- a/permissions/autogenerated/reference.md +++ b/permissions/autogenerated/reference.md @@ -4,8 +4,8 @@ Default permissions for the plugin #### This default permission set includes the following: -- `allow-cek-izin` -- `allow-minta-izin` +- `allow-check-permissions` +- `allow-request-permissions` - `allow-daftar-perangkat` - `allow-kirim` @@ -21,12 +21,12 @@ Default permissions for the plugin -`bluclas:allow-cek-izin` +`bluclas:allow-check-permissions` -Enables the cek_izin command without any pre-configured scope. +Enables the check_permissions command without any pre-configured scope. @@ -34,12 +34,12 @@ Enables the cek_izin command without any pre-configured scope. -`bluclas:deny-cek-izin` +`bluclas:deny-check-permissions` -Denies the cek_izin command without any pre-configured scope. +Denies the check_permissions command without any pre-configured scope. @@ -99,12 +99,12 @@ Denies the kirim command without any pre-configured scope. -`bluclas:allow-minta-izin` +`bluclas:allow-request-permissions` -Enables the minta_izin command without any pre-configured scope. +Enables the request_permissions command without any pre-configured scope. @@ -112,12 +112,12 @@ Enables the minta_izin command without any pre-configured scope. -`bluclas:deny-minta-izin` +`bluclas:deny-request-permissions` -Denies the minta_izin command without any pre-configured scope. +Denies the request_permissions command without any pre-configured scope. diff --git a/permissions/default.toml b/permissions/default.toml index 54eeb34..473ca86 100644 --- a/permissions/default.toml +++ b/permissions/default.toml @@ -1,8 +1,8 @@ [default] description = "Default permissions for the plugin" permissions = [ - "allow-cek-izin", - "allow-minta-izin", + "allow-check-permissions", + "allow-request-permissions", "allow-daftar-perangkat", "allow-kirim" ] diff --git a/permissions/schemas/schema.json b/permissions/schemas/schema.json index 7b7fbec..21b10d7 100644 --- a/permissions/schemas/schema.json +++ b/permissions/schemas/schema.json @@ -295,16 +295,16 @@ "type": "string", "oneOf": [ { - "description": "Enables the cek_izin command without any pre-configured scope.", + "description": "Enables the check_permissions command without any pre-configured scope.", "type": "string", - "const": "allow-cek-izin", - "markdownDescription": "Enables the cek_izin command without any pre-configured scope." + "const": "allow-check-permissions", + "markdownDescription": "Enables the check_permissions command without any pre-configured scope." }, { - "description": "Denies the cek_izin command without any pre-configured scope.", + "description": "Denies the check_permissions command without any pre-configured scope.", "type": "string", - "const": "deny-cek-izin", - "markdownDescription": "Denies the cek_izin command without any pre-configured scope." + "const": "deny-check-permissions", + "markdownDescription": "Denies the check_permissions command without any pre-configured scope." }, { "description": "Enables the daftar_perangkat command without any pre-configured scope.", @@ -331,22 +331,22 @@ "markdownDescription": "Denies the kirim command without any pre-configured scope." }, { - "description": "Enables the minta_izin command without any pre-configured scope.", + "description": "Enables the request_permissions command without any pre-configured scope.", "type": "string", - "const": "allow-minta-izin", - "markdownDescription": "Enables the minta_izin command without any pre-configured scope." + "const": "allow-request-permissions", + "markdownDescription": "Enables the request_permissions command without any pre-configured scope." }, { - "description": "Denies the minta_izin command without any pre-configured scope.", + "description": "Denies the request_permissions command without any pre-configured scope.", "type": "string", - "const": "deny-minta-izin", - "markdownDescription": "Denies the minta_izin command without any pre-configured scope." + "const": "deny-request-permissions", + "markdownDescription": "Denies the request_permissions command without any pre-configured scope." }, { - "description": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-cek-izin`\n- `allow-minta-izin`\n- `allow-daftar-perangkat`\n- `allow-kirim`", + "description": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-check-permissions`\n- `allow-request-permissions`\n- `allow-daftar-perangkat`\n- `allow-kirim`", "type": "string", "const": "default", - "markdownDescription": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-cek-izin`\n- `allow-minta-izin`\n- `allow-daftar-perangkat`\n- `allow-kirim`" + "markdownDescription": "Default permissions for the plugin\n#### This default permission set includes:\n\n- `allow-check-permissions`\n- `allow-request-permissions`\n- `allow-daftar-perangkat`\n- `allow-kirim`" } ] } diff --git a/src/commands.rs b/src/commands.rs index bc5c9c9..ec5f82d 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -4,16 +4,6 @@ use crate::BluclasExt; use crate::Result; use crate::models::*; -#[command] -pub(crate) async fn cek_izin(app: AppHandle) -> Result { - return app.bluclas().cek_izin(); -} - -#[command] -pub(crate) async fn minta_izin(app: AppHandle) -> Result<()> { - return app.bluclas().minta_izin(); -} - #[command] pub(crate) async fn daftar_perangkat( app: AppHandle, diff --git a/src/desktop.rs b/src/desktop.rs index c188a48..5f6ee09 100644 --- a/src/desktop.rs +++ b/src/desktop.rs @@ -14,14 +14,6 @@ pub fn init( pub struct Bluclas(AppHandle); impl Bluclas { - pub fn cek_izin(&self) -> crate::Result { - return Ok(String::new()); - } - - pub fn minta_izin(&self) -> crate::Result<()> { - return Ok(()); - } - pub fn daftar_perangkat(&self) -> crate::Result { return Ok(SBlueclasResponDaftarPerangkat { data: vec![] }); } diff --git a/src/lib.rs b/src/lib.rs index f8f9229..c155540 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,4 @@ -use crate::commands::{cek_izin, daftar_perangkat, kirim, minta_izin}; +use crate::commands::{daftar_perangkat, kirim}; use tauri::{ Manager, Runtime, plugin::{Builder, TauriPlugin}, @@ -36,12 +36,7 @@ impl> crate::BluclasExt for T { /// Initializes the plugin. pub fn init() -> TauriPlugin { Builder::new("bluclas") - .invoke_handler(tauri::generate_handler![ - cek_izin, - minta_izin, - daftar_perangkat, - kirim - ]) + .invoke_handler(tauri::generate_handler![daftar_perangkat, kirim]) .setup(|app, api| { #[cfg(mobile)] let bluclas = mobile::init(app, api)?; diff --git a/src/mobile.rs b/src/mobile.rs index 363a0bd..f976f48 100644 --- a/src/mobile.rs +++ b/src/mobile.rs @@ -25,20 +25,6 @@ pub fn init( pub struct Bluclas(PluginHandle); impl Bluclas { - pub fn cek_izin(&self) -> crate::Result { - return self - .0 - .run_mobile_plugin("checkPermissions", ()) - .map_err(Into::into); - } - - pub fn minta_izin(&self) -> crate::Result<()> { - return self - .0 - .run_mobile_plugin("requestPermissions", ()) - .map_err(Into::into); - } - pub fn daftar_perangkat(&self) -> crate::Result { return self .0