diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index ec6b1961..640660e5 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc index 8c95496c..d5456fbc 100644 Binary files a/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc differ diff --git a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc index ca081ac7..ffd14077 100644 Binary files a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc differ diff --git a/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc index 0e555e33..494999a8 100644 Binary files a/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc and b/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc differ diff --git a/osinaweb/osinacore/add/views.py b/osinaweb/osinacore/add/views.py index 6c0767c5..9f95d034 100644 --- a/osinaweb/osinacore/add/views.py +++ b/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') ) diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py index 9d9ffdfd..affa99c1 100644 --- a/osinaweb/osinacore/views.py +++ b/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)