Merge pull request #121 from threefoldtech/development_blocks_with_no_user_not_missing

blocks with no user not missing

Author: xmonader

src/server/block_handlers.rs

@@ -66,6 +66,10 @@ pub async fn upload_block_handler(
 
     // Get the username from the extension (set by the authorize middleware)
     let username = extension.0;
+	if username.is_empty() {
+        log::error!("Username is required but not provided");
+        return Err(ResponseError::BadRequest("Username is required".to_string()));
+	}
     let user_id = auth::get_user_id_from_token(&*state.db, &username).await?;
 
     // Store the block data in the database
@@ -423,6 +427,10 @@ pub async fn get_user_blocks_handler(
 
     // Get the username from the extension (set by the authorize middleware)
     let username = extension.0;
+    if username.is_empty() {
+        log::error!("Username is required but not provided");
+        return Err(ResponseError::BadRequest("Username is required".to_string()));
+    }
     let user_id = auth::get_user_id_from_token(&*state.db, &username).await?;
 
     let all_blocks = match state.db.list_blocks(1, 1).await {

src/server/db/sqlite.rs

@@ -119,7 +119,7 @@ impl DB for SqlDB {
             .await;
 
         // If both block and metadata exist, no need to store again
-        if block_exists && (metadata_exists || file_hash.is_empty()) {
+        if block_exists && (metadata_exists || file_hash.is_empty() || user_id == 0) {
             return true;
         }
 

src/server/file_handlers.rs

@@ -60,6 +60,10 @@ pub async fn upload_file_handler(
 
     // Get the username from the extension (set by the authorize middleware)
     let username = extension.0;
+    if username.is_empty() {
+        log::error!("Username is required but not provided");
+        return Err(ResponseError::BadRequest("Username is required".to_string()));
+    }
     let user_id = auth::get_user_id_from_token(&*state.db, &username).await?;
 
     // Store each block with a reference to the file