Skip to content

fix(qobuz): auto-refetch app id/secrets on stale credential error #1031

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

Open
karolyi wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix(qobuz): auto-refetch app id/secrets on stale credential error #1031

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pathvalidate = "^2.4.1"
simple-term-menu = { version = "^1.2.1", platform = 'darwin|linux' }
pick = { version = "^2", platform = 'win32|cygwin' }
windows-curses = { version = "^2.2.0", platform = 'win32|cygwin' }
Pillow = ">=9,<11"
Pillow = ">=9"
deezer-py = "1.3.6"
pycryptodomex = "^3.10.1"
appdirs = "^1.4.4"
Expand Down
34 changes: 26 additions & 8 deletions streamrip/client/qobuz.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,13 +171,33 @@ async def login(self):

if not c.app_id or not c.secrets:
logger.info("App id/secrets not found, fetching")
c.app_id, c.secrets = await self._get_app_id_and_secrets()
# write to file
f = self.config.file
f.qobuz.app_id = c.app_id
f.qobuz.secrets = c.secrets
f.set_modified()
await self._refresh_app_id_and_secrets()

# A stale app_id/secret pair (e.g. hardcoded in the config after Qobuz
# rotated its app secret) fails with InvalidAppIdError or
# InvalidAppSecretError. Re-fetch a fresh pair from the bundle and retry
# once before giving up.
try:
await self._attempt_login()
except (InvalidAppIdError, InvalidAppSecretError) as e:
logger.warning("Login failed with %s, refetching app id/secrets", e)
self.session.headers.pop("X-User-Auth-Token", None)
await self._refresh_app_id_and_secrets()
await self._attempt_login()

self.logged_in = True

async def _refresh_app_id_and_secrets(self):
c = self.config.session.qobuz
c.app_id, c.secrets = await self._get_app_id_and_secrets()
# write to file
f = self.config.file
f.qobuz.app_id = c.app_id
f.qobuz.secrets = c.secrets
f.set_modified()

async def _attempt_login(self):
c = self.config.session.qobuz
self.session.headers.update({"X-App-Id": str(c.app_id)})

if c.use_auth_token:
Expand Down Expand Up @@ -212,8 +232,6 @@ async def login(self):

self.secret = await self._get_valid_secret(c.secrets)

self.logged_in = True

async def get_metadata(self, item: str, media_type: str):
if media_type == "label":
return await self.get_label(item)
Expand Down