pypomes-iam 0.2.3__tar.gz → 0.2.5__tar.gz

{pypomes_iam-0.2.3 → pypomes_iam-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypomes_iam
-Version: 0.2.3
+Version: 0.2.5
 Summary: A collection of Python pomes, penyeach (IAM modules)
 Project-URL: Homepage, https://github.com/TheWiseCoder/PyPomes-IAM
 Project-URL: Bug Tracker, https://github.com/TheWiseCoder/PyPomes-IAM/issues

{pypomes_iam-0.2.3 → pypomes_iam-0.2.5}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pypomes_iam"
-version = "0.2.3"
+version = "0.2.5"
 authors = [
   { name="GT Nunes", email="wisecoder01@gmail.com" }
 ]

{pypomes_iam-0.2.3 → pypomes_iam-0.2.5}/src/pypomes_iam/common_pomes.py

@@ -292,9 +292,9 @@ def _get_user_data(registry: dict[str, Any],
         }
         users[user_id] = result
         if logger:
-            logger.debug(msg=f"Entry for user '{user_id}' added to the registry")
+            logger.debug(msg=f"Entry for '{user_id}' added to the registry")
     elif logger:
-        logger.debug(msg=f"Entry for user '{user_id}' obtained from the registry")
+        logger.debug(msg=f"Entry for '{user_id}' obtained from the registry")
 
     return result
 

{pypomes_iam-0.2.3 → pypomes_iam-0.2.5}/src/pypomes_iam/iam_pomes.py

@@ -22,14 +22,8 @@ def service_login() -> Response:
 
     :return: the response from the redirect operation
     """
-    logger: Logger
-    registry: dict[str, Any]
-    if request.endpoint == "jusbr-login":
-        logger = _jusbr_get_logger()
-        registry = _jusbr_get_registry()
-    else:
-        logger = _keycloak_get_logger()
-        registry = _keycloak_get_registry()
+    # retrieve logger and registry
+    logger, registry = _get_iam_args(endpoint=request.endpoint)
 
     # log the request
     if logger:
@@ -61,14 +55,8 @@ def service_logout() -> Response:
 
     :return: response *OK*
     """
-    logger: Logger
-    registry: dict[str, Any]
-    if request.endpoint == "jusbr-logout":
-        logger = _jusbr_get_logger()
-        registry = _jusbr_get_registry()
-    else:
-        logger = _keycloak_get_logger()
-        registry = _keycloak_get_registry()
+    # retrieve logger and registry
+    logger, registry = _get_iam_args(endpoint=request.endpoint)
 
     # log the request
     if logger:
@@ -98,14 +86,8 @@ def service_callback() -> Response:
 
     :return: the response containing the token, or *BAD REQUEST*
     """
-    logger: Logger
-    registry: dict[str, Any]
-    if request.endpoint == "jusbr-callback":
-        logger = _jusbr_get_logger()
-        registry = _jusbr_get_registry()
-    else:
-        logger = _keycloak_get_logger()
-        registry = _keycloak_get_registry()
+    # retrieve logger and registry
+    logger, registry = _get_iam_args(endpoint=request.endpoint)
 
     # log the request
     if logger:
@@ -143,14 +125,8 @@ def service_token() -> Response:
 
     :return: the response containing the token, or *UNAUTHORIZED*
     """
-    logger: Logger
-    registry: dict[str, Any]
-    if request.endpoint == "jusbr-token":
-        logger = _jusbr_get_logger()
-        registry = _jusbr_get_registry()
-    else:
-        logger = _keycloak_get_logger()
-        registry = _keycloak_get_registry()
+    # retrieve logger and registry
+    logger, registry = _get_iam_args(endpoint=request.endpoint)
 
     # log the request
     if logger:
@@ -174,3 +150,25 @@ def service_token() -> Response:
         logger.debug(msg=f"Response {result}")
 
     return result
+
+
+def _get_iam_args(endpoint: str) -> tuple[Logger, dict[str, Any]]:
+    """
+    Retrieve the logger and registry associated the the IAM identifies by *endpoint*.
+
+    :param endpoint: the service enpoint identifying the IAM.
+    :return: the tuple (*logger*, *registry*) associated with *endpoint*
+    """
+    # initialize the return variables
+    result_logger: Logger | None = None
+    result_registry: dict[str, Any] | None = None
+
+    if endpoint.startswith("jusbr-"):
+        result_logger = _jusbr_get_logger()
+        result_registry = _jusbr_get_registry()
+    elif endpoint.startswith("keycloak-"):
+        result_logger = _keycloak_get_logger()
+        result_registry = _keycloak_get_registry()
+
+    return result_logger, result_registry
+

{pypomes_iam-0.2.3 → pypomes_iam-0.2.5}/src/pypomes_iam/jusbr_pomes.py

@@ -91,7 +91,7 @@ def jusbr_setup(flask_app: Flask,
     global _jusbr_logger, _jusbr_registry
 
     # establish the logger
-    _logger = logger
+    _jusbr_logger = logger
 
     # configure the JusBR registry
     safe_cache: Cache = FIFOCache(maxsize=1048576)

{pypomes_iam-0.2.3 → pypomes_iam-0.2.5}/src/pypomes_iam/keycloak_pomes.py

@@ -111,11 +111,6 @@ def keycloak_setup(flask_app: Flask,
     }
 
     # establish the endpoints
-    if token_endpoint:
-        flask_app.add_url_rule(rule=token_endpoint,
-                               endpoint="keycloak-token",
-                               view_func=service_token,
-                               methods=["GET"])
     if login_endpoint:
         flask_app.add_url_rule(rule=login_endpoint,
                                endpoint="keycloak-login",
@@ -131,6 +126,11 @@ def keycloak_setup(flask_app: Flask,
                                endpoint="keycloak-callback",
                                view_func=service_callback,
                                methods=["POST"])
+    if token_endpoint:
+        flask_app.add_url_rule(rule=token_endpoint,
+                               endpoint="keycloak-token",
+                               view_func=service_token,
+                               methods=["GET"])
 
 
 def keycloak_get_token(user_id: str,