diff --git a/music/auth/auth.py b/music/auth/auth.py index 502cff1..c7ddb6e 100644 --- a/music/auth/auth.py +++ b/music/auth/auth.py @@ -203,6 +203,8 @@ def auth(): if 'username' in session: + config = Config.collection.get("config/music-tools") + spot_client = secret_client.access_secret_version(request={"name": SPOT_CLIENT_URI}) params = urlencode( { @@ -210,7 +212,7 @@ def auth(): 'response_type': 'code', 'scope': 'playlist-modify-public playlist-modify-private playlist-read-private ' 'user-read-playback-state user-modify-playback-state user-library-read', - 'redirect_uri': 'https://mixonomer.sarsoo.xyz/auth/spotify/token' + 'redirect_uri': f'https://{config.spotify_callback}/auth/spotify/token' } ) @@ -233,6 +235,8 @@ def token(): spot_client = secret_client.access_secret_version(request={"name": SPOT_CLIENT_URI}) spot_secret = secret_client.access_secret_version(request={"name": SPOT_SECRET_URI}) + config = Config.collection.get("config/music-tools") + idsecret = b64encode( bytes(spot_client.payload.data.decode("UTF-8") + ':' + spot_secret.payload.data.decode("UTF-8"), "utf-8") ).decode("ascii") @@ -241,7 +245,7 @@ def token(): data = { 'grant_type': 'authorization_code', 'code': code, - 'redirect_uri': 'https://mixonomer.sarsoo.xyz/auth/spotify/token' + 'redirect_uri': f'https://{config.spotify_callback}/auth/spotify/token' } req = requests.post('https://accounts.spotify.com/api/token', data=data, headers=headers) diff --git a/music/model/config.py b/music/model/config.py index e6d6684..6bb8c62 100644 --- a/music/model/config.py +++ b/music/model/config.py @@ -13,6 +13,7 @@ class Config(Model): id = IDField() + spotify_callback = TextField() apns_team_id = TextField() apns_key_id = TextField() playlist_cloud_operating_mode = TextField() # task, function