skyplatform-iam 1.0.5__py3-none-any.whl → 1.2.0__py3-none-any.whl

skyplatform_iam/connect_agenterra_iam.py

@@ -5,6 +5,8 @@ import copy
 from enum import Enum
 from fastapi import HTTPException, status
 
+from .config import decode_jwt_token
+
 
 class CredentialTypeEnum(str, Enum):
     """凭证类型枚举，与后端API保持一致"""
@@ -17,7 +19,7 @@ class CredentialTypeEnum(str, Enum):
 class ConnectAgenterraIam(object):
     _instance = None
     _initialized = False
-    
+
     def __new__(cls, config=None, logger_name="skyplatform_iam", log_level=logging.INFO):
         """
         单例模式实现
@@ -26,11 +28,11 @@ class ConnectAgenterraIam(object):
         if cls._instance is None:
             cls._instance = super(ConnectAgenterraIam, cls).__new__(cls)
         return cls._instance
-    
+
     def __init__(self, config=None, logger_name="skyplatform_iam", log_level=logging.INFO):
         """
         初始化AgenterraIAM连接器
-        
+
         参数:
         - config: AuthConfig配置对象，如果为None则从环境变量读取
         - logger_name: 日志记录器名称
@@ -39,7 +41,7 @@ class ConnectAgenterraIam(object):
         # 防止重复初始化
         if self._initialized:
             return
-            
+
         # 配置日志记录器
         self.logger = logging.getLogger(logger_name)
         if not self.logger.handlers:
@@ -50,16 +52,17 @@ class ConnectAgenterraIam(object):
             handler.setFormatter(formatter)
             self.logger.addHandler(handler)
             self.logger.setLevel(log_level)
-        
+
         # 必须传入config参数，不再支持从环境变量读取
         if config is None:
             raise ValueError("必须传入AuthConfig配置对象，不再支持从环境变量读取配置")
-        
+
         self.agenterra_iam_host = config.agenterra_iam_host
         self.server_name = config.server_name
         self.access_key = config.access_key
+        self.machine_token = config.machine_token
         self.logger.info("使用传入的AuthConfig配置")
-        
+
         # 验证必要的配置
         if not self.agenterra_iam_host:
             self.logger.warning("AGENTERRA_IAM_HOST 配置未设置")
@@ -67,9 +70,10 @@ class ConnectAgenterraIam(object):
             self.logger.warning("AGENTERRA_SERVER_NAME 配置未设置")
         if not self.access_key:
             self.logger.warning("AGENTERRA_ACCESS_KEY 配置未设置")
-        
-        self.logger.info(f"初始化AgenterraIAM连接器 - Host: {self.agenterra_iam_host}, Server: {self._mask_sensitive(self.server_name)}")
-        
+
+        self.logger.info(
+            f"初始化AgenterraIAM连接器 - Host: {self.agenterra_iam_host}, Server: {self._mask_sensitive(self.server_name)}")
+
         self.headers = {
             "Content-Type": "application/json",
             "SERVER-AK": self.server_name,
@@ -77,77 +81,31 @@ class ConnectAgenterraIam(object):
         }
         self.body = {
             "server_name": self.server_name,
-            "access_key": self.access_key
+            "access_key": self.access_key,
+            "machine_token": self.machine_token
         }
-        
+
         # 标记为已初始化
         self._initialized = True
 
-    @classmethod
-    def get_instance(cls):
-        """
-        获取已初始化的ConnectAgenterraIam单例实例
-        
-        如果实例尚未初始化，会抛出异常提示用户先进行配置
-        这个方法通常在用户已经通过setup_auth()进行配置后使用
-        
-        返回:
-        - ConnectAgenterraIam: 已初始化的单例实例
-        
-        异常:
-        - RuntimeError: 当实例未初始化时抛出
-        """
-        if cls._instance is None or not cls._initialized:
-            raise RuntimeError(
-                "ConnectAgenterraIam实例尚未初始化。请先使用以下方式之一进行配置：\n"
-                "1. 使用setup_auth()进行一键配置\n"
-                "2. 手动创建ConnectAgenterraIam实例：ConnectAgenterraIam(config=your_config)"
-            )
-        return cls._instance
-
-    @classmethod
-    def get_instance_lazy(cls):
-        """
-        获取已初始化的单例实例（延迟模式）
-        
-        此方法支持延迟初始化，当实例未初始化时返回 None 而不是抛出异常。
-        适用于在模块导入时需要获取实例但可能尚未初始化的场景。
-        
-        返回:
-        - ConnectAgenterraIam: 已初始化的单例实例，如果未初始化则返回 None
-        """
-        if cls._instance is None or not cls._initialized:
-            return None
-        return cls._instance
-
-    @classmethod
-    def is_initialized(cls):
-        """
-        检查单例实例是否已初始化
-        
-        返回:
-        - bool: 如果实例已初始化返回 True，否则返回 False
-        """
-        return cls._instance is not None and cls._initialized
-
     def reload_config(self, config):
         """
         重新加载配置
         用于在运行时更新配置
-        
+
         参数:
         - config: AuthConfig配置对象
         """
         if config is None:
             raise ValueError("必须传入AuthConfig配置对象")
-            
+
         self.logger.info("重新加载配置")
-        
+
         # 更新配置
         self.agenterra_iam_host = config.agenterra_iam_host
         self.server_name = config.server_name
         self.access_key = config.access_key
-        
+
         # 验证必要的配置
         if not self.agenterra_iam_host:
             self.logger.warning("AGENTERRA_IAM_HOST 配置未设置")
@@ -155,7 +113,7 @@ class ConnectAgenterraIam(object):
             self.logger.warning("AGENTERRA_SERVER_NAME 配置未设置")
         if not self.access_key:
             self.logger.warning("AGENTERRA_ACCESS_KEY 配置未设置")
-        
+
         # 更新headers和body
         self.headers = {
             "Content-Type": "application/json",
@@ -164,63 +122,65 @@ class ConnectAgenterraIam(object):
         }
         self.body = {
             "server_name": self.server_name,
-            "access_key": self.access_key
+            "access_key": self.access_key,
+            "machine_token": self.machine_token,
         }
-        
-        self.logger.info(f"配置重新加载完成 - Host: {self.agenterra_iam_host}, Server: {self._mask_sensitive(self.server_name)}")
+
+        self.logger.info(
+            f"配置重新加载完成 - Host: {self.agenterra_iam_host}, Server: {self._mask_sensitive(self.server_name)}")
 
     def _mask_sensitive(self, value, mask_char="*", show_chars=4):
         """
         脱敏处理敏感信息
-        
+
         参数:
         - value: 要脱敏的值
         - mask_char: 脱敏字符
         - show_chars: 显示的字符数量
-        
+
         返回: 脱敏后的字符串
         """
         if not value or not isinstance(value, str):
             return str(value) if value else "None"
-        
+
         if len(value) <= show_chars:
             return mask_char * len(value)
-        
+
         return value[:show_chars] + mask_char * (len(value) - show_chars)
 
     def _sanitize_log_data(self, data):
         """
         清理日志数据，脱敏敏感信息
-        
+
         参数:
         - data: 要清理的数据（字典或其他类型）
-        
+
         返回: 清理后的数据
         """
         if not isinstance(data, dict):
             return data
-        
+
         # 需要脱敏的字段列表
         sensitive_fields = [
-            'password', 'access_key', 'token', 'refresh_token', 
+            'password', 'access_key', 'token', 'refresh_token',
             'SERVER-SK', 'new_password', 'server_sk'
         ]
-        
+
         sanitized = copy.deepcopy(data)
-        
+
         for key, value in sanitized.items():
             if key.lower() in [field.lower() for field in sensitive_fields]:
                 sanitized[key] = self._mask_sensitive(str(value))
             elif isinstance(value, dict):
                 sanitized[key] = self._sanitize_log_data(value)
-        
+
         return sanitized
 
     def _log_request(self, method_name, url, headers, body):
         """记录请求信息"""
         sanitized_headers = self._sanitize_log_data(headers)
         sanitized_body = self._sanitize_log_data(body)
-        
+
         self.logger.info(f"[{method_name}] 发送请求 - URL: {url}")
         self.logger.info(f"[{method_name}] 请求头: {sanitized_headers}")
         self.logger.info(f"[{method_name}] 请求体: {sanitized_body}")
@@ -236,7 +196,7 @@ class ConnectAgenterraIam(object):
             self.logger.info(f"[{method_name}] 响应状态码: {response.status_code}")
             self.logger.info(f"[{method_name}] 响应内容解析失败: {str(e)}")
 
-    def register(self, cred_type=None, cred_value=None, password=None, nickname=None, avatar_url=None, 
+    def register(self, cred_type=None, cred_value=None, password=None, nickname=None, avatar_url=None,
                  username=None, phone=None):
         """
         注册用户时，同步至iam
@@ -259,8 +219,9 @@ class ConnectAgenterraIam(object):
         - 失败: 返回False
         """
         method_name = "register"
-        self.logger.info(f"[{method_name}] 开始用户注册 - cred_type: {cred_type}, cred_value: {self._mask_sensitive(str(cred_value))}")
-        
+        self.logger.info(
+            f"[{method_name}] 开始用户注册 - cred_type: {cred_type}, cred_value: {self._mask_sensitive(str(cred_value))}")
+
         try:
             # 参数映射：支持旧的调用方式
             if cred_type is None and cred_value is None:
@@ -296,10 +257,10 @@ class ConnectAgenterraIam(object):
 
             uri = "/api/v2/service/register"
             url = self.agenterra_iam_host + uri
-            
+
             # 记录请求信息
             self._log_request(method_name, url, self.headers, body)
-            
+
             response = requests.post(
                 url=url,
                 headers=self.headers,
@@ -319,7 +280,7 @@ class ConnectAgenterraIam(object):
                     self.logger.warning(f"[{method_name}] 用户注册失败 - 响应: {result}")
             else:
                 self.logger.warning(f"[{method_name}] 用户注册失败 - 状态码: {response.status_code}")
-            
+
             return False
         except Exception as e:
             self.logger.error(f"[{method_name}] 注册请求异常: {str(e)}")
@@ -327,7 +288,7 @@ class ConnectAgenterraIam(object):
             return False
 
     def login_with_password(self, cred_type=None, cred_value=None, password=None, ip_address=None, user_agent=None,
-                           username=None):
+                            username=None):
         """
         账号密码登陆时，同步至iam，由iam签发token
 
@@ -343,8 +304,9 @@ class ConnectAgenterraIam(object):
         - password: 用户密码
         """
         method_name = "login_with_password"
-        self.logger.info(f"[{method_name}] 开始密码登录 - cred_type: {cred_type}, cred_value: {self._mask_sensitive(str(cred_value))}")
-        
+        self.logger.info(
+            f"[{method_name}] 开始密码登录 - cred_type: {cred_type}, cred_value: {self._mask_sensitive(str(cred_value))}")
+
         try:
             # 参数映射：支持旧的调用方式
             if cred_type is None and cred_value is None:
@@ -375,10 +337,10 @@ class ConnectAgenterraIam(object):
 
             uri = "/api/v2/service/login"
             url = self.agenterra_iam_host + uri
-            
+
             # 记录请求信息
             self._log_request(method_name, url, self.headers, body)
-            
+
             response = requests.post(
                 url=url,
                 headers=self.headers,
@@ -391,10 +353,15 @@ class ConnectAgenterraIam(object):
 
             if response.status_code == 200:
                 self.logger.info(f"[{method_name}] 密码登录成功")
+                data = response.json()["data"]
+                access_token = data["access_token"]
+                payload = decode_jwt_token(access_token)
+                self.machine_token = payload["machine_access_token"]
+
                 return response
             else:
                 self.logger.warning(f"[{method_name}] 密码登录失败 - 状态码: {response.status_code}")
-            
+
             return False
         except Exception as e:
             self.logger.error(f"[{method_name}] 密码登录请求异常: {str(e)}")
@@ -402,7 +369,7 @@ class ConnectAgenterraIam(object):
             return False
 
     def login_without_password(self, cred_type=None, cred_value=None, ip_address=None, user_agent=None,
-                              username=None):
+                               username=None):
         """
         短信验证码登陆时，机机接口请求token
 
@@ -418,8 +385,9 @@ class ConnectAgenterraIam(object):
         返回: response对象或False
         """
         method_name = "login_without_password"
-        self.logger.info(f"[{method_name}] 开始免密登录 - cred_type: {cred_type}, cred_value: {self._mask_sensitive(str(cred_value))}")
-        
+        self.logger.info(
+            f"[{method_name}] 开始免密登录 - cred_type: {cred_type}, cred_value: {self._mask_sensitive(str(cred_value))}")
+
         try:
             # 参数映射：支持旧的调用方式
             if cred_type is None and cred_value is None:
@@ -449,10 +417,10 @@ class ConnectAgenterraIam(object):
 
             uri = "/api/v2/service/login_without_password"
             url = self.agenterra_iam_host + uri
-            
+
             # 记录请求信息
             self._log_request(method_name, url, self.headers, body)
-            
+
             response = requests.post(
                 url=url,
                 headers=self.headers,
@@ -468,7 +436,7 @@ class ConnectAgenterraIam(object):
                 return response
             else:
                 self.logger.warning(f"[{method_name}] 免密登录失败 - 状态码: {response.status_code}")
-            
+
             return False
         except Exception as e:
             self.logger.error(f"[{method_name}] 免密登录请求异常: {str(e)}")
@@ -483,7 +451,7 @@ class ConnectAgenterraIam(object):
         """
         method_name = "logout"
         self.logger.info(f"[{method_name}] 开始用户登出 - token: {self._mask_sensitive(token)}")
-        
+
         try:
             body = {
                 "server_name": self.server_name,
@@ -492,13 +460,16 @@ class ConnectAgenterraIam(object):
             }
             uri = "/api/v2/service/logout"
             url = self.agenterra_iam_host + uri
-            
+
             # 记录请求信息
             self._log_request(method_name, url, self.headers, body)
 
+            headers = self.headers.copy()
+            headers['MACHINE-TOKEN'] = self.machine_token
+
             response = requests.post(
                 url=url,
-                headers=self.headers,
+                headers=headers,
                 json=body,
                 verify=False
             )
@@ -511,14 +482,14 @@ class ConnectAgenterraIam(object):
                 return True
             else:
                 self.logger.warning(f"[{method_name}] 用户登出失败 - 状态码: {response.status_code}")
-            
+
             return False
         except Exception as e:
             self.logger.error(f"[{method_name}] 登出请求异常: {str(e)}")
             self.logger.error(f"[{method_name}] 异常堆栈: {traceback.format_exc()}")
             return False
 
-    def verify_token(self, token, api, method, server_ak="", server_sk=""):
+    def verify_token(self, token, api, method, server_ak="", server_sk="", machine_token=""):
         """
         请求iam进行鉴权
         server_name: 服务名称
@@ -531,12 +502,14 @@ class ConnectAgenterraIam(object):
         - token无效或其他错误: 返回None
         """
         method_name = "verify_token"
-        self.logger.info(f"[{method_name}] 开始token验证 - api: {api}, method: {method}, token: {self._mask_sensitive(token)}")
-        
+        self.logger.info(
+            f"[{method_name}] 开始token验证 - api: {api}, method: {method}, token: {self._mask_sensitive(token)}")
+
         try:
             body = {
                 "server_name": self.server_name,
                 "access_key": self.access_key,
+                "machine_token": machine_token if machine_token else self.machine_token,
                 "token": token,
                 "api": api,
                 "method": method,
@@ -544,16 +517,16 @@ class ConnectAgenterraIam(object):
                 "server_sk": server_sk,
             }
             uri = "/api/v2/service/verify"
-            
+
             # 检查agenterra_iam_host是否为None
             if self.agenterra_iam_host is None:
                 raise ValueError("AGENTERRA_IAM_HOST 配置未设置或为空，请确保传入正确的AuthConfig对象")
-                
+
             url = self.agenterra_iam_host + uri
-            
+
             # 记录请求信息
             self._log_request(method_name, url, self.headers, body)
-            
+
             response = requests.post(
                 url=url,
                 headers=self.headers,
@@ -577,7 +550,8 @@ class ConnectAgenterraIam(object):
                             "microservice": result.get("microservice"),
                             "is_whitelist": result.get("is_whitelist", False)
                         }
-                        self.logger.info(f"[{method_name}] token验证成功，用户有权限 - user_id: {user_info.get('user_id')}")
+                        self.logger.info(
+                            f"[{method_name}] token验证成功，用户有权限 - user_id: {user_info.get('user_id')}")
                         return user_info
                     else:
                         # token有效但无权限，抛出403异常
@@ -587,7 +561,8 @@ class ConnectAgenterraIam(object):
                             detail=result.get("message", "用户无权限访问此API")
                         )
                 else:
-                    self.logger.warning(f"[{method_name}] token验证失败 - success: {result.get('success')}, valid: {result.get('valid')}")
+                    self.logger.warning(
+                        f"[{method_name}] token验证失败 - success: {result.get('success')}, valid: {result.get('valid')}")
 
             elif response.status_code == 403:
                 result = response.json()
@@ -623,11 +598,11 @@ class ConnectAgenterraIam(object):
         """
         method_name = "reset_password"
         self.logger.info(f"[{method_name}] 开始重置密码 - user_id: {user_id}")
-        
+
         # 记录旧参数格式的使用
         if username or password:
             self.logger.debug(f"[{method_name}] 检测到旧参数格式 - username: {username}")
-        
+
         try:
             # 参数映射：支持旧的调用方式
             if user_id is None and new_password is None:
@@ -641,31 +616,32 @@ class ConnectAgenterraIam(object):
             body = {
                 "server_name": self.server_name,
                 "access_key": self.access_key,
+                "machine_token": self.machine_token,
                 "user_id": user_id,
                 "new_password": new_password
             }
             uri = "/api/v2/service/reset_password"
             url = self.agenterra_iam_host + uri
-            
+
             # 记录请求信息
             self._log_request(method_name, url, self.headers, body)
-            
+
             response = requests.post(
                 url=url,
                 headers=self.headers,
                 json=body,
                 verify=False
             )
-            
+
             # 记录响应信息
             self._log_response(method_name, response)
-            
+
             if response.status_code == 200:
                 self.logger.info(f"[{method_name}] 密码重置成功")
                 return True
             else:
                 self.logger.warning(f"[{method_name}] 密码重置失败 - 状态码: {response.status_code}")
-            
+
             return False
         except Exception as e:
             self.logger.error(f"[{method_name}] 重置密码请求异常: {str(e)}")
@@ -683,19 +659,20 @@ class ConnectAgenterraIam(object):
         """
         method_name = "refresh_token"
         self.logger.info(f"[{method_name}] 开始刷新令牌 - refresh_token: {self._mask_sensitive(refresh_token)}")
-        
+
         try:
             body = {
                 "server_name": self.server_name,
                 "access_key": self.access_key,
+                "machine_token": self.machine_token,
                 "refresh_token": refresh_token
             }
             uri = "/api/v2/service/refresh_token"
             url = self.agenterra_iam_host + uri
-            
+
             # 记录请求信息
             self._log_request(method_name, url, self.headers, body)
-            
+
             response = requests.post(
                 url=url,
                 headers=self.headers,
@@ -711,7 +688,7 @@ class ConnectAgenterraIam(object):
                 return response
             else:
                 self.logger.warning(f"[{method_name}] 令牌刷新失败 - 状态码: {response.status_code}")
-            
+
             return False
         except Exception as e:
             self.logger.error(f"[{method_name}] 刷新令牌请求异常: {str(e)}")
@@ -730,20 +707,21 @@ class ConnectAgenterraIam(object):
         """
         method_name = "assign_role_to_user"
         self.logger.info(f"[{method_name}] 开始角色分配 - user_id: {user_id}, role_id: {role_id}")
-        
+
         try:
             body = {
                 "server_name": self.server_name,
                 "access_key": self.access_key,
+                "machine_token": self.machine_token,
                 "user_id": user_id,
                 "role_id": role_id
             }
             uri = "/api/v2/service/assign_role"
             url = self.agenterra_iam_host + uri
-            
+
             # 记录请求信息
             self._log_request(method_name, url, self.headers, body)
-            
+
             response = requests.post(
                 url=url,
                 headers=self.headers,
@@ -759,7 +737,7 @@ class ConnectAgenterraIam(object):
                 return True
             else:
                 self.logger.warning(f"[{method_name}] 角色分配失败 - 状态码: {response.status_code}")
-            
+
             return False
         except Exception as e:
             self.logger.error(f"[{method_name}] 角色分配请求异常: {str(e)}")
@@ -772,19 +750,20 @@ class ConnectAgenterraIam(object):
                 """
         method_name = "get_userinfo_by_token"
         self.logger.info(f"[{method_name}] 开始获取用户信息 - token: {self._mask_sensitive(token)}")
-        
+
         try:
             body = {
                 "server_name": self.server_name,
                 "access_key": self.access_key,
+                "machine_token": self.machine_token,
                 "token": token,
             }
             uri = "/api/v2/service/token"
             url = self.agenterra_iam_host + uri
-            
+
             # 记录请求信息
             self._log_request(method_name, url, self.headers, body)
-            
+
             response = requests.post(
                 url=url,
                 headers=self.headers,
@@ -800,7 +779,7 @@ class ConnectAgenterraIam(object):
                 return response
             else:
                 self.logger.warning(f"[{method_name}] 获取用户信息失败 - 状态码: {response.status_code}")
-            
+
             return False
         except Exception as e:
             self.logger.error(f"[{method_name}] 获取用户信息请求异常: {str(e)}")
@@ -810,7 +789,7 @@ class ConnectAgenterraIam(object):
     def add_custom_config(self, user_id, config_name, config_value=None):
         """
         机机接口：添加用户自定义配置
-        
+
         为指定用户添加或更新自定义属性配置。
 
         参数:
@@ -818,17 +797,18 @@ class ConnectAgenterraIam(object):
         - config_name: 配置项名称
         - config_value: 配置项值（可选）
 
-        返回: 
+        返回:
         - 成功: 返回响应对象
         - 失败: 返回False
         """
         method_name = "add_custom_config"
         self.logger.info(f"[{method_name}] 开始添加用户自定义配置 - user_id: {user_id}, config_name: {config_name}")
-        
+
         try:
             body = {
                 "server_name": self.server_name,
                 "access_key": self.access_key,
+                "machine_token": self.machine_token,
                 "user_id": user_id,
                 "config_name": config_name
             }
@@ -839,10 +819,10 @@ class ConnectAgenterraIam(object):
 
             uri = "/api/v2/service/add_custom_config"
             url = self.agenterra_iam_host + uri
-            
+
             # 记录请求信息
             self._log_request(method_name, url, self.headers, body)
-            
+
             response = requests.post(
                 url=url,
                 headers=self.headers,
@@ -858,7 +838,7 @@ class ConnectAgenterraIam(object):
                 return response
             else:
                 self.logger.warning(f"[{method_name}] 添加用户自定义配置失败 - 状态码: {response.status_code}")
-            
+
             return False
         except Exception as e:
             self.logger.error(f"[{method_name}] 添加用户自定义配置请求异常: {str(e)}")
@@ -868,32 +848,33 @@ class ConnectAgenterraIam(object):
     def get_custom_configs(self, user_id):
         """
         机机接口：获取用户自定义配置
-        
+
         获取指定用户的所有自定义属性配置。
 
         参数:
         - user_id: 用户ID
 
-        返回: 
+        返回:
         - 成功: 返回响应对象
         - 失败: 返回False
         """
         method_name = "get_custom_configs"
         self.logger.info(f"[{method_name}] 开始获取用户自定义配置 - user_id: {user_id}")
-        
+
         try:
             body = {
                 "server_name": self.server_name,
                 "access_key": self.access_key,
+                "machine_token": self.machine_token,
                 "user_id": user_id
             }
 
             uri = "/api/v2/service/get_custom_configs"
             url = self.agenterra_iam_host + uri
-            
+
             # 记录请求信息
             self._log_request(method_name, url, self.headers, body)
-            
+
             response = requests.post(
                 url=url,
                 headers=self.headers,
@@ -909,7 +890,7 @@ class ConnectAgenterraIam(object):
                 return response
             else:
                 self.logger.warning(f"[{method_name}] 获取用户自定义配置失败 - 状态码: {response.status_code}")
-            
+
             return False
         except Exception as e:
             self.logger.error(f"[{method_name}] 获取用户自定义配置请求异常: {str(e)}")
@@ -919,34 +900,35 @@ class ConnectAgenterraIam(object):
     def delete_custom_config(self, user_id, config_name):
         """
         机机接口：删除用户自定义配置
-        
+
         删除指定用户的指定自定义属性配置。
 
         参数:
         - user_id: 用户ID
         - config_name: 配置项名称
 
-        返回: 
+        返回:
         - 成功: 返回响应对象
         - 失败: 返回False
         """
         method_name = "delete_custom_config"
         self.logger.info(f"[{method_name}] 开始删除用户自定义配置 - user_id: {user_id}, config_name: {config_name}")
-        
+
         try:
             body = {
                 "server_name": self.server_name,
                 "access_key": self.access_key,
+                "machine_token": self.machine_token,
                 "user_id": user_id,
                 "config_name": config_name
             }
 
             uri = "/api/v2/service/delete_custom_config"
             url = self.agenterra_iam_host + uri
-            
+
             # 记录请求信息
             self._log_request(method_name, url, self.headers, body)
-            
+
             response = requests.post(
                 url=url,
                 headers=self.headers,
@@ -962,7 +944,7 @@ class ConnectAgenterraIam(object):
                 return response
             else:
                 self.logger.warning(f"[{method_name}] 删除用户自定义配置失败 - 状态码: {response.status_code}")
-            
+
             return False
         except Exception as e:
             self.logger.error(f"[{method_name}] 删除用户自定义配置请求异常: {str(e)}")
@@ -972,7 +954,7 @@ class ConnectAgenterraIam(object):
     def merge_credential(self, target_user_id, cred_type, cred_value, merge_reason=None):
         """
         机机接口：凭证合并
-        
+
         为第三方服务提供凭证合并功能，处理用户绑定新凭证时的账号合并场景。
         例如用户先用账号密码注册，后续又绑定手机号时的账号合并需求。
 
@@ -982,13 +964,14 @@ class ConnectAgenterraIam(object):
         - cred_value: 要绑定的凭证值
         - merge_reason: 合并原因（可选）
 
-        返回: 
+        返回:
         - 成功: 返回响应对象
         - 失败: 返回False
         """
         method_name = "merge_credential"
-        self.logger.info(f"[{method_name}] 开始凭证合并 - target_user_id: {target_user_id}, cred_type: {cred_type}, cred_value: {self._mask_sensitive(cred_value)}")
-        
+        self.logger.info(
+            f"[{method_name}] 开始凭证合并 - target_user_id: {target_user_id}, cred_type: {cred_type}, cred_value: {self._mask_sensitive(cred_value)}")
+
         try:
             # 验证凭证类型
             if isinstance(cred_type, str):
@@ -997,6 +980,7 @@ class ConnectAgenterraIam(object):
             body = {
                 "server_name": self.server_name,
                 "access_key": self.access_key,
+                "machine_token": self.machine_token,
                 "target_user_id": target_user_id,
                 "cred_type": cred_type.value,
                 "cred_value": cred_value
@@ -1009,10 +993,10 @@ class ConnectAgenterraIam(object):
 
             uri = "/api/v2/service/merge_credential"
             url = self.agenterra_iam_host + uri
-            
+
             # 记录请求信息
             self._log_request(method_name, url, self.headers, body)
-            
+
             response = requests.post(
                 url=url,
                 headers=self.headers,
@@ -1028,7 +1012,7 @@ class ConnectAgenterraIam(object):
                 return response
             else:
                 self.logger.warning(f"[{method_name}] 凭证合并失败 - 状态码: {response.status_code}")
-            
+
             return False
         except Exception as e:
             self.logger.error(f"[{method_name}] 凭证合并请求异常: {str(e)}")
@@ -1038,20 +1022,21 @@ class ConnectAgenterraIam(object):
     def get_user_by_credential(self, cred_type, cred_value):
         """
         机机接口：通过凭证获取用户信息
-        
+
         为第三方服务提供通过用户名或手机号等认证凭据获取用户信息的功能。
 
         参数:
         - cred_type: 凭证类型 (CredentialTypeEnum: username, email, phone, wechat_openid)
         - cred_value: 凭证值
 
-        返回: 
+        返回:
         - 成功: 返回响应对象
         - 失败: 返回False
         """
         method_name = "get_user_by_credential"
-        self.logger.info(f"[{method_name}] 开始获取用户信息 - cred_type: {cred_type}, cred_value: {self._mask_sensitive(cred_value)}")
-        
+        self.logger.info(
+            f"[{method_name}] 开始获取用户信息 - cred_type: {cred_type}, cred_value: {self._mask_sensitive(cred_value)}")
+
         try:
             # 验证凭证类型
             if isinstance(cred_type, str):
@@ -1060,16 +1045,17 @@ class ConnectAgenterraIam(object):
             body = {
                 "server_name": self.server_name,
                 "access_key": self.access_key,
+                "machine_token": self.machine_token,
                 "cred_type": cred_type.value,
                 "cred_value": cred_value
             }
 
             uri = "/api/v2/service/get_user_by_credential"
             url = self.agenterra_iam_host + uri
-            
+
             # 记录请求信息
             self._log_request(method_name, url, self.headers, body)
-            
+
             response = requests.post(
                 url=url,
                 headers=self.headers,
@@ -1085,7 +1071,7 @@ class ConnectAgenterraIam(object):
                 return response
             else:
                 self.logger.warning(f"[{method_name}] 获取用户信息失败 - 状态码: {response.status_code}")
-            
+
             return False
         except Exception as e:
             self.logger.error(f"[{method_name}] 获取用户信息请求异常: {str(e)}")