pypomes-iam 0.6.0__py3-none-any.whl → 0.7.4__py3-none-any.whl

pypomes_iam/iam_actions.py

@@ -10,8 +10,8 @@ from typing import Any
 
 from .iam_common import (
     IamServer, IamParam, UserParam, _iam_lock,
-    _get_iam_users, _get_iam_registry,  # _get_public_key,
-    _get_login_timeout, _get_user_data
+    _get_iam_users, _get_iam_registry, _get_public_key,
+    _get_login_timeout, _get_user_data, _iam_server_from_issuer
 )
 from .token_pomes import token_get_claims, token_validate
 
@@ -59,7 +59,7 @@ def action_login(iam_server: IamServer,
                                               errors=errors,
                                               logger=logger)
             if not errors:
-                user_data[UserParam.LOGIN_EXPIRATION] = int(datetime.now(tz=TZ_LOCAL).timestamp()) + timeout \
+                user_data[UserParam.LOGIN_EXPIRATION] = (int(datetime.now(tz=TZ_LOCAL).timestamp()) + timeout) \
                     if timeout else None
                 redirect_uri: str = args.get(UserParam.REDIRECT_URI)
                 user_data[UserParam.REDIRECT_URI] = redirect_uri
@@ -138,6 +138,7 @@ def action_token(iam_server: IamServer,
                                                        user_id=user_id,
                                                        errors=errors,
                                                        logger=logger)
+            # retrieve the stored access token
             token: str = user_data[UserParam.ACCESS_TOKEN] if user_data else None
             if token:
                 access_expiration: int = user_data.get(UserParam.ACCESS_EXPIRATION)
@@ -148,7 +149,7 @@ def action_token(iam_server: IamServer,
                     # access token has expired
                     refresh_token: str = user_data[UserParam.REFRESH_TOKEN]
                     if refresh_token:
-                        refresh_expiration = user_data[UserParam.REFRESH_EXPIRATION]
+                        refresh_expiration: int = user_data[UserParam.REFRESH_EXPIRATION]
                         if now < refresh_expiration:
                             header_data: dict[str, str] = {
                                 "Content-Type": "application/json"
@@ -242,7 +243,7 @@ def action_callback(iam_server: IamServer,
                 users.pop(oauth_state)
                 code: str = args.get("code")
                 header_data: dict[str, str] = {
-                    "Content-Type": "application/json"
+                    "Content-Type": "application/x-www-form-urlencoded"
                 }
                 body_data: dict[str, Any] = {
                     "grant_type": "authorization_code",
@@ -276,7 +277,7 @@ def action_callback(iam_server: IamServer,
 def action_exchange(iam_server: IamServer,
                     args: dict[str, Any],
                     errors: list[str] = None,
-                    logger: Logger = None) -> dict[str, Any]:
+                    logger: Logger = None) -> tuple[str, str]:
     """
     Request *iam_server* to issue a token in exchange for the token obtained from another *IAM* server.
 
@@ -297,17 +298,23 @@ def action_exchange(iam_server: IamServer,
     :param args: the arguments passed when requesting the service
     :param errors: incidental errors
     :param logger: optional logger
-    :return: the data for the new token, or *None* if error
+    :return: a tuple containing the reference user identification and the token obtained, or *None* if error
     """
     # initialize the return variable
-    result: dict[str, Any] | None = None
+    result: tuple[str, str] | None = None
 
     # obtain the user's identification
     user_id: str = args.get("user-id") or args.get("login")
 
     # obtain the token to be exchanged
     token: str = args.get("access-token") if user_id else None
-    if token:
+    token_claims: dict[str, dict[str, Any]] = token_get_claims(token=token,
+                                                               errors=errors,
+                                                               logger=logger) if token else None
+    token_issuer: str = _iam_server_from_issuer(issuer=token_claims["payload"]["iss"],
+                                                errors=errors,
+                                                logger=logger) if token_claims else None
+    if not errors:
         # HAZARD: only 'IAM_KEYCLOAK' is currently supported
         with _iam_lock:
             # retrieve the IAM server's registry
@@ -323,6 +330,8 @@ def action_exchange(iam_server: IamServer,
                               logger=logger)
                 if not errors:
                     # exchange the token
+                    if logger:
+                        logger.debug(msg=f"Requesting the token exchange to IAM server '{iam_server}'")
                     header_data: dict[str, Any] = {
                         "Content-Type": "application/x-www-form-urlencoded"
                     }
@@ -332,7 +341,7 @@ def action_exchange(iam_server: IamServer,
                         "subject_token_type": "urn:ietf:params:oauth:token-type:access_token",
                         "requested_token_type": "urn:ietf:params:oauth:token-type:access_token",
                         "audience": registry[IamParam.CLIENT_ID],
-                        "subject_issuer": "oidc"
+                        "subject_issuer": token_issuer
                     }
                     now: int = int(datetime.now(tz=TZ_LOCAL).timestamp())
                     token_data: dict[str, Any] = __post_for_token(iam_server=iam_server,
@@ -367,7 +376,7 @@ def __assert_link(iam_server: IamServer,
     """
     Make sure *iam_server* has a link associating *user_id* to an internal user identification.
     This is a requirement for exchanging a token issued by a federated *IAM* server for an equivalent
-    one from *iam_server.
+    one from *iam_server*.
 
     :param iam_server: the reference *IAM* server
     :param user_id: the reference user identification
@@ -375,6 +384,9 @@ def __assert_link(iam_server: IamServer,
     :param errors: incidental errors
     :param logger: optional logger
     """
+    if logger:
+        logger.debug(msg="Verifying associations for user "
+                         f"'{user_id}' in IAM server '{iam_server}'")
     # obtain a token with administrative rights
     admin_token: str = __get_administrative_token(iam_server=iam_server,
                                                   errors=errors,
@@ -383,7 +395,10 @@ def __assert_link(iam_server: IamServer,
         registry: dict[str, Any] = _get_iam_registry(iam_server=iam_server,
                                                      errors=errors,
                                                      logger=logger)
-        # obtain the internal user identification for 'from_id'
+        # obtain the internal user identification for 'user_id'
+        if logger:
+            logger.debug(msg="Obtaining internal identification "
+                             f"for user {user_id} in IAM server {iam_server}")
         url: str = f"{registry[IamParam.URL_BASE]}/admin/realms/{registry[IamParam.CLIENT_REALM]}/users"
         header_data: dict[str, str] = {
             "Authorization": f"Bearer {admin_token}",
@@ -393,15 +408,18 @@ def __assert_link(iam_server: IamServer,
             "username": user_id,
             "exact": "true"
         }
-        users: dict[str, Any] = __get_for_data(url=url,
-                                               header_data=header_data,
-                                               params=params,
-                                               errors=errors,
-                                               logger=logger)
+        users: list[dict[str, Any]] = __get_for_data(url=url,
+                                                     header_data=header_data,
+                                                     params=params,
+                                                     errors=errors,
+                                                     logger=logger)
         if users:
             # verify whether the 'oidc' protocol is referred to in an
-            # association between 'from_id' and the internal user identification
-            internal_id: str = users.get("id")
+            # association between 'user_id' and the internal user identification
+            internal_id: str = users[0].get("id")
+            if logger:
+                logger.debug(msg="Obtaining the providers federated with "
+                                 f"IAM server '{iam_server}' for internal identification '{internal_id}'")
             url = (f"{registry[IamParam.URL_BASE]}/admin/realms/"
                    f"{registry[IamParam.CLIENT_REALM]}/users/{internal_id}/federated-identity")
             providers: list[dict[str, Any]] = __get_for_data(url=url,
@@ -410,27 +428,38 @@ def __assert_link(iam_server: IamServer,
                                                              errors=errors,
                                                              logger=logger)
             no_link: bool = True
-            for provider in providers:
-                if provider.get("identityProvider") == "oidc":
-                    no_link = False
-                    break
-            if no_link:
-                # link the identities
-                claims: dict[str, dict[str, Any]] = token_get_claims(token=token,
-                                                                     errors=errors,
-                                                                     logger=logger)
-                if claims:
-                    token_sub: str = claims["paylod"]["sub"]
-                    url += "/oidc"
-                    body_data: dict[str, Any] = {
-                        "userId": token_sub,
-                        "userName": user_id
-                    }
-                    __post_data(url=url,
-                                header_data=header_data,
-                                body_data=body_data,
-                                errors=errors,
-                                logger=logger)
+            claims: dict[str, dict[str, Any]] = token_get_claims(token=token,
+                                                                 errors=errors,
+                                                                 logger=logger)
+            issuer: str = claims["payload"]["iss"] if claims else None
+            provider_name: str = _iam_server_from_issuer(issuer=issuer,
+                                                         errors=errors,
+                                                         logger=logger) if issuer else None
+            if provider_name:
+                for provider in providers:
+                    if provider.get("identityProvider") == provider_name:
+                        no_link = False
+                        break
+                if no_link:
+                    # link the identities
+                    claims: dict[str, dict[str, Any]] = token_get_claims(token=token,
+                                                                         errors=errors,
+                                                                         logger=logger)
+                    if claims:
+                        token_sub: str = claims["payload"]["sub"]
+                        if logger:
+                            logger.debug(msg="Creating an association between identifications "
+                                             f"'{user_id}' and '{token_sub}' in IAM server {iam_server}")
+                        url += f"/{provider_name}"
+                        json_data: dict[str, Any] = {
+                            "userId": token_sub,
+                            "userName": user_id
+                        }
+                        __post_json(url=url,
+                                    header_data=header_data,
+                                    json_data=json_data,
+                                    errors=errors,
+                                    logger=logger)
 
 
 def __get_administrative_token(iam_server: IamServer,
@@ -450,31 +479,47 @@ def __get_administrative_token(iam_server: IamServer,
     # initialize the return variable
     result: str | None = None
 
+    if logger:
+        logger.debug(msg="Requesting a token with "
+                         f"administrative rights to IAM Server '{iam_server}'")
+
     # obtain the IAM server's registry
     registry: dict[str, Any] = _get_iam_registry(iam_server=iam_server,
                                                  errors=errors,
                                                  logger=logger)
-    if registry and registry[IamParam.ADMIN_ID] and registry[IamParam.ADMIN_SECRET]:
-        header_data: dict[str, str] = {
-            "Content-Type": "application/json"
-        }
-        body_data: dict[str, str] = {
-            "grant-type": "password",
-            "username": registry[IamParam.ADMIN_ID],
-            "password": registry[IamParam.ADMIN_SECRET],
-            "client_id": registry[IamParam.CLIENT_ID]
-        }
-        token_data: dict[str, Any] = __post_for_token(iam_server=iam_server,
-                                                      header_data=header_data,
-                                                      body_data=body_data,
-                                                      errors=errors,
-                                                      logger=logger)
-        if token_data:
-            # obtain the token
-            result = token_data["access_token"]
-    else:
-        msg: str = (f"To obtain token with administrative rights from '{iam_server}', "
-                    f"the credentials for the realm administrator must be provided at setup time")
+    if registry:
+        if registry[IamParam.ADMIN_ID] and registry[IamParam.ADMIN_SECRET]:
+            header_data: dict[str, str] = {
+                "Content-Type": "application/x-www-form-urlencoded"
+            }
+            body_data: dict[str, str] = {
+                "grant_type": "password",
+                "username": registry[IamParam.ADMIN_ID],
+                "password": registry[IamParam.ADMIN_SECRET],
+                "client_id": "admin-cli"
+            }
+            token_data: dict[str, Any] = __post_for_token(iam_server=iam_server,
+                                                          header_data=header_data,
+                                                          body_data=body_data,
+                                                          errors=errors,
+                                                          logger=logger)
+            if token_data:
+                # obtain the token
+                result = token_data["access_token"]
+                if logger:
+                    logger.debug(msg="Administrative token obtained")
+
+        elif logger or isinstance(errors, list):
+            msg: str = ("Credentials for administrator of realm "
+                        f"'{registry[IamParam.CLIENT_REALM]}' "
+                        f"at IAM server '{iam_server}' not provided")
+            if logger:
+                logger.error(msg=msg)
+            if isinstance(errors, list):
+                errors.append(msg)
+
+    elif logger or isinstance(errors, list):
+        msg: str = f"Unknown IAM server {iam_server}"
         if logger:
             logger.error(msg=msg)
         if isinstance(errors, list):
@@ -510,14 +555,19 @@ def __get_client_secret(iam_server: IamServer,
                                                 errors=errors,
                                                 logger=logger)
         if token:
+            realm: str = registry[IamParam.CLIENT_REALM]
+            client_id: str = registry[IamParam.CLIENT_ID]
+            if logger:
+                logger.debug(msg=f"Obtaining the UUID for client '{client_id}', "
+                                 f"in realm '{realm}' at IAM server '{iam_server}'")
             # obtain the client UUID
-            url: str = f"{registry[IamParam.URL_BASE]}/realms/{registry[IamParam.CLIENT_REALM]}/clients"
+            url: str = f"{registry[IamParam.URL_BASE]}/realms/{realm}/clients"
             header_data: dict[str, str] = {
                 "Authorization": f"Bearer {token}",
                 "Content-Type": "application/json"
             }
             params: dict[str, str] = {
-                "clientId": registry[IamParam.CLIENT_ID]
+                "clientId": client_id
             }
             clients: list[dict[str, Any]] = __get_for_data(url=url,
                                                            header_data=header_data,
@@ -527,6 +577,9 @@ def __get_client_secret(iam_server: IamServer,
             if clients:
                 # obtain the client's secret password
                 client_uuid: str = clients[0]["id"]
+                if logger:
+                    logger.debug(msg=f"Obtaining the secret for client UUID '{client_uuid}', "
+                                     f"in realm '{realm}' at IAM server '{iam_server}'")
                 url += f"/{client_uuid}/client-secret"
                 reply: dict[str, Any] = __get_for_data(url=url,
                                                        header_data=header_data,
@@ -573,7 +626,7 @@ def __get_for_data(url: str,
                 logger.debug(msg=f"GET success, {json.dumps(obj=result,
                                                             ensure_ascii=False)}")
         else:
-            # request resulted in error
+            # request failed, report the problem
             msg: str = f"GET failure, status {response.status_code}, reason {response.reason}"
             if hasattr(response, "content") and response.content:
                 msg += f", content '{response.content}'"
@@ -593,29 +646,29 @@ def __get_for_data(url: str,
     return result
 
 
-def __post_data(url: str,
+def __post_json(url: str,
                 header_data: dict[str, str],
-                body_data: dict[str, Any],
+                json_data: dict[str, Any],
                 errors: list[str] | None,
                 logger: Logger | None) -> None:
     """
     Submit a *POST* request to *url*.
 
     :param header_data: the data to send in the header of the request
-    :param body_data: the data to send in the body of the request
+    :param json_data: the JSON data to send in the request
     :param errors: incidental errors
     :param logger: optional logger
     """
     # log the POST
     if logger:
-        logger.debug(msg=f"POST {url}, {json.dumps(obj=body_data,
+        logger.debug(msg=f"POST {url}, {json.dumps(obj=json_data,
                                                    ensure_ascii=False)}")
     try:
-        response: requests.Response = requests.get(url=url,
-                                                   headers=header_data,
-                                                   data=body_data)
+        response: requests.Response = requests.post(url=url,
+                                                    headers=header_data,
+                                                    json=json_data)
         if response.status_code >= 400:
-            # request resulted in error
+            # request failed, report the problem
             msg = f"POST failure, status {response.status_code}, reason {response.reason}"
             if hasattr(response, "content") and response.content:
                 msg += f", content '{response.content}'"
@@ -665,9 +718,9 @@ def __post_for_token(iam_server: IamServer,
         - "username": <realm-administrator-identification>
         - "password": <realm-administrator-secret>
 
-    These attributes are then added to *body_data*:
+    These attributes are then added to *body_data*, except for acquiring administrative tokens:
         - "client_id": <client-id>
-        - "client_secret": <client-secret>  <- except for acquiring administrative tokens
+        - "client_secret": <client-secret>
 
     If the operation is successful, the token data is stored in the *IAM* server's registry, and returned.
     Otherwise, *errors* will contain the appropriate error message.
@@ -699,21 +752,25 @@ def __post_for_token(iam_server: IamServer,
                                                      logger=logger)
         if registry:
             # complete the data to send in body of request
-            body_data["client_id"] = registry[IamParam.CLIENT_ID]
+            if body_data["grant_type"] != "password":
+                body_data["client_id"] = registry[IamParam.CLIENT_ID]
 
             # build the URL
             base_url: str = f"{registry[IamParam.URL_BASE]}/realms/{registry[IamParam.CLIENT_REALM]}"
             url: str = f"{base_url}/protocol/openid-connect/token"
-
-            # log the POST ('client_secret' data must not be shown in log)
+            #  'client_secret' data must not be shown in log
+            msg: str = f"POST {url}, {json.dumps(obj=body_data,
+                                                 ensure_ascii=False)}"
+            if body_data["grant_type"] != "password":
+                # 'client_secret' not required for requesting tokens from staging environments
+                client_secret: str = __get_client_secret(iam_server=iam_server,
+                                                         errors=None,
+                                                         logger=logger)
+                if client_secret:
+                    body_data["client_secret"] = client_secret
+            # log the POST
             if logger:
-                logger.debug(msg=f"POST {url}, {json.dumps(obj=body_data,
-                                                           ensure_ascii=False)}")
-            client_secret: str = __get_client_secret(iam_server=iam_server,
-                                                     errors=errors,
-                                                     logger=logger)
-            if body_data["grant_type"] != "password" and client_secret:
-                body_data["client_secret"] = client_secret
+                logger.debug(msg=msg)
 
             # obtain the token
             try:
@@ -735,7 +792,7 @@ def __post_for_token(iam_server: IamServer,
                         logger.debug(msg=f"POST success, {json.dumps(obj=result,
                                                                      ensure_ascii=False)}")
                 else:
-                    # request resulted in error
+                    # request failed, report the problem
                     err_msg = f"POST failure, status {response.status_code}, reason {response.reason}"
                     if hasattr(response, "content") and response.content:
                         err_msg += f", content '{response.content}'"
@@ -796,9 +853,9 @@ def __validate_and_store(iam_server: IamServer,
             user_data["access-expiration"] = now + token_data.get("expires_in")
             refresh_exp: int = user_data.get("refresh_expires_in")
             user_data["refresh-expiration"] = (now + refresh_exp) if refresh_exp else sys.maxsize
-            # public_key: str = _get_public_key(iam_server=iam_server,
-            #                                   errors=errors,
-            #                                   logger=logger)
+            public_key: str = _get_public_key(iam_server=iam_server,
+                                              errors=errors,
+                                              logger=logger)
             recipient_attr = registry[IamParam.RECIPIENT_ATTR]
             login_id = user_data.pop("login-id", None)
             base_url: str = f"{registry[IamParam.URL_BASE]}/realms/{registry[IamParam.CLIENT_REALM]}"
@@ -806,7 +863,7 @@ def __validate_and_store(iam_server: IamServer,
                                                                issuer=base_url,
                                                                recipient_id=login_id,
                                                                recipient_attr=recipient_attr,
-                                                               # public_key=public_key,
+                                                               public_key=public_key,
                                                                errors=errors,
                                                                logger=logger)
             if claims:

pypomes_iam/iam_common.py

@@ -58,16 +58,17 @@ class UserParam(StrEnum):
 # Specifying configuration parameters with environment variables can be done in two ways:
 #
 # 1. for a single *IAM* server, specify the data set
-#       - *<APP_PREFIX>_IAM_ADMIN_ID*             (optional, needed only if administrative duties are performed)
-#       - *<APP_PREFIX>_IAM_ADMIN_PWD*            (optional, needed only if administrative duties are performed)
+#       - *<APP_PREFIX>_IAM_ADMIN_ID*             (optional, needed if administrative duties are performed)
+#       - *<APP_PREFIX>_IAM_ADMIN_PWD*            (optional, needed if administrative duties are performed)
 #       - *<APP_PREFIX>_IAM_CLIENT_ID*            (required)
 #       - *<APP_PREFIX>_IAM_CLIENT_REALM*         (required)
 #       - *<APP_PREFIX>_IAM_CLIENT_SECRET*        (required)
-#       - *<APP_PREFIX>_IAM_ENDPOINT_CALLBACK*    (optional)
-#       - *<APP_PREFIX>_IAM_ENDPOINT_LOGIN*       (optional)
-#       - *<APP_PREFIX>_IAM_ENDPOINT_LOGOUT*      (optional)
-#       - *<APP_PREFIX>_IAM_ENDPOINT_TOKEN*       (optional)
-#       - *<APP_PREFIX>_IAM_ENDPOINT_EXCHANGE*    (optional)
+#       - *<APP_PREFIX>_IAM_ENDPOINT_CALLBACK*    (required)
+#       - *<APP_PREFIX>_IAM_ENDPOINT_EXCHANGE*    (required)
+#       - *<APP_PREFIX>_IAM_ENDPOINT_LOGIN*       (required)
+#       - *<APP_PREFIX>_IAM_ENDPOINT_LOGOUT*      (required)
+#       - *<APP_PREFIX>_IAM_ENDPOINT_PROVIDER*    (optional, needed if requesting tokens to providers)
+#       - *<APP_PREFIX>_IAM_ENDPOINT_TOKEN*       (required)
 #       - *<APP_PREFIX>_IAM_LOGIN_TIMEOUT*        (optional, defaults to no timeout)
 #       - *<APP_PREFIX>_IAM_PK_LIFETIME*          (optional, defaults to non-terminating lifetime)
 #       - *<APP_PREFIX>_IAM_RECIPIENT_ATTR*       (required)

pypomes_iam/iam_pomes.py

@@ -40,7 +40,7 @@ def iam_setup(flask_app: Flask,
     the first time it is needed.
 
     :param flask_app: the Flask application
-    :param iam_server: identifies the supported *IAM* server (*jusbr* or *keycloak*)
+    :param iam_server: identifies the supported *IAM* server (currently, *jusbr* or *keycloak*)
     :param base_url: base URL to request services
     :param client_id: the client's identification with the *IAM* server
     :param client_realm: the client realm

pypomes_iam/iam_services.py

@@ -168,7 +168,7 @@ def service_login() -> Response:
 #                  methods=["GET"])
 def service_logout() -> Response:
     """
-    Entry point for the JusBR logout service.
+    Entry point for the IAM server's logout service.
 
     The user is identified by the attribute *user-id* or "login", provided as a request parameter.
     If successful, remove all data relating to the user from the *IAM* server's registry.
@@ -214,7 +214,7 @@ def service_logout() -> Response:
 #                  methods=["POST"])
 def service_callback() -> Response:
     """
-    Entry point for the callback from JusBR on authentication operation.
+    Entry point for the callback from the IAM server on authentication operation.
 
     This callback is invoked from a front-end application after a successful login at the
     *IAM* server's login page, forwarding the data received. In a typical OAuth2 flow faction,
@@ -338,13 +338,10 @@ def service_exchange() -> Response:
     If the exchange is successful, the token data is stored in the *IAM* server's registry, and returned.
     Otherwise, *errors* will contain the appropriate error message.
 
-    On success, the typical *Response* returned will contain the following attributes:
+    On success, the returned *Response* will contain the following JSON:
         {
-            "token_type": "Bearer",
-            "access_token": <str>,
-            "expires_in": <number-of-seconds>,
-            "refresh_token": <str>,
-            "refesh_expires_in": <number-of-seconds>
+            "user-id": <reference-user-identification>,
+            "access-token": <token>
         }
 
     :return: *Response* containing the token data, or *BAD REQUEST*
@@ -360,10 +357,10 @@ def service_exchange() -> Response:
                                                           errors=errors,
                                                           logger=__IAM_LOGGER)
         # exchange the token
-        token_data: dict[str, Any] | None = None
+        token_info: tuple[str, str] | None = None
         if iam_server:
             errors: list[str] = []
-            token_data = action_exchange(iam_server=iam_server,
+            token_info = action_exchange(iam_server=iam_server,
                                          args=request.args,
                                          errors=errors,
                                          logger=__IAM_LOGGER)
@@ -372,7 +369,8 @@ def service_exchange() -> Response:
         result = Response(response="; ".join(errors),
                           status=400)
     else:
-        result = jsonify(token_data)
+        result = jsonify({"user-id": token_info[0],
+                          "access-token": token_info[1]})
 
     # log the response
     if __IAM_LOGGER:

pypomes_iam/provider_pomes.py

@@ -106,76 +106,137 @@ def provider_get_token(provider_id: str,
     # initialize the return variable
     result: str | None = None
 
-    err_msg: str | None = None
     with _provider_lock:
         provider: dict[str, Any] = _provider_registry.get(provider_id)
         if provider:
-            now: float = datetime.now(tz=TZ_LOCAL).timestamp()
-            if now > provider.get(ProviderParam.ACCESS_EXPIRATION):
-                user: str = provider.get(ProviderParam.USER)
-                pwd: str = provider.get(ProviderParam.PWD)
-                headers_data: dict[str, str] = provider.get(ProviderParam.HEADER_DATA) or {}
-                body_data: dict[str, str] = provider.get(ProviderParam.BODY_DATA) or {}
-                custom_auth: tuple[str, str] = provider.get(ProviderParam.CUSTOM_AUTH)
-                if custom_auth:
-                    body_data[custom_auth[0]] = user
-                    body_data[custom_auth[1]] = pwd
-                else:
-                    enc_bytes: bytes = b64encode(f"{user}:{pwd}".encode())
-                    headers_data["Authorization"] = f"Basic {enc_bytes.decode()}"
+            now: int = int(datetime.now(tz=TZ_LOCAL).timestamp())
+            if now < provider.get(ProviderParam.ACCESS_EXPIRATION):
+                # retrieve the stored access token
+                result = provider.get(ProviderParam.ACCESS_TOKEN)
+            else:
+                # access token has expired
+                header_data: dict[str, str] | None = None
+                body_data: dict[str, str] | None = None
                 url: str = provider.get(ProviderParam.URL)
-                if logger:
-                    logger.debug(msg=f"POST {url}, {json.dumps(obj=body_data,
-                                                               ensure_ascii=False)}")
-                try:
-                    # typical return on a token request:
-                    # {
-                    #   "token_type": "Bearer",
-                    #   "access_token": <str>,
-                    #   "expires_in": <number-of-seconds>,
-                    #   optional data:
-                    #   "refresh_token": <str>,
-                    #   "refresh_expires_in": <number-of-seconds>
-                    # }
-                    response: requests.Response = requests.post(url=url,
-                                                                data=body_data,
-                                                                headers=headers_data,
-                                                                timeout=None)
-                    if response.status_code < 200 or response.status_code >= 300:
-                        # request resulted in error, report the problem
-                        err_msg = (f"POST failure, "
-                                   f"status {response.status_code}, reason {response.reason}")
+                refresh_token: str = provider.get(ProviderParam.REFRESH_TOKEN)
+                if refresh_token:
+                    # refresh token exists
+                    refresh_expiration: int = provider.get(ProviderParam.REFRESH_EXPIRATION)
+                    if now < refresh_expiration:
+                        # refresh token has not expired
+                        header_data: dict[str, str] = {
+                            "Content-Type": "application/json"
+                        }
+                        body_data: dict[str, str] = {
+                            "grant_type": "refresh_token",
+                            "refresh_token": refresh_token
+                        }
+                if not body_data:
+                    # refresh token does not exist or has expired
+                    user: str = provider.get(ProviderParam.USER)
+                    pwd: str = provider.get(ProviderParam.PWD)
+                    headers_data: dict[str, str] = provider.get(ProviderParam.HEADER_DATA) or {}
+                    body_data: dict[str, str] = provider.get(ProviderParam.BODY_DATA) or {}
+                    custom_auth: tuple[str, str] = provider.get(ProviderParam.CUSTOM_AUTH)
+                    if custom_auth:
+                        body_data[custom_auth[0]] = user
+                        body_data[custom_auth[1]] = pwd
                     else:
-                        # request succeeded
-                        if logger:
-                            logger.debug(msg=f"POST success, status {response.status_code}")
-                        reply: dict[str, Any] = response.json()
-                        provider[ProviderParam.ACCESS_TOKEN] = reply.get("access_token")
-                        provider[ProviderParam.ACCESS_EXPIRATION] = now + int(reply.get("expires_in"))
-                        if reply.get(ProviderParam.REFRESH_TOKEN):
-                            provider[ProviderParam.REFRESH_TOKEN] = reply["refresh_token"]
-                            if reply.get("refresh_expires_in"):
-                                provider[ProviderParam.REFRESH_EXPIRATION] = now + int(reply.get("refresh_expires_in"))
-                            else:
-                                provider[ProviderParam.REFRESH_EXPIRATION] = sys.maxsize
-                        if logger:
-                            logger.debug(msg=f"POST {url}: status {response.status_code}")
-                except Exception as e:
-                    # the operation raised an exception
-                    err_msg = exc_format(exc=e,
-                                         exc_info=sys.exc_info())
-                    err_msg = f"POST error, '{err_msg}'"
-        else:
-            err_msg: str = f"Provider '{provider_id}' not registered"
-
-    if err_msg:
-        if isinstance(errors, list):
-            errors.append(err_msg)
-        if logger:
-            logger.error(msg=err_msg)
-    else:
-        result = provider.get(ProviderParam.ACCESS_TOKEN)
+                        enc_bytes: bytes = b64encode(f"{user}:{pwd}".encode())
+                        headers_data["Authorization"] = f"Basic {enc_bytes.decode()}"
+
+                # obtain the token
+                token_data: dict[str, Any] = __post_for_token(url=url,
+                                                              header_data=header_data,
+                                                              body_data=body_data,
+                                                              errors=errors,
+                                                              logger=logger)
+                if token_data:
+                    result = token_data.get("access_token")
+                    provider[ProviderParam.ACCESS_TOKEN] = result
+                    provider[ProviderParam.ACCESS_EXPIRATION] = now + token_data.get("expires_in")
+                    refresh_token = token_data.get("refresh_token")
+                    if refresh_token:
+                        provider[ProviderParam.REFRESH_TOKEN] = refresh_token
+                        refresh_exp: int = token_data.get("refresh_expires_in")
+                        provider[ProviderParam.REFRESH_EXPIRATION] = (now + refresh_exp) \
+                            if refresh_exp else sys.maxsize
+
+        elif logger or isinstance(errors, list):
+            msg: str = f"Unknown provider '{provider_id}'"
+            if logger:
+                logger.error(msg=msg)
+            if isinstance(errors, list):
+                errors.append(msg)
 
     return result
 
 
+def __post_for_token(url: str,
+                     header_data: dict[str, str],
+                     body_data: dict[str, Any],
+                     errors: list[str] | None,
+                     logger: Logger | None) -> dict[str, Any] | None:
+    """
+    Send a *POST* request to *url* and return the token data obtained.
+
+    Token acquisition and token refresh are the two types of requests contemplated herein.
+    For the former, *header_data* and *body_data* will have contents customized to the specific provider,
+    whereas the latter's *body_data* will contain these two attributes:
+        - "grant_type": "refresh_token"
+        - "refresh_token": <current-refresh-token>
+
+    The typical data set returned contains the following attributes:
+        {
+            "token_type": "Bearer",
+            "access_token": <str>,
+            "expires_in": <number-of-seconds>,
+            "refresh_token": <str>,
+            "refesh_expires_in": <number-of-seconds>
+        }
+
+    :param url: the target URL
+    :param header_data: the data to send in the header of the request
+    :param body_data: the data to send in the body of the request
+    :param errors: incidental errors
+    :param logger: optional logger
+    :return: the token data, or *None* if error
+    """
+    # initialize the return variable
+    result: dict[str, Any] | None = None
+
+    # log the POST
+    if logger:
+        logger.debug(msg=f"POST {url}, {json.dumps(obj=body_data,
+                                                   ensure_ascii=False)}")
+    try:
+        response: requests.Response = requests.post(url=url,
+                                                    data=body_data,
+                                                    headers=header_data,
+                                                    timeout=None)
+        if response.status_code == 200:
+            # request succeeded
+            result = response.json()
+            if logger:
+                logger.debug(msg=f"POST success, status {response.status_code}")
+        else:
+            # request failed, report the problem
+            msg: str = (f"POST failure, "
+                        f"status {response.status_code}, reason {response.reason}")
+            if hasattr(response, "content") and response.content:
+                msg += f", content '{response.content}'"
+            if logger:
+                logger.error(msg=msg)
+            if isinstance(errors, list):
+                errors.append(msg)
+    except Exception as e:
+        # the operation raised an exception
+        err_msg = exc_format(exc=e,
+                             exc_info=sys.exc_info())
+        msg: str = f"POST error, {err_msg}"
+        if logger:
+            logger.debug(msg=msg)
+        if isinstance(errors, list):
+            errors.append(msg)
+
+    return result

{pypomes_iam-0.6.0.dist-info → pypomes_iam-0.7.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypomes_iam
-Version: 0.6.0
+Version: 0.7.4
 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
@@ -10,7 +10,6 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.12
-Requires-Dist: cachetools>=6.2.1
 Requires-Dist: flask>=3.1.2
 Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: pypomes-core>=2.8.1

pypomes_iam-0.7.4.dist-info/RECORD

@@ -0,0 +1,11 @@
+pypomes_iam/__init__.py,sha256=_6tSFfjuU-5p6TAMqNLHSL6IQmaJMSYuEW-TG3ybhTI,1044
+pypomes_iam/iam_actions.py,sha256=8cHtE6AU0sh8IBfO5w1IQj3HVZBSuTFMrrcOK0bnF9E,42774
+pypomes_iam/iam_common.py,sha256=ki_-m6fqJqUbGjgTD41r9zaE-FOXgA_c_tLisIYYTfU,15457
+pypomes_iam/iam_pomes.py,sha256=_kLnrZG25XhJsIv3wqDl_2sIJ2ho_2TIMKrPCyPmA7Q,7362
+pypomes_iam/iam_services.py,sha256=AzrZux2Pt_FoCNcTcXfWphHb587vB3WIbKYG7RFf5zE,15821
+pypomes_iam/provider_pomes.py,sha256=3mMj5LQs53YEINUEOfFBAxOwOP3aOR_szlE4daEBLK0,10523
+pypomes_iam/token_pomes.py,sha256=K4nSAotKUoHIE2s3ltc_nVimlNeKS9tnD-IlslkAvkk,6626
+pypomes_iam-0.7.4.dist-info/METADATA,sha256=Si9dT8ORriAGUwCTrl4jYs3tsoz0XVgHATeqIVPv96g,661
+pypomes_iam-0.7.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pypomes_iam-0.7.4.dist-info/licenses/LICENSE,sha256=YvUELgV8qvXlaYsy9hXG5EW3Bmsrkw-OJmmILZnonAc,1086
+pypomes_iam-0.7.4.dist-info/RECORD,,

pypomes_iam-0.6.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-pypomes_iam/__init__.py,sha256=_6tSFfjuU-5p6TAMqNLHSL6IQmaJMSYuEW-TG3ybhTI,1044
-pypomes_iam/iam_actions.py,sha256=Bmd8rBg3948Afsg10B6B1ZrFY4wYtbxi55rX4Rlqiyk,39167
-pypomes_iam/iam_common.py,sha256=4sn9V4_fRXrljz41Dh7P6ng4aqFfp0pLnrq_rURDKt4,15363
-pypomes_iam/iam_pomes.py,sha256=XkxpwwGivUR3Y1TKR6McrqLUnpFJhRvIrsEn9T_Ut9A,7351
-pypomes_iam/iam_services.py,sha256=IkCjrKDX1Ix7BiHh-BL3VKz5xogcNC8prXkHyJzQoZ8,15862
-pypomes_iam/provider_pomes.py,sha256=N0nL9_hgHmAjG9JKFoXC33zk8b1ckPG1veu1jTp-2JE,8045
-pypomes_iam/token_pomes.py,sha256=K4nSAotKUoHIE2s3ltc_nVimlNeKS9tnD-IlslkAvkk,6626
-pypomes_iam-0.6.0.dist-info/METADATA,sha256=xl-01mkMhab71h8WMqADHpX5qxS5ngFfcMyhSouQwt0,694
-pypomes_iam-0.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pypomes_iam-0.6.0.dist-info/licenses/LICENSE,sha256=YvUELgV8qvXlaYsy9hXG5EW3Bmsrkw-OJmmILZnonAc,1086
-pypomes_iam-0.6.0.dist-info/RECORD,,