simpserver 0.2.1__tar.gz → 0.2.2.post1__tar.gz

{simpserver-0.2.1 → simpserver-0.2.2.post1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simpserver
-Version: 0.2.1
+Version: 0.2.2.post1
 Summary: A simple solution to create servers http(s).
 Author-email: Manel <manelzaum@icloud.com>
 License-Expression: MIT

{simpserver-0.2.1 → simpserver-0.2.2.post1}/pyproject.toml

@@ -7,7 +7,7 @@ include = ["simpserver*", "tests*"]
 
 [project]
 name = "simpserver"
-version = "0.2.1"
+version = "0.2.2.post1"
 dependencies = ["mariadb"]
 authors = [{ name="Manel", email="manelzaum@icloud.com" }]
 description = "A simple solution to create servers http(s)."

{simpserver-0.2.1 → simpserver-0.2.2.post1}/simpserver/exceptions.py

@@ -93,3 +93,9 @@ class AlreadyExistsInDatabaseError(APIError):
     def __init__(self, table_name: str) -> None:
         super().__init__(HTTPStatus.CONFLICT,
                          {"message": f"Primary key already exists on {table_name}"})
+
+class UnauthorizedError(APIError):
+    """When the acion needs a specific role of something like"""
+
+    def __init__(self) -> None:
+        super().__init__(HTTPStatus.UNAUTHORIZED, {"message": "Não autorizado."})

{simpserver-0.2.1 → simpserver-0.2.2.post1}/simpserver/router.py

@@ -188,18 +188,39 @@ def ensure_exists_in_db_by_body(table: str, pk_name: str, body_key_pk_value: str
 
     return decorator
 
-def middleware():
+def get_safe_kwargs(func: Callable, kwargs: dict) -> dict:
+        sig = inspect.signature(func)
+        params = sig.parameters
+
+        if any(
+                p.kind == inspect.Parameter.VAR_KEYWORD 
+                for p in params.values()
+                ):
+            return kwargs
+
+        safe_kwargs = {key: value for key, value in kwargs.items() if key in sig.parameters.keys()}
+
+        return safe_kwargs
+
+def middleware(*middleware_args, **middleware_kwargs):
     def decorator(func: RouteCallback):
         def wrapper(**kwargs) -> RouteCallbackReturn:
             from .config import user_configs
 
             login_check = user_configs.get("login_check_func", None)
 
-            if not login_check: raise NotImplementedError
+            kwargs["user_info"] = safe_run(user_configs["get_user_info_func"], kwargs)
 
-            if not login_check(**kwargs):
+            if not kwargs["user_info"]:
                 raise InvalidTokenError()
 
+            if not login_check:
+                raise NotImplementedError
+
+            safe_kwargs = get_safe_kwargs(login_check, kwargs | middleware_kwargs)
+            if not login_check(*middleware_args, **safe_kwargs):
+                raise UnauthorizedError()
+
             return safe_run(func, kwargs)
 
         return wrapper

{simpserver-0.2.1 → simpserver-0.2.2.post1}/simpserver.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simpserver
-Version: 0.2.1
+Version: 0.2.2.post1
 Summary: A simple solution to create servers http(s).
 Author-email: Manel <manelzaum@icloud.com>
 License-Expression: MIT

{simpserver-0.2.1 → simpserver-0.2.2.post1}/tests/routes/login.py

@@ -21,18 +21,15 @@ def login(cur: Cursor, body: dict) -> dict:
 
     if not row: raise CredentialsError()
 
-    token = "".join(random.choices(token_character, k=2))
+    token = "".join(random.choices(token_characters, k=2))
 
     logins[row[0]] = token
 
     return {"token": token}
 
 
-@ensure_body_keys({"token": str})
-def login_check(**kwargs) -> bool:
-    body = kwargs["body"]
-
-    return body["token"] in logins.values()
+def login_check(user_info: dict, roles: list = []) -> bool:
+    return not roles or user_info["role"] in roles
 
 
 def get_user_info(cur: Cursor, body: dict) -> dict | None:
@@ -42,6 +39,6 @@ def get_user_info(cur: Cursor, body: dict) -> dict | None:
 
     for id, token in logins.items():
         if passed_token == token:
-            return UserModel.get_by_id(cur, id)
+            return UserModel.get_by_id(cur, id) | { "role": "User" }
 
     return None

{simpserver-0.2.1 → simpserver-0.2.2.post1}/tests/test.py

@@ -2,7 +2,7 @@ from sys import argv
 from http import HTTPMethod
 
 from simpserver.handler import serve_api
-from simpserver.router import route
+from simpserver.router import route, middleware
 import routes
 
 """
@@ -18,6 +18,7 @@ TODO:
 """
 
 @route("/test/<name:str>", HTTPMethod.GET)
+@middleware(roles="User")
 def test(path_params: dict) -> dict:
     return path_params