@tokamakdev/plugin-secure-storage 0.1.0-beta.49 → 0.1.0-beta.51

package/android/SecureStoragePlugin.kt

@@ -1,6 +1,5 @@
 package com.tokamak.plugins.securestorage
 
-import android.app.Activity
 import android.hardware.biometrics.BiometricManager
 import android.hardware.biometrics.BiometricManager.Authenticators
 import android.hardware.biometrics.BiometricPrompt
@@ -12,6 +11,7 @@ import android.security.keystore.KeyProperties
 import android.security.keystore.StrongBoxUnavailableException
 import android.security.keystore.UserNotAuthenticatedException
 import android.util.AtomicFile
+import com.tokamak.runtime.TokamakHost
 import com.tokamak.runtime.TokamakPlugin
 import com.tokamak.runtime.TokamakPluginError
 import com.tokamak.runtime.TokamakPluginReply
@@ -46,15 +46,16 @@ import org.json.JSONObject
  * carries the value's unlock and authentication requirements. Every write uses a new key
  * pair, identified in the value's file, so a failed write leaves the previous value readable.
  */
-internal class TokamakSecureStoragePlugin(
-    private val activity: Activity,
+class TokamakSecureStoragePlugin(
+    private val host: TokamakHost,
 ) : TokamakPlugin {
     override val id = "secure-storage"
 
+    private val context = host.context
     private val worker = Executors.newSingleThreadExecutor()
-    private val directory = File(activity.noBackupFilesDir, "tokamak-secure-storage")
+    private val directory = File(context.noBackupFilesDir, "tokamak-secure-storage")
     private val keyStore = KeyStore.getInstance(KEYSTORE).apply { load(null) }
-    private val biometrics = activity.getSystemService(BiometricManager::class.java)
+    private val biometrics = context.getSystemService(BiometricManager::class.java)
     private val random = SecureRandom()
 
     override fun call(method: String, arguments: Any?, reply: TokamakPluginReply) {
@@ -83,7 +84,7 @@ internal class TokamakSecureStoragePlugin(
         }
 
     private fun onUiThread(reply: TokamakPluginReply, operation: () -> Unit) =
-        activity.runOnUiThread {
+        context.mainExecutor.execute {
             runCatching(operation).onFailure { reply(Result.failure(pluginError(it))) }
         }
 
@@ -200,8 +201,9 @@ internal class TokamakSecureStoragePlugin(
         stored: StoredValue,
         reply: TokamakPluginReply,
     ) {
+        val activity = host.activity ?: throw notVisible()
         val callback = PromptCallback(reply) { execute(reply) { reply(Result.success(open(stored, unwrap))) } }
-        val title = prompt?.takeIf { it.isNotEmpty() } ?: activity.applicationInfo.loadLabel(activity.packageManager)
+        val title = prompt?.takeIf { it.isNotEmpty() } ?: context.applicationInfo.loadLabel(context.packageManager)
         val dialog =
             BiometricPrompt.Builder(activity)
                 .setTitle(title)
@@ -346,6 +348,9 @@ internal class TokamakSecureStoragePlugin(
         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 =
             when (error) {
                 is TokamakPluginError -> error

package/apple/Info.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSFaceIDUsageDescription</key>
+	<string>This app uses Face ID to confirm your identity.</string>
+</dict>
+</plist>

package/apple/SecureStoragePlugin.swift

@@ -9,6 +9,8 @@ final class TokamakSecureStoragePlugin: TokamakPlugin {
   /// Keychain calls block while the system authentication prompt is shown.
   private let queue = DispatchQueue(label: "tokamak.secure-storage")
 
+  init(host: TokamakHost) {}
+
   private static let teamSigningRequired = TokamakPluginError.notSupported(
     "Secure storage requires a team-signed build"
   )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokamakdev/plugin-secure-storage",
-  "version": "0.1.0-beta.49",
+  "version": "0.1.0-beta.51",
   "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.49"
+    "@tokamakdev/plugin": "0.1.0-beta.51"
   },
   "files": [
     "android",

package/tokamak-plugin.json

@@ -1,7 +1,6 @@
 {
   "schemaVersion": 1,
   "id": "secure-storage",
-  "kind": "frontend",
   "platforms": {
     "macos": {
       "class": "TokamakSecureStoragePlugin",
@@ -12,17 +11,13 @@
       "class": "TokamakSecureStoragePlugin",
       "sources": ["apple/SecureStoragePlugin.swift"],
       "frameworks": ["LocalAuthentication", "Security"],
-      "plist": {
-        "NSFaceIDUsageDescription": "This app uses Face ID to confirm your identity."
-      }
+      "plist": "apple/Info.plist"
     },
     "ios-simulator": {
       "class": "TokamakSecureStoragePlugin",
       "sources": ["apple/SecureStoragePlugin.swift"],
       "frameworks": ["LocalAuthentication", "Security"],
-      "plist": {
-        "NSFaceIDUsageDescription": "This app uses Face ID to confirm your identity."
-      }
+      "plist": "apple/Info.plist"
     },
     "android": {
       "class": "com.tokamak.plugins.securestorage.TokamakSecureStoragePlugin",