Update app.py

app.py

@@ -9,12 +9,7 @@ CLIENT_ID     = os.environ["SPOTIFY_CLIENT_ID"]
 CLIENT_SECRET = os.environ["SPOTIFY_CLIENT_SECRET"]
 REDIRECT_URI  = "https://jisaacso219-rng-shuffle.hf.space/"
 
-SCOPE = (
-    "streaming "
-    "user-read-playback-state "
-    "user-modify-playback-state "
-    "playlist-read-private"
-)
+SCOPE = "streaming user-read-playback-state user-modify-playback-state playlist-read-private"
 
 sp_oauth = SpotifyOAuth(
     client_id=CLIENT_ID,
@@ -30,14 +25,14 @@ user_playlists = {}
 def get_auth_url():
     return sp_oauth.get_authorize_url()
 
-def check_login(code: str):
+def complete_login(full_url):
     global sp, user_playlists
-    if not code:
-        return (
-            gr.update(visible=False),
-            gr.update(visible=False),
-            gr.update(visible=False),
-        )
+
+    # Extract code from full URL
+    try:
+        code = full_url.split("?code=")[1].split("&")[0]
+    except IndexError:
+        return gr.update(value="❌ No code found in URL. Please try logging in again."), gr.update(visible=False), gr.update(visible=False)
 
     tokinfo = sp_oauth.get_access_token(code, as_dict=True)
     access_token = tokinfo["access_token"]
@@ -49,9 +44,6 @@ def check_login(code: str):
     sdk_js = f"""
     <script>
       window.ACCESS_TOKEN = "{access_token}";
-      if (window.self !== window.top) {{
-        window.top.location.href = window.location.href;
-      }}
     </script>
     <script src="https://sdk.scdn.co/spotify-player.js"></script>
     <script>
@@ -71,16 +63,16 @@ def check_login(code: str):
     """
 
     return (
-        gr.update(visible=True, value="✅ Logged in! Select a playlist below."),
+        gr.update(value="✅ Logged in! Select a playlist."),
         gr.update(visible=True, choices=list(user_playlists.keys())),
-        gr.update(visible=True, value=sdk_js),
+        gr.update(visible=True, value=sdk_js)
     )
 
 def load_playlist_info(playlist_name: str):
-    pid  = user_playlists[playlist_name]
+    pid = user_playlists[playlist_name]
     data = sp.playlist(pid)
-    img  = data["images"][0]["url"] if data["images"] else ""
-    owner= data["owner"]["display_name"]
+    img = data["images"][0]["url"] if data["images"] else ""
+    owner = data["owner"]["display_name"]
     desc = data.get("description","")
     html = f"""
       <img src="{img}" width="300"/><br/>
@@ -114,37 +106,25 @@ def shuffle_and_play(playlist_name: str):
     return gr.update(value="▶️ Now playing in-browser!" + play_js, visible=True)
 
 with gr.Blocks() as demo:
-    gr.HTML("""
-      <script>
-      if (window.self !== window.top) {
-        window.top.location.href = window.location.href;
-      }
-      </script>
-    """)
-    gr.HTML('<a href="https://jisaacso219-rng-shuffle.hf.space/" target="_blank">Open standalone</a>')
-
-    gr.Markdown("Login → Select playlist → Shuffle & Play")
-
-    login_btn = gr.Button("🔐 Step 1: Login to Spotify")
-    login_btn.click(
-        fn=None, inputs=None, outputs=None,
-        js=f"() => window.location.href = '{get_auth_url()}'"
-    )
+    gr.Markdown("### RNG Spotify Playlist Shuffler 🎧")
+    login_btn = gr.Button("🔐 Login to Spotify", link=get_auth_url(), target="_blank")
+
+    gr.Markdown("After logging in to Spotify, copy the **full redirected URL** and paste it below to complete login.")
+    redirect_url_box = gr.Textbox(label="Paste redirected URL here")
+    complete_login_btn = gr.Button("✅ Complete Login")
 
-    code_state = gr.Textbox(visible=False)  # ✅ Critical Fix
-    status = gr.Markdown(visible=False)
+    status = gr.Markdown()
     playlist_dd = gr.Dropdown([], label="Select a Playlist", visible=False)
     sdk_html = gr.HTML(visible=False)
 
     info_html = gr.HTML(visible=False)
-    shuffle_btn = gr.Button("Shuffle & Play", visible=False)
+    shuffle_btn = gr.Button("🔀 Shuffle & Play", visible=False)
     result = gr.HTML(visible=False)
 
-    demo.load(
-        fn=check_login,
-        inputs=[code_state],
-        outputs=[status, playlist_dd, sdk_html],
-        js="() => new URLSearchParams(window.location.search).get('code') || ''"
+    complete_login_btn.click(
+        complete_login,
+        inputs=[redirect_url_box],
+        outputs=[status, playlist_dd, sdk_html]
     )
 
     playlist_dd.change(load_playlist_info, [playlist_dd], [info_html, shuffle_btn])
@@ -153,3 +133,4 @@ with gr.Blocks() as demo:
 if __name__ == "__main__":
     demo.launch(server_name="0.0.0.0", ssr_mode=False)
 
+