utg-base 1.18.0__tar.gz → 1.19.1__tar.gz

{utg_base-1.18.0 → utg_base-1.19.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: utg-base
-Version: 1.18.0
+Version: 1.19.1
 Summary: UTG Base Package
 Author: Olimboy
 Author-email: shavkatov.olimboy@mail.ru

{utg_base-1.18.0 → utg_base-1.19.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "utg-base"
-version = "1.18.0"
+version = "1.19.1"
 description = "UTG Base Package"
 authors = ["Olimboy <shavkatov.olimboy@mail.ru>", "Rovshen <rovshenashirov1619@gmail.com>"]
 readme = "README.md"

{utg_base-1.18.0 → utg_base-1.19.1}/src/utg_base/permissions/decorators.py

@@ -19,7 +19,7 @@ def has_perm(*permission: str, operator: Literal["OR", "AND"] = "OR"):
         @wraps(view_func)
         def _wrapped_view(self, request, *args, **kwargs):
             if not has_permissions(user_id=request.user.id, perms=list(permission), operator=operator, request=request):
-                raise PermissionDenied
+                self.permission_denied(request)
             return view_func(self, request, *args, **kwargs)
         return _wrapped_view
     return decorator
@@ -55,7 +55,7 @@ def has_class_perm(permissions_map: Dict[str, Union[str, List[str]]], operator:
                     required_perms = [required_perms]
 
                 if not has_permissions(user_id=request.user.id, perms=required_perms, operator=operator, request=request):
-                    raise PermissionDenied
+                    self.permission_denied(request)
 
             return original_initial(self, request, *args, **kwargs)
 

{utg_base-1.18.0 → utg_base-1.19.1}/src/utg_base/permissions/utils.py

@@ -7,6 +7,7 @@ from django_redis import get_redis_connection
 from redis.client import Redis
 from rest_framework.request import Request
 
+from utg_base.constants import AccessibilityType
 from utg_base.env import env
 from utg_base.u_services import u_requests
 from utg_base.u_services.constants import UServices
@@ -19,7 +20,8 @@ def generate_perm_cache_key(user_id: str):
 
 
 def has_perm(user_id, perm, request=None):
-    if request is not None and isinstance(request, Request) and request.user.is_superuser:
+    if (request is not None and isinstance(request, Request)
+            and (request.user.is_superuser or request.user.accessibility == AccessibilityType.ADMIN)):
         return True
     redis_conn: Redis = get_redis_connection("shared")
     perm = f"{to_snake_case(env('APP_NAME'))}:{perm}"
@@ -27,7 +29,8 @@ def has_perm(user_id, perm, request=None):
 
 
 def has_perms(user_id: str, perms: list[str], operator: Literal["OR", "AND"] = "OR", request=None):
-    if request is not None and isinstance(request, Request) and request.user.is_superuser:
+    if (request is not None and isinstance(request, Request)
+            and (request.user.is_superuser or request.user.accessibility == AccessibilityType.ADMIN)):
         return True
     redis_conn: Redis = get_redis_connection("shared")
     perms = [f"{to_snake_case(env('APP_NAME'))}:{perm}" for perm in perms]
@@ -38,6 +41,12 @@ def has_perms(user_id: str, perms: list[str], operator: Literal["OR", "AND"] = "
     return all(result)
 
 
+def get_user_perms(user_id: str):
+    redis_conn: Redis = get_redis_connection("shared")
+    perms = redis_conn.smembers(generate_perm_cache_key(user_id))
+    return [perm.decode() for perm in perms]
+
+
 def get_permissions(url_patterns):
     permissions = set()