oauth2-cli-auth 1.6.1__tar.gz → 2.0.0__tar.gz

{oauth2_cli_auth-1.6.1 → oauth2_cli_auth-2.0.0}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.3
 Name: oauth2-cli-auth
-Version: 1.6.1
+Version: 2.0.0
 Summary: Authenticate against OAuth2 Provider in Python CLIs
 License: MIT
 Author: Timo Reymann
 Author-email: mail@timo-reymann.de
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Environment :: MacOS X
@@ -15,7 +15,6 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: Unix
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{oauth2_cli_auth-1.6.1 → oauth2_cli_auth-2.0.0}/oauth2_cli_auth/__init__.py

@@ -3,5 +3,5 @@ Authenticate against OAuth2 Provider in Python CLIs
 """
 from oauth2_cli_auth.__version__ import __version__
 from oauth2_cli_auth.http_server import OAuthCallbackHttpServer
-from oauth2_cli_auth.code_grant import OAuth2ClientInfo, exchange_code_for_access_token, get_auth_url, open_browser, load_oidc_config
+from oauth2_cli_auth.code_grant import OAuth2ClientInfo, refresh_access_token, exchange_code_for_access_token, exchange_code_for_response, get_auth_url, open_browser, load_oidc_config
 from oauth2_cli_auth.simplified_flow import get_access_token_with_browser_open

oauth2_cli_auth-2.0.0/oauth2_cli_auth/__version__.py

@@ -0,0 +1 @@
+__version__ = "2.0.0"

{oauth2_cli_auth-1.6.1 → oauth2_cli_auth-2.0.0}/oauth2_cli_auth/_urllib_util.py

@@ -2,6 +2,7 @@ import json
 import time
 import urllib
 from urllib.error import URLError
+from typing import Union
 
 
 def _urlopen_with_backoff(url, max_retries=3, base_delay=1, timeout=15):
@@ -19,7 +20,7 @@ def _urlopen_with_backoff(url, max_retries=3, base_delay=1, timeout=15):
     raise URLError(f"Failed to open URL after {max_retries} retries")
 
 
-def _load_json(url_or_request: str | urllib.request.Request) -> dict:
+def _load_json(url_or_request: Union[str, urllib.request.Request]) -> dict:
     with _urlopen_with_backoff(url_or_request) as response:
         response_data = response.read().decode('utf-8')
         json_response = json.loads(response_data)

{oauth2_cli_auth-1.6.1 → oauth2_cli_auth-2.0.0}/oauth2_cli_auth/code_grant.py

@@ -7,6 +7,7 @@ import urllib.request
 import webbrowser
 from collections.abc import Callable
 from dataclasses import dataclass
+from typing import Optional
 
 from oauth2_cli_auth._urllib_util import _load_json
 
@@ -25,11 +26,14 @@ class OAuth2ClientInfo:
     client_id: str
     """Id of the client to request for"""
 
+    client_secret: str | None
+    """Secret of the client to request for"""
+
     scopes: list[str]
     """List of scopes to request"""
 
     @staticmethod
-    def from_oidc_endpoint(oidc_config_endpoint: str, client_id: str, scopes: list[str]) -> "OAuth2ClientInfo":
+    def from_oidc_endpoint(oidc_config_endpoint: str, client_id: str, scopes: list[str] = [], client_secret: str | None = None) -> "OAuth2ClientInfo":
         """
         Create client information object from well known endpoint in format as specified in
         https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata
@@ -44,6 +48,7 @@ class OAuth2ClientInfo:
             authorization_url=config.get("authorization_endpoint"),
             token_url=config.get("token_endpoint"),
             client_id=client_id,
+            client_secret=client_secret,
             scopes=scopes,
         )
 
@@ -58,7 +63,7 @@ def load_oidc_config(odic_well_known_endpoint: str) -> dict:
     return config
 
 
-def open_browser(url: str, print_open_browser_instruction: Callable[[str], None] | None = print) -> None:
+def open_browser(url: str, print_open_browser_instruction: Optional[Callable[[str], None]] = print) -> None:
     """
     Open browser using webbrowser module and show message about URL open
 
@@ -101,7 +106,7 @@ def exchange_code_for_response(
     """
     headers = {
         "Content-Type": "application/x-www-form-urlencoded",
-        "Authorization": "Basic " + base64.b64encode(f"{client_info.client_id}:".encode()).decode(),
+        "Authorization": "Basic " + base64.b64encode(f"{client_info.client_id}:{client_info.client_secret if client_info.client_secret is not None else ''}".encode()).decode(),
     }
 
     data = {
@@ -116,6 +121,32 @@ def exchange_code_for_response(
 
     return json_response
 
+def refresh_access_token(
+        client_info: OAuth2ClientInfo,
+        refresh_token: str,
+) -> dict:
+    """
+    Refresh an access token using the endpoints from client info
+
+    :param client_info: Info about oauth2 client
+    :param refresh_token: Refresh token to use
+    :return: Response from OAuth2 endpoint
+    """
+    headers = {
+        "Content-Type": "application/x-www-form-urlencoded",
+        "Authorization": "Basic " + base64.b64encode(f"{client_info.client_id}:{client_info.client_secret if client_info.client_secret is not None else ''}".encode()).decode(),
+    }
+
+    data = {
+        "refresh_token": refresh_token,
+        "grant_type": "refresh_token",
+    }
+    encoded_data = urllib.parse.urlencode(data).encode('utf-8')
+
+    request = urllib.request.Request(client_info.token_url, data=encoded_data, headers=headers)
+    json_response = _load_json(request)
+
+    return json_response
 
 def exchange_code_for_access_token(
         client_info: OAuth2ClientInfo,

{oauth2_cli_auth-1.6.1 → oauth2_cli_auth-2.0.0}/oauth2_cli_auth/http_server.py

@@ -234,9 +234,9 @@ class OAuthCallbackHttpServer(HTTPServer):
     def __init__(self, port):
         super().__init__(("", port), OAuthRedirectHandler)
 
-        self._code: str | None = None
+        self._code: Optional[str] = None
 
-    def get_code(self) -> str | None:
+    def get_code(self) -> Optional[str]:
         """
         This method should only be called after the request was done and might be None when no token is given.
 

{oauth2_cli_auth-1.6.1 → oauth2_cli_auth-2.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oauth2-cli-auth"
-version = "1.6.1"
+version = "2.0.0"
 description = "Authenticate against OAuth2 Provider in Python CLIs"
 authors = ["Timo Reymann <mail@timo-reymann.de>"]
 license = "MIT"
@@ -26,7 +26,7 @@ include = [
     "LICENSE"
 ]
 [tool.poetry.dependencies]
-python = ">=3.9"
+python = ">=3.10"
 
 [tool.poetry.urls]
 "Bug Tracker" = "https://github.com/timo-reymann/python-oauth2-cli-auth/issues"
@@ -39,7 +39,7 @@ priority="explicit"
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.0.0"
 coverage = "^7.3.2"
-setuptools = "^78.0.0"
+setuptools = "^80.0.0"
 pydoctor = "^24.0.0"
 
 [tool.coverage.run]

oauth2_cli_auth-1.6.1/oauth2_cli_auth/__version__.py

@@ -1 +0,0 @@
-__version__ = "1.6.1"