nc-user-terminator 0.1.11__py3-none-any.whl → 0.1.13__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"
@@ -47,8 +47,11 @@ class OAuthClient:
     def _headers(self, extra: Optional[Dict[str, str]] = None) -> Dict[str, str]:
         headers = {
             PRODUCT_HEADER: self._product_code,
-            "Host": "auth.nc.com"
         }
+        if self._base_url == 'http://172.27.92.74':
+            headers.update({
+                "Host": "auth.nc.com"
+            })
         if extra:
             headers.update(extra)
         return headers
@@ -279,6 +282,59 @@ class OAuthClient:
             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 forgot_password(self, token: str) -> str:
+        headers = self._headers({"Authorization": f"Bearer {token}"})
+        resp = request("POST", f"{self._base_url}/api/auth/forgot-password", headers=headers)
+        return resp.get("token")
+
+    def reset_password(self, password_token: str, password: str) -> None:
+        """
+        修改密码
+        :param password_token: forgot_password获取的验证token
+        :param password: 新密码
+        :return:
+        """
+        json_data = {
+            "token": password_token,
+            "password": password
+        }
+        request("POST", f"{self._base_url}/api/auth/forgot-password", headers=self._headers(), json_body=json_data)
+
+
 async def main():
     def get_redis_url() -> str:
         return f'redis://default:1q2w3e@localhost:6379/1'
@@ -289,11 +345,17 @@ 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("http://auth.nc.com/", "bankgpt", "http://localhost:8000/auth/google/custom_callback", single_session=True, cache=redis_cache)
-    authorize = client.authorize("google")
-    print(authorize)
+    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")
+
+    # res = client.forgot_password("QtbMAqXNwrsy-7dr-D_lIVvUu88gjhPM0fBXeJTaOiA")
 
+    token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiI1IiwicGFzc3dvcmRfZmdwdCI6IiRhcmdvbjJpZCR2PTE5JG09NjU1MzYsdD0zLHA9NCRYUlQ1K1p3Uk5sbjhKQzQrZW94TFlnJERadnFKb29xUDNMUGVJbEV6OVR5TjZIdm1LYW9yYnpvdGxGRlB5SlBKZE0iLCJhdWQiOiJmYXN0YXBpLXVzZXJzOnJlc2V0IiwiZXhwIjoxNzYxNTU4MTUxfQ.rSr8tRql4ZsE2k-WGHzhq9aT387E9jXGJ_bNomC4LKA"
+    print(client.reset_password(token, "965965965"))
+    print(authorize)
 
 
 

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.11.dist-info → nc_user_terminator-0.1.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nc-user-terminator
-Version: 0.1.11
+Version: 0.1.13
 Summary: OAuth client wrapper for multi-tenant projects
 Author: bw_song
 Author-email: m132777096902@gmail.com
@@ -25,3 +25,9 @@ Dynamic: requires-python
   - 获取用户信息,本地缓存配置
 + v0.1.11
   - 用户头像字段调整
++ v0.1.12
+  - 新增密码学登录
+  - 新增修改密码
+  - 支持重置社媒账号密码
++ v0.1.13
+  - 包路径调整

nc_user_terminator-0.1.13.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=3Ua1pGUa4pU0JiBmU-SK5G3yCP9i7lD1XbddKdwphm0,13893
+nc_user_manager/exceptions.py,sha256=yUMDrh1HHZF36UUadQNHvJlDgEYSYoYOObs8Q11fjrE,351
+nc_user_manager/models.py,sha256=r3OmicvfeDtDyvFlfxhn-g0svAvyeXIwa1BEuCMx4Ns,1074
+nc_user_manager/utils.py,sha256=zn0ds3UftTaEnrTVDn0YL9N-EkVWpbJtowFzAotU80E,2608
+nc_user_terminator-0.1.13.dist-info/METADATA,sha256=Tdatp5ycYaPfATDaDUz9_hHQSmjO4N6lAXWIOVEKcgY,732
+nc_user_terminator-0.1.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nc_user_terminator-0.1.13.dist-info/top_level.txt,sha256=kOAUtl6RYo-x3vMJL8It3KCJLoIFPvMUiAAyXjPQTYA,16
+nc_user_terminator-0.1.13.dist-info/RECORD,,

nc_user_terminator-0.1.11.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=TrRM3GPg6FCRDUlC2W4rvyzWzNeXRmtp4zUWhz8ouWk,11330
-nc_user_manager/exceptions.py,sha256=yUMDrh1HHZF36UUadQNHvJlDgEYSYoYOObs8Q11fjrE,351
-nc_user_manager/models.py,sha256=r3OmicvfeDtDyvFlfxhn-g0svAvyeXIwa1BEuCMx4Ns,1074
-nc_user_manager/utils.py,sha256=gxFSaUq0oiymIlvHITu2L7EkU2ZYQmW2q_okmUxGBeU,2319
-nc_user_terminator-0.1.11.dist-info/METADATA,sha256=Z5NfbEqefb5bA-Viz_Fpb_3VCPzHhUNC6QrpmsgiEK0,602
-nc_user_terminator-0.1.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nc_user_terminator-0.1.11.dist-info/top_level.txt,sha256=kOAUtl6RYo-x3vMJL8It3KCJLoIFPvMUiAAyXjPQTYA,16
-nc_user_terminator-0.1.11.dist-info/RECORD,,