kinde-python-sdk 2.0.9__tar.gz → 2.0.10__tar.gz

{kinde_python_sdk-2.0.9/kinde_python_sdk.egg-info → kinde_python_sdk-2.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kinde-python-sdk
-Version: 2.0.9
+Version: 2.0.10
 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
@@ -30,7 +30,7 @@ Requires-Dist: cryptography<42.0.0,>=41.0.0
 Requires-Dist: python-dotenv<2.0.0,>=1.0.0
 Requires-Dist: itsdangerous<3.0.0,>=2.2.0
 Requires-Dist: nest-asyncio<2.0.0,>=1.5.8
-Requires-Dist: httpx<0.26.0,>=0.25.0
+Requires-Dist: httpx<0.29.0,>=0.25.0
 Requires-Dist: pydantic<3.0.0,>=2.0.0
 Provides-Extra: fastapi
 Requires-Dist: fastapi<1.0.0,>=0.110.0; extra == "fastapi"
@@ -128,7 +128,7 @@ The FastAPI integration automatically provides these routes:
 
 ```python
 from fastapi import Depends
-from kinde_sdk.kinde_api_client import KindeApiClient
+from kinde_sdk.management.kinde_api_client import KindeApiClient
 
 @router.get("/protected")
 async def protected_route(
@@ -253,7 +253,7 @@ The Management API client requires:
 You can access the Management API through the existing `KindeApiClient`:
 
 ```python
-from kinde_sdk.kinde_api_client import KindeApiClient
+from kinde_sdk.management.kinde_api_client import KindeApiClient
 from kinde_sdk.enums import GrantType
 
 # Initialize the client with client credentials
@@ -396,7 +396,7 @@ except Exception as e:
 Complete example given below
 
 ```python
-from kinde_sdk.kinde_api_client import KindeApiClient
+from kinde_sdk.management.kinde_api_client import KindeApiClient
 from kinde_sdk.enums import GrantType
 
 def main():

{kinde_python_sdk-2.0.9 → kinde_python_sdk-2.0.10}/README.md

@@ -86,7 +86,7 @@ The FastAPI integration automatically provides these routes:
 
 ```python
 from fastapi import Depends
-from kinde_sdk.kinde_api_client import KindeApiClient
+from kinde_sdk.management.kinde_api_client import KindeApiClient
 
 @router.get("/protected")
 async def protected_route(
@@ -211,7 +211,7 @@ The Management API client requires:
 You can access the Management API through the existing `KindeApiClient`:
 
 ```python
-from kinde_sdk.kinde_api_client import KindeApiClient
+from kinde_sdk.management.kinde_api_client import KindeApiClient
 from kinde_sdk.enums import GrantType
 
 # Initialize the client with client credentials
@@ -354,7 +354,7 @@ except Exception as e:
 Complete example given below
 
 ```python
-from kinde_sdk.kinde_api_client import KindeApiClient
+from kinde_sdk.management.kinde_api_client import KindeApiClient
 from kinde_sdk.enums import GrantType
 
 def main():

{kinde_python_sdk-2.0.9 → kinde_python_sdk-2.0.10}/kinde_fastapi/examples/example_app.py

@@ -6,7 +6,7 @@ from pathlib import Path
 import os
 from dotenv import load_dotenv
 import logging
-from kinde_sdk.auth.oauth import OAuth
+from kinde_sdk import OAuth
 from kinde_sdk.auth import claims, feature_flags, permissions, tokens
 from kinde_sdk.management import ManagementClient;
 from kinde_sdk.management.management_token_manager import ManagementTokenManager

{kinde_python_sdk-2.0.9 → kinde_python_sdk-2.0.10}/kinde_fastapi/framework/fastapi_framework.py

@@ -7,6 +7,10 @@ from ..middleware.framework_middleware import FrameworkMiddleware
 import os
 import uuid
 import logging
+import base64
+import json
+from urllib.parse import urlparse, parse_qs
+from urllib.parse import urlencode, urlunparse
 
 logger = logging.getLogger(__name__)
 
@@ -133,30 +137,78 @@ class FastAPIFramework(FrameworkInterface):
         
         # Callback route
         @self.app.get("/callback")
-        async def callback(request: Request, code: str, state: Optional[str] = None):
+        async def callback(request: Request, code: Optional[str] = None, state: Optional[str] = None):
             """Handle the OAuth callback from Kinde."""
+            error = request.query_params.get('error')
+            if error and error.lower() == 'login_link_expired':
+                reauth_state = request.query_params.get('reauth_state')
+                if reauth_state:
+                    try:
+                        decoded_auth_state = base64.b64decode(reauth_state).decode('utf-8')
+                        reauth_dict = json.loads(decoded_auth_state)
+
+                        # Get the redirect URL from config
+                        redirect_url = os.getenv("KINDE_REDIRECT_URI")
+                        base_url = redirect_url.replace("/callback", "")
+
+                        # Build the login route URL
+                        login_route_url = f"{base_url}/login"
+
+                        # Parse and add parameters properly
+                        parsed = urlparse(login_route_url)
+                        query_dict = parse_qs(parsed.query)
+
+                        # Add reauth parameters
+                        for key, value in reauth_dict.items():
+                            query_dict[key] = [value]
+
+                        # Build final URL
+                        new_query = urlencode(query_dict, doseq=True)
+                        login_url = urlunparse((
+                            parsed.scheme,
+                            parsed.netloc,
+                            parsed.path,
+                            parsed.params,
+                            new_query,
+                            parsed.fragment
+                        ))
+
+                        return RedirectResponse(login_url)
+                    except Exception as ex:
+                        return HTMLResponse(f"Error parsing reauth state: {str(ex)}", status_code=400)
+
+            user_id = request.session.get('user_id') or str(uuid.uuid4())
+
             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
-                self._logger.warning(f"[Callback] Request session is: {request.session}")
-                self._logger.warning(f"[Callback] The full result: {result}")
-                response = RedirectResponse(url="/")
-                
-                return response
+                assert self._oauth is not None
+                await self._oauth.handle_redirect(code, user_id, state)
             except Exception as e:
-                logger.error(f"Authentication failed: {str(e)}")
-                return HTMLResponse(f"Authentication failed: {str(e)}")
+                if "State not found" in str(e):
+                    return HTMLResponse("Error: State not found. Please check Kinde Python SDK documentation.\n" + str(e), status_code=500)
+                raise e
+
+            request.session['user_id'] = user_id
+
+            # Initialize post_login_redirect
+            post_login_redirect = request.session.pop('post_login_redirect_url', None)
+            if post_login_redirect:
+                post_login_redirect = post_login_redirect.get('url', '/')
+            else:
+                post_login_redirect = '/'
+
+            if not post_login_redirect.startswith('http'):
+                post_login_redirect = str(request.base_url).rstrip('/') + post_login_redirect
+
+            parsed = urlparse(post_login_redirect)
+            if state:
+                query_dict = parse_qs(parsed.query)
+                query_dict['state'] = [state]
+                new_query = urlencode(query_dict, doseq=True)
+                redirect_url = urlunparse((parsed.scheme, parsed.netloc, parsed.path, parsed.params, new_query, parsed.fragment))
+            else:
+                redirect_url = post_login_redirect
+
+            return RedirectResponse(redirect_url)
         
         # Logout route
         @self.app.get("/logout")

{kinde_python_sdk-2.0.9 → kinde_python_sdk-2.0.10}/kinde_flask/framework/flask_framework.py

@@ -132,32 +132,85 @@ class FlaskFramework(FrameworkInterface):
             loop = asyncio.get_event_loop()
             login_url = loop.run_until_complete(self._oauth.login())
             return redirect(login_url)
-        
 
         # Callback route
-        @self.app.route('/callback')
+        @self.app.route("/callback")
         def callback():
             """Handle the OAuth callback from Kinde."""
+            import base64
+            import json
+            from urllib.parse import urlencode, urlparse, parse_qs, urlunparse
+            
+            error = request.args.get('error')
+            if error and error.lower() == 'login_link_expired':
+                reauth_state = request.args.get('reauth_state')
+                if reauth_state:
+                    try:
+                        decoded_auth_state = base64.b64decode(reauth_state).decode('utf-8')
+                        reauth_dict = json.loads(decoded_auth_state)
+
+                        # Get the redirect URL from config
+                        redirect_url = os.getenv("KINDE_REDIRECT_URI")
+                        base_url = redirect_url.replace("/callback", "")
+
+                        # Build the login route URL
+                        login_route_url = f"{base_url}/login"
+
+                        # Parse and add parameters properly
+                        parsed = urlparse(login_route_url)
+                        query_dict = parse_qs(parsed.query)
+
+                        # Add reauth parameters
+                        for key, value in reauth_dict.items():
+                            query_dict[key] = [value]
+
+                        # Build final URL
+                        new_query = urlencode(query_dict, doseq=True)
+                        login_url = urlunparse((
+                            parsed.scheme,
+                            parsed.netloc,
+                            parsed.path,
+                            parsed.params,
+                            new_query,
+                            parsed.fragment
+                        ))
+
+                        return redirect(login_url)
+                    except Exception as ex:
+                        return f"Error parsing reauth state: {str(ex)}", 400
+
+            post_login_redirect = session.pop('post_login_redirect_url', None)
+            if post_login_redirect:
+                post_login_redirect = post_login_redirect.get('url', '/')
+            else:
+                post_login_redirect = '/'
+
+            code = request.args.get('code')
+            state = request.args.get('state')
+            
+            # Validate required code parameter
+            if not code:
+                return "Authentication failed: Missing authorization code", 400
+            
+            # Get or generate user_id
+            user_id = session.get('user_id', str(uuid.uuid4()))
+            session['user_id'] = user_id
+            
+            # Handle async call to handle_redirect
             try:
-                code = request.args.get('code')
-                state = request.args.get('state')
-                
-                if not code:
-                    return "Authentication failed: No code provided", 400
-                
-                # Generate a unique user ID for the session
-                user_id = session.get('user_id') or str(uuid.uuid4())
-                
-                # Use OAuth's handle_redirect method to process the callback
-                loop = asyncio.get_event_loop()
-                result = loop.run_until_complete(self._oauth.handle_redirect(code, user_id, state))
-                
-                # Store user ID in session
-                session['user_id'] = user_id
-                
-                return redirect('/')
+                loop = asyncio.new_event_loop()
+                asyncio.set_event_loop(loop)
+                loop.run_until_complete(self._oauth.handle_redirect(code, user_id, state))
+                loop.close()
             except Exception as e:
                 return f"Authentication failed: {str(e)}", 400
+
+            if not post_login_redirect.startswith('http'):
+                # Use url_root to get just the scheme and host without the current path
+                post_login_redirect = str(request.url_root).rstrip('/') + post_login_redirect
+
+            # After successful authentication, simply redirect to the destination
+            return redirect(post_login_redirect)
         
         # Logout route
         @self.app.route('/logout')
@@ -206,4 +259,4 @@ class FlaskFramework(FrameworkInterface):
             import flask
             return True
         except ImportError:
-            return False 
+            return False

{kinde_python_sdk-2.0.9 → kinde_python_sdk-2.0.10/kinde_python_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kinde-python-sdk
-Version: 2.0.9
+Version: 2.0.10
 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
@@ -30,7 +30,7 @@ Requires-Dist: cryptography<42.0.0,>=41.0.0
 Requires-Dist: python-dotenv<2.0.0,>=1.0.0
 Requires-Dist: itsdangerous<3.0.0,>=2.2.0
 Requires-Dist: nest-asyncio<2.0.0,>=1.5.8
-Requires-Dist: httpx<0.26.0,>=0.25.0
+Requires-Dist: httpx<0.29.0,>=0.25.0
 Requires-Dist: pydantic<3.0.0,>=2.0.0
 Provides-Extra: fastapi
 Requires-Dist: fastapi<1.0.0,>=0.110.0; extra == "fastapi"
@@ -128,7 +128,7 @@ The FastAPI integration automatically provides these routes:
 
 ```python
 from fastapi import Depends
-from kinde_sdk.kinde_api_client import KindeApiClient
+from kinde_sdk.management.kinde_api_client import KindeApiClient
 
 @router.get("/protected")
 async def protected_route(
@@ -253,7 +253,7 @@ The Management API client requires:
 You can access the Management API through the existing `KindeApiClient`:
 
 ```python
-from kinde_sdk.kinde_api_client import KindeApiClient
+from kinde_sdk.management.kinde_api_client import KindeApiClient
 from kinde_sdk.enums import GrantType
 
 # Initialize the client with client credentials
@@ -396,7 +396,7 @@ except Exception as e:
 Complete example given below
 
 ```python
-from kinde_sdk.kinde_api_client import KindeApiClient
+from kinde_sdk.management.kinde_api_client import KindeApiClient
 from kinde_sdk.enums import GrantType
 
 def main():