Kingosticks change: Obtain spclient access token using login5 instead…

… of keymaster (Fixes librespot-org#1179)
Gerrelt · Dec 1, 2023 · ba08273 · ba08273
1 parent 96e02fd
commit ba08273
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/core/src/session.rs b/core/src/session.rs
@@ -77,7 +77,7 @@ struct SessionData {
     client_brand_name: String,
     client_model_name: String,
     connection_id: String,
-    auth_blob: Vec<u8>,    
+    auth_blob: Vec<u8>,
     time_delta: i64,
     invalid: bool,
     user_data: UserData,
@@ -477,7 +477,7 @@ impl Session {
         self.0.data.read().auth_blob.clone()
     }
 
-    pub fn set_auth_blob(&self, auth_blob: &Vec<u8>,) {
+    pub fn set_auth_blob(&self, auth_blob: &Vec<u8>) {
         self.0.data.write().auth_blob = auth_blob.clone();
     }
 

diff --git a/core/src/spclient.rs b/core/src/spclient.rs
@@ -32,7 +32,7 @@ use crate::{
         },
         connect::PutStateRequest,
         extended_metadata::BatchedEntityRequest,
-        login5::{LoginRequest, LoginResponse,},
+        login5::{LoginRequest, LoginResponse},
     },
     token::Token,
     version::spotify_version,
@@ -149,7 +149,7 @@ impl SpClient {
 
         Ok(())
     }
-    
+
     async fn auth_token_request<M: Message>(&self, message: &M) -> Result<Bytes, Error> {
         let client_token = self.client_token().await?;
         let body = message.write_to_bytes()?;
@@ -185,7 +185,8 @@ impl SpClient {
 
         let mut login_request = LoginRequest::new();
         login_request.client_info.mut_or_insert_default().client_id = client_id;
-        login_request.client_info.mut_or_insert_default().device_id = self.session().device_id().to_string();
+        login_request.client_info.mut_or_insert_default().device_id =
+            self.session().device_id().to_string();
 
         let stored_credential = login_request.mut_stored_credential();
         stored_credential.username = self.session().username().to_string();
@@ -556,7 +557,10 @@ impl SpClient {
             }
             headers_mut.insert(
                 AUTHORIZATION,
-                HeaderValue::from_str(&format!("{} {}", auth_token.token_type, auth_token.access_token,))?,
+                HeaderValue::from_str(&format!(
+                    "{} {}",
+                    auth_token.token_type, auth_token.access_token,
+                ))?,
             );
 
             let client_token = self.client_token().await?;