Add base64 response for files (#588)

Author: zupzup

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.4.3
+
+* Add endpoints to fetch files as base64 for identity, contacts, companies and bills
+
 # 0.4.2
 
 * Add logic to get endorsees from plaintext chain

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.4.2"
+version = "0.4.3"
 edition = "2024"
 license = "MIT"
 

crates/bcr-ebill-wasm/Cargo.toml

@@ -33,3 +33,4 @@ gloo-timers = { version = "0.3.0", features = ["futures"] }
 tsify = { version = "0.4.5", features = ["js"] }
 bcr-ebill-api = { path = "../bcr-ebill-api" }
 bcr-ebill-transport.workspace = true
+base64.workspace = true

crates/bcr-ebill-wasm/main.js

@@ -56,8 +56,8 @@ let config = {
   job_runner_check_interval_seconds: 600,
   // default_mint_url: "http://localhost:4343",
   default_mint_url: "https://wildcat-dev-docker.minibill.tech",
-  // default_mint_node_id: "bitcrt038d1bd3e2e3a01f20c861f18eb456cc33f869c9aaa5dec685f7f7d8c40ea3b3c7",
-  default_mint_node_id: "bitcrt0372422bfa5c9b60ef2f10ced26e764983b2e675cd7fac374f5f223616530ce3fb", // dev mint
+// default_mint_node_id: "bitcrt038d1bd3e2e3a01f20c861f18eb456cc33f869c9aaa5dec685f7f7d8c40ea3b3c7",
+  default_mint_node_id: "bitcrt03cbb9254a24df6bad6243227cadf257c25eb10c2177c1ee85bfaefde3bf532ab6", // dev mint
 };
 
 async function start() {
@@ -334,14 +334,8 @@ async function fetchTempFile() {
 async function fetchContactFile() {
   let node_id = document.getElementById("contact_id").value;
   let file_name = document.getElementById("contact_file_name").value;
-  let file = await contactApi.file(node_id, file_name);
-  let file_bytes = file.data;
-  let arr = new Uint8Array(file_bytes);
-  let blob = new Blob([arr], { type: file.content_type });
-  let url = URL.createObjectURL(blob);
-
-  console.log("file", file, url, blob);
-  document.getElementById("attached_file").src = url;
+  let file = await contactApi.file_base64(node_id, file_name);
+  document.getElementById("attached_file").src = `data:${file.content_type};base64,${file.data}`;
 }
 
 async function switchIdentity() {
@@ -523,11 +517,8 @@ async function fetchBillFile() {
   let detail = await billApi.detail(bill_id);
 
   if (detail.data.files.length > 0) {
-    let file = await billApi.attachment(bill_id, detail.data.files[0].name);
-    let file_bytes = file.data;
-    let arr = new Uint8Array(file_bytes);
-    let blob = new Blob([arr], { type: file.content_type });
-    document.getElementById("bill_attached_file").src = URL.createObjectURL(blob);
+    let file = await billApi.attachment_base64(bill_id, detail.data.files[0].name);
+    document.getElementById("bill_attached_file").src = `data:${file.content_type};base64,${file.data}`;
   } else {
       console.log("Bill has no file");
   }

crates/bcr-ebill-wasm/src/api/bill.rs

@@ -1,6 +1,7 @@
 use std::str::FromStr;
 
 use super::Result;
+use base64::{Engine as _, engine::general_purpose::STANDARD};
 use bcr_ebill_api::{
     data::{
         NodeId,
@@ -25,7 +26,7 @@ use crate::{
     api::identity::get_current_identity_node_id,
     context::get_ctx,
     data::{
-        BinaryFileResponse, UploadFile, UploadFileResponse,
+        Base64FileResponse, BinaryFileResponse, UploadFile, UploadFileResponse,
         bill::{
             AcceptBitcreditBillPayload, BillCombinedBitcoinKeyWeb, BillIdResponse,
             BillNumbersToWordsForSum, BillsResponse, BillsSearchFilterPayload,
@@ -42,6 +43,44 @@ use crate::{
 
 use super::identity::get_current_identity;
 
+async fn get_attachment(bill_id: &str, file_name: &str) -> Result<(Vec<u8>, String)> {
+    let parsed_bill_id = BillId::from_str(bill_id)?;
+    let current_timestamp = util::date::now().timestamp() as u64;
+    let identity = get_ctx().identity_service.get_identity().await?;
+    // get bill
+    let bill = get_ctx()
+        .bill_service
+        .get_detail(
+            &parsed_bill_id,
+            &identity,
+            &get_current_identity_node_id().await?,
+            current_timestamp,
+        )
+        .await?;
+
+    // check if this file even exists on the bill
+    let file = match bill.data.files.iter().find(|f| f.name == file_name) {
+        Some(f) => f,
+        None => {
+            return Err(bcr_ebill_api::service::bill_service::Error::NotFound.into());
+        }
+    };
+
+    // fetch the attachment
+    let keys = get_ctx()
+        .bill_service
+        .get_bill_keys(&parsed_bill_id)
+        .await?;
+    let file_bytes = get_ctx()
+        .bill_service
+        .open_and_decrypt_attached_file(&parsed_bill_id, file, &keys.private_key)
+        .await?;
+
+    let content_type = detect_content_type_for_bytes(&file_bytes)
+        .ok_or(Error::Validation(ValidationError::InvalidContentType))?;
+    Ok((file_bytes, content_type))
+}
+
 #[wasm_bindgen]
 pub struct Bill;
 
@@ -111,41 +150,7 @@ impl Bill {
 
     #[wasm_bindgen(unchecked_return_type = "BinaryFileResponse")]
     pub async fn attachment(&self, bill_id: &str, file_name: &str) -> Result<JsValue> {
-        let parsed_bill_id = BillId::from_str(bill_id)?;
-        let current_timestamp = util::date::now().timestamp() as u64;
-        let identity = get_ctx().identity_service.get_identity().await?;
-        // get bill
-        let bill = get_ctx()
-            .bill_service
-            .get_detail(
-                &parsed_bill_id,
-                &identity,
-                &get_current_identity_node_id().await?,
-                current_timestamp,
-            )
-            .await?;
-
-        // check if this file even exists on the bill
-        let file = match bill.data.files.iter().find(|f| f.name == file_name) {
-            Some(f) => f,
-            None => {
-                return Err(bcr_ebill_api::service::bill_service::Error::NotFound.into());
-            }
-        };
-
-        // fetch the attachment
-        let keys = get_ctx()
-            .bill_service
-            .get_bill_keys(&parsed_bill_id)
-            .await?;
-        let file_bytes = get_ctx()
-            .bill_service
-            .open_and_decrypt_attached_file(&parsed_bill_id, file, &keys.private_key)
-            .await?;
-
-        let content_type = detect_content_type_for_bytes(&file_bytes)
-            .ok_or(Error::Validation(ValidationError::InvalidContentType))?;
-
+        let (file_bytes, content_type) = get_attachment(bill_id, file_name).await?;
         let res = serde_wasm_bindgen::to_value(&BinaryFileResponse {
             data: file_bytes,
             name: file_name.to_owned(),
@@ -154,6 +159,17 @@ impl Bill {
         Ok(res)
     }
 
+    #[wasm_bindgen(unchecked_return_type = "Base64FileResponse")]
+    pub async fn attachment_base64(&self, bill_id: &str, file_name: &str) -> Result<JsValue> {
+        let (file_bytes, content_type) = get_attachment(bill_id, file_name).await?;
+        let res = serde_wasm_bindgen::to_value(&Base64FileResponse {
+            data: STANDARD.encode(&file_bytes),
+            name: file_name.to_owned(),
+            content_type,
+        })?;
+        Ok(res)
+    }
+
     #[wasm_bindgen(unchecked_return_type = "UploadFileResponse")]
     pub async fn upload(
         &self,

crates/bcr-ebill-wasm/src/api/company.rs

@@ -1,6 +1,7 @@
 use std::str::FromStr;
 
 use super::Result;
+use base64::{Engine as _, engine::general_purpose::STANDARD};
 use bcr_ebill_api::{
     data::{NodeId, OptionalPostalAddress, PostalAddress},
     external,
@@ -16,14 +17,37 @@ use wasm_bindgen::prelude::*;
 use crate::{
     context::get_ctx,
     data::{
-        BinaryFileResponse, UploadFile, UploadFileResponse,
+        Base64FileResponse, BinaryFileResponse, UploadFile, UploadFileResponse,
         company::{
             AddSignatoryPayload, CompaniesResponse, CompanyWeb, CreateCompanyPayload,
             EditCompanyPayload, ListSignatoriesResponse, RemoveSignatoryPayload, SignatoryResponse,
         },
     },
 };
 
+async fn get_file(id: &str, file_name: &str) -> Result<(Vec<u8>, String)> {
+    let parsed_id = NodeId::from_str(id)?;
+    let company = get_ctx()
+        .company_service
+        .get_company_by_id(&parsed_id)
+        .await?; // check if company exists
+    let private_key = get_ctx()
+        .identity_service
+        .get_full_identity()
+        .await?
+        .key_pair
+        .get_private_key();
+
+    let file_bytes = get_ctx()
+        .company_service
+        .open_and_decrypt_file(company, &parsed_id, file_name, &private_key)
+        .await?;
+
+    let content_type = detect_content_type_for_bytes(&file_bytes)
+        .ok_or(Error::Validation(ValidationError::InvalidContentType))?;
+    Ok((file_bytes, content_type))
+}
+
 #[wasm_bindgen]
 pub struct Company;
 
@@ -36,26 +60,7 @@ impl Company {
 
     #[wasm_bindgen(unchecked_return_type = "BinaryFileResponse")]
     pub async fn file(&self, id: &str, file_name: &str) -> Result<JsValue> {
-        let parsed_id = NodeId::from_str(id)?;
-        let company = get_ctx()
-            .company_service
-            .get_company_by_id(&parsed_id)
-            .await?; // check if company exists
-        let private_key = get_ctx()
-            .identity_service
-            .get_full_identity()
-            .await?
-            .key_pair
-            .get_private_key();
-
-        let file_bytes = get_ctx()
-            .company_service
-            .open_and_decrypt_file(company, &parsed_id, file_name, &private_key)
-            .await?;
-
-        let content_type = detect_content_type_for_bytes(&file_bytes)
-            .ok_or(Error::Validation(ValidationError::InvalidContentType))?;
-
+        let (file_bytes, content_type) = get_file(id, file_name).await?;
         let res = serde_wasm_bindgen::to_value(&BinaryFileResponse {
             data: file_bytes,
             name: file_name.to_owned(),
@@ -64,6 +69,18 @@ impl Company {
         Ok(res)
     }
 
+    #[wasm_bindgen(unchecked_return_type = "Base64FileResponse")]
+    pub async fn file_base64(&self, id: &str, file_name: &str) -> Result<JsValue> {
+        let (file_bytes, content_type) = get_file(id, file_name).await?;
+
+        let res = serde_wasm_bindgen::to_value(&Base64FileResponse {
+            data: STANDARD.encode(&file_bytes),
+            name: file_name.to_owned(),
+            content_type,
+        })?;
+        Ok(res)
+    }
+
     #[wasm_bindgen(unchecked_return_type = "UploadFileResponse")]
     pub async fn upload(
         &self,

crates/bcr-ebill-wasm/src/api/contact.rs

@@ -3,8 +3,9 @@ use std::str::FromStr;
 use crate::data::contact::{
     ContactTypeWeb, ContactWeb, ContactsResponse, EditContactPayload, NewContactPayload,
 };
-use crate::data::{BinaryFileResponse, UploadFile, UploadFileResponse};
+use crate::data::{Base64FileResponse, BinaryFileResponse, UploadFile, UploadFileResponse};
 use crate::{Result, context::get_ctx};
+use base64::{Engine as _, engine::general_purpose::STANDARD};
 use bcr_ebill_api::data::contact::ContactType;
 use bcr_ebill_api::data::{NodeId, OptionalPostalAddress, PostalAddress};
 use bcr_ebill_api::service;
@@ -15,6 +16,30 @@ use wasm_bindgen::prelude::*;
 #[wasm_bindgen]
 pub struct Contact;
 
+async fn get_file(node_id: &str, file_name: &str) -> Result<(Vec<u8>, String)> {
+    let parsed_node_id = NodeId::from_str(node_id)?;
+    let contact = get_ctx()
+        .contact_service
+        .get_contact(&parsed_node_id)
+        .await?; // check if contact exists
+
+    let private_key = get_ctx()
+        .identity_service
+        .get_full_identity()
+        .await?
+        .key_pair
+        .get_private_key();
+
+    let file_bytes = get_ctx()
+        .contact_service
+        .open_and_decrypt_file(contact, &parsed_node_id, file_name, &private_key)
+        .await?;
+    let content_type = detect_content_type_for_bytes(&file_bytes).ok_or(
+        service::Error::Validation(ValidationError::InvalidContentType),
+    )?;
+    Ok((file_bytes, content_type))
+}
+
 #[wasm_bindgen]
 impl Contact {
     #[wasm_bindgen]
@@ -24,28 +49,7 @@ impl Contact {
 
     #[wasm_bindgen(unchecked_return_type = "BinaryFileResponse")]
     pub async fn file(&self, node_id: &str, file_name: &str) -> Result<JsValue> {
-        let parsed_node_id = NodeId::from_str(node_id)?;
-        let contact = get_ctx()
-            .contact_service
-            .get_contact(&parsed_node_id)
-            .await?; // check if contact exists
-
-        let private_key = get_ctx()
-            .identity_service
-            .get_full_identity()
-            .await?
-            .key_pair
-            .get_private_key();
-
-        let file_bytes = get_ctx()
-            .contact_service
-            .open_and_decrypt_file(contact, &parsed_node_id, file_name, &private_key)
-            .await?;
-
-        let content_type = detect_content_type_for_bytes(&file_bytes).ok_or(
-            service::Error::Validation(ValidationError::InvalidContentType),
-        )?;
-
+        let (file_bytes, content_type) = get_file(node_id, file_name).await?;
         let res = serde_wasm_bindgen::to_value(&BinaryFileResponse {
             data: file_bytes,
             name: file_name.to_owned(),
@@ -54,6 +58,18 @@ impl Contact {
         Ok(res)
     }
 
+    #[wasm_bindgen(unchecked_return_type = "Base64FileResponse")]
+    pub async fn file_base64(&self, node_id: &str, file_name: &str) -> Result<JsValue> {
+        let (file_bytes, content_type) = get_file(node_id, file_name).await?;
+
+        let res = serde_wasm_bindgen::to_value(&Base64FileResponse {
+            data: STANDARD.encode(&file_bytes),
+            name: file_name.to_owned(),
+            content_type,
+        })?;
+        Ok(res)
+    }
+
     #[wasm_bindgen(unchecked_return_type = "UploadFileResponse")]
     pub async fn upload(
         &self,