github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ensure a client ID is present

Browse source
This commit is contained in:
Roderick van Domburg 2022-01-22 21:27:56 +01:00
parent 0822af0328
commit 0630586cd6
No known key found for this signature in database
GPG key ID: FE2585E713F9F30A
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/src/token.rs
View file

@ -65,6 +65,11 @@ impl TokenProvider {
// scopes must be comma-separated // scopes must be comma-separated
pub async fn get_token(&self, scopes: &str) -> Result<Token, Error> { pub async fn get_token(&self, scopes: &str) -> Result<Token, Error> {
let client_id = self.session().client_id();
if client_id.is_empty() {
return Err(Error::invalid_argument("Client ID cannot be empty"));
}
if let Some(index) = self.find_token(scopes.split(',').collect()) { if let Some(index) = self.find_token(scopes.split(',').collect()) {
let cached_token = self.lock(|inner| inner.tokens[index].clone()); let cached_token = self.lock(|inner| inner.tokens[index].clone());
if cached_token.is_expired() { if cached_token.is_expired() {
@ -82,7 +87,7 @@ impl TokenProvider {
let query_uri = format!( let query_uri = format!(
"hm://keymaster/token/authenticated?scope={}&client_id={}&device_id={}", "hm://keymaster/token/authenticated?scope={}&client_id={}&device_id={}",
scopes, scopes,
self.session().client_id(), client_id,
self.session().device_id(), self.session().device_id(),
); );
let request = self.session().mercury().get(query_uri)?; let request = self.session().mercury().get(query_uri)?;