pypomes-iam 0.6.9__py3-none-any.whl → 0.7.1__py3-none-any.whl

pypomes_iam/iam_actions.py

@@ -277,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.
 
@@ -298,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
@@ -324,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"
                     }
@@ -333,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,

pypomes_iam/iam_services.py

@@ -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-0.6.9.dist-info → pypomes_iam-0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypomes_iam
-Version: 0.6.9
+Version: 0.7.1
 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.6.9.dist-info → pypomes_iam-0.7.1.dist-info}/RECORD

@@ -1,11 +1,11 @@
 pypomes_iam/__init__.py,sha256=_6tSFfjuU-5p6TAMqNLHSL6IQmaJMSYuEW-TG3ybhTI,1044
-pypomes_iam/iam_actions.py,sha256=0PC7Z7xsepxynmgjMvKZLjLdvC3s5kGk_dqCFrG4Qs8,42083
+pypomes_iam/iam_actions.py,sha256=HDCQ91AphDt9__K9Pu2AqCIwN0fh1K9Oovgpjbp9ZMQ,42778
 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=uUD333SaTbo8MGRyIp5GGil7HAupK73ym4_bKtGkPFg,15878
+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.6.9.dist-info/METADATA,sha256=tPsAu2TWT9hb3vu-KHnYT77TYZytoCQfs78uxWLlLH8,661
-pypomes_iam-0.6.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pypomes_iam-0.6.9.dist-info/licenses/LICENSE,sha256=YvUELgV8qvXlaYsy9hXG5EW3Bmsrkw-OJmmILZnonAc,1086
-pypomes_iam-0.6.9.dist-info/RECORD,,
+pypomes_iam-0.7.1.dist-info/METADATA,sha256=--KMHaPTqpjvClqPS8B2xaRUsn98DJzVLpzosXk2yHk,661
+pypomes_iam-0.7.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pypomes_iam-0.7.1.dist-info/licenses/LICENSE,sha256=YvUELgV8qvXlaYsy9hXG5EW3Bmsrkw-OJmmILZnonAc,1086
+pypomes_iam-0.7.1.dist-info/RECORD,,