Merge pull request #27 from extrawest/bugfix/version-endpoints-no-auth

[bugfix] Version endpoints no auth support

py_ocpi/core/authentication/verifier.py

@@ -131,6 +131,35 @@ async def __call__(
         return await authenticator.authenticate_credentials(token)
 
 
+class VersionsAuthorizationVerifier(CredentialsAuthorizationVerifier):
+    """
+    A class responsible for verifying authorization tokens
+    based on the specified version number.
+    """
+
+    async def __call__(
+        self,
+        authorization: str = auth_verifier,
+        authenticator: Authenticator = Depends(get_authenticator),
+    ) -> str | dict | None:
+        """
+        Verifies the authorization token using the specified version
+        and an Authenticator for version endpoints.
+
+        :param authorization (str): The authorization header containing
+          the token.
+        :param authenticator (Authenticator): An Authenticator instance used
+          for authentication.
+
+        :raises AuthorizationOCPIError: If there is an issue with
+          the authorization token.
+        """
+        if settings.NO_AUTH and authorization == "":
+            logger.debug("Authentication skipped due to NO_AUTH setting.")
+            return ""
+        return await super().__call__(authorization, authenticator)
+
+
 class HttpPushVerifier:
     """
     A class responsible for verifying authorization tokens if using push.

py_ocpi/modules/versions/main.py

@@ -7,7 +7,7 @@
 )
 
 from py_ocpi.core.authentication.verifier import (
-    CredentialsAuthorizationVerifier,
+    VersionsAuthorizationVerifier,
 )
 from py_ocpi.core import status
 from py_ocpi.core.config import logger
@@ -20,7 +20,7 @@
 
 
 router = APIRouter()
-cred_dependency = CredentialsAuthorizationVerifier(None)
+cred_dependency = VersionsAuthorizationVerifier(None)
 
 
 @router.get("/versions", response_model=OCPIResponse)

py_ocpi/modules/versions/v_2_1_1/api/main.py

@@ -7,7 +7,7 @@
 )
 
 from py_ocpi.core.authentication.verifier import (
-    CredentialsAuthorizationVerifier,
+    VersionsAuthorizationVerifier,
 )
 from py_ocpi.core.crud import Crud
 from py_ocpi.core import status
@@ -21,7 +21,7 @@
 )
 
 router = APIRouter()
-cred_dependency = CredentialsAuthorizationVerifier(VersionNumber.v_2_1_1)
+cred_dependency = VersionsAuthorizationVerifier(VersionNumber.v_2_1_1)
 
 
 @router.get("/2.1.1/details", response_model=OCPIResponse)

py_ocpi/modules/versions/v_2_2_1/api/main.py

@@ -7,7 +7,7 @@
 )
 
 from py_ocpi.core.authentication.verifier import (
-    CredentialsAuthorizationVerifier,
+    VersionsAuthorizationVerifier,
 )
 from py_ocpi.core.crud import Crud
 from py_ocpi.core import status
@@ -21,7 +21,7 @@
 )
 
 router = APIRouter()
-cred_dependency = CredentialsAuthorizationVerifier(VersionNumber.v_2_2_1)
+cred_dependency = VersionsAuthorizationVerifier(VersionNumber.v_2_2_1)
 
 
 @router.get("/2.2.1/details", response_model=OCPIResponse)