Skip to content

Commit 9abd1c1

Browse files
committed
fix: Enable login5 as access_token source for psst-core cdn
1 parent 82cb6e4 commit 9abd1c1

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

psst-core/src/cdn.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@ use crate::{
1212
session::{access_token::TokenProvider, SessionService},
1313
util::default_ureq_agent_builder,
1414
};
15+
use crate::session::login5::Login5Manager;
16+
use crate::session::spclient::SpClient;
1517

1618
pub type CdnHandle = Arc<Cdn>;
1719

1820
pub struct Cdn {
1921
session: SessionService,
2022
agent: ureq::Agent,
2123
token_provider: TokenProvider,
24+
login5: Login5Manager,
25+
spclient: SpClient,
2226
}
2327

2428
impl Cdn {
@@ -28,6 +32,8 @@ impl Cdn {
2832
session,
2933
agent: agent.into(),
3034
token_provider: TokenProvider::new(),
35+
login5: Login5Manager::new(proxy_url),
36+
spclient: SpClient::new(proxy_url),
3137
}))
3238
}
3339

@@ -36,15 +42,15 @@ impl Cdn {
3642
"https://api.spotify.com/v1/storage-resolve/files/audio/interactive/{}",
3743
id.to_base16()
3844
);
39-
let access_token = self.token_provider.get(&self.session)?;
45+
let access_token = self.login5.auth_token(&self.session, &self.spclient)?;
4046
let response = self
4147
.agent
4248
.get(&locations_uri)
4349
.query("version", "10000000")
4450
.query("product", "9")
4551
.query("platform", "39")
4652
.query("alt", "json")
47-
.header("Authorization", &format!("Bearer {}", access_token.token))
53+
.header("Authorization", &format!("Bearer {}", access_token.access_token))
4854
.call()?;
4955

5056
#[derive(Deserialize)]

0 commit comments

Comments
 (0)