add api

Cargo.lock

@@ -5699,6 +5699,7 @@ dependencies = [
  "log",
  "serde",
  "serde_json",
+ "serde_repr",
  "tauri",
  "tauri-build",
  "thiserror",

plugins/biometric/Cargo.toml

@@ -20,3 +20,4 @@ serde_json = { workspace = true }
 tauri = { workspace = true }
 log = { workspace = true }
 thiserror = { workspace = true }
+serde_repr = "0.1"

plugins/biometric/guest-js/index.ts

@@ -2,4 +2,52 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-export async function doSomething() {}
+declare global {
+  interface Window {
+    __TAURI_INVOKE__: <T>(cmd: string, args?: unknown) => Promise<T>;
+  }
+}
+
+export enum BiometryType {
+  None = 0,
+  TouchID = 1,
+  FaceID = 2,
+}
+
+export interface Status {
+  isAvailable: boolean;
+  biometryType: BiometryType;
+  error?: string;
+  errorCode?:
+    | "appCancel"
+    | "authenticationFailed"
+    | "invalidContext"
+    | "notInteractive"
+    | "passcodeNotSet"
+    | "systemCancel"
+    | "userCancel"
+    | "userFallback"
+    | "biometryLockout"
+    | "biometryNotAvailable"
+    | "biometryNotEnrolled";
+}
+
+export interface AuthOptions {
+  fallbackTitle?: string;
+  cancelTitle?: string;
+  allowDeviceCredential?: boolean;
+}
+
+export async function checkStatus(): Promise<Status> {
+  return window.__TAURI_INVOKE__("plugin:biometry|status");
+}
+
+export async function authenticate(
+  reason: string,
+  options?: AuthOptions,
+): Promise<void> {
+  return window.__TAURI_INVOKE__("plugin:biometry|authenticate", {
+    reason,
+    ...options,
+  });
+}

plugins/biometric/ios/Sources/BiometricPlugin.swift

@@ -84,8 +84,8 @@ class BiometricPlugin: Plugin {
       invoke.resolve([
         "isAvailable": self.status.available,
         "biometryType": self.status.biometryType.rawValue,
-        "reason": self.status.errorReason ?? "",
+        "error": self.status.errorReason ?? "",
-        "code": self.status.errorCode ?? "",
+        "errorCode": self.status.errorCode ?? "",
       ])
     }
   }

plugins/biometric/src/api-iife.js

@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_BIOMETRIC__=function(_){"use strict";return _.doSomething=async function(){},_}({});Object.defineProperty(window.__TAURI__,"biometric",{value:__TAURI_BIOMETRIC__})}
+if("__TAURI__"in window){var __TAURI_BIOMETRIC__=function(e){"use strict";var _;return e.BiometryType=void 0,(_=e.BiometryType||(e.BiometryType={}))[_.None=0]="None",_[_.TouchID=1]="TouchID",_[_.FaceID=2]="FaceID",e.authenticate=async function(e,_){return window.__TAURI_INVOKE__("plugin:biometry|authenticate",{reason:e,..._})},e.checkStatus=async function(){return window.__TAURI_INVOKE__("plugin:biometry|status")},e}({});Object.defineProperty(window.__TAURI__,"biometric",{value:__TAURI_BIOMETRIC__})}

plugins/biometric/src/commands.rs

@@ -1,15 +0,0 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
-use tauri::{AppHandle, command, Runtime, Window};
-
-use crate::Result;
-
-#[command]
-pub(crate) async fn execute<R: Runtime>(
-  _app: AppHandle<R>,
-  _window: Window<R>,
-) -> Result<String> {
-  Ok("success".to_string())
-}

plugins/biometric/src/lib.rs

@@ -4,6 +4,7 @@
 
 #![cfg(mobile)]
 
+use serde::Serialize;
 use tauri::{
     plugin::{Builder, PluginHandle, TauriPlugin},
     Manager, Runtime,
@@ -11,7 +12,6 @@ use tauri::{
 
 pub use models::*;
 
-mod commands;
 mod error;
 mod models;
 
@@ -26,10 +26,21 @@ tauri::ios_plugin_binding!(init_plugin_biometric);
 /// Access to the biometric APIs.
 pub struct Biometric<R: Runtime>(PluginHandle<R>);
 
+#[derive(Serialize)]
+struct AuthenticatePayload {
+    reason: String,
+    #[serde(flatten)]
+    options: AuthOptions,
+}
+
 impl<R: Runtime> Biometric<R> {
-    pub fn ping(&self, payload: PingRequest) -> crate::Result<PingResponse> {
+    pub fn status(&self) -> crate::Result<Status> {
+        self.0.run_mobile_plugin("status", ()).map_err(Into::into)
+    }
+
+    pub fn authenticate(&self, reason: String, options: AuthOptions) -> crate::Result<()> {
         self.0
-            .run_mobile_plugin("ping", payload)
+            .run_mobile_plugin("authenticate", AuthenticatePayload { reason, options })
             .map_err(Into::into)
     }
 }
@@ -49,7 +60,6 @@ impl<R: Runtime, T: Manager<R>> crate::BiometricExt<R> for T {
 pub fn init<R: Runtime>() -> TauriPlugin<R> {
     Builder::new("biometric")
         .js_init_script(include_str!("api-iife.js").to_string())
-        .invoke_handler(tauri::generate_handler![commands::execute])
         .setup(|app, api| {
             #[cfg(target_os = "android")]
             let handle = api.register_android_plugin(PLUGIN_IDENTIFIER, "BiometricPlugin")?;

plugins/biometric/src/models.rs

@@ -4,14 +4,27 @@
 
 use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Serialize)]
+#[derive(Debug, Default, Serialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PingRequest {
+pub struct AuthOptions {
-    pub value: Option<String>,
+    pub fallback_title: Option<String>,
+    pub cancel_title: Option<String>,
+    pub allow_device_credential: bool,
 }
 
-#[derive(Debug, Clone, Default, Deserialize)]
+#[derive(Debug, Clone, serde_repr::Deserialize_repr)]
+#[repr(u8)]
+pub enum BiometryType {
+    None = 0,
+    TouchID = 1,
+    FaceID = 2,
+}
+
+#[derive(Debug, Clone, Deserialize)]
 #[serde(rename_all = "camelCase")]
-pub struct PingResponse {
+pub struct Status {
-    pub value: Option<String>,
+    pub is_available: bool,
+    pub biometry_type: BiometryType,
+    pub error: Option<String>,
+    pub error_code: Option<String>,
 }