Merge pull request #45 from joetsoi/master

restore #30 "if user attribute is callable then call it..."

Author: knaperek

djangosaml2/backends.py

@@ -233,8 +233,14 @@ def update_user(self, user, attributes, attribute_mapping,
             try:
                 for attr in django_attrs:
                     if hasattr(user, attr):
-                        modified = self._set_attribute(
-                            user, attr, attributes[saml_attr][0])
+                        user_attr = getattr(user, attr)
+                        if callable(user_attr):
+                            modified = user_attr(
+                                    attributes[saml_attr])
+                        else:
+                            modified = self._set_attribute(
+                                    user, attr, attributes[saml_attr][0])
+
                         user_modified = user_modified or modified
 
                     elif profile is not None and hasattr(profile, attr):

tests/testprofiles/models.py

@@ -23,7 +23,12 @@ class TestProfile(models.Model):
         user = models.OneToOneField('auth.User')
         age = models.CharField(max_length=100, blank=True)
 
+        def process_first_name(self, first_name):
+            self.first_name = first_name[0]
 else:
     from django.contrib.auth.models import AbstractUser
     class TestUser(AbstractUser):
         age = models.CharField(max_length=100, blank=True)
+
+        def process_first_name(self, first_name):
+            self.first_name = first_name[0]

tests/testprofiles/tests.py

@@ -68,3 +68,24 @@ def test_update_user(self):
             self.assertEquals(user.get_profile().age, '22')
         else:
             self.assertEquals(user.age, '22')
+
+    def test_update_user_callable_attributes(self):
+        user = User.objects.create(username='john')
+
+        backend = Saml2Backend()
+        attribute_mapping = {
+            'uid': ('username', ),
+            'mail': ('email', ),
+            'cn': ('process_first_name', ),
+            'sn': ('last_name', ),
+            }
+        attributes = {
+            'uid': ('john', ),
+            'mail': ('[email protected]', ),
+            'cn': ('John', ),
+            'sn': ('Doe', ),
+            }
+        backend.update_user(user, attributes, attribute_mapping)
+        self.assertEquals(user.email, '[email protected]')
+        self.assertEquals(user.first_name, 'John')
+        self.assertEquals(user.last_name, 'Doe')