fix: Libre.fm auth not working

Losses · Dec 18, 2024 · 40bf5b5 · 40bf5b5
1 parent ed73d1e
commit 40bf5b5
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 20 deletions.
diff --git a/scrobbling/examples/scrobble_random.rs b/scrobbling/examples/scrobble_random.rs
@@ -17,34 +17,32 @@ async fn main() -> Result<()> {
                 .index(1),
         )
         .arg(
-            Arg::new("api_key")
-                .help("API Key for the service")
+            Arg::new("username")
+                .help("Username for the service")
                 .required(true)
                 .index(2),
         )
         .arg(
-            Arg::new("api_secret")
-                .help("API Secret for Last.fm (ignored for Libre.fm)")
-                .required(false)
+            Arg::new("password")
+                .help("Password for the service")
+                .required(true)
                 .index(3),
         )
         .arg(
-            Arg::new("username")
-                .help("Username for the service")
-                .required(true)
-                .index(4),
+            Arg::new("api_key")
+                .help("API Key for the service")
+                .long("api_key"),
         )
         .arg(
-            Arg::new("password")
-                .help("Password for the service")
-                .required(true)
-                .index(5),
+            Arg::new("api_secret")
+                .help("API Secret for Last.fm (ignored for Libre.fm)")
+                .long("api_secret"),
         )
         .get_matches();
 
     let binding = "".to_string();
     let service = matches.get_one::<String>("service").unwrap();
-    let api_key = matches.get_one::<String>("api_key").unwrap();
+    let api_key = matches.get_one::<String>("api_key").unwrap_or(&binding);
     let api_secret = matches.get_one::<String>("api_secret").unwrap_or(&binding);
     let username = matches.get_one::<String>("username").unwrap();
     let password = matches.get_one::<String>("password").unwrap();

diff --git a/scrobbling/src/last_fm.rs b/scrobbling/src/last_fm.rs
@@ -65,8 +65,22 @@ impl ScrobblingClient for LastFmClient {
 
         if response.status().is_success() {
             let auth_response: AuthResponse = response.json().await?;
-            self.session_key = Some(auth_response.session.key);
-            Ok(())
+
+            if auth_response.error.is_some() {
+                bail!(
+                    "Authentication failed: {}",
+                    auth_response
+                        .message
+                        .unwrap_or_else(|| "Unknown error".to_string())
+                );
+            }
+
+            if let Some(session) = auth_response.session {
+                self.session_key = Some(session.key);
+                Ok(())
+            } else {
+                bail!("Authentication failed: No session key returned");
+            }
         } else {
             bail!("Authentication failed")
         }

diff --git a/scrobbling/src/lib.rs b/scrobbling/src/lib.rs
@@ -8,7 +8,9 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Deserialize)]
 struct AuthResponse {
-    session: SessionInfo,
+    session: Option<SessionInfo>,
+    error: Option<i32>,
+    message: Option<String>,
 }
 
 #[derive(Debug, Deserialize)]

diff --git a/scrobbling/src/libre_fm.rs b/scrobbling/src/libre_fm.rs
@@ -27,10 +27,20 @@ impl LibreFmClient {
 #[async_trait]
 impl ScrobblingClient for LibreFmClient {
     async fn authenticate(&mut self, username: &str, password: &str) -> Result<()> {
+        // Compute MD5 of the password
+        let password_hash = format!("{:x}", md5::compute(password));
+
+        // Compute the authentication token
+        let authtoken = format!(
+            "{:x}",
+            md5::compute(format!("{}{}", username.to_lowercase(), password_hash))
+        );
+
         let mut params = HashMap::new();
         params.insert("method".to_string(), "auth.getMobileSession".to_string());
         params.insert("username".to_string(), username.to_string());
         params.insert("password".to_string(), password.to_string());
+        params.insert("authtoken".to_string(), authtoken);
         params.insert("api_key".to_string(), "0".repeat(32));
 
         let response = self
@@ -43,10 +53,25 @@ impl ScrobblingClient for LibreFmClient {
 
         if response.status().is_success() {
             let auth_response: AuthResponse = response.json().await?;
-            self.session_key = Some(auth_response.session.key);
-            Ok(())
+
+            if auth_response.error.is_some() {
+                bail!(
+                    "Authentication failed: {}",
+                    auth_response
+                        .message
+                        .unwrap_or_else(|| "Unknown error".to_string())
+                );
+            }
+
+            if let Some(session) = auth_response.session {
+                self.session_key = Some(session.key);
+                Ok(())
+            } else {
+                bail!("Authentication failed: No session key returned");
+            }
         } else {
-            bail!("Authentication failed")
+            let error_text = response.text().await?;
+            bail!("Authentication failed: {}", error_text)
         }
     }