only update OAuth refresh_token if present in refresh response

credential formation from ap_welcome spun off into separate Session function
version bump v0.0.13

Author: Googolplexed0

librespot/__init__.py

@@ -6,7 +6,7 @@
 
 
 class Version:
-    version_name = "0.0.12"
+    version_name = "0.0.13"
 
     @staticmethod
     def platform() -> Platform:

librespot/core.py

@@ -1179,6 +1179,20 @@ def create_client(conf: Configuration) -> requests.Session:
         client = requests.Session()
         return client
 
+    def credentials(self) -> dict:
+        ap_welcome = self.ap_welcome()
+        reusable = ap_welcome.reusable_auth_credentials
+        reusable_type = Authentication.AuthenticationType.Name(
+            ap_welcome.reusable_auth_credentials_type)
+        return {
+            "username":
+            ap_welcome.canonical_username,
+            "credentials":
+            base64.b64encode(reusable).decode(),
+            "type":
+            reusable_type,
+        }
+
     def dealer(self) -> DealerClient:
         """ """
         self.__wait_auth_lock()
@@ -1375,28 +1389,15 @@ def __authenticate_partial(self,
                     self.__auth_lock_bool = False
                     self.__auth_lock.notify_all()
             if self.__inner.conf.store_credentials:
-                reusable = self.__ap_welcome.reusable_auth_credentials
-                reusable_type = Authentication.AuthenticationType.Name(
-                    self.__ap_welcome.reusable_auth_credentials_type)
+                self.__stored_str = base64.b64encode(
+                    json.dumps(self.credentials()).encode()
+                    ).decode()
                 if self.__inner.conf.stored_credentials_file is None:
                     raise TypeError(
                         "The file path to be saved is not specified")
-                self.__stored_str = base64.b64encode(
-                    json.dumps({
-                        "username":
-                        self.__ap_welcome.canonical_username,
-                        "credentials":
-                        base64.b64encode(reusable).decode(),
-                        "type":
-                        reusable_type,
-                    }).encode()).decode()
                 with open(self.__inner.conf.stored_credentials_file, "w") as f:
                     json.dump(
-                        {
-                            "username": self.__ap_welcome.canonical_username,
-                            "credentials": base64.b64encode(reusable).decode(),
-                            "type": reusable_type,
-                        },
+                        self.credentials(),
                         f,
                     )
 

librespot/oauth.py

@@ -73,7 +73,8 @@ def set_listen_all(self, listen_all: bool):
 
     def ingest_token_response(self, result):
         self.__token = result["access_token"]
-        self.__refresh_token = result["refresh_token"]
+        if "refresh_token" in result:
+            self.__refresh_token = result["refresh_token"]
         if "expires_in" in result:
             self.__token_expires_at = datetime.now() + timedelta(seconds=result["expires_in"])
         elif "expires_at" in result:

setup.py

@@ -1,7 +1,7 @@
 import setuptools
 
 setuptools.setup(name="librespot",
-                 version="0.0.12",
+                 version="0.0.13",
                  description="Open Source Spotify Client",
                  long_description=open("README.md").read(),
                  long_description_content_type="text/markdown",