For exporting a mirrored playlist back to Spotify:
- The OAuth scope string was duplicated verbatim in 5 places (spotify_client, the per-profile
registry, and 3 web_server callbacks) — a drift hazard where the authorize URL and token
exchange could request different scopes and silently re-prompt/deny. Extracted ONE
SPOTIFY_OAUTH_SCOPE constant and pointed all 5 at it, and added playlist-modify-public/private
there. Existing users re-auth once to grant write; reads are unaffected.
- SpotifyClient.create_or_update_playlist(name, track_ids, existing_id=None): creates a playlist
owned by the authed user, or replaces an existing one's tracks in place (idempotent re-export).
Chunks at Spotify's 100-track cap. A pre-scope token gets a clear "reconnect Spotify" message
instead of a raw 403. Returns {success, playlist_id, url, added, error}.
6 tests: create-new adds tracks, update replaces (no create), >100 chunking, empty → error (no API
calls), not-authed → error, insufficient-scope → reconnect message. 268 spotify/oauth tests green,
ruff clean. Additive — read paths and existing tokens unchanged.
Next: Deezer write via the ARL gw-light gateway, then the export-job branch + endpoint + modal.
166 lines
5.8 KiB
Python
166 lines
5.8 KiB
Python
import sys
|
|
from pathlib import Path
|
|
|
|
sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
|
|
|
|
from core.spotify_client import normalize_spotify_oauth_config
|
|
|
|
def test_normalization():
|
|
# Whitespace + quotes are stripped (paste garbage); the redirect_uri's
|
|
# trailing slash is PRESERVED — Spotify matches it exactly against the app
|
|
# dashboard, so stripping it could break a valid registration (#942 follow-up).
|
|
config = {
|
|
"client_id": ' "client_id" ',
|
|
"client_secret": " client_secret ",
|
|
"redirect_uri": " http://127.0.0.1:8888/callback/ "
|
|
}
|
|
expected = {
|
|
"client_id": "client_id",
|
|
"client_secret": "client_secret",
|
|
"redirect_uri": "http://127.0.0.1:8888/callback/" # slash kept
|
|
}
|
|
assert normalize_spotify_oauth_config(config) == expected
|
|
|
|
|
|
def test_trailing_slash_on_redirect_uri_is_preserved():
|
|
"""Regression guard: Spotify requires an EXACT redirect-URI match against the
|
|
app dashboard, so a trailing slash a user registered must NOT be stripped —
|
|
stripping it would send '…/callback' and trigger INVALID_CLIENT (#942)."""
|
|
with_slash = {"client_id": "x", "client_secret": "y",
|
|
"redirect_uri": "http://127.0.0.1:8888/callback/"}
|
|
without_slash = {"client_id": "x", "client_secret": "y",
|
|
"redirect_uri": "http://127.0.0.1:8888/callback"}
|
|
assert normalize_spotify_oauth_config(with_slash)["redirect_uri"] == "http://127.0.0.1:8888/callback/"
|
|
assert normalize_spotify_oauth_config(without_slash)["redirect_uri"] == "http://127.0.0.1:8888/callback"
|
|
|
|
def test_empty_values():
|
|
# Empty input values
|
|
config = {
|
|
"client_id": "",
|
|
"client_secret": None,
|
|
"redirect_uri": ""
|
|
}
|
|
# When value is None, it falls into the else branch: normalized[key] = value
|
|
# value is None, so expected is None for client_secret
|
|
expected = {
|
|
"client_id": "",
|
|
"client_secret": None,
|
|
"redirect_uri": ""
|
|
}
|
|
assert normalize_spotify_oauth_config(config) == expected
|
|
|
|
def test_missing_keys():
|
|
# Input dictionary with missing keys
|
|
config = {
|
|
"client_id": "client_id"
|
|
}
|
|
# .get(key, "") means missing keys become ""
|
|
expected = {
|
|
"client_id": "client_id",
|
|
"client_secret": "",
|
|
"redirect_uri": ""
|
|
}
|
|
assert normalize_spotify_oauth_config(config) == expected
|
|
|
|
def test_non_string_values():
|
|
# Input dictionary with non-string values for the keys
|
|
config = {
|
|
"client_id": 123,
|
|
"client_secret": True,
|
|
"redirect_uri": None
|
|
}
|
|
# When value is not a string, it falls into the else branch: normalized[key] = value
|
|
expected = {
|
|
"client_id": 123,
|
|
"client_secret": True,
|
|
"redirect_uri": None
|
|
}
|
|
assert normalize_spotify_oauth_config(config) == expected
|
|
|
|
def test_no_input():
|
|
# Empty input dictionary
|
|
config = {}
|
|
# .get(key, "") means missing keys become ""
|
|
expected = {
|
|
"client_id": "",
|
|
"client_secret": "",
|
|
"redirect_uri": ""
|
|
}
|
|
assert normalize_spotify_oauth_config(None) == {}
|
|
assert normalize_spotify_oauth_config(config) == expected
|
|
|
|
# ── create_or_update_playlist: export a mirrored playlist back to Spotify (#945) ──
|
|
|
|
from core.spotify_client import SpotifyClient as _SpotifyClient
|
|
|
|
|
|
class _FakeSp:
|
|
def __init__(self):
|
|
self.calls = []
|
|
|
|
def current_user(self):
|
|
self.calls.append(('current_user',))
|
|
return {'id': 'user-1'}
|
|
|
|
def user_playlist_create(self, user_id, name, public=False, description=''):
|
|
self.calls.append(('create', user_id, name, public))
|
|
return {'id': 'pl-new'}
|
|
|
|
def playlist_add_items(self, pid, uris):
|
|
self.calls.append(('add', pid, list(uris)))
|
|
|
|
def playlist_replace_items(self, pid, uris):
|
|
self.calls.append(('replace', pid, list(uris)))
|
|
|
|
|
|
def _spotify_with(sp, authed=True):
|
|
c = _SpotifyClient.__new__(_SpotifyClient)
|
|
c.sp = sp
|
|
c.is_spotify_authenticated = lambda: authed
|
|
return c
|
|
|
|
|
|
def test_create_new_playlist_adds_tracks():
|
|
sp = _FakeSp()
|
|
res = _spotify_with(sp).create_or_update_playlist('My Mix', ['a', 'b', 'c'])
|
|
assert res['success'] and res['playlist_id'] == 'pl-new'
|
|
assert res['url'] == 'https://open.spotify.com/playlist/pl-new'
|
|
assert res['added'] == 3
|
|
assert ('create', 'user-1', 'My Mix', False) in sp.calls
|
|
assert ('add', 'pl-new', ['spotify:track:a', 'spotify:track:b', 'spotify:track:c']) in sp.calls
|
|
|
|
|
|
def test_update_existing_replaces_no_create():
|
|
sp = _FakeSp()
|
|
res = _spotify_with(sp).create_or_update_playlist('My Mix', ['a', 'b'], existing_id='pl-x')
|
|
assert res['success'] and res['playlist_id'] == 'pl-x'
|
|
assert ('replace', 'pl-x', ['spotify:track:a', 'spotify:track:b']) in sp.calls
|
|
assert not any(c[0] == 'create' for c in sp.calls)
|
|
|
|
|
|
def test_chunks_over_100_tracks():
|
|
sp = _FakeSp()
|
|
res = _spotify_with(sp).create_or_update_playlist('Big', [str(i) for i in range(250)])
|
|
assert res['added'] == 250
|
|
adds = [c for c in sp.calls if c[0] == 'add']
|
|
assert len(adds) == 3 and len(adds[0][2]) == 100 and len(adds[2][2]) == 50
|
|
|
|
|
|
def test_empty_tracks_errors_no_api_calls():
|
|
sp = _FakeSp()
|
|
res = _spotify_with(sp).create_or_update_playlist('X', [])
|
|
assert not res['success'] and 'No matching' in res['error']
|
|
assert sp.calls == []
|
|
|
|
|
|
def test_not_authed_errors():
|
|
res = _spotify_with(_FakeSp(), authed=False).create_or_update_playlist('X', ['a'])
|
|
assert not res['success'] and 'not connected' in res['error']
|
|
|
|
|
|
def test_insufficient_scope_says_reconnect():
|
|
class _ScopeErr(_FakeSp):
|
|
def user_playlist_create(self, *a, **k):
|
|
raise Exception('403 Forbidden: insufficient client scope')
|
|
res = _spotify_with(_ScopeErr()).create_or_update_playlist('X', ['a'])
|
|
assert not res['success'] and 'Reconnect Spotify' in res['error']
|