Merge branch 'dev/1.0.3' of github.com:Neoteroi/GuardPost into dev/1.0.3

Author: RobertoPrevato

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8, 3.9, "3.10", "3.11"]
+        python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
 
     steps:
       - uses: actions/checkout@v1
@@ -81,18 +81,18 @@ jobs:
 
       - name: Install distribution dependencies
         run: pip install --upgrade build
-        if: matrix.python-version == 3.10
+        if: matrix.python-version == 3.12
 
       - name: Create distribution package
         run: python -m build
-        if: matrix.python-version == 3.10
+        if: matrix.python-version == 3.12
 
       - name: Upload distribution package
         uses: actions/upload-artifact@master
         with:
           name: dist
           path: dist
-        if: matrix.python-version == 3.10
+        if: matrix.python-version == 3.12
 
   publish:
     runs-on: ubuntu-latest
@@ -105,10 +105,10 @@ jobs:
           name: dist
           path: dist
 
-      - name: Use Python 3.11
+      - name: Use Python 3.12
         uses: actions/setup-python@v1
         with:
-          python-version: '3.11'
+          python-version: "3.12"
 
       - name: Install dependencies
         run: |

CHANGELOG.md

@@ -13,6 +13,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   (`SymmetricJWTValidator` and `AsymmetricJWTValidator`).
 - Add support to call the `authorize` method with an optional set of roles,
   treated as sufficient roles to succeed authorization.
+- Add Python `3.12` and `3.13` to the build matrix.
+- Remove Python `3.8` from the build matrix.
+- Improve `pyproject.toml`.
 
 ## [1.0.2] - 2023-06-16 :corn:
 

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Roberto Prevato
+Copyright (c) 2019-present Roberto Prevato roberto.prevato@gmail.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

guardpost/__about__.py

@@ -1 +1 @@
-__version__ = "1.0.2"
+__version__ = "1.0.3"

guardpost/jwts/__init__.py

@@ -39,8 +39,8 @@ class JWTValidatorProtocol(Protocol):
     async def validate_jwt(self, access_token: str) -> Dict[str, Any]: ...
 
 
-class AbstractJWTValidator:
-    """Base class for JWT validators with common functionality"""
+class BaseJWTValidator:
+    """Base class for JWT validators with common functionality."""
 
     def __init__(
         self,
@@ -55,7 +55,11 @@ def __init__(
         self.logger = get_logger()
 
 
-class AsymmetricJWTValidator(AbstractJWTValidator):
+class AsymmetricJWTValidator(BaseJWTValidator):
+    """
+    A JWTValidator that can validate JWTs signed using asymmetric encryption.
+    """
+
     def __init__(
         self,
         *,
@@ -196,7 +200,7 @@ async def validate_jwt(self, access_token: str) -> Dict[str, Any]:
         raise InvalidAccessToken()
 
 
-class SymmetricJWTValidator(AbstractJWTValidator):
+class SymmetricJWTValidator(BaseJWTValidator):
     def __init__(
         self,
         *,
@@ -262,7 +266,7 @@ async def validate_jwt(self, access_token: str) -> Dict[str, Any]:
         raise InvalidAccessToken()
 
 
-class CompositeJWTValidator(AbstractJWTValidator):
+class CompositeJWTValidator(BaseJWTValidator):
     def __init__(self, validators: List[JWTValidatorProtocol]) -> None:
         """
         Creates a composite validator that tries multiple validation strategies.

pyproject.toml

@@ -5,53 +5,36 @@ build-backend = "hatchling.build"
 [project]
 name = "guardpost"
 dynamic = ["version"]
-authors = [
-    { name = "Roberto Prevato", email = "roberto.prevato@gmail.com" },
-]
+authors = [{ name = "Roberto Prevato", email = "roberto.prevato@gmail.com" }]
+license = "MIT"
+license-files = ["LICENSE"]
 description = "Framework to handle authentication and authorization."
 readme = "README.md"
 requires-python = ">=3.7"
 classifiers = [
-    "Development Status :: 5 - Production/Stable",
-    "License :: OSI Approved :: MIT License",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.7",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Operating System :: OS Independent",
+  "Development Status :: 5 - Production/Stable",
+  "License :: OSI Approved :: MIT License",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+  "Operating System :: OS Independent",
 ]
 keywords = ["authentication", "authorization", "identity", "claims", "strategy"]
-dependencies = [
-    "rodi>=2.0.0",
-    "typing_extensions; python_version < '3.8'",
-]
+dependencies = ["rodi>=2.0.0", "typing_extensions; python_version < '3.8'"]
 
 [project.optional-dependencies]
-jwt = [
-  "PyJWT",
-  "cryptography",
-]
+jwt = ["PyJWT", "cryptography"]
 
 [tool.hatch.build.targets.sdist]
-exclude = [
-  "/.github",
-  "/docs",
-  "/examples",
-  "/deps",
-  "/styles",
-  "/tests",
-  "mkdocs-plugins.code-workspace",
-  "Makefile",
-  "CODE_OF_CONDUCT.md",
-  ".isort.cfg",
-  ".gitignore",
-  ".flake8",
-  "junit",
-  "guardpost.code-workspace",
-  "requirements.txt",
-  "examples-summary.py"
+include = [
+  "guardpost/",
+  "README.md",
+  "LICENSE*",
+  "CHANGELOG*",
+  "pyproject.toml",
 ]
 
 [tool.hatch.version]

tests/serverfixtures.py

@@ -3,7 +3,7 @@
 from multiprocessing import Process
 from time import sleep
 
-import pkg_resources
+from importlib.resources import files
 import pytest
 from flask import Flask
 
@@ -17,7 +17,7 @@
 
 
 def get_file_path(file_name, folder_name: str = "res") -> str:
-    return pkg_resources.resource_filename(__name__, f"./{folder_name}/{file_name}")
+    return str(files(__package__) / folder_name / file_name)
 
 
 def get_test_jwks_dict():

tests/test_examples.py

@@ -1,17 +1,20 @@
 import glob
 import importlib
 import sys
+from pathlib import Path
 
 import pytest
 
-examples = [file for file in glob.glob("./examples/*.py")]
+examples = [
+    file for file in glob.glob("./examples/*.py") if not file.endswith("__init__.py")
+]
 
 
 sys.path.append("./examples")
 
 
 @pytest.mark.parametrize("file_path", examples)
 def test_example(file_path: str):
-    module_name = file_path.replace("./examples/", "").replace(".py", "")
-    # assertions are in imported
+    module_name = Path(file_path).stem
+    # assertions are in the imported code
     importlib.import_module(module_name)