Upload 10 files

src/views/InstructorView.js

@@ -393,14 +393,29 @@ export function setupInstructorEvents() {
         btn.disabled = true;
 
         try {
-            await loginWithEmail(email, password);
-            // Auth state listener will handle the rest
+            const user = await loginWithEmail(email, password);
+            // Manually trigger success flow to avoid listener delays/detachments
+            console.log("Login success, checking permissions manually...");
+            const instructorData = await checkInstructorPermission(user);
+
+            if (instructorData) {
+                const liveAuthModal = document.getElementById('auth-modal');
+                if (liveAuthModal) liveAuthModal.classList.add('hidden');
+                if (typeof checkPermissions === 'function') {
+                    checkPermissions(instructorData);
+                }
+            } else {
+                throw new Error("無此帳號權限");
+            }
+
         } catch (e) {
             console.error("Login Error:", e);
-            if (authErrorMsg) {
-                authErrorMsg.textContent = "登入失敗: " + e.message;
-                authErrorMsg.classList.remove('hidden');
+            const liveAuthErrorMsg = document.getElementById('auth-error');
+            if (liveAuthErrorMsg) {
+                liveAuthErrorMsg.textContent = "登入失敗: " + e.message;
+                liveAuthErrorMsg.classList.remove('hidden');
             }
+        } finally {
             btn.textContent = originalText;
             btn.disabled = false;
         }