技能修改

skills-data/xdfx-split-controller/scripts/xdfx_auth.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """Authentication helper for xdfx skill scripts.
 
-The caller should not pass tokens through command-line arguments.  This module
+The caller should not pass tokens through command-line arguments. This module
 owns the fixed admin login flow and returns a Bearer token before business
 interfaces are called.
 """
@@ -12,7 +12,6 @@ import json
 import re
 import ssl
 import urllib.error
-import urllib.parse
 import urllib.request
 from dataclasses import dataclass
 from typing import Any
@@ -58,12 +57,8 @@ def ssl_context(*, verify_ssl: bool) -> ssl.SSLContext | None:
     return ssl._create_unverified_context()
 
 
-def build_login_url(api_base: str, path: str, password: str) -> str:
-    base = path if re.match(r"^https?://", path, flags=re.IGNORECASE) else api_base.rstrip("/") + "/" + path.lstrip("/")
-    if password:
-        separator = "&" if "?" in base else "?"
-        base = f"{base}{separator}password={urllib.parse.quote(password, safe='')}"
-    return base
+def build_login_url(api_base: str, path: str) -> str:
+    return path if re.match(r"^https?://", path, flags=re.IGNORECASE) else api_base.rstrip("/") + "/" + path.lstrip("/")
 
 
 def extract_access_token(data: Any) -> str | None:
@@ -106,13 +101,13 @@ def fetch_access_token(
     api_base: str,
     username: str = "admin",
     password: str = "ch@user",
-    login_path: str = "/api/v1/auth/login/username",
+    login_path: str = "/api/auth/login",
     timeout: float = 90,
     verify_ssl: bool = False,
 ) -> AuthResult:
     """Login once and return the extracted access token."""
-    url = build_login_url(api_base, login_path, password)
-    payload = {"username": username}
+    url = build_login_url(api_base, login_path)
+    payload = {"username": username, "password": password}
     data = json.dumps(payload, ensure_ascii=False).encode("utf-8")
     headers = {"Content-Type": "application/json", "Accept": "application/json"}
     req = urllib.request.Request(url, data=data, headers=headers, method="POST")