pixelarraythirdparty 1.2.0__py3-none-any.whl → 1.2.2__py3-none-any.whl

pixelarraythirdparty/__init__.py

@@ -13,7 +13,7 @@ PixelArray 第三方微服务客户端
 - project: 项目管理模块
 """
 
-__version__ = "1.2.0"
+__version__ = "1.2.2"
 __author__ = "Lu qi"
 __email__ = "qi.lu@pixelarrayai.com"
 

pixelarraythirdparty/unified_login/__init__.py

@@ -1,4 +1,5 @@
 from .unified_login import (
+    OAuth2Login,
     GoogleLogin,
     WechatLogin,
     GitHubLogin,
@@ -9,6 +10,7 @@ from .unified_login import (
 )
 
 __all__ = [
+    "OAuth2Login",
     "GoogleLogin",
     "WechatLogin",
     "GitHubLogin",

pixelarraythirdparty/unified_login/unified_login.py

@@ -6,6 +6,248 @@ from typing import Dict, Optional, Tuple
 from pixelarraythirdparty.client import AsyncClient
 
 
+class OAuth2Login(AsyncClient):
+    """
+    统一的 OAuth2 登录客户端基类
+    
+    支持所有基于 OAuth2 的第三方登录（Google、微信、GitHub、GitLab、抖音等）
+    通过配置不同的端点来支持不同的提供商
+    
+    使用示例:
+    ```
+    # Google登录
+    google = OAuth2Login(
+        api_key="your_api_key",
+        provider="google"
+    )
+    user_info, success = await google.login()
+    
+    # 微信PC端扫码登录
+    wechat = OAuth2Login(
+        api_key="your_api_key",
+        provider="wechat",
+        login_type="desktop"
+    )
+    user_info, success = await wechat.login()
+    
+    # 微信手机端登录
+    wechat_mobile = OAuth2Login(
+        api_key="your_api_key",
+        provider="wechat",
+        login_type="mobile"
+    )
+    user_info, success = await wechat_mobile.login()
+    
+    # 支持refresh_token的提供商（如Google、GitLab）
+    if user_info.get("refresh_token"):
+        token_data, success = await google.refresh_access_token(
+            user_info.get("refresh_token")
+        )
+    ```
+    """
+    
+    # 提供商端点映射
+    PROVIDER_ENDPOINTS = {
+        "google": {
+            "auth_url": "/api/unified-login/google/auth-url",
+            "wait_login": "/api/unified-login/google/wait-login",
+            "refresh_token": "/api/unified-login/google/refresh-token",
+        },
+        "wechat": {
+            "auth_url": "/api/unified-login/wechat/auth-url",
+            "wait_login": "/api/unified-login/wechat/wait-login",
+        },
+        "wechat-official": {
+            "auth_url": "/api/unified-login/wechat-official/auth-url",
+            "wait_login": "/api/unified-login/wechat-official/wait-login",
+        },
+        "github": {
+            "auth_url": "/api/unified-login/github/auth-url",
+            "wait_login": "/api/unified-login/github/wait-login",
+        },
+        "gitlab": {
+            "auth_url": "/api/unified-login/gitlab/auth-url",
+            "wait_login": "/api/unified-login/gitlab/wait-login",
+            "refresh_token": "/api/unified-login/gitlab/refresh-token",
+        },
+        "douyin": {
+            "auth_url": "/api/unified-login/douyin/auth-url",
+            "wait_login": "/api/unified-login/douyin/wait-login",
+        },
+    }
+    
+    def __init__(
+        self,
+        api_key: str,
+        provider: str,
+        login_type: Optional[str] = None
+    ):
+        """
+        description:
+            初始化OAuth2登录客户端
+        parameters:
+            api_key(str): API密钥
+            provider(str): 提供商名称，可选值：google, wechat, github, gitlab, douyin
+            login_type(str, optional): 登录类型，仅对微信有效，可选值：desktop（PC端扫码）, mobile（手机端）
+        """
+        super().__init__(api_key)
+        self.provider = provider.lower()
+        self.login_type = login_type
+        
+        # 验证提供商是否支持
+        if self.provider not in self.PROVIDER_ENDPOINTS:
+            raise ValueError(
+                f"不支持的提供商: {provider}。"
+                f"支持的提供商: {', '.join(self.PROVIDER_ENDPOINTS.keys())}"
+            )
+        
+        # 微信特殊处理：根据login_type选择不同的端点
+        if self.provider == "wechat":
+            if login_type == "mobile":
+                self.provider = "wechat-official"
+    
+    def _get_endpoint(self, endpoint_type: str) -> str:
+        """
+        description:
+            获取指定类型的端点URL
+        parameters:
+            endpoint_type(str): 端点类型，可选值：auth_url, wait_login, refresh_token
+        return:
+            endpoint(str): 端点URL
+        """
+        endpoints = self.PROVIDER_ENDPOINTS.get(self.provider, {})
+        endpoint = endpoints.get(endpoint_type)
+        if not endpoint:
+            raise ValueError(
+                f"提供商 {self.provider} 不支持 {endpoint_type} 端点"
+            )
+        return endpoint
+    
+    async def _get_auth_url(self) -> Tuple[Optional[Dict[str, str]], bool]:
+        """
+        description:
+            获取OAuth授权URL
+        return:
+            auth_data(dict, optional): 授权数据字典，包含auth_url和state
+            success(bool): 是否成功
+        """
+        endpoint = self._get_endpoint("auth_url")
+        data, success = await self._request("POST", endpoint)
+        if not success:
+            return None, False
+        auth_url = data.get("auth_url")
+        if not auth_url:
+            return None, False
+        return data, True
+    
+    def _extract_state(self, auth_url: Optional[str]) -> Optional[str]:
+        """
+        description:
+            从授权URL中提取state参数
+        parameters:
+            auth_url(str, optional): 授权URL
+        return:
+            state(str, optional): state参数值，如果提取失败则返回None
+        """
+        if not auth_url:
+            return None
+        try:
+            parsed = urllib.parse.urlparse(auth_url)
+            query = urllib.parse.parse_qs(parsed.query)
+            values = query.get("state")
+            if values:
+                return values[0]
+        except Exception:
+            return None
+        return None
+    
+    async def _wait_for_login(
+        self, state: str, timeout: int
+    ) -> Tuple[Dict, bool]:
+        """
+        description:
+            等待登录结果，轮询检查登录状态
+        parameters:
+            state(str): 登录状态标识
+            timeout(int): 超时时间（秒）
+        return:
+            user_info(dict): 用户信息字典
+            success(bool): 是否成功
+        """
+        interval = 2
+        total_checks = max(1, timeout // interval) if timeout > 0 else 1
+        endpoint = self._get_endpoint("wait_login")
+        
+        for _ in range(total_checks):
+            status, response = await self._request_raw(
+                "POST",
+                endpoint,
+                json={"state": state},
+            )
+            
+            if status == 200 and response.get("success") is True:
+                return response.get("data", {}), True
+            
+            if status in (400, 408):
+                break
+            
+            await asyncio.sleep(interval)
+        
+        return {}, False
+    
+    async def login(self, timeout: int = 180) -> Tuple[Dict, bool]:
+        """
+        description:
+            仿 Supabase CLI 的一键登录流程：打开浏览器完成授权，终端端轮询等待登录结果
+        parameters:
+            timeout(int, optional): 等待用户完成授权的超时时间（秒），默认为180
+        return:
+            user_info(dict): 用户信息字典
+            success(bool): 是否成功
+        """
+        auth_data, success = await self._get_auth_url()
+        if not success or not auth_data:
+            return {}, False
+        
+        auth_url = auth_data.get("auth_url")
+        state = auth_data.get("state") or self._extract_state(auth_url)
+        
+        if not auth_url or not state:
+            return {}, False
+        
+        webbrowser.open(auth_url, new=2)
+        
+        return await self._wait_for_login(state, timeout)
+    
+    async def refresh_access_token(self, refresh_token: str) -> Tuple[Dict, bool]:
+        """
+        description:
+            使用refresh_token刷新access_token（仅支持Google和GitLab）
+            
+            注意：GitLab 采用 token rotation（令牌轮换）机制，每次刷新时会返回新的 refresh_token，
+            旧的 refresh_token 会立即失效。必须保存新的 refresh_token 并替换旧的。
+            Google 也可能在某些情况下返回新的 refresh_token。
+        parameters:
+            refresh_token(str): OAuth refresh_token
+        return:
+            token_data(dict): 包含新的access_token和可能的refresh_token的字典
+            success(bool): 是否成功
+        """
+        try:
+            endpoint = self._get_endpoint("refresh_token")
+        except ValueError:
+            return {}, False
+        
+        data, success = await self._request(
+            "POST",
+            endpoint,
+            json={"refresh_token": refresh_token},
+        )
+        if not success:
+            return {}, False
+        return data, True
+
+
 class GoogleLogin(AsyncClient):
     """
     Google OAuth2 登录客户端
@@ -574,6 +816,28 @@ class GitLabLogin(AsyncClient):
 
         return {}, False
 
+    async def refresh_access_token(self, refresh_token: str) -> Tuple[Dict, bool]:
+        """
+        description:
+            使用refresh_token刷新access_token
+            
+            注意：GitLab 采用 token rotation（令牌轮换）机制，每次刷新时会返回新的 refresh_token，
+            旧的 refresh_token 会立即失效。必须保存新的 refresh_token 并替换旧的。
+        parameters:
+            refresh_token(str): GitLab OAuth refresh_token
+        return:
+            token_data(dict): 包含新的access_token和可能的refresh_token的字典
+            success(bool): 是否成功
+        """
+        data, success = await self._request(
+            "POST",
+            "/api/unified-login/gitlab/refresh-token",
+            json={"refresh_token": refresh_token},
+        )
+        if not success:
+            return {}, False
+        return data, True
+
 
 class SMSLogin(AsyncClient):
     """

{pixelarraythirdparty-1.2.0.dist-info → pixelarraythirdparty-1.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pixelarraythirdparty
-Version: 1.2.0
+Version: 1.2.2
 Summary: PixelArray 第三方微服务客户端
 Author-email: Lu qi <qi.lu@pixelarrayai.com>
 License-Expression: MIT

{pixelarraythirdparty-1.2.0.dist-info → pixelarraythirdparty-1.2.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pixelarraythirdparty/__init__.py,sha256=CavOkBWTHTd6_ND5ztZNmYWhOESL2XpC9XIdrwSS2Pk,582
+pixelarraythirdparty/__init__.py,sha256=nJENJpeEcGI9wm3q8bM__BslEPtmFVRN3-ZqeV_0Bd4,582
 pixelarraythirdparty/client.py,sha256=Ym_IZ6cdoZJoMKW61ZRTfQ81-Hay5dpLTgExoANZwI4,3171
 pixelarraythirdparty/cron/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pixelarraythirdparty/cron/cron.py,sha256=nv4e2hX_UkEJ-kbEARbInU2J6aREyYZ61dZ-4b9UWJI,3146
@@ -10,12 +10,12 @@ pixelarraythirdparty/product/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 pixelarraythirdparty/product/product.py,sha256=5fgv2Ck860epYXxipY83vePziubCIlocFu43mGt_bhM,7497
 pixelarraythirdparty/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pixelarraythirdparty/project/project.py,sha256=a8swjckyn4y3NlIx0-tMbcRwDY9woOijGi7lb1wN7Ok,2455
-pixelarraythirdparty/unified_login/__init__.py,sha256=_PeHBsyrPLfcNjbdcsBgQ_75fr1CoRZCNu7S33fsh_Y,291
-pixelarraythirdparty/unified_login/unified_login.py,sha256=A_VBbtIR5clT5HoP56w8cOjOy9T_QfM7s3m9zpxpYLw,23468
+pixelarraythirdparty/unified_login/__init__.py,sha256=tzy3nmRv-qZID-6kYRFarqQVrmkUsEI7D6de_PFu7Tg,327
+pixelarraythirdparty/unified_login/unified_login.py,sha256=Klz8Jb-8qIy6Sc1okQS7SQe_ByS0CpO_AvbDnLJnUwM,32700
 pixelarraythirdparty/user/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pixelarraythirdparty/user/user.py,sha256=SqufSAVMxQElz-NqtlOZs_dG7UtbuE-ygLAyml9oKpY,5761
-pixelarraythirdparty-1.2.0.dist-info/licenses/LICENSE,sha256=O-g1dUr0U50rSIvmWE9toiVkSgFpVt72_MHITbWvAqA,1067
-pixelarraythirdparty-1.2.0.dist-info/METADATA,sha256=NUdsnHIXVRU9OPFzt50AyoLkcGyWQZphj7oSOiIQxhM,993
-pixelarraythirdparty-1.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pixelarraythirdparty-1.2.0.dist-info/top_level.txt,sha256=dzG2Ut8j7noUqj_0ZQjcIDAeHYCh_9WtlxjAxtoyufo,21
-pixelarraythirdparty-1.2.0.dist-info/RECORD,,
+pixelarraythirdparty-1.2.2.dist-info/licenses/LICENSE,sha256=O-g1dUr0U50rSIvmWE9toiVkSgFpVt72_MHITbWvAqA,1067
+pixelarraythirdparty-1.2.2.dist-info/METADATA,sha256=TC042i-Yca5TeDXqu5xereatr-bwINhP_9xLoTpi6qE,993
+pixelarraythirdparty-1.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pixelarraythirdparty-1.2.2.dist-info/top_level.txt,sha256=dzG2Ut8j7noUqj_0ZQjcIDAeHYCh_9WtlxjAxtoyufo,21
+pixelarraythirdparty-1.2.2.dist-info/RECORD,,