优化客服CK重登流程

tests/test_cookie_operations.py

@@ -11,12 +11,15 @@ from sqlalchemy.orm import sessionmaker
 
 from web.backend.database import Base
 from web.backend.models import Account, LoginTask, User
+from web.backend.services.login_service import LoginBatchRunner, cleanup_orphan_relogin_tasks
+from web.backend.services.cookie_check_service import check_douyu_cookie
 from web.backend.routers.cookies import (
     check_cookie_operations,
     get_cookie,
     list_cookie_operation_tags,
     list_cookie_operations,
     list_cookies,
+    relogin_invalid_cookie_operations,
 )
 
 
@@ -78,6 +81,9 @@ class CookieOperationTests(unittest.TestCase):
             "ck_check_status": "",
             "ck_checked_at": None,
             "created_at": None,
+            "relogin_status": "",
+            "relogin_message": "",
+            "relogin_batch_id": "",
         }])
         self.assertNotIn("owned-secret", str(result))
         self.assertNotIn("owned-password", str(result))
@@ -168,6 +174,89 @@ class CookieOperationTests(unittest.TestCase):
                 current=no_permission_user,
             )
 
+    def test_relogin_failed_record_stays_visible_and_can_be_checked(self):
+        self.owned_task.status = "relogin_failed"
+        self.owned_task.message = "重新登录失败: 密码错误（旧 Cookie 已保留）"
+        self.session.commit()
+
+        result = list_cookie_operations(
+            search="", tag="", page=1, page_size=20, db=self.session, current=self.support,
+        )
+
+        self.assertEqual(result["total"], 1)
+        self.assertEqual(result["items"][0]["relogin_status"], "relogin_failed")
+        self.assertIn("旧 Cookie 已保留", result["items"][0]["relogin_message"])
+
+    def test_service_restart_cleans_orphan_relogin_tasks(self):
+        self.owned_task.status = "relogin_running"
+        self.session.commit()
+
+        cleaned = cleanup_orphan_relogin_tasks(self.session)
+
+        self.assertEqual(cleaned, 1)
+        self.session.refresh(self.owned_task)
+        self.session.refresh(self.other_task)
+        self.assertEqual(self.owned_task.status, "relogin_failed")
+        self.assertIn("服务重启", self.owned_task.message)
+        self.assertEqual(self.other_task.status, "success")
+
+    def test_runner_copies_proxy_config_before_background_execution(self):
+        proxy = SimpleNamespace(
+            enabled=True,
+            http="http://127.0.0.1:8080",
+            https="",
+            api_url="",
+            whitelist_enabled=False,
+            whitelist_platform=None,
+            whitelist_credentials=None,
+            whitelist_uid="",
+            whitelist_ukey="",
+        )
+        runner = LoginBatchRunner(
+            db=self.session,
+            account_ids=[],
+            created_by=self.support.id,
+            creator_permissions=[],
+            proxy_config=proxy,
+        )
+        proxy.http = "http://changed.example:8080"
+
+        proxy_dict, _ = runner._resolve_static_proxy()
+
+        self.assertEqual(proxy_dict, {
+            "http": "http://127.0.0.1:8080",
+            "https": "http://127.0.0.1:8080",
+        })
+
+    @patch("web.backend.services.cookie_check_service.requests.get")
+    def test_cookie_check_uses_new_cookie_result(self, mock_get):
+        mock_get.side_effect = [
+            SimpleNamespace(json=lambda: {"error": 0, "data": {"count": 9}}),
+            SimpleNamespace(json=lambda: {"error": 0, "data": {"nn": "new-name", "lv": 12}}),
+        ]
+
+        result = check_douyu_cookie("new-cookie")
+
+        self.assertTrue(result["valid"])
+        self.assertEqual(result["fish_ball"], 9)
+        self.assertEqual(result["nickname"], "new-name")
+        self.assertEqual(result["level"], 12)
+
+    @patch("web.backend.routers.cookies._start_relogin_tasks")
+    def test_relogin_invalid_only_targets_support_visible_accounts(self, start_relogin):
+        self.owned_task.ck_check_status = "invalid"
+        self.other_task.ck_check_status = "invalid"
+        self.session.commit()
+        start_relogin.return_value = {"batch_id": "batch", "count": 1, "skipped": 0, "success": True}
+
+        result = relogin_invalid_cookie_operations(
+            search="", tag="", db=self.session, current=self.support,
+        )
+
+        self.assertTrue(result["success"])
+        selected_tasks = start_relogin.call_args.args[0]
+        self.assertEqual([task.id for task in selected_tasks], [self.owned_task.id])
+
 
 if __name__ == "__main__":
     unittest.main()