@tokamakdev/plugin-local-authentication 0.1.0-beta.64 → 0.1.0-beta.69

package/android/AndroidManifest.xml

@@ -0,0 +1,3 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+  <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+</manifest>

package/android/LocalAuthenticationPlugin.kt

@@ -2,12 +2,15 @@ package com.tokamak.plugins.localauthentication
 
 import android.hardware.biometrics.BiometricManager
 import android.hardware.biometrics.BiometricManager.Authenticators
-import android.hardware.biometrics.BiometricPrompt
-import android.os.CancellationSignal
 import com.tokamak.runtime.TokamakHost
 import com.tokamak.runtime.TokamakPlugin
 import com.tokamak.runtime.TokamakPluginError
 import com.tokamak.runtime.TokamakPluginReply
+import com.tokamak.runtime.authenticateOwner
+import com.tokamak.runtime.optionalString
+import com.tokamak.runtime.requireObject
+import com.tokamak.runtime.requireOwnerAuthentication
+import com.tokamak.runtime.requireString
 import org.json.JSONObject
 
 class TokamakLocalAuthenticationPlugin(
@@ -19,16 +22,12 @@ class TokamakLocalAuthenticationPlugin(
 
     override fun call(method: String, arguments: Any?, reply: TokamakPluginReply) {
         when (method) {
-            "status" -> respond(reply) { reply(Result.success(status(request(arguments)))) }
-            "authenticate" -> respond(reply) { authenticate(request(arguments), reply) }
+            "status" -> reply(Result.success(status(requireObject(arguments))))
+            "authenticate" -> authenticate(requireObject(arguments), reply)
             else -> super.call(method, arguments, reply)
         }
     }
 
-    private fun respond(reply: TokamakPluginReply, operation: () -> Unit) {
-        runCatching(operation).onFailure { reply(Result.failure(pluginError(it))) }
-    }
-
     private fun status(request: JSONObject): String =
         when (biometrics.canAuthenticate(authenticators(request))) {
             BiometricManager.BIOMETRIC_SUCCESS -> "available"
@@ -39,53 +38,17 @@ class TokamakLocalAuthenticationPlugin(
     private fun authenticate(request: JSONObject, reply: TokamakPluginReply) {
         val authenticators = authenticators(request)
         val prompt = request.requireString("prompt")
-        if (prompt.isEmpty()) throw typeError("prompt must be a non-empty string")
-        requireAvailable(authenticators)
-        val activity = host.activity ?: throw notVisible()
-        val callback = PromptCallback(reply) { reply(Result.success(null)) }
-        val dialog =
-            BiometricPrompt.Builder(activity)
-                .setTitle(prompt)
-                .setAllowedAuthenticators(authenticators)
-        if ((authenticators and Authenticators.DEVICE_CREDENTIAL) == 0) {
-            dialog.setNegativeButton(
-                activity.getString(android.R.string.cancel),
-                activity.mainExecutor,
-            ) { _, _ ->
-                reply(Result.failure(TokamakPluginError("NotAllowedError", "Authentication was cancelled")))
-            }
-        }
-        dialog.build().authenticate(CancellationSignal(), activity.mainExecutor, callback)
-    }
-
-    private fun requireAvailable(authenticators: Int) {
-        when (biometrics.canAuthenticate(authenticators)) {
-            BiometricManager.BIOMETRIC_SUCCESS -> Unit
-            BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE ->
-                throw TokamakPluginError.notSupported("This device cannot perform the requested authentication")
-            else -> throw notSetUp()
-        }
+        if (prompt.isEmpty()) throw TokamakPluginError.typeError("prompt must be a non-empty string")
+        host.requireOwnerAuthentication(authenticators)
+        host.authenticateOwner(prompt, authenticators, null, reply) { reply(Result.success(null)) }
     }
 
     private fun authenticators(request: JSONObject): Int {
         val wireName = request.optionalString("authentication")
         return Authentication.entries.firstOrNull { it.wireName == wireName }?.authenticators
-            ?: throw typeError("authentication must be \"biometricsOrPasscode\" or \"biometrics\"")
+            ?: throw TokamakPluginError.typeError("authentication must be \"biometricsOrPasscode\" or \"biometrics\"")
     }
 
-    private fun request(arguments: Any?): JSONObject =
-        arguments as? JSONObject ?: throw typeError("$id arguments must be an object")
-
-    private fun JSONObject.requireString(name: String): String =
-        optionalString(name) ?: throw typeError("$name must be a string")
-
-    private fun JSONObject.optionalString(name: String): String? =
-        when (val value = opt(name)) {
-            null, JSONObject.NULL -> null
-            is String -> value
-            else -> throw typeError("$name must be a string")
-        }
-
     private enum class Authentication(val wireName: String, val authenticators: Int) {
         BIOMETRICS_OR_PASSCODE(
             "biometricsOrPasscode",
@@ -93,46 +56,4 @@ class TokamakLocalAuthenticationPlugin(
         ),
         BIOMETRICS("biometrics", Authenticators.BIOMETRIC_STRONG),
     }
-
-    private companion object {
-        fun typeError(message: String) = TokamakPluginError("TypeError", message)
-
-        fun notSetUp() =
-            TokamakPluginError("InvalidStateError", "The requested authentication is not set up on this device")
-
-        fun notVisible() =
-            TokamakPluginError("InvalidStateError", "The app has no activity to show the authentication prompt in")
-
-        fun pluginError(error: Throwable): TokamakPluginError =
-            error as? TokamakPluginError
-                ?: TokamakPluginError("OperationError", error.message ?: error.javaClass.name)
-    }
 }
-
-private class PromptCallback(
-    private val reply: TokamakPluginReply,
-    private val succeeded: () -> Unit,
-) : BiometricPrompt.AuthenticationCallback() {
-    override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) = succeeded()
-
-    override fun onAuthenticationError(code: Int, message: CharSequence) =
-        reply(Result.failure(authenticationError(code, message)))
-}
-
-private fun authenticationError(code: Int, message: CharSequence) =
-    TokamakPluginError(
-        when (code) {
-            BiometricPrompt.BIOMETRIC_ERROR_CANCELED,
-            BiometricPrompt.BIOMETRIC_ERROR_USER_CANCELED,
-            BiometricPrompt.BIOMETRIC_ERROR_TIMEOUT,
-            BiometricPrompt.BIOMETRIC_ERROR_LOCKOUT,
-            BiometricPrompt.BIOMETRIC_ERROR_LOCKOUT_PERMANENT,
-            -> "NotAllowedError"
-            BiometricPrompt.BIOMETRIC_ERROR_NO_BIOMETRICS,
-            BiometricPrompt.BIOMETRIC_ERROR_NO_DEVICE_CREDENTIAL,
-            -> "InvalidStateError"
-            BiometricPrompt.BIOMETRIC_ERROR_HW_NOT_PRESENT -> "NotSupportedError"
-            else -> "OperationError"
-        },
-        message.toString(),
-    )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokamakdev/plugin-local-authentication",
-  "version": "0.1.0-beta.64",
+  "version": "0.1.0-beta.69",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/mantty/tokamak.git",
@@ -11,7 +11,7 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@tokamakdev/plugin": "0.1.0-beta.64"
+    "@tokamakdev/plugin": "0.1.0-beta.69"
   },
   "files": [
     "android",

package/tokamak-plugin.json

@@ -4,25 +4,17 @@
   "platforms": {
     "macos": {
       "class": "TokamakLocalAuthenticationPlugin",
-      "sources": ["apple/LocalAuthenticationPlugin.swift"],
-      "frameworks": ["LocalAuthentication"]
+      "sources": ["apple/LocalAuthenticationPlugin.swift"]
     },
     "ios": {
       "class": "TokamakLocalAuthenticationPlugin",
       "sources": ["apple/LocalAuthenticationPlugin.swift"],
-      "frameworks": ["LocalAuthentication"],
-      "plist": "apple/Info.plist"
-    },
-    "ios-simulator": {
-      "class": "TokamakLocalAuthenticationPlugin",
-      "sources": ["apple/LocalAuthenticationPlugin.swift"],
-      "frameworks": ["LocalAuthentication"],
       "plist": "apple/Info.plist"
     },
     "android": {
       "class": "com.tokamak.plugins.localauthentication.TokamakLocalAuthenticationPlugin",
       "sources": ["android/LocalAuthenticationPlugin.kt"],
-      "permissions": ["android.permission.USE_BIOMETRIC"]
+      "manifest": "android/AndroidManifest.xml"
     }
   }
 }