Ensure kwargs are defined and not passed as queryset filters

Author: fabienheureux

grapple/helpers.py

@@ -70,13 +70,13 @@ def resolve_singular(self, _, info, **kwargs):
                 if not kwargs:
                     return None
 
+                token = kwargs.pop("token", None)
+
                 try:
                     # If is a Page then only query live/public pages.
                     if issubclass(cls, Page):
-                        if "token" in kwargs and hasattr(
-                            cls, "get_page_from_preview_token"
-                        ):
-                            return cls.get_page_from_preview_token(kwargs["token"])
+                        if token and hasattr(cls, "get_page_from_preview_token"):
+                            return cls.get_page_from_preview_token(token)
 
                         return cls.objects.live().public().get(**kwargs)
 
@@ -166,13 +166,13 @@ def resolve_singular(self, _, info, **kwargs):
                 if not kwargs:
                     return None
 
+                token = kwargs.pop("token", None)
+
                 try:
                     # If is a Page then only query live/public pages.
                     if issubclass(cls, Page):
-                        if "token" in kwargs and hasattr(
-                            cls, "get_page_from_preview_token"
-                        ):
-                            return cls.get_page_from_preview_token(kwargs["token"])
+                        if token and hasattr(cls, "get_page_from_preview_token"):
+                            return cls.get_page_from_preview_token(token)
 
                         return cls.objects.live().public().get(**kwargs)
 
@@ -251,15 +251,15 @@ def Mixin():
             def resolve_singular(self, _, info, **kwargs):
                 try:
                     qs = cls.objects
-                    if "order" in kwargs:
-                        qs = qs.order_by(kwargs.pop("order"))
+                    order = kwargs.pop("order", None)
+                    token = kwargs.pop("token", None)
+                    if order:
+                        qs = qs.order_by(order)
 
                     # If is a Page then only query live/public pages.
                     if issubclass(cls, Page):
-                        if "token" in kwargs and hasattr(
-                            cls, "get_page_from_preview_token"
-                        ):
-                            return cls.get_page_from_preview_token(kwargs["token"])
+                        if token and hasattr(cls, "get_page_from_preview_token"):
+                            return cls.get_page_from_preview_token(token)
 
                         return qs.live().public().filter(**kwargs).first()