pypomes-iam 0.3.8__py3-none-any.whl → 0.3.9__py3-none-any.whl

pypomes_iam/jusbr_pomes.py

@@ -31,32 +31,32 @@ JUSBR_URL_AUTH_BASE: Final[str] = env_get_str(key=f"{APP_PREFIX}_JUSBR_URL_AUTH_
 
 
 def jusbr_setup(flask_app: Flask,
+                base_url: str = JUSBR_URL_AUTH_BASE,
                 client_id: str = JUSBR_CLIENT_ID,
                 client_secret: str = JUSBR_CLIENT_SECRET,
                 client_timeout: int = JUSBR_CLIENT_TIMEOUT,
-                public_key_lifetime: int = JUSBR_PUBLIC_KEY_LIFETIME,
-                recipient_attribute: str = JUSBR_RECIPIENT_ATTR,
-                callback_endpoint: str = JUSBR_ENDPOINT_CALLBACK,
-                token_endpoint: str = JUSBR_ENDPOINT_TOKEN,
-                login_endpoint: str = JUSBR_ENDPOINT_LOGIN,
-                logout_endpoint: str = JUSBR_ENDPOINT_LOGOUT,
-                base_url: str = JUSBR_URL_AUTH_BASE) -> None:
+                public_key_lifetime: int | None = JUSBR_PUBLIC_KEY_LIFETIME,
+                recipient_attribute: str | None = JUSBR_RECIPIENT_ATTR,
+                callback_endpoint: str | None = JUSBR_ENDPOINT_CALLBACK,
+                login_endpoint: str | None = JUSBR_ENDPOINT_LOGIN,
+                logout_endpoint: str | None = JUSBR_ENDPOINT_LOGOUT,
+                token_endpoint: str | None = JUSBR_ENDPOINT_TOKEN) -> None:
     """
     Configure the JusBR IAM.
 
     This should be invoked only once, before the first access to a JusBR service.
 
     :param flask_app: the Flask application
+    :param base_url: base URL to request JusBR services
     :param client_id: the client's identification with JusBR
     :param client_secret: the client's password with JusBR
     :param client_timeout: timeout for login authentication (in seconds,defaults to no timeout)
     :param public_key_lifetime: how long to use JusBR's public key, before refreshing it (in seconds)
     :param recipient_attribute: attribute in the token's payload holding the token's subject
     :param callback_endpoint: endpoint for the callback from JusBR
-    :param token_endpoint: endpoint for retrieving JusBR's authentication token
     :param login_endpoint: endpoint for redirecting user to JusBR's login page
     :param logout_endpoint: endpoint for terminating user access to JusBR
-    :param base_url: base URL to request JusBR services
+    :param token_endpoint: endpoint for retrieving JusBR's authentication token
     """
     from .iam_services import service_login, service_logout, service_callback, service_token
 
@@ -77,6 +77,11 @@ def jusbr_setup(flask_app: Flask,
         }
 
     # establish the endpoints
+    if callback_endpoint:
+        flask_app.add_url_rule(rule=callback_endpoint,
+                               endpoint="jusbr-callback",
+                               view_func=service_callback,
+                               methods=["GET"])
     if login_endpoint:
         flask_app.add_url_rule(rule=login_endpoint,
                                endpoint="jusbr-login",
@@ -87,11 +92,6 @@ def jusbr_setup(flask_app: Flask,
                                endpoint="jusbr-logout",
                                view_func=service_logout,
                                methods=["GET"])
-    if callback_endpoint:
-        flask_app.add_url_rule(rule=callback_endpoint,
-                               endpoint="jusbr-callback",
-                               view_func=service_callback,
-                               methods=["GET"])
     if token_endpoint:
         flask_app.add_url_rule(rule=token_endpoint,
                                endpoint="jusbr-token",

pypomes_iam/keycloak_pomes.py

@@ -34,36 +34,36 @@ KEYCLOAK_URL_AUTH_BASE: Final[str] = env_get_str(key=f"{APP_PREFIX}_KEYCLOAK_URL
 
 
 def keycloak_setup(flask_app: Flask,
+                   base_url: str = KEYCLOAK_URL_AUTH_BASE,
+                   realm: str = KEYCLOAK_REALM,
                    client_id: str = KEYCLOAK_CLIENT_ID,
                    client_secret: str = KEYCLOAK_CLIENT_SECRET,
                    client_timeout: int = KEYCLOAK_CLIENT_TIMEOUT,
-                   public_key_lifetime: int = KEYCLOAK_PUBLIC_KEY_LIFETIME,
-                   recipient_attribute: str = KEYCLOAK_RECIPIENT_ATTR,
-                   realm: str = KEYCLOAK_REALM,
-                   callback_endpoint: str = KEYCLOAK_ENDPOINT_CALLBACK,
-                   exchange_endpoint: str = KEYCLOAK_ENDPOINT_EXCHANGE,
-                   login_endpoint: str = KEYCLOAK_ENDPOINT_LOGIN,
-                   logout_endpoint: str = KEYCLOAK_ENDPOINT_LOGOUT,
-                   token_endpoint: str = KEYCLOAK_ENDPOINT_TOKEN,
-                   base_url: str = KEYCLOAK_URL_AUTH_BASE) -> None:
+                   public_key_lifetime: int | None = KEYCLOAK_PUBLIC_KEY_LIFETIME,
+                   recipient_attribute: str | None = KEYCLOAK_RECIPIENT_ATTR,
+                   callback_endpoint: str | None = KEYCLOAK_ENDPOINT_CALLBACK,
+                   login_endpoint: str | None = KEYCLOAK_ENDPOINT_LOGIN,
+                   logout_endpoint: str | None = KEYCLOAK_ENDPOINT_LOGOUT,
+                   token_endpoint: str | None = KEYCLOAK_ENDPOINT_TOKEN,
+                   exchange_endpoint: str | None = KEYCLOAK_ENDPOINT_EXCHANGE) -> None:
     """
     Configure the Keycloak IAM.
 
     This should be invoked only once, before the first access to a Keycloak service.
 
     :param flask_app: the Flask application
+    :param base_url: base URL to request Keycloak services
+    :param realm: the Keycloak realm
     :param client_id: the client's identification with JusBR
     :param client_secret: the client's password with JusBR
     :param client_timeout: timeout for login authentication (in seconds,defaults to no timeout)
     :param public_key_lifetime: how long to use Keycloak's public key, before refreshing it (in seconds)
     :param recipient_attribute: attribute in the token's payload holding the token's subject
-    :param realm: the Keycloak realm
     :param callback_endpoint: endpoint for the callback from the front end
-    :param exchange_endpoint: endpoint fro requesting token exchange
-    :param token_endpoint: endpoint for retrieving Keycloak's authentication token
     :param login_endpoint: endpoint for redirecting user to Keycloak's login page
     :param logout_endpoint: endpoint for terminating user access to Keycloak
-    :param base_url: base URL to request Keycloak services
+    :param token_endpoint: endpoint for retrieving Keycloak's authentication token
+    :param exchange_endpoint: endpoint for requesting token exchange
     """
     from .iam_services import (
         service_login, service_logout, service_callback, service_exchange, service_token
@@ -86,6 +86,11 @@ def keycloak_setup(flask_app: Flask,
         }
 
     # establish the endpoints
+    if callback_endpoint:
+        flask_app.add_url_rule(rule=callback_endpoint,
+                               endpoint="keycloak-callback",
+                               view_func=service_callback,
+                               methods=["GET"])
     if login_endpoint:
         flask_app.add_url_rule(rule=login_endpoint,
                                endpoint="keycloak-login",
@@ -96,11 +101,6 @@ def keycloak_setup(flask_app: Flask,
                                endpoint="keycloak-logout",
                                view_func=service_logout,
                                methods=["GET"])
-    if callback_endpoint:
-        flask_app.add_url_rule(rule=callback_endpoint,
-                               endpoint="keycloak-callback",
-                               view_func=service_callback,
-                               methods=["GET"])
     if token_endpoint:
         flask_app.add_url_rule(rule=token_endpoint,
                                endpoint="keycloak-token",

{pypomes_iam-0.3.8.dist-info → pypomes_iam-0.3.9.dist-info}/METADATA

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

@@ -2,11 +2,11 @@ pypomes_iam/__init__.py,sha256=vl7Frit5Xte3deOSwBSkg462lIhirwU0Rb0QMY3X2pM,965
 pypomes_iam/iam_common.py,sha256=f74FUDcnMM2cgzJg-AF17GwCKwbfoezS8LppwxYwPys,10049
 pypomes_iam/iam_pomes.py,sha256=Qlg78xv4e1WJSX2CMNluZRnHov6lqabeD45-bJ2JZSM,23966
 pypomes_iam/iam_services.py,sha256=xs0y0FUBTDiVu_B_kP900Kp1D77wyphUBxb_-QlD07Y,10445
-pypomes_iam/jusbr_pomes.py,sha256=JQFJVrEzaJZ_uTSDroPgEOxcqmdzz6EZMZmb6jno48s,5716
-pypomes_iam/keycloak_pomes.py,sha256=rZzAtBXgfwTrCs7qf_HsZltS9FzQWZSGCd-ac4eh7vE,6726
+pypomes_iam/jusbr_pomes.py,sha256=G-COBstBeQeD7dPgvf2MI1E8r2-ACHHwzhyfsphhKgw,5758
+pypomes_iam/keycloak_pomes.py,sha256=JxVVFdhXJypK5x9ocn7283pB1xJbS-yPgStkSFS12HM,6775
 pypomes_iam/provider_pomes.py,sha256=3Rui68hmj8zwY0tnw4aWurz-yQ-niacJFQpi6nWzh-M,6355
 pypomes_iam/token_pomes.py,sha256=1g6PMNNMbmdwLrsvSXvpO8-zdRhso1IFnwAyndNmV4Q,5332
-pypomes_iam-0.3.8.dist-info/METADATA,sha256=qc2_kcS5mEYBQuO-96AQJZz_4ZbMqHYdE08rcNi0IW8,694
-pypomes_iam-0.3.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pypomes_iam-0.3.8.dist-info/licenses/LICENSE,sha256=YvUELgV8qvXlaYsy9hXG5EW3Bmsrkw-OJmmILZnonAc,1086
-pypomes_iam-0.3.8.dist-info/RECORD,,
+pypomes_iam-0.3.9.dist-info/METADATA,sha256=fvTKxq9nwZGvQAcE0uQxMa9BLjgZomapgkn6OwplsWk,694
+pypomes_iam-0.3.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pypomes_iam-0.3.9.dist-info/licenses/LICENSE,sha256=YvUELgV8qvXlaYsy9hXG5EW3Bmsrkw-OJmmILZnonAc,1086
+pypomes_iam-0.3.9.dist-info/RECORD,,