revisi 7

app/auth.py

@@ -6,21 +6,41 @@ from app.db import supabase
 
 def auth_view():
     """Render Supabase authentication with Login, Register, and Forgot Password tabs."""
-    # Wrapper (centered) for all auth content
+
+    # --- Redirect handler: ubah fragment (#...) jadi query (?) sekali saja ---
+    st.markdown(
+        """
+        <script>
+        (function(){
+          const hash = window.location.hash.startsWith('#') ? window.location.hash.substring(1) : window.location.hash;
+          if (hash && !window.__hashMigrated) {
+            const h = new URLSearchParams(hash);
+            const qp = new URLSearchParams(window.location.search);
+            for (const [k,v] of h.entries()) { qp.set(k, v); }
+            const newUrl = window.location.pathname + '?' + qp.toString();
+            window.history.replaceState(null, '', newUrl);
+            window.location.hash = '';
+            window.__hashMigrated = true;
+            window.location.replace(newUrl); // redirect bersih
+          }
+        })();
+        </script>
+        """,
+        unsafe_allow_html=True,
+    )
+
+    # --- Wrapper (centered) for all auth content ---
     left, center, right = st.columns([1, 2, 1])
     with center:
-        # Header: smaller PNP logo and centered title
-        # Path logo
+        # Header: PNP logo + title
         logo_path = os.path.join("assets", "pnp-logo.png")
 
-        # Convert ke base64 biar bisa di-embed langsung
         def get_base64_image(path):
             with open(path, "rb") as f:
                 return base64.b64encode(f.read()).decode()
 
         encoded_logo = get_base64_image(logo_path)
 
-        # Render dalam satu div center
         st.markdown(
             f"""
             <div style="text-align:center;">
@@ -31,32 +51,7 @@ def auth_view():
             unsafe_allow_html=True
         )
 
-        # --- Password recovery handler (Supabase redirect) ---
-        # 1) Move hash params to query params on first load, then reload once
-        if not st.session_state.get("_hash_migrated"):
-            st.markdown(
-                """
-                <script>
-                (function(){
-                  const hash = window.location.hash.startsWith('#') ? window.location.hash.substring(1) : window.location.hash;
-                  if (hash && !window.__hashMigrated) {
-                    const h = new URLSearchParams(hash);
-                    const qp = new URLSearchParams(window.location.search);
-                    for (const [k,v] of h.entries()) { qp.set(k, v); }
-                    const newUrl = window.location.pathname + '?' + qp.toString();
-                    window.history.replaceState(null, '', newUrl);
-                    window.location.hash = '';
-                    window.__hashMigrated = true;
-                    window.location.reload();
-                  }
-                })();
-                </script>
-                """,
-                unsafe_allow_html=True,
-            )
-            st.session_state["_hash_migrated"] = True
-
-        # 2) Read query params for recovery flow
+        # --- Password recovery flow ---
         try:
             qp = st.query_params  # Streamlit >= 1.30
             get_q = lambda k: qp.get(k, None)
@@ -82,44 +77,42 @@ def auth_view():
                     st.error("Token pemulihan tidak ditemukan. Coba klik ulang tautan dari email.")
                 else:
                     try:
-                        # Set current session using tokens from redirect
                         supabase.auth.set_session(access_token, refresh_token)
-                        # Update user password
                         supabase.auth.update_user({"password": npw})
                         st.success("Password berhasil diubah. Silakan login kembali.")
-                        # Optional: clear recovery query params
-                        try:
-                            # Best-effort to clear params
-                            st.markdown(
-                                """
-                                <script>
-                                (function(){
-                                  const qp = new URLSearchParams(window.location.search);
-                                  ["type","access_token","refresh_token","expires_in","expires_at","token_type"].forEach(k=>qp.delete(k));
-                                  const newUrl = window.location.pathname + (qp.toString()?('?'+qp.toString()):'');
-                                  window.history.replaceState(null, '', newUrl);
-                                })();
-                                </script>
-                                """,
-                                unsafe_allow_html=True,
-                            )
-                        except Exception:
-                            pass
+
+                        # Bersihkan query param biar URL rapi
+                        st.markdown(
+                            """
+                            <script>
+                            (function(){
+                              const qp = new URLSearchParams(window.location.search);
+                              ["type","access_token","refresh_token","expires_in","expires_at","token_type"].forEach(k=>qp.delete(k));
+                              const newUrl = window.location.pathname + (qp.toString()?('?'+qp.toString()):'');
+                              window.history.replaceState(null, '', newUrl);
+                            })();
+                            </script>
+                            """,
+                            unsafe_allow_html=True,
+                        )
+
+                        # langsung rerun supaya balik ke tampilan login
+                        st.rerun()
+
                     except Exception as e:
                         st.error(f"Gagal mengubah password: {e}")
-            # When in recovery mode, do not render login/register tabs
             return
 
-        # Auth tabs inside wrapper
+        # --- Auth tabs ---
         tab_login, tab_register, tab_forgot = st.tabs(["Login", "Register", "Forgot Password"])
 
+        # Login tab
         with tab_login:
             with st.form("login_form"):
                 email = st.text_input("Email")
                 password = st.text_input("Password", type="password")
                 submitted = st.form_submit_button("Login")
             if submitted:
-                # Demo password fallback
                 shared_pw = os.getenv("APP_DEMO_PASSWORD")
                 if shared_pw and password == shared_pw:
                     st.session_state["user"] = {"id": "demo-user", "email": email or "demo@example.com"}
@@ -146,6 +139,7 @@ def auth_view():
                 except Exception as e:
                     st.error(f"Gagal login: {e}")
 
+        # Register tab
         with tab_register:
             st.caption("Buat akun baru. Anda akan menerima email konfirmasi.")
             with st.form("register_form"):
@@ -158,7 +152,6 @@ def auth_view():
                     st.error("Password tidak sama.")
                 else:
                     try:
-                        # Prefer explicit env, then generic site URL, then localhost for dev
                         redirect_url = os.getenv(
                             "SUPABASE_EMAIL_REDIRECT",
                             os.getenv("NEXT_PUBLIC_SITE_URL", "http://localhost:8501"),
@@ -172,6 +165,7 @@ def auth_view():
                     except Exception as e:
                         st.error(f"Gagal registrasi: {e}")
 
+        # Forgot password tab
         with tab_forgot:
             st.caption("Kirim tautan reset password ke email Anda.")
             with st.form("forgot_form"):
@@ -179,7 +173,6 @@ def auth_view():
                 submitted_f = st.form_submit_button("Kirim Link Reset")
             if submitted_f:
                 try:
-                    # Prefer explicit env, then generic site URL, then localhost for dev
                     redirect_url = os.getenv(
                         "SUPABASE_EMAIL_REDIRECT",
                         os.getenv("NEXT_PUBLIC_SITE_URL", "http://localhost:8501"),