reverts adding middle name to last_name in commit c9ed0e8

The `full_name` is none-the-less passed to `create_user` when
the user model manager allows it (ex: djaodjin-signup creates
`Contact` models attached to the user).

Author: smirolo

saas/api/roles.py

@@ -27,9 +27,11 @@
 import logging
 
 from django.contrib.auth import get_user_model
+from django.core.exceptions import FieldDoesNotExist
 from django.db import transaction, IntegrityError
 from django.db.models import Q
 from django.http import Http404
+from django.template.defaultfilters import slugify
 from rest_framework import serializers, status
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.generics import (ListAPIView, ListCreateAPIView,
@@ -43,7 +45,7 @@
 from ..docs import extend_schema, OpenApiResponse
 from ..decorators import _has_valid_access
 from ..filters import OrderingFilter, SearchFilter
-from ..helpers import full_name_natural_split
+from ..helpers import full_name_natural_parts
 from ..mixins import (OrganizationMixin, OrganizationCreateMixin,
     OrganizationSmartListMixin, RoleDescriptionMixin, RoleMixin,
     RoleSmartListMixin, UserMixin)
@@ -70,52 +72,53 @@ def create_user_from_email(email, password=None, **kwargs):
     # `signup.models.ActivatedUserManager.create_user_from_email`.
     # Its purpose here instead of calling the above is to have
     # djaodjin-saas works as a stand-alone project (no dependency on signup).
+    request = kwargs.pop('request', None)
     user = None
     user_model = get_user_model()
-    first_name = kwargs.get('first_name', "")
-    last_name = kwargs.get('last_name', "")
-    if not (first_name or last_name):
-        first_name, last_name = full_name_natural_split(
-            kwargs.get('full_name', ''))
-    first_name = _clean_field(
-        user_model, 'first_name', first_name, prefix='user_')
-    last_name = _clean_field(
-        user_model, 'last_name', last_name, prefix='user_')
     # The e-mail address was already validated by the Serializer.
     err = IntegrityError()
-    if hasattr(user_model.objects, 'create_user_from_email'):
-        # Implementation Note:
-        # calling `signup.models.ActivatedUserManager.create_user_from_email`
-        # directly bypasses sending a `user_registered` signal.
-        user = user_model.objects.create_user_from_email(
-            email, password=password,
-            first_name=first_name, last_name=last_name)
-    else:
-        username = _clean_field(
-            user_model, 'username', email.split('@')[0], prefix='user_')
-        #pylint:disable=protected-access
-        field = user_model._meta.get_field('username')
-        max_length = field.max_length
-        trials = 0
-        username_base = username
-        while trials < 10:
+    user_kwargs = {}
+    user_kwargs.update(kwargs)
+    username = _clean_field(
+        user_model, 'username', slugify(email.split('@')[0]), prefix='user_')
+    if ('first_name' not in user_kwargs or
+        'last_name' not in user_kwargs):
+        first_name, _mid, last_name = \
+            full_name_natural_parts(kwargs.get('full_name'))
+        if 'first_name' not in user_kwargs:
+            user_kwargs.update({'first_name': first_name})
+        if 'last_name' not in user_kwargs:
+            user_kwargs.update({'last_name': last_name})
+    if not hasattr(user_model.objects, 'create_user_from_email'):
+        # When djaodjin-saas is used in conjunction with djaodjin-signup,
+        # we are able to set a full_name, phone number, etc.
+        for field_name in kwargs:
             try:
-                user = user_model.objects.create_user(username,
-                    email=email, first_name=first_name, last_name=last_name)
-                break
-            except IntegrityError as exp:
-                err = exp
-                suffix = '-%s' % generate_random_slug(3)
-                if len(username_base) + len(suffix) > max_length:
-                    username = '%s%s' % (
-                        username_base[:(max_length - len(suffix))],
-                        suffix)
-                else:
-                    username = '%s%s' % (username_base, suffix)
-                trials = trials + 1
+                _field = user_model._meta.get_field(field_name)
+            except (FieldDoesNotExist, KeyError):
+                del user_kwargs[field_name]
+    #pylint:disable=protected-access
+    field = user_model._meta.get_field('username')
+    max_length = field.max_length
+    trials = 0
+    username_base = username
+    while trials < 10:
+        try:
+            user = user_model.objects.create_user(username,
+                email=email, password=password, **user_kwargs)
+            break
+        except IntegrityError as exp:
+            err = exp
+            suffix = '-%s' % generate_random_slug(3)
+            if len(username_base) + len(suffix) > max_length:
+                username = '%s%s' % (
+                    username_base[:(max_length - len(suffix))],
+                    suffix)
+            else:
+                username = '%s%s' % (username_base, suffix)
+            trials = trials + 1
     if not user:
         raise err
-    request = kwargs.get('request', None)
     invited_by = request.user if request else None
     LOGGER.info("'%s %s <%s>' invited by '%s'",
         user.first_name, user.last_name, user.email, invited_by,

saas/mixins.py

@@ -29,6 +29,7 @@
 
 from django.contrib.auth import REDIRECT_FIELD_NAME, get_user_model
 from django.contrib.auth.hashers import UNUSABLE_PASSWORD_PREFIX
+from django.core.exceptions import FieldDoesNotExist
 from django.db import models, transaction, IntegrityError
 from django.http import Http404
 from django.template.defaultfilters import slugify
@@ -41,7 +42,7 @@
     is_authenticated, reverse, six)
 from .decorators import _valid_manager
 from .filters import DateRangeFilter, OrderingFilter, SearchFilter
-from .helpers import (datetime_or_now, full_name_natural_split,
+from .helpers import (datetime_or_now, full_name_natural_parts,
     update_context_urls)
 from .models import (CartItem, Charge, Coupon, Plan, Price,
     RoleDescription, Subscription, Transaction, get_broker, sum_orig_amount)
@@ -515,9 +516,10 @@ class OrganizationCreateMixin(object):
 
     def create_organization(self, validated_data):
         organization_model = get_organization_model()
+        full_name = validated_data.get('full_name')
         organization = organization_model(
             slug=validated_data.get('slug', None),
-            full_name=validated_data.get('full_name'),
+            full_name=full_name,
             email=validated_data.get('email'),
             default_timezone=validated_data.get(
                 'default_timezone', settings.TIME_ZONE),
@@ -549,13 +551,34 @@ def create_organization(self, validated_data):
                         # does not exist so we have a chance to create
                         # a slug/username.
                         organization.save()
-                        first_name, last_name = full_name_natural_split(
-                            organization.full_name)
+                        user_kwargs = {}
+                        user_kwargs.update(validated_data)
+                        if 'email' in user_kwargs:
+                            del user_kwargs['email']
+                        if ('first_name' not in user_kwargs or
+                            'last_name' not in user_kwargs):
+                            first_name, _mid, last_name = \
+                                full_name_natural_parts(full_name)
+                            if 'first_name' not in user_kwargs:
+                                user_kwargs.update({'first_name': first_name})
+                            if 'last_name' not in user_kwargs:
+                                user_kwargs.update({'last_name': last_name})
+                            if not hasattr(self.user_model.objects,
+                                           'create_user_from_email'):
+                                # When djaodjin-saas is used in conjunction
+                                # with djaodjin-signup, we are able to set
+                                # a full_name, phone number, etc.
+                                for field_name in validated_data:
+                                    try:
+                                        _field = \
+                                            self.user_model._meta.get_field(
+                                                field_name)
+                                    except (FieldDoesNotExist, KeyError):
+                                        del user_kwargs[field_name]
                         user = self.user_model.objects.create_user(
-                            username=organization.slug,
+                            organization.slug,
                             email=organization.email,
-                            first_name=first_name,
-                            last_name=last_name)
+                            **user_kwargs)
                     organization.add_manager(user)
                 else:
                     # When `slug` is not present, `save` would try to create