sarsoo/Mixonomer
1
0
Fork 0
Code Issues 15 Pull Requests Actions Packages Projects Releases Wiki Activity

adding configurable spotify callback

Browse Source
This commit is contained in:
Andy Pack 2023-09-15 19:57:26 +01:00
parent 2bb375d4da
commit 70117005d5
Signed by: sarsoo
GPG Key ID: A55BA3536A5E0ED7
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
music/auth/auth.py
View File

@ -203,6 +203,8 @@ def auth():
if 'username' in session: if 'username' in session:
config = Config.collection.get("config/music-tools")
spot_client = secret_client.access_secret_version(request={"name": SPOT_CLIENT_URI}) spot_client = secret_client.access_secret_version(request={"name": SPOT_CLIENT_URI})
params = urlencode( params = urlencode(
{ {
@ -210,7 +212,7 @@ def auth():
'response_type': 'code', 'response_type': 'code',
'scope': 'playlist-modify-public playlist-modify-private playlist-read-private ' 'scope': 'playlist-modify-public playlist-modify-private playlist-read-private '
'user-read-playback-state user-modify-playback-state user-library-read', '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_client = secret_client.access_secret_version(request={"name": SPOT_CLIENT_URI})
spot_secret = secret_client.access_secret_version(request={"name": SPOT_SECRET_URI}) spot_secret = secret_client.access_secret_version(request={"name": SPOT_SECRET_URI})
config = Config.collection.get("config/music-tools")
idsecret = b64encode( idsecret = b64encode(
bytes(spot_client.payload.data.decode("UTF-8") + ':' + spot_secret.payload.data.decode("UTF-8"), "utf-8") bytes(spot_client.payload.data.decode("UTF-8") + ':' + spot_secret.payload.data.decode("UTF-8"), "utf-8")
).decode("ascii") ).decode("ascii")
@ -241,7 +245,7 @@ def token():
data = { data = {
'grant_type': 'authorization_code', 'grant_type': 'authorization_code',
'code': 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) req = requests.post('https://accounts.spotify.com/api/token', data=data, headers=headers)

1
music/model/config.py
View File

@ -13,6 +13,7 @@ class Config(Model):
id = IDField() id = IDField()
spotify_callback = TextField()
apns_team_id = TextField() apns_team_id = TextField()
apns_key_id = TextField() apns_key_id = TextField()
playlist_cloud_operating_mode = TextField() # task, function playlist_cloud_operating_mode = TextField() # task, function