danvics/soulsync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix Spotify auth completion sync

Browse source 
- Make the Spotify auth completion popup notify the opener across callback origins.
- Refresh service status in the settings UI after auth completes so the button flips to Disconnect immediately.
- Keep the standalone callback instruction page and the main app flow working with the same completion signal.
This commit is contained in:
Antti Kettunen 2026-05-01 12:14:13 +03:00
parent 74e3cc460c
commit f733744f91
No known key found for this signature in database
GPG key ID: C6B2A3D250359BD7
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
web_server.py
View file

@ -5539,7 +5539,6 @@ def auth_spotify():
<script> <script>
window.addEventListener('message', function(event) {{ window.addEventListener('message', function(event) {{
if (event.origin !== window.location.origin) return;
if (!event.data || event.data.type !== 'spotify-auth-complete') return; if (!event.data || event.data.type !== 'spotify-auth-complete') return;
setTimeout(() => window.close(), 300); setTimeout(() => window.close(), 300);
}}); }});
@ -5734,7 +5733,7 @@ def _spotify_auth_success_page(detail_text: str) -> str:
(function() {{ (function() {{
try {{ try {{
if (window.opener && !window.opener.closed) {{ if (window.opener && !window.opener.closed) {{
window.opener.postMessage({{ type: 'spotify-auth-complete' }}, window.location.origin); window.opener.postMessage({{ type: 'spotify-auth-complete' }}, '*');
}} }}
}} catch (error) {{ }} catch (error) {{
console.warn('Unable to notify opener about Spotify auth completion', error); console.warn('Unable to notify opener about Spotify auth completion', error);

2
webui/static/settings.js
View file

@ -3079,7 +3079,7 @@ async function authenticateSpotify() {
// Save settings first to ensure client_id/client_secret are persisted // Save settings first to ensure client_id/client_secret are persisted
await saveSettings(); await saveSettings();
showToast('Spotify authentication started', 'success'); showToast('Spotify authentication started', 'success');
window.open('/auth/spotify', '_blank'); window._spotifyAuthWindow = window.open('/auth/spotify', '_blank');
} catch (error) { } catch (error) {
console.error('Error authenticating Spotify:', error); console.error('Error authenticating Spotify:', error);
showToast('Failed to start Spotify authentication', 'error', 'gs-connecting'); showToast('Failed to start Spotify authentication', 'error', 'gs-connecting');

4
webui/static/shared-helpers.js
View file

@ -3108,16 +3108,18 @@ async function _forceServiceStatusRefresh() {
} }
let _spotifyAuthCompletionListenerInstalled = false; let _spotifyAuthCompletionListenerInstalled = false;
window._spotifyAuthWindow = window._spotifyAuthWindow || null;
function initializeSpotifyAuthCompletionListener() { function initializeSpotifyAuthCompletionListener() {
if (_spotifyAuthCompletionListenerInstalled) return; if (_spotifyAuthCompletionListenerInstalled) return;
_spotifyAuthCompletionListenerInstalled = true; _spotifyAuthCompletionListenerInstalled = true;
window.addEventListener('message', async event => { window.addEventListener('message', async event => {
if (event.origin !== window.location.origin) return;
if (!event.data || event.data.type !== 'spotify-auth-complete') return; if (!event.data || event.data.type !== 'spotify-auth-complete') return;
if (window._spotifyAuthWindow && event.source && event.source !== window._spotifyAuthWindow) return;
try { try {
window._spotifyAuthWindow = null;
await _forceServiceStatusRefresh(); await _forceServiceStatusRefresh();
} catch (error) { } catch (error) {
console.warn('Could not refresh Spotify status after auth completion:', error); console.warn('Could not refresh Spotify status after auth completion:', error);