nc-user-terminator 0.1.7__py3-none-any.whl → 0.1.9__py3-none-any.whl

nc_user_manager/client.py

@@ -1,10 +1,10 @@
 import asyncio
 from typing import Optional, Dict, Any
 
-from cache import MemoryCache, BaseCache, AsyncRedisCache
-from models import UserResponse, OAuth2AuthorizeResponse, CallbackResponse
-from exceptions import OAuthError
-from utils import request
+from .cache import MemoryCache, BaseCache, AsyncRedisCache
+from .models import UserResponse, OAuth2AuthorizeResponse, CallbackResponse
+from .exceptions import OAuthError
+from .utils import request
 
 
 PRODUCT_HEADER = "X-Product-Code"
@@ -14,8 +14,8 @@ DEFAULT_TTL = 3600
 class OAuthClient:
     def __init__(
         self,
-        base_url: Optional[str],
         product_code: str,
+        base_url: Optional[str] = None,
         redirect_url: Optional[str] = None,
         single_session: bool = False,
         cache: Optional[BaseCache] = None,
@@ -219,12 +219,13 @@ class OAuthClient:
         return UserResponse(res_dict)
 
     async def say_my_name_async(self, token: str) -> UserResponse:
-        if not self._async_cache:
-            raise RuntimeError("异步方法只支持异步缓存，请传入 async_cache")
-
         """异步获取当前用户"""
         key = f"user:{token}"
-        data = await self._cache.get(key)
+        if self._async_cache:
+            data = await self._cache.get(key)
+        else:
+            data = self._cache.get(key)
+
         if data:
             return UserResponse(data)
 
@@ -267,8 +268,12 @@ class OAuthClient:
         headers = self._headers({"Authorization": f"Bearer {token}"})
         resp = await self._arequest("POST", f"{self._base_url}/api/auth/logout", headers=headers)
 
-        data = await self._cache.get(f"user:{token}")
-        await self._uncache_user_async(token, data)
+        if self._async_cache:
+            data = await self._cache.get(f"user:{token}")
+            await self._uncache_user_async(token, data)
+        else:
+            data = self._cache.get(f"user:{token}")
+            self._uncache_user(token, data)
         return resp
 
 async def main():

{nc_user_terminator-0.1.7.dist-info → nc_user_terminator-0.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nc-user-terminator
-Version: 0.1.7
+Version: 0.1.9
 Summary: OAuth client wrapper for multi-tenant projects
 Author: bw_song
 Author-email: m132777096902@gmail.com
@@ -17,3 +17,7 @@ Dynamic: requires-python
   - 默认连接地址
 + v0.1.7
   - 映射host
++ v0.1.8
+  - 调整相对路径
++ v0.1.9
+  - 修改缓存配置

{nc_user_terminator-0.1.7.dist-info → nc_user_terminator-0.1.9.dist-info}/RECORD

@@ -1,10 +1,10 @@
 nc_user_manager/__init__.py,sha256=fF3FZD0XUW5YCfTbBeJs3RK-Mnm3IQ7lns6Eb_tMqPU,238
 nc_user_manager/cache.py,sha256=u9ioXDwHmEJHRB4VKI4JU_pp-8Y5O4bLPm8-pwqiMVc,2273
-nc_user_manager/client.py,sha256=Ly4OKny-IndK2Q6yOm1vP-dM3aXAALRSzbJrm4zNeiM,11095
+nc_user_manager/client.py,sha256=BEryWh_uooiSDZaLeKokawKG7U_hWB1mA9-fwVUSWrI,11221
 nc_user_manager/exceptions.py,sha256=yUMDrh1HHZF36UUadQNHvJlDgEYSYoYOObs8Q11fjrE,351
 nc_user_manager/models.py,sha256=mDK7zskIcaThxvUUTWVf6eMasw7YaA3hDGVVSd1ZJgo,1088
 nc_user_manager/utils.py,sha256=gxFSaUq0oiymIlvHITu2L7EkU2ZYQmW2q_okmUxGBeU,2319
-nc_user_terminator-0.1.7.dist-info/METADATA,sha256=swVnTFl7hZIILw-5oULdVu9GtdRGe_8FBQD5cyqkBro,438
-nc_user_terminator-0.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nc_user_terminator-0.1.7.dist-info/top_level.txt,sha256=kOAUtl6RYo-x3vMJL8It3KCJLoIFPvMUiAAyXjPQTYA,16
-nc_user_terminator-0.1.7.dist-info/RECORD,,
+nc_user_terminator-0.1.9.dist-info/METADATA,sha256=8bfDGjP5d-D94vpspEoA1hq_TmYAng--GEhzWBTwwKs,506
+nc_user_terminator-0.1.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nc_user_terminator-0.1.9.dist-info/top_level.txt,sha256=kOAUtl6RYo-x3vMJL8It3KCJLoIFPvMUiAAyXjPQTYA,16
+nc_user_terminator-0.1.9.dist-info/RECORD,,