Renamed permission method

Author: MySecondLanguage

nxtbn/cart/admin_query.py

@@ -3,7 +3,7 @@
 
 from nxtbn.cart.models import Cart
 from nxtbn.cart.admin_types import CartItemType, CartType
-from nxtbn.core.admin_permissions import staff_required
+from nxtbn.core.admin_permissions import gql_staff_required
 
 
 class AdminCartQuery(graphene.ObjectType):
@@ -13,18 +13,18 @@ class AdminCartQuery(graphene.ObjectType):
 
     items_in_cart = graphene.List(CartItemType, cart_id=graphene.ID(required=True))
 
-    @staff_required
+    @gql_staff_required
     def resolve_carts(self, info, **kwargs):
         return Cart.objects.all()
 
-    @staff_required
+    @gql_staff_required
     def resolve_cart_by_user(self, info, user_id):
         try:
             return Cart.objects.get(user_id=user_id)
         except Cart.DoesNotExist:
             return None
 
-    @staff_required
+    @gql_staff_required
     def resolve_items_in_cart(self, info, cart_id):
         try:
             cart = Cart.objects.get(id=cart_id)

nxtbn/core/admin_permissions.py

@@ -6,6 +6,7 @@
 
 import functools
 from graphql import GraphQLError
+
 class GranularPermission(BasePermission):
     def get_permission_name(self, model_name, action):
 
@@ -22,7 +23,7 @@ def has_permission(self, request, view):
             return True
 
         model_name = view.queryset.model.__name__.lower()  # Get model name dynamically
-        action = view.action.required_perm
+        action = view.action.gql_required_perm
 
         permission_name = self.get_permission_name(model_name, action)
 
@@ -70,7 +71,7 @@ def has_permission(self, request, view):
 
 
 
-def required_perm(code: str): # Used in graphql only
+def gql_required_perm(code: str): # Used in graphql only
     def decorator(func):
         @functools.wraps(func)
         def wrapper(self, info, *args, **kwargs):
@@ -95,7 +96,7 @@ def wrapper(self, info, *args, **kwargs):
     return decorator
 
 
-def staff_required(func):
+def gql_staff_required(func): # Used in graphql only
     @functools.wraps(func)
     def wrapper(self, info, *args, **kwargs):
         user = info.context.user

nxtbn/core/admin_queries.py

@@ -3,7 +3,7 @@
 from graphql import GraphQLError
 
 from nxtbn.core import CurrencyTypes
-from nxtbn.core.admin_permissions import staff_required
+from nxtbn.core.admin_permissions import gql_staff_required
 from nxtbn.core.admin_types import AdminCurrencyTypesEnum, CurrencyExchangeType
 from nxtbn.core.models import CurrencyExchange
 from graphene_django.filter import DjangoFilterConnectionField
@@ -14,7 +14,7 @@ class AdminCoreQuery(graphene.ObjectType):
     currency_exchange = graphene.Field(CurrencyExchangeType, id=graphene.ID(required=True))
     allowed_currency_list = graphene.List(AdminCurrencyTypesEnum)
 
-    @staff_required
+    @gql_staff_required
     def resolve_currency_exchanges(self, info, **kwargs):
         return CurrencyExchange.objects.all()
 
@@ -24,7 +24,7 @@ def resolve_currency_exchange(self, info, id):
         except CurrencyExchange.DoesNotExist:
             return None
 
-    @staff_required
+    @gql_staff_required
     def resolve_allowed_currency_list(self, info):
         allowed_currency_list = settings.ALLOWED_CURRENCIES
 

nxtbn/order/admin_queries.py

@@ -1,7 +1,7 @@
 import graphene
 from graphene_django.filter import DjangoFilterConnectionField
 
-from nxtbn.core.admin_permissions import staff_required
+from nxtbn.core.admin_permissions import gql_staff_required
 from nxtbn.order.admin_types import OrderType
 from nxtbn.order.models import Address, Order
 from nxtbn.users import UserRole
@@ -13,11 +13,11 @@ class AdminOrderQuery(graphene.ObjectType):
 
 
 
-    @staff_required
+    @gql_staff_required
     def resolve_orders(self, info, **kwargs):
         return Order.objects.all()
 
-    @staff_required
+    @gql_staff_required
     def resolve_order(self, info, id):
         try:
             order = Order.objects.get(id=id)

nxtbn/order/api/dashboard/views.py

@@ -393,7 +393,7 @@ def get(self, request, *args, **kwargs):
         return Response(formatted_data)
 class OrderEastimateView(OrderProccessorAPIView):
     permission_classes = (GranularPermission, )
-    required_perm = 'order.eastimate_order'
+    gql_required_perm = 'order.eastimate_order'
 
     create_order = False # Eastimate order
 

nxtbn/product/admin_queries.py

@@ -3,7 +3,7 @@
 import graphene
 
 from graphene_django.filter import DjangoFilterConnectionField
-from nxtbn.core.admin_permissions import staff_required
+from nxtbn.core.admin_permissions import gql_staff_required
 from nxtbn.product.admin_types import CategoryTranslationType, CategoryType, CollectionTranslationType, CollectionType, ProductGraphType, ProductTagTranslationType, ProductTagType, ProductTranslationType, ProductVariantAdminType, SupplierType
 from nxtbn.product.models import Category, CategoryTranslation, Collection, CollectionTranslation, Product, ProductTag, ProductTagTranslation, ProductTranslation, Supplier
 from nxtbn.users import UserRole
@@ -42,114 +42,114 @@ class ProductQuery(graphene.ObjectType):
     tags_translations = DjangoFilterConnectionField(ProductTagTranslationType)
 
 
-    @staff_required
+    @gql_staff_required
     def resolve_product(root, info, id):
 
         try:
             return Product.objects.get(pk=id)
         except Product.DoesNotExist:
             return None
 
-    @staff_required
+    @gql_staff_required
     def resolve_products(root, info, **kwargs):
         return Product.objects.all()
 
 
-    @staff_required
+    @gql_staff_required
     def resolve_collection(root, info, id):
 
         try:
             return Collection.objects.get(pk=id)
         except Collection.DoesNotExist:
             return None
 
-    @staff_required
+    @gql_staff_required
     def resolve_collections(root, info, **kwargs):
         return Collection.objects.all()
 
-    @staff_required
+    @gql_staff_required
     def resolve_producttag(root, info, id):
 
         try:
             return ProductTag.objects.get(pk=id)
         except ProductTag.DoesNotExist:
             return None
 
-    @staff_required
+    @gql_staff_required
     def resolve_producttags(root, info, **kwargs):
         return ProductTag.objects.all()
 
 
-    @staff_required
+    @gql_staff_required
     def resolve_supplier(root, info, id):
 
         try:
             return Supplier.objects.get(pk=id)
         except Supplier.DoesNotExist:
             return None
 
-    @staff_required
+    @gql_staff_required
     def resolve_suppliers(root, info, **kwargs):
         return Product.objects.all()
 
-    @staff_required
+    @gql_staff_required
     def resolve_product_variants(root, info, **kwargs):
         return Product.objects.all()
 
-    @staff_required
+    @gql_staff_required
     def resolve_category(root, info, id):
 
         try:
             return Category.objects.get(pk=id)
         except Category.DoesNotExist:
             return None
 
-    @staff_required
+    @gql_staff_required
     def resolve_categories(root, info, **kwargs):
         return Category.objects.all()
 
     # All translations
-    @staff_required
+    @gql_staff_required
     def resolve_category_translation(root, info, base_category_id, lang_code):
         try:
             return CategoryTranslation.objects.get(category_id=base_category_id, language_code=lang_code)
         except CategoryTranslation.DoesNotExist:
             return None
-    @staff_required
+    @gql_staff_required
     def resolve_category_translations(root, info, **kwargs):
         return CategoryTranslation.objects.all()
 
-    @staff_required
+    @gql_staff_required
     def resolve_collection_translation(root, info, base_collection_id, lang_code):
         try:
             return CollectionTranslation.objects.get(collection_id=base_collection_id, language_code=lang_code)
         except CollectionTranslation.DoesNotExist:
             return None
 
-    @staff_required
+    @gql_staff_required
     def resolve_collection_translations(root, info, **kwargs):
         return CollectionTranslation.objects.all()
 
-    @staff_required
+    @gql_staff_required
     def resolve_tags_translation(root, info, base_tag_id, lang_code):
         try:
             return ProductTagTranslation.objects.get(tag_id=base_tag_id, language_code=lang_code)
         except ProductTagTranslation.DoesNotExist:
             return None
 
-    @staff_required
+    @gql_staff_required
     def resolve_tags_translations(root, info, **kwargs):
         return ProductTagTranslation.objects.all()
 
 
-    @staff_required
+    @gql_staff_required
     def resolve_product_translation(root, info, base_product_id, lang_code):
         try:
             return ProductTranslation.objects.get(product_id=base_product_id, language_code=lang_code)
         except ProductTranslation.DoesNotExist:
             return None
 
-    @staff_required
+    @gql_staff_required
     def resolve_product_translations(root, info, **kwargs):
         return ProductTranslation.objects.all()
 

nxtbn/warehouse/admin_queries.py

@@ -2,7 +2,7 @@
 
 import graphene
 
-from nxtbn.core.admin_permissions import staff_required
+from nxtbn.core.admin_permissions import gql_staff_required
 from nxtbn.warehouse.admin_types import StockReservationType, StockTransferItemType, StockTransferType, StockType, WarehouseType
 from nxtbn.warehouse.models import Stock, StockReservation, StockTransfer, StockTransferItem, Warehouse
 from graphene_django.filter import DjangoFilterConnectionField
@@ -22,55 +22,55 @@ class WarehouseQuery(graphene.ObjectType):
     stock_transfer = graphene.Field(StockTransferType, id=graphene.ID(required=True))
     stock_transfer_item = graphene.Field(StockTransferItemType, id=graphene.ID(required=True))
 
-    @staff_required
+    @gql_staff_required
     def resolve_warehouses(root, info, **kwargs):
         return Warehouse.objects.all()
 
-    @staff_required
+    @gql_staff_required
     def resolve_stocks(root, info, **kwargs):
         return Stock.objects.all()
 
-    @staff_required
+    @gql_staff_required
     def resolve_stock_reservations(root, info, **kwargs):
         return StockReservation.objects.all()
 
-    @staff_required
+    @gql_staff_required
     def resolve_stock_transfers(root, info, **kwargs):
         return StockTransfer.objects.all()
 
-    @staff_required
+    @gql_staff_required
     def resolve_stock_transfer_items(root, info, **kwargs):
         return StockTransferItem.objects.all()
 
-    @staff_required
+    @gql_staff_required
     def resolve_warehouse(root, info, id):
         try:
             return Warehouse.objects.get(pk=id)
         except Warehouse.DoesNotExist:
             return None
 
-    @staff_required
+    @gql_staff_required
     def resolve_stock(root, info, id):
         try:
             return Stock.objects.get(pk=id)
         except Stock.DoesNotExist:
             return None
 
-    @staff_required
+    @gql_staff_required
     def resolve_stock_reservation(root, info, id):
         try:
             return StockReservation.objects.get(pk=id)
         except StockReservation.DoesNotExist:
             return None
 
-    @staff_required
+    @gql_staff_required
     def resolve_stock_transfer(root, info, id):
         try:
             return StockTransfer.objects.get(pk=id)
         except StockTransfer.DoesNotExist:
             return None
 
-    @staff_required
+    @gql_staff_required
     def resolve_stock_transfer_item(root, info, id):
         try:
             return StockTransferItem.objects.get(pk=id)