fix: centralized storage

ChecksumDev · Oct 17, 2023 · a2bf524 · a2bf524
1 parent 9ac81de
commit a2bf524
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -11,9 +11,11 @@ use sqlx::{
     sqlite::{SqliteConnectOptions, SqlitePoolOptions},
     Pool, Sqlite,
 };
+use storage::Storage;
 
 struct AppData {
     pool: Pool<Sqlite>,
+    storage: Storage,
 }
 
 #[tokio::main]
@@ -30,8 +32,10 @@ async fn main() -> Result<()> {
         .await
         .unwrap();
 
+    let storage = Storage::new(String::from("data")).await;
+
     sqlx::migrate!().run(&pool).await.unwrap();
-    let data = Data::new(AppData { pool });
+    let data = Data::new(AppData { pool, storage });
 
     println!("Lumen is running on {}", std::env::var("HOST").unwrap());
     HttpServer::new(move || {

diff --git a/src/routes.rs b/src/routes.rs
@@ -14,7 +14,6 @@ use uuid::Uuid;
 use crate::{
     encryption::Encryption,
     models::{File, User},
-    storage::Storage,
     AppData,
 };
 
@@ -70,8 +69,7 @@ async fn upload(bytes: Bytes, req: HttpRequest, data: Data<AppData>) -> impl Res
     let encoded_key = general_purpose::URL_SAFE_NO_PAD.encode(encryption.key);
     let encoded_nonce = general_purpose::URL_SAFE_NO_PAD.encode(encryption.nonce);
 
-    let storage = Storage::new(String::from("data")).await;
-    storage
+    data.storage
         .save(String::from(&uuid), &encrypted_bytes)
         .await
         .unwrap();
@@ -136,8 +134,7 @@ async fn download(
             .unwrap(),
     };
 
-    let storage = Storage::new(String::from("data")).await;
-    let encrypted_bytes = storage.load(id).await.unwrap();
+    let encrypted_bytes = data.storage.load(id).await.unwrap();
 
     let bytes = encryption.decrypt(&encrypted_bytes);