test allow_basic_auth (#8)

ariadne_django_ext/decorators.py

@@ -9,16 +9,14 @@
 def allow_basic_auth(view_func):
  @wraps(view_func)
  def wrapper(request, *args, **kwargs):
- if not is_authenticated(request):
+ if getattr(request, "user", None) is None:
  http_auth = request.META.get("HTTP_AUTHORIZATION")
  if http_auth and http_auth.startswith("Basic"):
  try:
  _, token = http_auth.split()
  username, password = b64decode(token).decode().split(":")
- user = authenticate(
- request=request, username=username, password=password
- )
- if user and user.is_active:
+ user = authenticate(request, username=username, password=password)
+ if user:
  request.user = user
  except Exception:
  pass
@@ -30,7 +28,7 @@ def wrapper(request, *args, **kwargs):
 def login_required(view_func):
  @wraps(view_func)
  def wrapper(request, *args, **kwargs):
- if is_authenticated(request, is_active=True, raise_exception=True):
+ if is_authenticated(request):
  return view_func(request, *args, **kwargs)
 
  return wrapper

ariadne_django_ext/utils.py

@@ -2,7 +2,7 @@
 
 
 def is_authenticated(request, is_active=True, raise_exception=True):
- user = getattr(request, "user")
+ user = getattr(request, "user", None)
  if user and user.is_authenticated and (not is_active or user.is_active):
  return user
  if raise_exception:

tests/conftest.py

@@ -1,15 +1,20 @@
 import pytest
 
+password = "something"
+
 
 @pytest.fixture(
  ids=["anonymous", "not-active", "authenticated"],
  params=[None, False, True],
 )
 def user(request, django_user_model):
  if request.param is not None:
- return django_user_model.objects.create(
- username="someone", password="something", is_active=request.param
+ user = django_user_model.objects.create(
+ username="someone", is_active=request.param
  )
+ user.set_password(password)
+ user.save(update_fields=["password"])
+ return user
 
 
 @pytest.fixture

tests/settings.py

@@ -1,8 +1,9 @@
-SECRET_KEY = "asda"
+SECRET_KEY = "SECRET_KEY"
 INSTALLED_APPS = ["django.contrib.auth", "django.contrib.contenttypes"]
 DATABASES = {
  "default": {
  "ENGINE": "django.db.backends.sqlite3",
  "NAME": "test",
  }
 }
+USE_TZ = True

tests/test_decorators.py

@@ -1,14 +1,40 @@
+from base64 import b64encode
+
 import pytest
 from django.core.exceptions import PermissionDenied
 
-from ariadne_django_ext.decorators import login_required
+from ariadne_django_ext import decorators
+
+from .conftest import password
+
+
+def test_allow_basic_auth(user, rf, django_user_model):
+ return_value = "return_value"
+
+ @decorators.allow_basic_auth
+ @decorators.login_required
+ def view(_):
+ return return_value
+
+ request = rf.get("/")
+ if user:
+ request.META["HTTP_AUTHORIZATION"] = "Basic {}".format(
+ b64encode(f"{user.username}:{password}".encode()).decode()
+ )
+
+ assert getattr(request, "user", None) is None
+ if user and user.is_active:
+ assert view(request) == return_value
+ else:
+ with pytest.raises(PermissionDenied):
+ view(request)
 
 
 def test_login_required(user_request):
  return_value = "return_value"
 
- @login_required
- def view(request):
+ @decorators.login_required
+ def view(_):
  return return_value
 
  user = getattr(user_request, "user", None)
@@ -17,3 +43,11 @@ def view(request):
  else:
  with pytest.raises(PermissionDenied):
  view(user_request)
+
+
+def test_wrap_result():
+ @decorators.wrap_result(key="key")
+ def resolver():
+ return "result"
+
+ assert resolver() == {"key": "result"}