spotify: fix credentials cache

Cache Spotify response instead of username and password.
This should resolve frequent "New login to Spotify" emails.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1183>

1 files changed, 28 insertions, 20 deletions

diff --git a/audio/spotify/src/common.rs b/audio/spotify/src/common.rs
index ae2bd176..f373af65 100644
--- a/audio/spotify/src/common.rs
+++ b/audio/spotify/src/common.rs
@@ -131,29 +131,37 @@ impl Settings {
 
         let cache = Cache::new(credentials_cache, None, files_cache, max_size)?;
 
-        let credentials = match cache.credentials() {
-            Some(cached_cred) => {
-                gst::debug!(cat, obj: &src, "reuse credentials from cache",);
-                cached_cred
+        if let Some(cached_cred) = cache.credentials() {
+            gst::debug!(cat, obj: &src, "reuse credentials from cache",);
+            if let Ok((session, _credentials)) = Session::connect(
+                SessionConfig::default(),
+                cached_cred,
+                Some(cache.clone()),
+                true,
+            )
+            .await
+            {
+                return Ok(session);
             }
-            None => {
-                gst::debug!(cat, obj: &src, "credentials not in cache",);
-
-                if self.username.is_empty() {
-                    bail!("username is not set and credentials are not in cache");
-                }
-                if self.password.is_empty() {
-                    bail!("password is not set and credentials are not in cache");
-                }
-
-                let cred = Credentials::with_password(&self.username, &self.password);
-                cache.save_credentials(&cred);
-                cred
-            }
-        };
+        }
+
+        gst::debug!(
+            cat,
+            obj: &src,
+            "credentials not in cache or cached credentials invalid",
+        );
+
+        if self.username.is_empty() {
+            bail!("username is not set and credentials are not in cache");
+        }
+        if self.password.is_empty() {
+            bail!("password is not set and credentials are not in cache");
+        }
+
+        let cred = Credentials::with_password(&self.username, &self.password);
 
         let (session, _credentials) =
-            Session::connect(SessionConfig::default(), credentials, Some(cache), false).await?;
+            Session::connect(SessionConfig::default(), cred, Some(cache), true).await?;
 
         Ok(session)
     }