test fix

Author: mhindery

djangosaml2/backends.py

@@ -69,9 +69,6 @@ def set_attribute(obj: Any, attr: str, new_value: Any) -> bool:
     return False
 
 
-UserModel = get_saml_user_model()
-
-
 class Saml2Backend(ModelBackend):
     def is_authorized(self, attributes, attribute_mapping) -> bool:
         """ Hook to allow custom authorization policies based on SAML attributes. """
@@ -89,6 +86,8 @@ def _extract_user_identifier_params(self, session_info, attributes, attribute_ma
         """ Returns the attribute to perform a user lookup on, and the value to use for it.
             The value could be the name_id, or any other saml attribute from the request.
         """
+        UserModel = get_saml_user_model()
+
         # Lookup key
         user_lookup_key = get_django_user_lookup_attribute(UserModel)
 
@@ -124,6 +123,8 @@ def get_or_create_user(self, user_lookup_key, user_lookup_value, create_unknown_
             e.g. customize this per IdP. The kwargs contain these additional params: session_info, attribute_mapping, attributes, request.
             The identity provider id can be found in kwargs['session_info']['issuer]
         """
+        UserModel = get_saml_user_model()
+
         # Construct query parameters to query the userModel with. An additional lookup modifier could be specified in the settings.
         user_query_args = {
             user_lookup_key + getattr(settings, 'SAML_DJANGO_USER_MAIN_ATTRIBUTE_LOOKUP', ''): user_lookup_value

tests/testprofiles/tests.py

@@ -18,11 +18,12 @@
 
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import User as DjangoUserModel
-from django.test import TestCase, override_settings
 from django.core.exceptions import ImproperlyConfigured
-from djangosaml2.backends import (Saml2Backend, get_model, get_saml_user_model, set_attribute,
-                                  get_django_user_lookup_attribute, get_django_user_lookup_attribute,
-                                  get_saml_user_model)
+from django.test import TestCase, override_settings
+
+from djangosaml2.backends import (Saml2Backend,
+                                  get_django_user_lookup_attribute, get_model,
+                                  get_saml_user_model, set_attribute)
 
 from .models import TestUser
 
@@ -190,9 +191,8 @@ def test_invalid_model_attribute_log(self):
             logs.output,
         )
 
-    @override_settings(AUTH_USER_MODEL='testprofiles.RequiredFieldUser')
+    @override_settings(SAML_USER_MODEL='testprofiles.RequiredFieldUser')
     def test_create_user_with_required_fields(self):
-        backend = Saml2Backend()
         attribute_mapping = {
             'mail': ['email'],
             'mail_verified': ['email_verified']
@@ -202,12 +202,16 @@ def test_create_user_with_required_fields(self):
             'mail_verified': [True],
         }
         # User creation does not fail if several fields are required.
-        user = backend._get_or_create_saml2_user(
+        user, created = self.backend.get_or_create_user(
+            get_django_user_lookup_attribute(get_saml_user_model()),
             'john@example.org',
-            attributes,
-            attribute_mapping,
+            True
         )
+
         self.assertEquals(user.email, 'john@example.org')
+        self.assertIs(user.email_verified, None)
+
+        user = self.backend._update_user(user, attributes, attribute_mapping, created)
         self.assertIs(user.email_verified, True)
 
     def test_django_user_main_attribute(self):