kinde-python-sdk 2.0.0b4__tar.gz → 2.0.0b5__tar.gz

{kinde_python_sdk-2.0.0b4/kinde_python_sdk.egg-info → kinde_python_sdk-2.0.0b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kinde-python-sdk
-Version: 2.0.0b4
+Version: 2.0.0b5
 Summary: Connect your app to the Kinde platform
 Author-email: Kinde Engineering <engineering@kinde.com>
 Project-URL: Homepage, https://github.com/kinde-oss/kinde-python-sdk

{kinde_python_sdk-2.0.0b4 → kinde_python_sdk-2.0.0b5}/kinde_fastapi/framework/fastapi_framework.py

@@ -139,12 +139,15 @@ class FastAPIFramework(FrameworkInterface):
             """Handle the OAuth callback from Kinde."""
             try:
                 # Generate a unique user ID for the session
+                logger.warning(f"[Callback] Request session is: {request.session}")
                 user_id = request.session.get("user_id") or str(uuid.uuid4())
                 
                 # Use OAuth's handle_redirect method to process the callback
+                logger.warning(f"[Callback] code[{code}] state[{state}] user_id[{user_id}]")
                 result = await self._oauth.handle_redirect(code, user_id, state)
                 
                 # Store user ID in session
+                logger.warning(f"[Callback] Storing user ID in session: {user_id}")
                 request.session["user_id"] = user_id
                 
                 # Create response with explicit session cookie settings

{kinde_python_sdk-2.0.0b4 → kinde_python_sdk-2.0.0b5/kinde_python_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kinde-python-sdk
-Version: 2.0.0b4
+Version: 2.0.0b5
 Summary: Connect your app to the Kinde platform
 Author-email: Kinde Engineering <engineering@kinde.com>
 Project-URL: Homepage, https://github.com/kinde-oss/kinde-python-sdk

{kinde_python_sdk-2.0.0b4 → kinde_python_sdk-2.0.0b5}/kinde_sdk/auth/claims.py

@@ -1,18 +1,37 @@
 from typing import Dict, Any, Optional
 import logging
-from kinde_sdk.auth.oauth import OAuth
+from kinde_sdk.core.framework.framework_factory import FrameworkFactory
+from kinde_sdk.auth.user_session import UserSession
 
 class Claims:
     def __init__(self):
         self._logger = logging.getLogger("kinde_sdk")
         self._logger.setLevel(logging.INFO)
-        self._oauth = None
+        self._framework = None
+        self._session_manager = UserSession()
 
-    def _get_oauth(self) -> OAuth:
-        """Get the OAuth instance using singleton pattern."""
-        if not self._oauth:
-            self._oauth = OAuth.get_instance()
-        return self._oauth
+    def _get_framework(self):
+        """Get the framework instance using singleton pattern."""
+        if not self._framework:
+            self._framework = FrameworkFactory.get_framework_instance()
+        return self._framework
+
+    def _get_token_manager(self) -> Optional[Any]:
+        """
+        Get the token manager for the current user.
+        
+        Returns:
+            Optional[Any]: The token manager if available, None otherwise
+        """
+        framework = self._get_framework()
+        if not framework:
+            return None
+
+        user_id = framework.get_user_id()
+        if not user_id:
+            return None
+
+        return self._session_manager.get_token_manager(user_id)
 
     async def get_claim(self, claim_name: str, token_type: str = "access_token") -> Dict[str, Any]:
         """
@@ -29,16 +48,7 @@ class Claims:
                 "value": Any
             }
         """
-        oauth = self._get_oauth()
-        if not oauth.is_authenticated():
-            return {
-                "name": claim_name,
-                "value": None
-            }
-
-        user_id = oauth._framework.get_user_id()
-        token_manager = oauth._session_manager.get_token_manager(user_id)
-        
+        token_manager = self._get_token_manager()
         if not token_manager:
             return {
                 "name": claim_name,
@@ -63,13 +73,7 @@ class Claims:
         Returns:
             Dict containing all claims from the token
         """
-        oauth = self._get_oauth()
-        if not oauth.is_authenticated():
-            return {}
-
-        user_id = oauth._framework.get_user_id()
-        token_manager = oauth._session_manager.get_token_manager(user_id)
-        
+        token_manager = self._get_token_manager()
         if not token_manager:
             return {}
 

{kinde_python_sdk-2.0.0b4 → kinde_python_sdk-2.0.0b5}/kinde_sdk/auth/feature_flags.py

@@ -1,6 +1,7 @@
 from typing import Dict, Any, Optional, TypeVar, Generic, Union
 import logging
-from kinde_sdk.auth.oauth import OAuth
+from kinde_sdk.core.framework.framework_factory import FrameworkFactory
+from kinde_sdk.auth.user_session import UserSession
 
 T = TypeVar('T')
 
@@ -15,13 +16,31 @@ class FeatureFlags:
     def __init__(self):
         self._logger = logging.getLogger("kinde_sdk")
         self._logger.setLevel(logging.INFO)
-        self._oauth = None
+        self._framework = None
+        self._session_manager = UserSession()
 
-    def _get_oauth(self) -> OAuth:
-        """Get the OAuth instance using singleton pattern."""
-        if not self._oauth:
-            self._oauth = OAuth.get_instance()
-        return self._oauth
+    def _get_framework(self):
+        """Get the framework instance using singleton pattern."""
+        if not self._framework:
+            self._framework = FrameworkFactory.get_framework_instance()
+        return self._framework
+
+    def _get_token_manager(self) -> Optional[Any]:
+        """
+        Get the token manager for the current user.
+        
+        Returns:
+            Optional[Any]: The token manager if available, None otherwise
+        """
+        framework = self._get_framework()
+        if not framework:
+            return None
+
+        user_id = framework.get_user_id()
+        if not user_id:
+            return None
+
+        return self._session_manager.get_token_manager(user_id)
 
     def _parse_flag_value(self, flag_data: Dict[str, Any], expected_type: Optional[str] = None) -> FeatureFlag:
         """
@@ -72,18 +91,7 @@ class FeatureFlags:
         Returns:
             FeatureFlag object containing the flag value and metadata
         """
-        oauth = self._get_oauth()
-        if not oauth.is_authenticated():
-            return FeatureFlag(
-                code=flag_code,
-                type="unknown",
-                value=default_value,
-                is_default=True
-            )
-
-        user_id = oauth._framework.get_user_id()
-        token_manager = oauth._session_manager.get_token_manager(user_id)
-        
+        token_manager = self._get_token_manager()
         if not token_manager:
             return FeatureFlag(
                 code=flag_code,
@@ -112,13 +120,7 @@ class FeatureFlags:
         Returns:
             Dict mapping flag codes to FeatureFlag objects
         """
-        oauth = self._get_oauth()
-        if not oauth.is_authenticated():
-            return {}
-
-        user_id = oauth._framework.get_user_id()
-        token_manager = oauth._session_manager.get_token_manager(user_id)
-        
+        token_manager = self._get_token_manager()
         if not token_manager:
             return {}
 

{kinde_python_sdk-2.0.0b4 → kinde_python_sdk-2.0.0b5}/kinde_sdk/auth/oauth.py

@@ -21,42 +21,6 @@ from kinde_sdk.core.exceptions import (
 )
 
 class OAuth:
-    _instance = None
-    _initialized = False
-
-    def __new__(cls, *args, **kwargs):
-        if cls._instance is None:
-            cls._instance = super(OAuth, cls).__new__(cls)
-        return cls._instance
-
-    @classmethod
-    def get_instance(cls) -> 'OAuth':
-        """Get the singleton instance of OAuth."""
-        if cls._instance is None:
-            raise KindeConfigurationException("OAuth instance not initialized. Please create an instance first.")
-        return cls._instance
-
-    @classmethod
-    def _reset(cls) -> None:
-        """Reset the singleton instance and its state.
-        This is primarily used for testing to ensure a clean state between tests."""
-        if cls._instance:
-            # Clear any stored state
-            if hasattr(cls._instance, '_session_manager'):
-                cls._instance._session_manager = None
-            if hasattr(cls._instance, '_storage_manager'):
-                cls._instance._storage_manager = None
-            if hasattr(cls._instance, '_framework'):
-                cls._instance._framework = None
-            if hasattr(cls._instance, '_storage'):
-                cls._instance._storage = None
-            if hasattr(cls._instance, '_config'):
-                cls._instance._config = None
-            
-            # Reset class variables
-            cls._instance = None
-            cls._initialized = False
-
     def __init__(
         self,
         client_id: Optional[str] = None,
@@ -128,9 +92,6 @@ class OAuth:
         self.proxy = None
         self.proxy_headers = None
 
-        # Mark as initialized
-        self._initialized = True
-
     def _initialize_framework(self) -> None:
         """
         Initialize the framework-specific components.
@@ -591,14 +552,17 @@ class OAuth:
         }
         
         # Add client secret if available (for non-PKCE flow)
-        if self.client_secret and not code_verifier:
+        if self.client_secret:
             data["client_secret"] = self.client_secret
         
         # Add code verifier for PKCE flow
         if code_verifier:
             data["code_verifier"] = code_verifier
         
+        self._logger.warning(f"[Exchange code for tokens] [{self.token_url}] [{data}]")
+
         response = requests.post(self.token_url, data=data)
+        self._logger.warning(f"[Exchange code for tokens] [{response.status_code}] [{response.text}]")
         if response.status_code != 200:
             raise KindeTokenException(f"Token exchange failed: {response.text}")
         

{kinde_python_sdk-2.0.0b4 → kinde_python_sdk-2.0.0b5}/kinde_sdk/auth/permissions.py

@@ -1,18 +1,37 @@
 from typing import Dict, List, Optional, Any
 import logging
-from kinde_sdk.auth.oauth import OAuth
+from kinde_sdk.core.framework.framework_factory import FrameworkFactory
+from kinde_sdk.auth.user_session import UserSession
 
 class Permissions:
     def __init__(self):
         self._logger = logging.getLogger("kinde_sdk")
         self._logger.setLevel(logging.INFO)
-        self._oauth = None
+        self._framework = None
+        self._session_manager = UserSession()
 
-    def _get_oauth(self) -> OAuth:
-        """Get the OAuth instance using singleton pattern."""
-        if not self._oauth:
-            self._oauth = OAuth.get_instance()
-        return self._oauth
+    def _get_framework(self):
+        """Get the framework instance using singleton pattern."""
+        if not self._framework:
+            self._framework = FrameworkFactory.get_framework_instance()
+        return self._framework
+
+    def _get_token_manager(self) -> Optional[Any]:
+        """
+        Get the token manager for the current user.
+        
+        Returns:
+            Optional[Any]: The token manager if available, None otherwise
+        """
+        framework = self._get_framework()
+        if not framework:
+            return None
+
+        user_id = framework.get_user_id()
+        if not user_id:
+            return None
+
+        return self._session_manager.get_token_manager(user_id)
 
     async def get_permission(self, permission_key: str) -> Dict[str, Any]:
         """
@@ -29,17 +48,7 @@ class Permissions:
                 "isGranted": bool
             }
         """
-        oauth = self._get_oauth()
-        if not oauth.is_authenticated():
-            return {
-                "permissionKey": permission_key,
-                "orgCode": None,
-                "isGranted": False
-            }
-
-        user_id = oauth._framework.get_user_id()
-        token_manager = oauth._session_manager.get_token_manager(user_id)
-        
+        token_manager = self._get_token_manager()
         if not token_manager:
             return {
                 "permissionKey": permission_key,
@@ -68,16 +77,7 @@ class Permissions:
                 "permissions": List[str]
             }
         """
-        oauth = self._get_oauth()
-        if not oauth.is_authenticated():
-            return {
-                "orgCode": None,
-                "permissions": []
-            }
-
-        user_id = oauth._framework.get_user_id()
-        token_manager = oauth._session_manager.get_token_manager(user_id)
-        
+        token_manager = self._get_token_manager()
         if not token_manager:
             return {
                 "orgCode": None,

{kinde_python_sdk-2.0.0b4 → kinde_python_sdk-2.0.0b5}/kinde_sdk/core/framework/framework_factory.py

@@ -6,6 +6,7 @@ from typing import Dict, Type, Optional, Any
 import importlib
 import pkgutil
 import logging
+import threading
 from .framework_interface import FrameworkInterface
 from .null_framework import NullFramework
 
@@ -17,6 +18,8 @@ class FrameworkFactory:
     """
     _frameworks = {}
     _initialized = False
+    _framework_instance = None
+    _lock = threading.RLock()
     
     @classmethod
     def _discover_frameworks(cls) -> None:
@@ -54,13 +57,26 @@ class FrameworkFactory:
             name: The name of the framework
             framework_class: The framework implementation class
         """
-        cls._frameworks[name] = framework_class
-        logger.warning(f"Registered framework: {name}")
+        with cls._lock:
+            cls._frameworks[name] = framework_class
+            logger.warning(f"Registered framework: {name}")
+    
+    @classmethod
+    def get_framework_instance(cls) -> Optional[FrameworkInterface]:
+        """
+        Get the current framework instance if it exists.
+        
+        Returns:
+            Optional[FrameworkInterface]: The current framework instance or None if not created yet
+        """
+        with cls._lock:
+            return cls._framework_instance
     
     @classmethod
     def create_framework(cls, config: Dict[str, Any], app: Optional[Any] = None) -> FrameworkInterface:
         """
-        Create a framework instance.
+        Create a framework instance or return existing instance if already created.
+        Thread-safe implementation.
         
         Args:
             config: Dictionary containing framework configuration
@@ -72,27 +88,33 @@ class FrameworkFactory:
         Raises:
             ValueError: If the framework is not found
         """
-        # Ensure frameworks are discovered
-        cls._discover_frameworks()
-        
-        framework_type = config.get('type')
-        if framework_type is None:
-            raise ValueError("Framework type not specified in configuration")
-            
-        # Try to get the framework class
-        framework_class = cls._frameworks.get(framework_type)
-        if framework_class is None:
-            # If not found, try auto-detection
-            for name, impl in cls._frameworks.items():
-                # Create an instance to check auto-detection
-                instance = impl(app)
-                if hasattr(instance, 'can_auto_detect') and instance.can_auto_detect():
-                    logger.info(f"Auto-detected framework: {name}")
-                    framework_class = impl
-                    break
+        with cls._lock:
+            # Return existing instance if it exists
+            if cls._framework_instance is not None:
+                return cls._framework_instance
+                
+            # Ensure frameworks are discovered
+            cls._discover_frameworks()
             
+            framework_type = config.get('type')
+            if framework_type is None:
+                raise ValueError("Framework type not specified in configuration")
+                
+            # Try to get the framework class
+            framework_class = cls._frameworks.get(framework_type)
             if framework_class is None:
-                raise ValueError(f"Framework not found: {framework_type}")
-        
-        # Create and return the framework instance
-        return framework_class(app) 
+                # If not found, try auto-detection
+                for name, impl in cls._frameworks.items():
+                    # Create an instance to check auto-detection
+                    instance = impl(app)
+                    if hasattr(instance, 'can_auto_detect') and instance.can_auto_detect():
+                        logger.info(f"Auto-detected framework: {name}")
+                        framework_class = impl
+                        break
+                
+                if framework_class is None:
+                    raise ValueError(f"Framework not found: {framework_type}")
+            
+            # Create and store the framework instance
+            cls._framework_instance = framework_class(app)
+            return cls._framework_instance 

{kinde_python_sdk-2.0.0b4 → kinde_python_sdk-2.0.0b5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kinde-python-sdk"
-version = "2.0.0-beta.4"
+version = "2.0.0-beta.5"
 authors = [
     { name = "Kinde Engineering", email = "engineering@kinde.com" },
 ]