nc-user-terminator 0.1.5__py3-none-any.whl → 0.1.17__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 nc_user_manager.cache import MemoryCache, BaseCache, AsyncRedisCache
+from nc_user_manager.models import UserResponse, OAuth2AuthorizeResponse, CallbackResponse
+from nc_user_manager.exceptions import OAuthError
+from nc_user_manager.utils import request
 
 
 PRODUCT_HEADER = "X-Product-Code"
@@ -14,8 +14,8 @@ DEFAULT_TTL = 3600
 class OAuthClient:
     def __init__(
         self,
-        base_url: str,
         product_code: str,
+        base_url: Optional[str] = None,
         redirect_url: Optional[str] = None,
         single_session: bool = False,
         cache: Optional[BaseCache] = None,
@@ -28,6 +28,8 @@ class OAuthClient:
         :param redirect_url: 可选，重定向地址
         :param single_session: 是否单会话登录
         """
+        if not base_url:
+            base_url = "http://172.27.92.74"
         self._base_url = base_url.rstrip("/")
         self._product_code = product_code
         self._redirect_url = redirect_url
@@ -43,7 +45,13 @@ class OAuthClient:
         return await asyncio.to_thread(request, *args, **kwargs)
 
     def _headers(self, extra: Optional[Dict[str, str]] = None) -> Dict[str, str]:
-        headers = {PRODUCT_HEADER: self._product_code}
+        headers = {
+            PRODUCT_HEADER: self._product_code,
+        }
+        if self._base_url == 'http://172.27.92.74':
+            headers.update({
+                "Host": "auth.nc.com"
+            })
         if extra:
             headers.update(extra)
         return headers
@@ -214,19 +222,23 @@ 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)
 
         headers = self._headers({"Authorization": f"Bearer {token}"})
         res_dict = await self._arequest("GET", f"{self._base_url}/api/me", headers=headers)
         if res_dict.get("success", True):
-            await self._cache_user_async(token, res_dict)
+            if self._async_cache:
+                await self._cache_user_async(token, res_dict)
+            else:
+                self._cache_user(token, res_dict)
 
         return UserResponse(res_dict)
 
@@ -262,10 +274,125 @@ 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
 
+    # 密码学登录
+    def open_sesame(self, user_name:str, password: str) -> CallbackResponse:
+        params = {"single_session": str(self._single_session).lower()}
+
+        form = {
+            "username": user_name,
+            "password": password,
+        }
+
+        res_dict = request("POST", f"{self._base_url}/api/auth/login", headers=self._headers(), params=params, form_body=form)
+
+        return CallbackResponse(res_dict)
+
+
+    async def open_sesame_async(self, user_name:str, password: str) -> CallbackResponse:
+        params = {"single_session": str(self._single_session).lower()}
+
+        form = {
+            "username": user_name,
+            "password": password,
+        }
+
+        res_dict = await self._arequest(
+            "POST",
+            f"{self._base_url}/api/auth/login",
+            params=params,
+            form_body=form,
+            headers={
+                "Content-Type": "application/x-www-form-urlencoded",
+                **self._headers(),
+            }
+        )
+        return CallbackResponse(res_dict)
+
+    def forget_me_not(self, user_email: str, redirect_url: str):
+        """
+        忘记密码
+        :param user_email:
+        :param redirect_url:
+        :return:
+        """
+        headers = self._headers()
+        json_data = {
+            "email": user_email,
+            "redirect_url": redirect_url
+        }
+        return request("POST", f"{self._base_url}/api/auth/forgot-password", headers=headers, json_body=json_data)
+
+    def lily_of_the_valley(self, password_token: str, password: str):
+        """
+        找回密码
+        :param password_token: forgot_password获取的验证token
+        :param password: 新密码
+        :return:
+        """
+        json_data = {
+            "token": password_token,
+            "password": password
+        }
+        return request("POST", f"{self._base_url}/api/auth/reset-password", headers=self._headers(), json_body=json_data)
+
+    def register_apply(self, ip_address: str, email: str, password: str, full_name: str = None, redirect_url: str = None) -> dict:
+        """
+        邮件注册申请
+        :param ip_address:
+        :param redirect_url: 不填默认为系统配置的回调地址
+        :param password: 用户的密码
+        :param full_name: 用户的名称
+        :param email: 用户的邮箱
+        :return:
+        """
+        json_data = {
+            "email": email,
+            "password": password,
+            "full_name": full_name,
+        }
+        params = {"redirect_url": redirect_url, "ip_address": ip_address}
+        return request("POST", f"{self._base_url}/api/auth/register-apply", params=params, headers=self._headers(),
+                       json_body=json_data)
+
+    def register(self, register_token: str, full_name: str = None) -> dict:
+        """
+        邮箱注册
+        :param register_token:
+        :param full_name: 可不填, 填写后会修改名称
+        :return:
+        """
+        json_data = {
+            "token": register_token,
+            "full_name": full_name,
+        }
+        return request("POST", f"{self._base_url}/api/auth/register", headers=self._headers(),
+                       json_body=json_data)
+
+    def lycoris(self, token: str, password: str):
+        """
+        账户注销
+        :param password: 用户密码 用来确认用户是否正确
+        :param token: 用户token
+        :return:
+        """
+        user = self.say_my_name(token=token)
+        user_id = user.user_id
+
+        headers = self._headers({"Authorization": f"Bearer {token}"})
+        form_data = {
+            "username": user.email,
+            "password": password
+        }
+        return request("POST", f"{self._base_url}/api/users/{ user_id }/remove", headers=headers, form_body=form_data)
+
 async def main():
     def get_redis_url() -> str:
         return f'redis://default:1q2w3e@localhost:6379/1'
@@ -276,18 +403,19 @@ async def main():
     _redis = redis.from_url(get_redis_url(), decode_responses=True)
 
     redis_cache = AsyncRedisCache(_redis)
+    import socket
+    print(socket.gethostbyname("dev.ncuser.com"))
+
+    client = OAuthClient("kode", "http://dev.ncuser.com", "http://localhost:8000/auth/google/custom_callback", single_session=True, cache=redis_cache)
+    authorize = await client.say_my_name_async("QtbMAqXNwrsy-7dr-D_lIVvUu88gjhPM0fBXeJTaOiA")
 
-    client = OAuthClient("http://localhost:8000/", "bankgpt", "http://localhost:8000/auth/google/custom_callback", single_session=True, cache=redis_cache)
-    # authorize = client.authorize("google")
-    # print(authorize)
+    client.open_sesame_async("glztestvt1@zingfront.com", "123456789")
+    # res = client.forgot_password("QtbMAqXNwrsy-7dr-D_lIVvUu88gjhPM0fBXeJTaOiA")
 
+    token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiI1IiwicGFzc3dvcmRfZmdwdCI6IiRhcmdvbjJpZCR2PTE5JG09NjU1MzYsdD0zLHA9NCRYUlQ1K1p3Uk5sbjhKQzQrZW94TFlnJERadnFKb29xUDNMUGVJbEV6OVR5TjZIdm1LYW9yYnpvdGxGRlB5SlBKZE0iLCJhdWQiOiJmYXN0YXBpLXVzZXJzOnJlc2V0IiwiZXhwIjoxNzYxNTU4MTUxfQ.rSr8tRql4ZsE2k-WGHzhq9aT387E9jXGJ_bNomC4LKA"
+    print(client.logout_async(token, "965965965"))
+    print(authorize)
 
-    name = await client.say_my_name_async("Tu72u4SVue4ezadi1v5Ui9r9HjxH7YqbkY_yf5jFtPQ")
-    print(name)
-    name = await client.say_my_name_async("Tu72u4SVue4ezadi1v5Ui9r9HjxH7YqbkY_yf5jFtPQ")
-    print(name)
-    name = await client.logout_async("Tu72u4SVue4ezadi1v5Ui9r9HjxH7YqbkY_yf5jFtPQ")
-    print(name)
 
 
 if __name__ == '__main__':

nc_user_manager/models.py

@@ -15,8 +15,8 @@ class UserResponse(dict):
         return self.get("email")
 
     @property
-    def picture(self) -> Optional[str]:
-        return self.get("picture")
+    def avatar(self) -> Optional[str]:
+        return self.get("avatar")
 
     @property
     def full_name(self) -> Optional[str]:
@@ -26,6 +26,10 @@ class UserResponse(dict):
     def role(self) -> Optional[str]:
         return self.get("role")
 
+    @property
+    def user_id(self) -> Optional[str]:
+        return self.get("user_id")
+
 class CallbackResponse(dict):
     @property
     def token(self) -> str:
@@ -44,5 +48,5 @@ class CallbackResponse(dict):
         return self.get("email")
 
     @property
-    def user_picture(self) -> str:
-        return self.get("user_picture")
+    def avatar(self) -> str:
+        return self.get("avatar")

nc_user_manager/utils.py

@@ -10,7 +10,8 @@ def request(
     url: str,
     params: Optional[Dict[str, Any]] = None,
     headers: Optional[Dict[str, str]] = None,
-    json_body: Optional[dict] = None
+    json_body: Optional[dict] = None,
+    form_body: Optional[dict] = None,
 ) -> dict:
     """
     发送 HTTP 请求并返回统一结果，不抛异常
@@ -28,12 +29,20 @@ def request(
         url = f"{url}?{query}"
 
     data = None
+
+    # JSON 请求
     if json_body is not None:
         data = json.dumps(json_body).encode("utf-8")
         if headers is None:
             headers = {}
         headers["Content-Type"] = "application/json"
 
+    # Form 表单请求
+    if form_body is not None:
+        data = urllib.parse.urlencode(form_body).encode("utf-8")
+        headers = headers or {}
+        headers["Content-Type"] = "application/x-www-form-urlencoded"
+
     req = urllib.request.Request(url, method=method.upper(), data=data)
     if headers:
         for k, v in headers.items():

nc_user_terminator-0.1.17.dist-info/METADATA

@@ -0,0 +1,44 @@
+Metadata-Version: 2.4
+Name: nc-user-terminator
+Version: 0.1.17
+Summary: OAuth client wrapper for multi-tenant projects
+Author: bw_song
+Author-email: m132777096902@gmail.com
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+Requires-Dist: cachetools==6.2.0
+Dynamic: author-email
+Dynamic: requires-python
+
+# 更新
++ V0.1.5
+  - 新增本地缓存机制
++ v0.1.6
+  - 默认连接地址
++ v0.1.7
+  - 映射host
++ v0.1.8
+  - 调整相对路径
++ v0.1.9
+  - 修改缓存配置
++ v0.1.10
+  - 获取用户信息,本地缓存配置
++ v0.1.11
+  - 用户头像字段调整
++ v0.1.12
+  - 新增密码学登录
+  - 新增修改密码
+  - 支持重置社媒账号密码
++ v0.1.13
+  - 包路径调整
++ v0.1.14
+  - 新增facebook第三方登录
+  - 新增邮箱注册功能
++ v0.1.15
+  - 新增忘记密码
+  - 新增找回密码
+  - 新增账户注销
++ v0.1.16
+  - 修改接口返回数据
++ v0.1.17
+  - 用户注销调整

nc_user_terminator-0.1.17.dist-info/RECORD

@@ -0,0 +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=r8M-HXaku8D_x4zp4fxVY5avjjr3TKqmHd6ILQXl-cc,16055
+nc_user_manager/exceptions.py,sha256=yUMDrh1HHZF36UUadQNHvJlDgEYSYoYOObs8Q11fjrE,351
+nc_user_manager/models.py,sha256=WgNC7z7Xy9fok5tA6CawxvBmEhGM6J0KCD3bk2MMUWU,1166
+nc_user_manager/utils.py,sha256=zn0ds3UftTaEnrTVDn0YL9N-EkVWpbJtowFzAotU80E,2608
+nc_user_terminator-0.1.17.dist-info/METADATA,sha256=pfxhwK_sbiC6quB-jO8u-_XwfYsvsN1VajsGkG9Lze8,967
+nc_user_terminator-0.1.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nc_user_terminator-0.1.17.dist-info/top_level.txt,sha256=kOAUtl6RYo-x3vMJL8It3KCJLoIFPvMUiAAyXjPQTYA,16
+nc_user_terminator-0.1.17.dist-info/RECORD,,

nc_user_terminator-0.1.5.dist-info/METADATA

@@ -1,15 +0,0 @@
-Metadata-Version: 2.4
-Name: nc-user-terminator
-Version: 0.1.5
-Summary: OAuth client wrapper for multi-tenant projects
-Author: bw_song
-Author-email: m132777096902@gmail.com
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-Requires-Dist: cachetools==6.2.0
-Dynamic: author-email
-Dynamic: requires-python
-
-# 更新
-+ V0.1.5
-  - 新增本地缓存机制

nc_user_terminator-0.1.5.dist-info/RECORD

@@ -1,10 +0,0 @@
-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=71pQ_4YZy1f_BJ9Pc2Md1r57SStqI1qRxnXU9IGAm5Y,11276
-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.5.dist-info/METADATA,sha256=1uCPVZ-m6nHokYebpNHDAdgJbtNxxJxugWNvzmqxm1U,378
-nc_user_terminator-0.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nc_user_terminator-0.1.5.dist-info/top_level.txt,sha256=kOAUtl6RYo-x3vMJL8It3KCJLoIFPvMUiAAyXjPQTYA,16
-nc_user_terminator-0.1.5.dist-info/RECORD,,