revisi 15

app/auth.py

@@ -9,17 +9,15 @@ def auth_view():
     # Wrapper (centered) for all auth content
     left, center, right = st.columns([1, 2, 1])
     with center:
-        # Header: smaller PNP logo and centered title
+        # 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;">
@@ -30,365 +28,144 @@ def auth_view():
             unsafe_allow_html=True
         )
 
-        # Read query params for recovery flow
-        try:
-            if hasattr(st, 'query_params'):
-                qp = st.query_params
-                get_q = lambda k: qp.get(k, None)
-            else:
-                qp = st.experimental_get_query_params()
-                get_q = lambda k: (qp.get(k, [None])[0] if isinstance(qp.get(k, None), list) else qp.get(k, None))
-        except Exception:
-            qp = {}
-            get_q = lambda k: None
+        # --- FIX: Auto convert hash (#) to query (?) ---
+        st.markdown(
+            """
+            <script>
+            (function() {
+                const hash = window.location.hash;
+                if (hash && hash.length > 1 && !sessionStorage.getItem("hash_migrated")) {
+                    // ambil param setelah #
+                    const query = hash.substring(1); 
+                    const newUrl = window.location.pathname + "?" + query;
 
-        q_type = get_q("type")
-        access_token = get_q("access_token")
-        refresh_token = get_q("refresh_token")
-        
-        # Check if user is coming from email but params are in wrong format
-        # Tampilkan helper hanya jika tidak ada query params yang valid
-        if not q_type and not access_token:
-            st.markdown("---")
-            st.info("Datang dari link email reset password? Jika halaman reset tidak muncul otomatis, klik tombol di bawah:")
-            
-            col1, col2 = st.columns([1, 1])
-            with col1:
-                if st.button("Saya dari Link Email", use_container_width=True, help="Klik jika Anda mengakses dari link email reset password"):
-                    st.info("Instruksi sederhana:")
-                    st.markdown("""
-                    1. **Lihat URL di address bar browser Anda**
-                    2. **Ganti tanda `#` dengan `?`** (jika ada)
-                    3. **Tekan Enter** untuk reload halaman
-                    
-                    **Contoh:**
-                    - Dari: `app.com/#access_token=abc`  
-                    - Jadi: `app.com/?access_token=abc`
-                    """)
-                    
-            with col2:
-                if st.button("Butuh Bantuan", use_container_width=True):
-                    st.markdown("""
-                    **Masalah umum dan solusi:**
-                    
-                    **Link tidak berfungsi?**  
-                    Coba minta link reset password baru
-                    
-                    **Halaman kosong setelah klik link?**  
-                    Ganti `#` dengan `?` di URL browser
-                    
-                    **Masih tidak bisa?**  
-                    Gunakan tab "Forgot Password" di bawah
-                    """)
+                    // tandai sudah migrasi supaya tidak infinite loop
+                    sessionStorage.setItem("hash_migrated", "true");
+
+                    // ganti URL tanpa hash
+                    window.history.replaceState(null, "", newUrl);
+
+                    // reload supaya Streamlit bisa baca query param
+                    window.location.reload();
+                }
+            })();
+            </script>
+            """,
+            unsafe_allow_html=True
+        )
 
-        # Debug info untuk development (hanya tampil jika ada query params)
-        if os.getenv("DEBUG_MODE") == "true" and (q_type or access_token):
-            with st.expander("Debug Info", expanded=False):
-                st.write("Query params:", dict(qp) if hasattr(qp, 'items') else qp)
-                st.write("Type:", q_type)
-                st.write("Has access token:", bool(access_token))
-                st.write("Has refresh token:", bool(refresh_token))
+        # --- Recovery flow ---
+        if hasattr(st, "query_params"):
+            qp = st.query_params
+            get_q = lambda k: qp.get(k)
+        else:
+            qp = st.experimental_get_query_params()
+            get_q = lambda k: (qp.get(k, [None])[0] if isinstance(qp.get(k, None), list) else qp.get(k))
 
-        # RECOVERY MODE - Reset Password
+        q_type = get_q("type")
         if q_type == "recovery":
-            st.success("Halaman Reset Password")
-            st.info("Silakan masukkan password baru Anda di bawah ini.")
-            
-            # Validasi token availability
-            if not access_token or not refresh_token:
-                st.error("Token reset password tidak valid atau sudah expired.")
-                st.markdown("**Kemungkinan penyebab:**")
-                st.markdown("- Link sudah pernah digunakan sebelumnya")
-                st.markdown("- Link sudah expired (biasanya berlaku 1 jam)")
-                st.markdown("- URL tidak lengkap")
-                
-                st.info("**Solusi:** Minta link reset password yang baru menggunakan form di bawah.")
-                
-                if st.button("Minta Link Reset Baru", use_container_width=True):
-                    # Clear query params dan redirect ke forgot password
-                    if hasattr(st, 'query_params'):
-                        params_to_clear = ['type', 'access_token', 'refresh_token', 'expires_in', 'expires_at', 'token_type']
-                        for param in params_to_clear:
-                            if param in st.query_params:
-                                del st.query_params[param]
-                    st.rerun()
-                return
-            
-            # Form untuk reset password
-            with st.form("reset_password_form", clear_on_submit=False):
-                st.markdown("### Set Password Baru")
-                new_password = st.text_input("Password Baru", type="password", help="Minimal 6 karakter")
-                confirm_password = st.text_input("Konfirmasi Password Baru", type="password")
-                
-                # Password strength indicator
-                if new_password:
-                    strength_score = 0
-                    feedback = []
-                    
-                    if len(new_password) >= 6:
-                        strength_score += 1
-                    else:
-                        feedback.append("Minimal 6 karakter")
-                    
-                    if any(c.isupper() for c in new_password):
-                        strength_score += 1
-                    else:
-                        feedback.append("Gunakan huruf besar")
-                    
-                    if any(c.islower() for c in new_password):
-                        strength_score += 1
-                    else:
-                        feedback.append("Gunakan huruf kecil")
-                    
-                    if any(c.isdigit() for c in new_password):
-                        strength_score += 1
-                    else:
-                        feedback.append("Gunakan angka")
-                    
-                    # Display strength
-                    if strength_score <= 1:
-                        st.error(f"Password lemah: {', '.join(feedback)}")
-                    elif strength_score <= 2:
-                        st.warning(f"Password cukup: {', '.join(feedback)}")
-                    elif strength_score <= 3:
-                        st.info("Password baik")
-                    else:
-                        st.success("Password sangat kuat!")
-                
-                submit_reset = st.form_submit_button("Update Password", use_container_width=True)
-                
+            st.info("Reset password: silakan masukkan password baru Anda.")
+            access_token = get_q("access_token")
+            refresh_token = get_q("refresh_token")
+            with st.form("reset_password_form"):
+                npw = st.text_input("Password Baru", type="password")
+                npw2 = st.text_input("Konfirmasi Password Baru", type="password")
+                submit_reset = st.form_submit_button("Set Password Baru")
             if submit_reset:
-                # Validasi input
-                if not new_password:
-                    st.error("Password tidak boleh kosong.")
-                elif len(new_password) < 6:
+                if not npw or len(npw) < 6:
                     st.error("Password minimal 6 karakter.")
-                elif new_password != confirm_password:
+                elif npw != npw2:
                     st.error("Konfirmasi password tidak sama.")
+                elif not access_token or not refresh_token:
+                    st.error("Token pemulihan tidak ditemukan. Coba klik ulang tautan dari email.")
                 else:
-                    # Proses update password
                     try:
-                        with st.spinner("Mengupdate password..."):
-                            # Set session dengan token dari URL
-                            supabase.auth.set_session(access_token, refresh_token)
-                            
-                            # Update password
-                            result = supabase.auth.update_user({"password": new_password})
-                            
-                            if result:
-                                st.success("Password berhasil diubah!")
-                                st.success("Sekarang Anda dapat login dengan password baru!")
-                                
-                                # Show success message with countdown
-                                placeholder = st.empty()
-                                for i in range(5, 0, -1):
-                                    placeholder.info(f"Halaman akan kembali ke login dalam {i} detik...")
-                                    import time
-                                    time.sleep(1)
-                                
-                                # Clear query params dan redirect
-                                if hasattr(st, 'query_params'):
-                                    params_to_clear = ['type', 'access_token', 'refresh_token', 'expires_in', 'expires_at', 'token_type']
-                                    for param in params_to_clear:
-                                        if param in st.query_params:
-                                            del st.query_params[param]
-                                
-                                placeholder.empty()
-                                st.rerun()
-                            else:
-                                st.error("Gagal mengubah password. Silakan coba lagi.")
-                                
+                        supabase.auth.set_session(access_token, refresh_token)
+                        supabase.auth.update_user({"password": npw})
+                        st.success("Password berhasil diubah. Anda akan diarahkan ke login...")
+                        # bersihkan query params setelah reset
+                        st.experimental_set_query_params()
+                        st.session_state.clear()
+                        st.rerun()
                     except Exception as e:
-                        st.error(f"Error: {str(e)}")
-                        st.info("Jika masalah berlanjut, minta link reset password baru.")
-            
-            # Tombol alternatif
-            st.markdown("---")
-            col1, col2 = st.columns([1, 1])
-            with col1:
-                if st.button("Kembali ke Login", use_container_width=True):
-                    if hasattr(st, 'query_params'):
-                        params_to_clear = ['type', 'access_token', 'refresh_token', 'expires_in', 'expires_at', 'token_type']
-                        for param in params_to_clear:
-                            if param in st.query_params:
-                                del st.query_params[param]
-                    st.rerun()
-            
-            with col2:
-                if st.button("Minta Link Baru", use_container_width=True):
-                    if hasattr(st, 'query_params'):
-                        params_to_clear = ['type', 'access_token', 'refresh_token', 'expires_in', 'expires_at', 'token_type']
-                        for param in params_to_clear:
-                            if param in st.query_params:
-                                del st.query_params[param]
-                    st.rerun()
-            
-            return  # Exit early, don't show other tabs
+                        st.error(f"Gagal mengubah password: {e}")
+            return
 
-        # NORMAL MODE - Login/Register/Forgot Password Tabs
+        # --- Auth tabs ---
         tab_login, tab_register, tab_forgot = st.tabs(["Login", "Register", "Forgot Password"])
 
+        # LOGIN
         with tab_login:
-            st.markdown("### Selamat Datang Kembali")
-            
-            # Quick tips untuk login
-            with st.expander("Tips Login", expanded=False):
-                st.markdown("""
-                - Pastikan email dan password sudah benar
-                - Jika lupa password, gunakan tab "Forgot Password"
-                - Untuk akun baru, gunakan tab "Register"
-                """)
-            
             with st.form("login_form"):
-                email = st.text_input("Email", placeholder="contoh@email.com")
+                email = st.text_input("Email")
                 password = st.text_input("Password", type="password")
-                remember_me = st.checkbox("Ingat saya")
-                submitted = st.form_submit_button("Login", use_container_width=True)
-                
+                submitted = st.form_submit_button("Login")
             if submitted:
-                if not email or not password:
-                    st.error("Email dan password harus diisi.")
-                    return
-                    
-                # 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"}
                     st.success("Login demo berhasil")
                     st.rerun()
-                    return
-                
                 try:
-                    with st.spinner("Memverifikasi kredensial..."):
-                        auth_res = supabase.auth.sign_in_with_password({
-                            "email": email,
-                            "password": password,
-                        })
-                        user = getattr(auth_res, "user", None)
-                        if user:
-                            st.session_state["user"] = {"id": user.id, "email": getattr(user, "email", email)}
-                            session_obj = getattr(auth_res, "session", None)
-                            if session_obj:
-                                st.session_state["sb_session"] = {
-                                    "access_token": getattr(session_obj, "access_token", None),
-                                    "refresh_token": getattr(session_obj, "refresh_token", None),
-                                }
-                            st.success("Login berhasil! Selamat datang!")
-                            st.rerun()
-                        else:
-                            st.error("Email atau password salah.")
-                            st.info("Cek kembali email dan password Anda, atau gunakan 'Forgot Password' jika lupa.")
+                    auth_res = supabase.auth.sign_in_with_password({
+                        "email": email,
+                        "password": password,
+                    })
+                    user = getattr(auth_res, "user", None)
+                    if user:
+                        st.session_state["user"] = {"id": user.id, "email": getattr(user, "email", email)}
+                        session_obj = getattr(auth_res, "session", None)
+                        if session_obj:
+                            st.session_state["sb_session"] = {
+                                "access_token": getattr(session_obj, "access_token", None),
+                                "refresh_token": getattr(session_obj, "refresh_token", None),
+                            }
+                        st.success("Login berhasil")
+                        st.rerun()
+                    else:
+                        st.error("Email atau password salah.")
                 except Exception as e:
-                    st.error(f"Gagal login: {str(e)}")
+                    st.error(f"Gagal login: {e}")
 
+        # REGISTER
         with tab_register:
-            st.markdown("### Daftar Akun Baru")
-            st.caption("Buat akun untuk mulai menggunakan PNP Bot")
-            
+            st.caption("Buat akun baru. Anda akan menerima email konfirmasi.")
             with st.form("register_form"):
-                r_email = st.text_input("Email", key="reg_email", placeholder="contoh@email.com")
-                r_password = st.text_input("Password", type="password", key="reg_password", help="Minimal 6 karakter, gunakan kombinasi huruf dan angka")
+                r_email = st.text_input("Email", key="reg_email")
+                r_password = st.text_input("Password", type="password", key="reg_password")
                 r_password2 = st.text_input("Konfirmasi Password", type="password", key="reg_password2")
-                
-                # Password strength untuk register juga
-                if r_password:
-                    strength_score = 0
-                    if len(r_password) >= 6: strength_score += 1
-                    if any(c.isupper() for c in r_password): strength_score += 1
-                    if any(c.islower() for c in r_password): strength_score += 1
-                    if any(c.isdigit() for c in r_password): strength_score += 1
-                    
-                    if strength_score <= 1:
-                        st.error("Password terlalu lemah")
-                    elif strength_score <= 2:
-                        st.warning("Password cukup")
-                    elif strength_score <= 3:
-                        st.info("Password baik")
-                    else:
-                        st.success("Password sangat kuat!")
-                
-                submitted_r = st.form_submit_button("Daftar Sekarang", use_container_width=True)
-                
+                submitted_r = st.form_submit_button("Register")
             if submitted_r:
-                if not r_email or not r_password:
-                    st.error("Email dan password harus diisi.")
-                elif len(r_password) < 6:
-                    st.error("Password minimal 6 karakter.")
-                elif r_password != r_password2:
-                    st.error("Konfirmasi password tidak sama.")
+                if r_password != r_password2:
+                    st.error("Password tidak sama.")
                 else:
                     try:
-                        with st.spinner("Mendaftarkan akun..."):
-                            redirect_url = os.getenv("SUPABASE_EMAIL_REDIRECT")
-                            if not redirect_url:
-                                redirect_url = os.getenv("NEXT_PUBLIC_SITE_URL", "https://yozora721-pnp-chatbot-v1.hf.space/")
-                            
-                            supabase.auth.sign_up({
-                                "email": r_email,
-                                "password": r_password,
-                                "options": {"email_redirect_to": redirect_url}
-                            })
-                            st.success("Registrasi berhasil!")
-                            st.info("Email konfirmasi telah dikirim ke " + r_email)
-                            st.info("**Langkah selanjutnya:**")
-                            st.info("1. Buka email Anda")
-                            st.info("2. Klik link konfirmasi")
-                            st.info("3. Kembali ke halaman ini untuk login")
-                            st.warning("Periksa folder spam jika email tidak ditemukan dalam 5 menit")
+                        redirect_url = os.getenv(
+                            "SUPABASE_EMAIL_REDIRECT",
+                            os.getenv("NEXT_PUBLIC_SITE_URL", "https://yozora721-pnp-chatbot-v1.hf.space/"),
+                        )
+                        supabase.auth.sign_up({
+                            "email": r_email,
+                            "password": r_password,
+                            "options": {"email_redirect_to": redirect_url}
+                        })
+                        st.success("Registrasi berhasil. Silakan cek email untuk konfirmasi.")
                     except Exception as e:
-                        st.error(f"Gagal registrasi: {str(e)}")
+                        st.error(f"Gagal registrasi: {e}")
 
+        # FORGOT PASSWORD
         with tab_forgot:
-            st.markdown("### Reset Password")
-            st.caption("Masukkan email Anda untuk menerima link reset password")
-            
-            # Instruksi yang jelas tanpa copy-paste
-            st.info("""
-            **Cara kerja reset password:**
-            1. Masukkan email dan klik "Kirim Link Reset"
-            2. Buka email dari PNP Bot
-            3. Klik link di email (link akan membuka halaman ini)
-            4. Jika halaman reset tidak muncul, ganti `#` dengan `?` di URL browser
-            5. Set password baru Anda
-            """)
-            
+            st.caption("Kirim tautan reset password ke email Anda.")
             with st.form("forgot_form"):
-                f_email = st.text_input("Email", key="forgot_email", placeholder="contoh@email.com")
-                submitted_f = st.form_submit_button("Kirim Link Reset", use_container_width=True)
-                
+                f_email = st.text_input("Email", key="forgot_email")
+                submitted_f = st.form_submit_button("Kirim Link Reset")
             if submitted_f:
-                if not f_email:
-                    st.error("Email harus diisi.")
-                else:
-                    try:
-                        with st.spinner("Mengirim email..."):
-                            redirect_url = os.getenv("SUPABASE_EMAIL_REDIRECT")
-                            if not redirect_url:
-                                redirect_url = os.getenv("NEXT_PUBLIC_SITE_URL", "https://yozora721-pnp-chatbot-v1.hf.space/")
-                                
-                            supabase.auth.reset_password_for_email(
-                                f_email, 
-                                {"redirect_to": redirect_url}
-                            )
-                            st.success("Link reset password telah dikirim!")
-                            st.info(f"Silakan cek email di **{f_email}**")
-                            
-                            # Tips tanpa copy paste
-                            with st.expander("Troubleshooting", expanded=False):
-                                st.markdown("""
-                                **Jika mengalami masalah:**
-                                
-                                **Email tidak masuk?**  
-                                Tunggu 2-3 menit, periksa folder spam
-                                
-                                **Link tidak berfungsi?**  
-                                Di browser, ganti tanda `#` dengan `?` pada URL
-                                
-                                **Halaman kosong setelah klik link?**  
-                                Refresh halaman atau coba browser lain
-                                
-                                **Link sudah expired?**  
-                                Minta link baru (berlaku 1 jam)
-                                """)
-                    except Exception as e:
-                        st.error(f"Gagal mengirim email: {str(e)}")
+                try:
+                    redirect_url = os.getenv(
+                        "SUPABASE_EMAIL_REDIRECT",
+                        os.getenv("NEXT_PUBLIC_SITE_URL", "https://yozora721-pnp-chatbot-v1.hf.space/"),
+                    )
+                    supabase.auth.reset_password_for_email(f_email, {"redirect_to": redirect_url})
+                    st.success("Email reset password telah dikirim. Periksa kotak masuk Anda.")
+                except Exception as e:
+                    st.error(f"Gagal mengirim email reset password: {e}")