Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement timeout mechanism for getting authentication token #212

Merged
merged 1 commit into from
Jun 25, 2023
Merged

Implement timeout mechanism for getting authentication token #212

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions spotify_player/src/token.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::collections::HashSet;

use anyhow::{anyhow, Result};
use anyhow::Result;
use chrono::{Duration, Utc};
use librespot_core::{keymaster, session::Session};
use rspotify::Token;
Expand All @@ -24,13 +24,20 @@ const SCOPES: [&str; 15] = [
"user-library-modify",
];

const TIMEOUT_IN_SECS: u64 = 5;

/// gets an authentication token with pre-defined permission scopes
pub async fn get_token(session: &Session, client_id: &str) -> Result<Token> {
tracing::info!("Getting new authentication token...");

let token = keymaster::get_token(session, client_id, &SCOPES.join(","))
.await
.map_err(|err| anyhow!(format!("failed to get token: {err:#?}")))?;
let scopes = SCOPES.join(",");
let fut = keymaster::get_token(session, client_id, &scopes);
let token =
match tokio::time::timeout(std::time::Duration::from_secs(TIMEOUT_IN_SECS), fut).await {
Ok(Ok(token)) => token,
Ok(Err(err)) => anyhow::bail!("failed to get the token: {:?}", err),
Err(_) => anyhow::bail!("timeout when getting the token"),
};

// converts the token returned by librespot `get_token` function to a `rspotify::Token`

Expand Down
Loading