pypomes-iam 0.0.9__tar.gz → 0.1.1__tar.gz

{pypomes_iam-0.0.9 → pypomes_iam-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypomes_iam
-Version: 0.0.9
+Version: 0.1.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.0.9 → pypomes_iam-0.1.1}/pyproject.toml

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

{pypomes_iam-0.0.9 → pypomes_iam-0.1.1}/src/pypomes_iam/jusbr_pomes.py

@@ -25,8 +25,8 @@ JUSBR_ENDPOINT_TOKEN: Final[str] = env_get_str(key=f"{APP_PREFIX}_JUSBR_ENDPOINT
                                                def_value="/iam/jusbr:get-token")
 
 JUSBR_URL_AUTH_CALLBACK: Final[str] = env_get_str(key=f"{APP_PREFIX}_JUSBR_URL_AUTH_CALLBACK")
-JUSBR_URL_AUTH_LOGIN: Final[str] = env_get_str(key=f"{APP_PREFIX}JUSBR_URL_AUTH_LOGIN")
-JUSBR_URL_AUTH_TOKEN: Final[str] = env_get_str(key=f"{APP_PREFIX}JUSBR_URL_AUTH_TOKEN")
+JUSBR_URL_AUTH_LOGIN: Final[str] = env_get_str(key=f"{APP_PREFIX}_JUSBR_URL_AUTH_LOGIN")
+JUSBR_URL_AUTH_TOKEN: Final[str] = env_get_str(key=f"{APP_PREFIX}_JUSBR_URL_AUTH_TOKEN")
 
 # safe memory cache - structure:
 # {
@@ -35,7 +35,7 @@ JUSBR_URL_AUTH_TOKEN: Final[str] = env_get_str(key=f"{APP_PREFIX}JUSBR_URL_AUTH_
 #    "auth-url": <str>,
 #    "token-url": <str>,
 #    "client-timeout": <int>,
-#    "users": [
+#    "users": {
 #       "<user-id>": {
 #         "cache-obj": <Cache>,
 #         "oauth-scope": <str>,
@@ -45,7 +45,7 @@ JUSBR_URL_AUTH_TOKEN: Final[str] = env_get_str(key=f"{APP_PREFIX}JUSBR_URL_AUTH_
 #           "access-token": <str>
 #           "refresh-token": <str>
 #       }
-#    ]
+#    }
 # }
 _jusbr_registry: dict[str, Any] = {
     "client-id": None,
@@ -54,7 +54,7 @@ _jusbr_registry: dict[str, Any] = {
     "auth-url": None,
     "callback-url": None,
     "token-url": None,
-    "users": []
+    "users": {}
 }
 
 # dafault logger
@@ -141,33 +141,42 @@ def service_login() -> Response:
     """
     global _jusbr_registry
 
+    # declare the return variable
+    result: Response
+
     # retrieve user id
     input_params: dict[str, Any] = request.values
     user_id: str = input_params.get("user-id") or input_params.get("login")
 
-    # retrieve user data
-    user_data: dict[str, Any] = __get_user_data(user_id=user_id,
-                                                logger=_logger)
-    # build redirect url
-    oauth_state: str = "".join(secrets.choice(string.ascii_letters + string.digits) for _ in range(16))
-    timeout: int = __get_login_timeout()
-    safe_cache: Cache
-    if timeout:
-        safe_cache = TTLCache(maxsize=16,
-                              ttl=600)
+    if user_id:
+        # retrieve user data
+        user_data: dict[str, Any] = __get_user_data(user_id=user_id,
+                                                    logger=_logger)
+        # build redirect url
+        oauth_state: str = "".join(secrets.choice(string.ascii_letters + string.digits) for _ in range(16))
+        timeout: int = __get_login_timeout()
+        safe_cache: Cache
+        if timeout:
+            safe_cache = TTLCache(maxsize=16,
+                                  ttl=600)
+        else:
+            safe_cache = FIFOCache(maxsize=16)
+        safe_cache["oauth-state"] = oauth_state
+        user_data["cache-obj"] = safe_cache
+        auth_url: str = (f"{_jusbr_registry["auth-url"]}?response_type=code"
+                         f"&client_id={_jusbr_registry["client-id"]}"
+                         f"&redirect_url={_jusbr_registry["callback-url"]}"
+                         f"&state={oauth_state}")
+        if user_data.get("oauth-scope"):
+            auth_url += f"&scope={user_data.get("oauth-scope")}"
+
+        # redirect request
+        result = redirect(location=auth_url)
     else:
-        safe_cache = FIFOCache(maxsize=16)
-    safe_cache["oauth-state"] = oauth_state
-    user_data["cache-obj"] = safe_cache
-    auth_url: str = (f"{_jusbr_registry["auth-url"]}?response_type=code"
-                     f"&client_id={_jusbr_registry["client-id"]}"
-                     f"&redirect_url={_jusbr_registry["callback-url"]}"
-                     f"&state={oauth_state}")
-    if user_data.get("oauth-scope"):
-        auth_url += f"&scope={user_data.get("oauth-scope")}"
+        result = jsonify({"errors": "User id must be provided"})
+        result.status_code = 401
 
-    # redirect request
-    return redirect(location=auth_url)
+    return result
 
 
 # @flask_app.route(rule=<login_endpoint>,  # JUSBR_LOGIN_ENDPOINT: /iam/jusbr:logout
@@ -178,17 +187,17 @@ def service_logout() -> Response:
 
     Remove all data associating the user with JusBR from the registry.
 
-    :return: the response from the redirect operation
+    :return: response *OK*
     """
     global _jusbr_registry
 
     # retrieve user id
-    input_params: dict[str, Any] = request.values
+    input_params: dict[str, Any] = request.args
     user_id: str = input_params.get("user-id") or input_params.get("login")
 
     # remove user data
-    if user_id in _jusbr_registry.get("users"):
-        _jusbr_registry.pop(user_id)
+    if user_id and user_id in _jusbr_registry.get("users"):
+        _jusbr_registry["users"].pop(user_id)
         if _logger:
             _logger.debug(f"User '{user_id}' removed from the registry")
 
@@ -253,20 +262,22 @@ def service_token() -> Response:
     """
     Entry point for retrieving the JusBR token.
 
-    :return: the response containing the token, or *NOT AUTHORIZED*
+    :return: the response containing the token, or *UNAUTHORIZED*
     """
     # retrieve user id
-    input_params: dict[str, Any] = request.values
+    input_params: dict[str, Any] = request.args
     user_id: str = input_params.get("user-id") or input_params.get("login")
 
     # retrieve the token
+    errors: list[str] = []
     token: str = jusbr_get_token(user_id=user_id,
                                  logger=_logger)
     result: Response
     if token:
         result = jsonify({"token": token})
     else:
-        result = Response(status=401)
+        result = Response("; ".join(errors))
+        result.status_code = 401
 
     return result
 
@@ -287,9 +298,10 @@ def jusbr_get_token(user_id: str,
     # initialize the return variable
     result: str | None = None
 
-    user_data: dict[str, Any] = _jusbr_registry["users"].get(user_id)
-    safe_cache: Cache = user_data["cache-obj"] if user_data else None
-    if user_data and safe_cache:
+    user_data: dict[str, Any] = __get_user_data(user_id=user_id,
+                                                logger=logger)
+    safe_cache: Cache = user_data.get("cache-obj")
+    if safe_cache:
         access_expiration: int = user_data.get("access-expiration")
         now: int = int(datetime.now(tz=TZ_LOCAL).timestamp())
         if now < access_expiration: