-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Big exception refactor and simplification (#11)
* Big exception refactor and simplification * fix test coverage
- Loading branch information
Showing
62 changed files
with
9,121 additions
and
223 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| # fitbit_client/__init__.py |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| # fitbit_client/auth/__init__.py |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| # fitbit_client/auth/callback_handler.py | ||
|
|
||
| # Standard library imports | ||
| > from http.server import BaseHTTPRequestHandler | ||
| > from http.server import HTTPServer | ||
| > from logging import Logger | ||
| > from logging import getLogger | ||
| > from socket import socket | ||
| > from typing import Any # Used only for type declarations, not in runtime code | ||
| > from typing import Callable | ||
| > from typing import Dict | ||
| > from typing import List | ||
| > from typing import Tuple | ||
| > from typing import Type | ||
| > from typing import TypeVar | ||
| > from typing import Union | ||
| > from urllib.parse import parse_qs | ||
| > from urllib.parse import urlparse | ||
|
|
||
| # Local imports | ||
| > from fitbit_client.exceptions import InvalidGrantException | ||
| > from fitbit_client.exceptions import InvalidRequestException | ||
| > from fitbit_client.utils.types import JSONDict | ||
|
|
||
| # Type variable for server | ||
| > T = TypeVar("T", bound=HTTPServer) | ||
|
|
||
|
|
||
| > class CallbackHandler(BaseHTTPRequestHandler): | ||
| > """Handle OAuth2 callback requests""" | ||
|
|
||
| > logger: Logger | ||
|
|
||
| > def __init__(self, *args: Any, **kwargs: Any) -> None: | ||
| > """Initialize the callback handler. | ||
|
|
||
| > The signature matches BaseHTTPRequestHandler's __init__ method: | ||
| > __init__(self, request: Union[socket, Tuple[bytes, socket]], | ||
| > client_address: Tuple[str, int], | ||
| > server: HTTPServer) | ||
|
|
||
| > But we use *args, **kwargs to avoid type compatibility issues with the parent class. | ||
| > """ | ||
| > self.logger = getLogger("fitbit_client.callback_handler") | ||
| > super().__init__(*args, **kwargs) | ||
|
|
||
| > def parse_query_parameters(self) -> Dict[str, str]: | ||
| > """Parse and validate query parameters from callback URL | ||
|
|
||
| > Returns: | ||
| > Dictionary of parsed parameters with single values | ||
|
|
||
| > Raises: | ||
| > InvalidRequestException: If required parameters are missing | ||
| > InvalidGrantException: If authorization code is invalid/expired | ||
| > """ | ||
| > query_components: Dict[str, List[str]] = parse_qs(urlparse(self.path).query) | ||
| > self.logger.debug(f"Query parameters: {query_components}") | ||
|
|
||
| # Check for error response | ||
| > if "error" in query_components: | ||
| > error_type: str = query_components["error"][0] | ||
| > error_desc: str = query_components.get("error_description", ["Unknown error"])[0] | ||
|
|
||
| > if error_type == "invalid_grant": | ||
| > raise InvalidGrantException( | ||
| > message=error_desc, status_code=400, error_type="invalid_grant" | ||
| > ) | ||
| > else: | ||
| > raise InvalidRequestException( | ||
| > message=error_desc, status_code=400, error_type=error_type | ||
| > ) | ||
|
|
||
| # Check for required parameters | ||
| > required_params: List[str] = ["code", "state"] | ||
| > missing_params: List[str] = [ | ||
| > param for param in required_params if param not in query_components | ||
| > ] | ||
| > if missing_params: | ||
| > raise InvalidRequestException( | ||
| > message=f"Missing required parameters: {', '.join(missing_params)}", | ||
| > status_code=400, | ||
| > error_type="invalid_request", | ||
| > field_name="callback_params", | ||
| > ) | ||
|
|
||
| # Convert from Dict[str, List[str]] to Dict[str, str] by taking first value of each | ||
| > return {k: v[0] for k, v in query_components.items()} | ||
|
|
||
| > def send_success_response(self) -> None: | ||
| > """Send successful authentication response to browser""" | ||
| > self.send_response(200) | ||
| > self.send_header("Content-Type", "text/html") | ||
| > self.end_headers() | ||
|
|
||
| > response: str = """ | ||
| > <html> | ||
| > <body> | ||
| > <h1>Authentication Successful!</h1> | ||
| > <p>You can close this window and return to your application.</p> | ||
| > <script>setTimeout(() => window.close(), 5000);</script> | ||
| > </body> | ||
| > </html> | ||
| > """ | ||
|
|
||
| > self.wfile.write(response.encode("utf-8")) | ||
| > self.logger.debug("Sent success response to browser") | ||
|
|
||
| > def send_error_response(self, error_message: str) -> None: | ||
| > """Send error response to browser""" | ||
| > self.send_response(400) | ||
| > self.send_header("Content-Type", "text/html") | ||
| > self.end_headers() | ||
|
|
||
| > response: str = f""" | ||
| > <html> | ||
| > <body> | ||
| > <h1>Authentication Error</h1> | ||
| > <p>{error_message}</p> | ||
| > <p>You can close this window and try again.</p> | ||
| > <script>setTimeout(() => window.close(), 10000);</script> | ||
| > </body> | ||
| > </html> | ||
| > """ | ||
|
|
||
| > self.wfile.write(response.encode("utf-8")) | ||
| > self.logger.debug("Sent error response to browser") | ||
|
|
||
| > def do_GET(self) -> None: | ||
| > """Process GET request and extract OAuth parameters | ||
|
|
||
| > This handles the OAuth2 callback, including: | ||
| > - Parameter validation | ||
| > - Error handling | ||
| > - Success/error responses | ||
| > - Storing callback data for the server | ||
| > """ | ||
| > self.logger.debug(f"Received callback request: {self.path}") | ||
|
|
||
| > try: | ||
| # Parse and validate query parameters | ||
| > self.parse_query_parameters() | ||
|
|
||
| # Send success response | ||
| > self.send_success_response() | ||
|
|
||
| # Store validated callback in server instance | ||
| > setattr(self.server, "last_callback", self.path) | ||
| > self.logger.debug("OAuth callback received and validated successfully") | ||
|
|
||
| > except (InvalidRequestException, InvalidGrantException) as e: | ||
| # Send error response to browser | ||
| > self.send_error_response(str(e)) | ||
| # Re-raise for server to handle | ||
| > raise | ||
|
|
||
| > def log_message(self, format_str: str, *args: Union[str, int, float]) -> None: | ||
| > """Override default logging to use our logger instead | ||
|
|
||
| > Args: | ||
| > format_str: Format string for the log message | ||
| > args: Values to be formatted into the string | ||
| > """ | ||
| > self.logger.debug(f"Server log: {format_str % args}") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.