Share owned host API state between HTTP hooks and native pages

host/tests/api_auth.rs

@@ -21,7 +21,7 @@ fn caller() -> Caller {
         conversations: vec!["conversation".into()],
     }
 }
-async fn send(api: &Api<'_>, method: &str, path: &str, body: Value) -> Result<(u16, Value)> {
+async fn send(api: &Api, method: &str, path: &str, body: Value) -> Result<(u16, Value)> {
     let response = handle(
         api,
         caller(),
@@ -37,12 +37,12 @@ async fn send(api: &Api<'_>, method: &str, path: &str, body: Value) -> Result<(u
         serde_json::from_slice(response.body())?,
     ))
 }
-async fn ok(api: &Api<'_>, method: &str, path: &str, body: Value) -> Result<Value> {
+async fn ok(api: &Api, method: &str, path: &str, body: Value) -> Result<Value> {
     let (status, value) = send(api, method, path, body).await?;
     assert_eq!(status, 200, "unexpected API status");
     Ok(value)
 }
-async fn page(api: &Api<'_>, path: &str) -> Result<String> {
+async fn page(api: &Api, path: &str) -> Result<String> {
     let response = handle(
         api,
         caller(),
@@ -62,7 +62,7 @@ async fn page(api: &Api<'_>, path: &str) -> Result<String> {
 fn item(cred: &Cred, name: &str) -> Result<cred::items::Item> {
     Ok(cred.create_item(serde_json::from_value(json!({"name":name,"rules":[],"transform_js":"","fields":[{"name":"first","field_type":"text"},{"name":"second","field_type":"text"}]}))?,&caller(),cred.unlocked()?)?)
 }
-async fn file(api: &Api<'_>, item: &str, key: &str) -> Result<String> {
+async fn file(api: &Api, item: &str, key: &str) -> Result<String> {
     let result = ok(
         api,
         "POST",
@@ -72,7 +72,7 @@ async fn file(api: &Api<'_>, item: &str, key: &str) -> Result<String> {
     .await?;
     Ok(result["request"].as_str().unwrap().into())
 }
-async fn register(api: &Api<'_>) -> Result<WebauthnAuthenticator<SoftPasskey>> {
+async fn register(api: &Api) -> Result<WebauthnAuthenticator<SoftPasskey>> {
     let start: Challenge<CreationChallengeResponse> = serde_json::from_value(
         ok(
             api,
@@ -94,7 +94,7 @@ async fn register(api: &Api<'_>) -> Result<WebauthnAuthenticator<SoftPasskey>> {
     Ok(auth)
 }
 async fn assertion(
-    api: &Api<'_>,
+    api: &Api,
     auth: &mut WebauthnAuthenticator<SoftPasskey>,
     path: &str,
     body: Value,
@@ -114,7 +114,7 @@ async fn approvals_registration_and_revocation() -> Result<()> {
     let second = item(&cred, "review <script>not markup</script>")?;
     let api = Api::new(
         cred,
-        Passkeys::new(&db, "localhost", ORIGIN)?,
+        Passkeys::new(db, "localhost", ORIGIN)?,
         EntryKey::open(&dir.path().join("entry.key"))?,
     );
     page(&api, "/register").await?;
@@ -314,7 +314,7 @@ async fn approvals_registration_and_revocation() -> Result<()> {
     Ok(())
 }
 
-async fn encrypt(api: &Api<'_>, public_key: Value) -> Result<Envelope> {
+async fn encrypt(api: &Api, public_key: Value) -> Result<Envelope> {
     use deno_core::{JsRuntime, RuntimeOptions};
     let script = handle(
         api,
@@ -358,7 +358,7 @@ async fn encrypted_entry_uses_the_host_page_code() -> Result<()> {
     let item = item(&cred, "secret")?;
     let api = Api::new(
         cred,
-        Passkeys::new(&db, "localhost", ORIGIN)?,
+        Passkeys::new(db, "localhost", ORIGIN)?,
         EntryKey::open(&dir.path().join("entry.key"))?,
     );
     let mut auth = register(&api).await?;
@@ -408,6 +408,7 @@ async fn encrypted_entry_uses_the_host_page_code() -> Result<()> {
     assert!(!api.cred.item_get(&item.id)?.fields[0].needs_value);
     ok(&api, "GET", &format!("/cred/items/{}", item.id), json!({})).await?;
     let master = std::fs::read(dir.path().join("cred.key"))?;
+    let db = rusqlite::Connection::open(dir.path().join("cred.sqlite"))?;
     let cipher: Vec<u8> = db.query_row(
         "SELECT ciphertext FROM fields WHERE item=?",
         [&item.id],