new

osinaweb/osinacore/add/views.py

@@ -50,15 +50,10 @@ def add_customer(request):
         business_id = request.POST.get('business')
         business = get_object_or_404(Business, id=business_id)
         username = f"{first_name.lower()}{last_name.lower()}"
-        original_username = username
-        counter = 1 
             
-        while User.objects.filter(username=username).exists():
-            username = f"{original_username.lower()}{counter}"
-            counter += 1
             
         user = User.objects.create_user(
-            username=username,
+            username=email,
             email=email,
             password=request.POST.get('password2')
         )

osinaweb/osinacore/views.py

@@ -39,14 +39,7 @@ def signin(request):
         if form.is_valid():
             username = form.cleaned_data['username']
             password = form.cleaned_data['password']
-            
-            try:
-                validate_email(username)
-                email = username
-                user = User.objects.get(email=email) 
-            except ValidationError:
-                email = None
-                user = authenticate(request, username=username, password=password)
+            user = authenticate(request, username=username, password=password)
 
             if user is not None:
                 login(request, user)