pypomes-iam 0.4.3__tar.gz → 0.4.5__tar.gz

{pypomes_iam-0.4.3 → pypomes_iam-0.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypomes_iam
-Version: 0.4.3
+Version: 0.4.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.4.3 → pypomes_iam-0.4.5}/pyproject.toml

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

{pypomes_iam-0.4.3 → pypomes_iam-0.4.5}/src/pypomes_iam/iam_common.py

@@ -28,8 +28,7 @@ class IamServer(StrEnum):
 #       "pk-lifetime": <int>,
 #       "pk-expiration": <int>,
 #       "base-url": <str>,
-#       "cache": <FIFOCache>,
-#       "redirect-uri": <str>  <-- transient
+#       "cache": <FIFOCache>
 #    },
 #    ...
 # }
@@ -41,8 +40,10 @@ class IamServer(StrEnum):
 #          "refresh-token": <str>
 #          "access-expiration": <timestamp>,
 #          "refresh-expiration": <timestamp>,
-#          "login-expiration": <timestamp>,    <-- transient
-#          "login-id": <str>,                  <-- transient
+#          # transient attributes:
+#          "login-expiration": <timestamp>,
+#          "login-id": <str>,
+#          "redirect-uri": <str>
 #       }
 #    },
 #   ...

{pypomes_iam-0.4.3 → pypomes_iam-0.4.5}/src/pypomes_iam/iam_pomes.py

@@ -5,7 +5,6 @@ import string
 import sys
 from datetime import datetime
 from logging import Logger
-from urllib import parse
 from pypomes_core import TZ_LOCAL, exc_format
 from typing import Any
 
@@ -63,18 +62,18 @@ def user_login(iam_server: IamServer,
                 user_data["login-expiration"] = int(datetime.now(tz=TZ_LOCAL).timestamp()) + timeout \
                     if timeout else None
                 redirect_uri: str = args.get("redirect-uri")
+                user_data["redirect-uri"] = redirect_uri
 
                 # build the login url
                 registry: dict[str, Any] = _get_iam_registry(iam_server=iam_server,
                                                              errors=errors,
                                                              logger=logger)
                 if registry:
-                    registry["redirect-uri"] = redirect_uri
-                    result = parse.quote(f"{registry["base-url"]}/protocol/openid-connect/auth"
-                                         f"?response_type=code&scope=openid"
-                                         f"&client_id={registry["client-id"]}"
-                                         f"&redirect_uri={redirect_uri}"
-                                         f"&state={oauth_state}")
+                    result = (f"{registry["base-url"]}/protocol/openid-connect/auth"
+                              f"?response_type=code&scope=openid"
+                              f"&client_id={registry["client-id"]}"
+                              f"&redirect_uri={redirect_uri}"
+                              f"&state={oauth_state}")
     return result
 
 
@@ -204,7 +203,7 @@ def login_callback(iam_server: IamServer,
 
     The relevant expected arguments in *args* are:
         - *state*: used to enhance security during the authorization process, typically to provide *CSRF* protection
-        - *code*: the temporary authorization code, to be exchanged for the token
+        - *code*: the temporary authorization code provided by *iam_server*, to be exchanged for the token
 
     :param iam_server: the reference registered *IAM* server
     :param args: the arguments passed when requesting the service
@@ -216,11 +215,10 @@ def login_callback(iam_server: IamServer,
     result: tuple[str, str] | None = None
 
     with _iam_lock:
-        # retrieve the IAM server's registry and the data for all users therein
-        registry: dict[str, Any] = _get_iam_registry(iam_server=iam_server,
-                                                     errors=errors,
-                                                     logger=logger)
-        users: dict[str, dict[str, Any]] = (registry["cache"]["users"] or {}) if registry else {}
+        # retrieve the IAM server's data for all users
+        users: dict[str, dict[str, Any]] = _get_iam_users(iam_server=iam_server,
+                                                          errors=errors,
+                                                          logger=logger) or {}
         # retrieve the OAuth2 state
         oauth_state: str = args.get("state")
         user_data: dict[str, Any] | None = None
@@ -241,7 +239,7 @@ def login_callback(iam_server: IamServer,
                 body_data: dict[str, Any] = {
                     "grant_type": "authorization_code",
                     "code": code,
-                    "redirect_uri": registry["redirect-uri"]
+                    "redirect_uri": user_data["redirect-uri"]
                 }
                 now: int = int(datetime.now(tz=TZ_LOCAL).timestamp())
                 token_data: dict[str, Any] = __post_for_token(iam_server=iam_server,

{pypomes_iam-0.4.3 → pypomes_iam-0.4.5}/src/pypomes_iam/iam_services.py

@@ -72,7 +72,7 @@ def service_login() -> Response:
 
     # log the response
     if __IAM_LOGGER:
-        __IAM_LOGGER.debug(msg=f"Response {result}")
+        __IAM_LOGGER.debug(msg=f"Response {result}, {result.get_data(as_text=True)}")
 
     return result
 
@@ -137,7 +137,7 @@ def service_callback() -> Response:
 
     The relevant expected request arguments are:
         - *state*: used to enhance security during the authorization process, typically to provide *CSRF* protection
-        - *code*: the temporary authorization code, to be exchanged for the token
+        - *code*: the temporary authorization code provided by the IAM server, to be exchanged for the token
 
     On success, the returned *Response* will contain the following JSON:
         {
@@ -173,7 +173,7 @@ def service_callback() -> Response:
                           "token": token_data[1]})
     # log the response
     if __IAM_LOGGER:
-        __IAM_LOGGER.debug(msg=f"Response {result}")
+        __IAM_LOGGER.debug(msg=f"Response {result}, {result.get_data(as_text=True)}")
 
     return result
 
@@ -234,7 +234,7 @@ def service_token() -> Response:
                           "token": token})
     # log the response
     if __IAM_LOGGER:
-        __IAM_LOGGER.debug(msg=f"Response {result}")
+        __IAM_LOGGER.debug(msg=f"Response {result}, {result.get_data(as_text=True)}")
 
     return result
 
@@ -291,7 +291,7 @@ def service_exchange() -> Response:
 
     # log the response
     if __IAM_LOGGER:
-        __IAM_LOGGER.debug(msg=f"Response {result}")
+        __IAM_LOGGER.debug(msg=f"Response {result}, {result.get_data(as_text=True)}")
 
     return result