usso 0.19.0__py3-none-any.whl → 0.20.0__py3-none-any.whl

usso/api.py

@@ -1,7 +1,7 @@
 import requests
 from singleton import Singleton
 
-from usso.core import Usso
+from usso.core import UserData, Usso
 
 
 class UssoAPI(metaclass=Singleton):
@@ -11,6 +11,8 @@ class UssoAPI(metaclass=Singleton):
         api_key: str = None,
         refresh_token: str = None,
     ):
+        if url and not url.startswith("http"):
+            url = f"https://{url}"
         self.url = url
         assert (
             api_key or refresh_token
@@ -19,19 +21,22 @@ class UssoAPI(metaclass=Singleton):
         self.refresh_token = refresh_token
         self.access_token = None
 
-    def refresh(self):
+    def _refresh(self):
         if not self.refresh_token:
             return
 
         url = f"{self.url}/auth/refresh"
 
         if self.refresh_token:
-            headers = {"Authorization": f"Bearer {self.refresh_token}"}
+            headers = {
+                "Authorization": f"Bearer {self.refresh_token}",
+                "content-type": "application/json",
+            }
 
         resp = requests.post(url, headers=headers)
         self.access_token = resp.json().get("access_token")
 
-    def _access_valid(self):
+    def _access_valid(self) -> bool:
         if not self.access_token:
             return False
 
@@ -42,67 +47,131 @@ class UssoAPI(metaclass=Singleton):
             return True
         return False
 
-    def _request(self, method="get", endpoint: str = "", data: dict = None):
+    def _request(
+        self,
+        method="get",
+        endpoint: str = "",
+        data: dict = None,
+        **kwargs,
+    ) -> dict:
         url = f"{self.url}/{endpoint}"
-        headers = {}
+        headers = {"content-type": "application/json"}
         if self.api_key:
             headers["x-api-key"] = self.api_key
         elif self.refresh_token:
             if not self.access_token:
-                self.refresh()
+                self._refresh()
             headers["Authorization"] = f"Bearer {self.access_token}"
 
-        resp = requests.request(method, url, headers=headers, json=data)
+        resp = requests.request(
+            method,
+            url,
+            headers=headers,
+            json=data,
+        )
+        if kwargs.get("raise", True):
+            resp.raise_for_status()
         return resp.json()
 
-    def get_users(self):
-        return self._request(endpoint="website/users/")
+    def get_users(self, **kwargs) -> list[UserData]:
+        users_dict = self._request(endpoint="website/users", **kwargs)
 
-    def get_user(self, user_id: str):
-        return self._request(endpoint=f"website/users/{user_id}/")
+        return [
+            UserData(user_id=user.get("uid"), **user) for user in users_dict
+        ]
 
-    def get_user_credentials(self, user_id: str):
-        return self._request(endpoint=f"website/users/{user_id}/credentials/")
+    def get_user(self, user_id: str, **kwargs) -> UserData:
+        return UserData(
+            **self._request(
+                endpoint=f"website/users/{user_id}",
+                **kwargs,
+            )
+        )
 
-    def get_user_by_credentials(self, credentials: dict):
-        return self._request(
-            endpoint="website/users/credentials/", data=credentials
+    def get_user_credentials(self, user_id: str, **kwargs) -> UserData:
+        return UserData(
+            **self._request(
+                endpoint=f"website/users/{user_id}/credentials",
+                **kwargs,
+            )
         )
 
-    def create_user(self, user_data: dict):
-        return self._request(
-            method="post", endpoint="website/users/", data=user_data
+    def get_user_by_credentials(self, credentials: dict, **kwargs) -> UserData:
+        return UserData(
+            **self._request(
+                endpoint="website/users/credentials",
+                data=credentials,
+                **kwargs,
+            )
         )
 
-    def create_user_credentials(self, user_id: str, credentials: dict):
-        return self._request(
-            method="post",
-            endpoint=f"website/users/{user_id}/credentials/",
-            data=credentials,
+    def create_user(self, user_data: dict, **kwargs) -> UserData:
+        return UserData(
+            **self._request(
+                method="post",
+                endpoint="website/users",
+                data=user_data,
+                **kwargs,
+            )
+        )
+
+    def create_user_credentials(
+        self, user_id: str, credentials: dict, **kwargs
+    ) -> UserData:
+        return UserData(
+            **self._request(
+                method="post",
+                endpoint=f"website/users/{user_id}/credentials",
+                data=credentials,
+                **kwargs,
+            )
         )
 
     def create_user_by_credentials(
-        self, user_data: dict, credentials: dict | None = None
-    ):
+        self,
+        user_data: dict | None = None,
+        credentials: dict | None = None,
+        **kwargs,
+    ) -> UserData:
+
         if credentials:
             user_data["authenticators"] = [credentials]
-        return self._request(
-            method="post", endpoint="website/users/", data=user_data
+        return UserData(
+            **self._request(
+                method="post",
+                endpoint="website/users",
+                data=user_data,
+                **kwargs,
+            )
         )
 
-    def get_user_payload(self, user_id: str):
-        return self._request(endpoint=f"website/users/{user_id}/payload/")
+    def get_user_payload(self, user_id: str, **kwargs) -> dict:
+        return self._request(
+            endpoint=f"website/users/{user_id}/payload", **kwargs
+        )
 
-    def update_user_payload(self, user_id: str, payload: dict):
+    def update_user_payload(
+        self,
+        user_id: str,
+        payload: dict,
+        **kwargs,
+    ) -> dict:
         return self._request(
             method="patch",
-            endpoint=f"website/users/{user_id}/payload/",
+            endpoint=f"website/users/{user_id}/payload",
             data=payload,
+            **kwargs,
         )
 
-    def set_user_payload(self, user_id: str, payload: dict):
+    def set_user_payload(
+        self,
+        user_id: str,
+        payload: dict,
+        **kwargs,
+    ) -> dict:
         return self._request(
             method="put",
-            endpoint=f"website/users/{user_id}/payload/",
+            endpoint=f"website/users/{user_id}/payload",
             data=payload,
+            **kwargs,
         )

usso/core.py

@@ -1,12 +1,12 @@
-import os
 import logging
+import os
 import uuid
 from functools import lru_cache
 from typing import Optional, Tuple
-from singleton import Singleton
 
 import jwt
 from pydantic import BaseModel
+from singleton import Singleton
 
 from . import b64tools
 from .exceptions import USSOException

{usso-0.19.0.dist-info → usso-0.20.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: usso
-Version: 0.19.0
+Version: 0.20.0
 Summary: A plug-and-play client for integrating universal single sign-on (SSO) with Python frameworks, enabling secure and seamless authentication across microservices.
 Author-email: Mahdi Kiani <mahdikiany@gmail.com>
 Maintainer-email: Mahdi Kiani <mahdikiany@gmail.com>

{usso-0.19.0.dist-info → usso-0.20.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
 usso/__init__.py,sha256=RN0E6HI9kHedvDxheDPVWiAmh-169IrhXfvq_sHphQc,65
-usso/api.py,sha256=Sxo1JJOzfjSuidmFWfdE4g2CrllLxxWjzrW9VXSpKP4,3329
+usso/api.py,sha256=Gl_Gxivt78EzvJp6VnRjT9AMREmA0C3xHoWSgCtb3fs,4824
 usso/b64tools.py,sha256=6YCBx2lLaYFdk36f064VNZ1RejJTHtmgxqq0eT1sCwQ,518
-usso/core.py,sha256=3K6LMsryvqf3b7NZwNUt7Hx31xJ9KX3g7Pa6HBjkY4o,3034
+usso/core.py,sha256=wGtzwzuZ-qq2lBbUUoRifmAb0LoFoNFrDgW-uS7r5RQ,3034
 usso/exceptions.py,sha256=hawOAuVbvQtjgRfwp1KFZ4SmV7fh720y5Gom9JVA8W8,504
 usso/package_data.dat,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 usso/fastapi/__init__.py,sha256=TRTDVJo8bwZQDAuCQFhh-g1XbIspf6TdFYXGAO5cgAU,130
 usso/fastapi/integration.py,sha256=9Q10dfy8UagOkmG49-Ar0mj6PPsiKS8ioLFgBIREpWQ,1823
-usso-0.19.0.dist-info/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
-usso-0.19.0.dist-info/METADATA,sha256=xbjJB8mJRoyGJtecwNRR32fvcztbGYFb_dZHEaKoX74,4334
-usso-0.19.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-usso-0.19.0.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
-usso-0.19.0.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
-usso-0.19.0.dist-info/RECORD,,
+usso-0.20.0.dist-info/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
+usso-0.20.0.dist-info/METADATA,sha256=RVG1LcaSbhNOLwSwrd6qpC64CS2we5nxbrqie0LjrDQ,4334
+usso-0.20.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+usso-0.20.0.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
+usso-0.20.0.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
+usso-0.20.0.dist-info/RECORD,,