more robust handling of invalid cookies and logged out state

meeb · Nov 19, 2023 · a68fe80 · a68fe80
1 parent a6a2d3a
commit a68fe80
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/bandcampsync/bandcamp.py b/bandcampsync/bandcamp.py
@@ -157,13 +157,17 @@ def verify_authentication(self):
         except KeyError as e:
             raise BandcampError(f'Failed to parse pagedata JSON, does not contain an '
                                 f'"identities.fan" key') from e
+        if not isinstance(fan, dict):
+            raise BandcampError(f'Failed to parse pagedata JSON, "identities.fan" is not '
+                                f'a dictionary. Check your cookies.txt file is valid '
+                                f'and up to date')
         try:
             self.user_id = fan['id']
             self.user_name = fan['name']
             self.user_url = fan['url']
             self.user_verified = fan['verified']
             self.user_private = fan['private']
-        except KeyError as e:
+        except (KeyError, TypeError) as e:
             raise BandcampError(f'Failed to parse pagedata JSON, "identities.fan" seems '
                                 f'invalid: {fan}') from e
         self.is_authenticated = self.user_id > 0