Bug fixes, passes the tests

Author: gravit0

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   # PostgreSQL Database
   postgres:
@@ -13,8 +11,6 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
       - ./migrations:/docker-entrypoint-initdb.d:ro
-    ports:
-      - "5432:5432"
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U texture_user -d texture_provider"]
       interval: 10s
@@ -35,7 +31,7 @@ services:
       DATABASE_URL: postgresql://texture_user:texture_password@postgres/texture_provider
 
       # JWT (You should replace this with your actual public key)
-      JWT_PUBLIC_KEY: BASE64_ECDSA_LAUNCHSERVER_KEY
+      JWT_PUBLIC_KEY: MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEjKxPlWFkYXHKt3BpXEJLhF3F8qlKvLqLqLqLqLqLqLqLqLqLqLqLqLqLqLqLqLqLqLqLqLqLqLqLqLqLqLqLqA==
 
       # Base URL
       BASE_URL: http://localhost:3000
@@ -46,8 +42,11 @@ services:
 
       # Retrieval Configuration
       RETRIEVAL_TYPE: storage
-      # RETRIEVAL_CHAIN: storage,mojang,default_skin
+      RETRIEVAL_CHAIN: storage,mojang,default_skin
 
+      # Admin API (optional)
+      ADMIN_TOKEN: test-admin-token-12345
+
       # Server
       SERVER_PORT: 3000
     volumes:

src/handlers.rs

@@ -199,7 +199,7 @@ pub async fn upload_texture(
     // Store file with proper extension
     let file_url = state
         .storage
-        .store_file(file_bytes.clone(), &hash, texture_type.file_extension())
+        .store_file(file_bytes, &hash, texture_type.file_extension())
         .await
         .map_err(|e| {
             tracing::error!("Failed to store file: {}", e);
@@ -399,7 +399,7 @@ pub async fn admin_upload_texture(
                 let username_str = field.text().await.map_err(|e| {
                     (
                         StatusCode::BAD_REQUEST,
-                        format!("Failed to read user UUID: {}", e),
+                        format!("Failed to read username: {}", e),
                     )
                 })?;
                 user_username = Some(username_str);
@@ -448,7 +448,7 @@ pub async fn admin_upload_texture(
     // Store file with proper extension
     let file_url = state
         .storage
-        .store_file(file_bytes.clone(), &hash, texture_type.file_extension())
+        .store_file(file_bytes, &hash, texture_type.file_extension())
         .await
         .map_err(|e| {
             tracing::error!("Failed to store file: {}", e);

src/main.rs

@@ -24,8 +24,8 @@ use crate::auth::decode_key;
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
-    // Load .env file
-    dotenvy::dotenv()?;
+    // Load .env file (ignore error if file doesn't exist, e.g., in Docker)
+    let _ = dotenvy::dotenv();
 
     // Initialize tracing
     tracing_subscriber::registry()

src/retrieval/default_skin.rs

@@ -19,7 +19,7 @@ pub struct DefaultSkinRetriever {
 impl DefaultSkinRetriever {
     pub fn new() -> Self {
         // The official default Steve skin from Minecraft
-        let default_steve_url = "http://textures.minecraft.net/texture/1a4af718455d58aab3011401517e43cb6f84b5f9cbd717f8df0334e0b88b8ecf".to_string();
+        let default_steve_url = "https://textures.minecraft.net/texture/1a4af718455d58aab3011401517e43cb6f84b5f9cbd717f8df0334e0b88b8ecf".to_string();
 
         // Pre-computed hash of the default Steve skin
         let default_steve_hash =
@@ -151,7 +151,7 @@ impl EmbeddedDefaultSkinRetriever {
 impl TextureRetriever for EmbeddedDefaultSkinRetriever {
     async fn get_texture(
         &self,
-        user_uuid: Uuid,
+        _user_uuid: Uuid,
         texture_type: TextureType,
     ) -> Result<Option<RetrievedTexture>> {
         match texture_type {
@@ -172,7 +172,7 @@ impl TextureRetriever for EmbeddedDefaultSkinRetriever {
         }
     }
 
-    async fn get_textures(&self, user_uuid: Uuid) -> Result<HashMap<String, RetrievedTexture>> {
+    async fn get_textures(&self, _user_uuid: Uuid) -> Result<HashMap<String, RetrievedTexture>> {
         let mut map = HashMap::new();
         let url = format!(
             "{}/download/{}",
@@ -192,7 +192,7 @@ impl TextureRetriever for EmbeddedDefaultSkinRetriever {
 
     async fn get_texture_bytes(
         &self,
-        user_uuid: Uuid,
+        _user_uuid: Uuid,
         texture_type: TextureType,
     ) -> Result<Option<RetrievedTextureBytes>> {
         match texture_type {

src/retrieval/mojang.rs

@@ -232,6 +232,53 @@ impl MojangRetriever {
 
 #[async_trait]
 impl TextureRetriever for MojangRetriever {
+    async fn get_texture(
+        &self,
+        user_uuid: Uuid,
+        texture_type: TextureType,
+    ) -> Result<Option<RetrievedTexture>> {
+        let mut fetch_uuid = user_uuid;
+
+        if self.use_database_username_in_mojang_requests {
+            if let Some(db) = &self.db {
+                match sqlx::query!(
+                    r#"
+                    SELECT username
+                    FROM username_mappings
+                    WHERE user_uuid = $1
+                    LIMIT 1
+                    "#,
+                    user_uuid
+                ).fetch_optional(db).await {
+                    Ok(Some(record)) => {
+                        match self.resolve_username_to_uuid(&record.username).await {
+                            Ok(Some(resolved_uuid)) => {
+                                fetch_uuid = resolved_uuid;
+                            }
+                            Ok(None) => {
+                                tracing::warn!(
+                                    "Username '{}' not found in Mojang API, using original UUID",
+                                    record.username
+                                );
+                            }
+                            Err(e) => {
+                                tracing::error!("Failed to resolve username from Mojang: {}", e);
+                            }
+                        }
+                    }
+                    Ok(None) => {
+                        tracing::debug!("No username mapping found for UUID {}", user_uuid);
+                    }
+                    Err(e) => {
+                        tracing::error!("Failed to lookup username from database: {}", e);
+                    }
+                }
+            }
+        }
+
+        self.get_texture_from_mojang(fetch_uuid, texture_type).await
+    }
+
     async fn get_textures(&self, user_uuid: Uuid) -> Result<HashMap<String, RetrievedTexture>> {
         let mut fetch_uuid = user_uuid;