utg-base 1.18.0__py3-none-any.whl → 1.19.1__py3-none-any.whl

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/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()
 

{utg_base-1.18.0.dist-info → utg_base-1.19.1.dist-info}/METADATA

@@ -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.dist-info → utg_base-1.19.1.dist-info}/RECORD

@@ -40,9 +40,9 @@ utg_base/models/__init__.py,sha256=1zXygGICiR3iUCKdkNal9d3i3kNp654gFgBf_VlR2gI,6
 utg_base/models/jwt_user.py,sha256=6TQ5wB_OZBtGhRL-2MonBGZm0n0Y86s4BRTxiRlUJOk,375
 utg_base/models/timestamp.py,sha256=AkCliNXnvs8Z17b1mcS7gOK7v6h3Jul6WCyGyVAkb-w,217
 utg_base/permissions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-utg_base/permissions/decorators.py,sha256=chjOUOQAF0qbedDtOebGzp1HUeyhFLlt9fnWmnsg6u0,2100
+utg_base/permissions/decorators.py,sha256=g-ozzjkjJ-O69_wHWzZnZ9jitFR6MxqGLz2skFjzht4,2118
 utg_base/permissions/folder.py,sha256=uJv40FVb7R379qss66a5oUcLK7KCUIL6DPbzEcGOw38,694
-utg_base/permissions/utils.py,sha256=Jhm3RIe9Pcm5eZIHrRMiHo8jv7py5Xl3GGNOBumKl6k,2841
+utg_base/permissions/utils.py,sha256=ZoPlqVRmAQv8IS7AYWN1uEWj0CjTt_y5gy7A5hz2His,3238
 utg_base/references_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utg_base/references_api/apps.py,sha256=thAGmO-ZT-OD9dHHBSQRL_RRt-Es_jt-mEmHgVTpERs,168
 utg_base/references_api/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -69,6 +69,6 @@ utg_base/utils/sql.py,sha256=rqIWcSjdjIMszdRnsnhV5TTYB8W17RPOujIQA9rKC_Y,762
 utg_base/utils/string.py,sha256=ATwIo9uLa00p85h_NjRYLcjRs8o3KSGF7s2yhTg5GiA,1073
 utg_base/utils/thread.py,sha256=4RqRnwtyHymY-dNcuPrMSTamE2V7wCMVfzzyIb0P4TI,2191
 utg_base/utils/translation.py,sha256=GxJHUt0iar_0E7RWBPbeLFQ4DhgXBjffHCmxfKyjFtk,463
-utg_base-1.18.0.dist-info/METADATA,sha256=UfKeX0kty8_sO1vvemCJkWSnRMLwF1eP67hLuz5KZIo,960
-utg_base-1.18.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-utg_base-1.18.0.dist-info/RECORD,,
+utg_base-1.19.1.dist-info/METADATA,sha256=xgijhSRbBO6e5wcVUngfQLkNpB6-64mxZIcc9Q906OU,960
+utg_base-1.19.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+utg_base-1.19.1.dist-info/RECORD,,