Change error message

Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>

Author: TG1999

vulnerabilities/forms.py

@@ -41,25 +41,24 @@ class ApiUserCreationForm(forms.ModelForm):
     class Meta:
         model = ApiUser
         fields = (
-            "username",
+            "email",
             "first_name",
             "last_name",
         )
-
+    
     def __init__(self, *args, **kwargs):
         super(ApiUserCreationForm, self).__init__(*args, **kwargs)
-        self.fields["username"].help_text = f"<ul><li>{self.fields['username'].help_text}</li></ul>"
-        self.fields["username"].label = "Email"
+        self.fields["email"].required = True
 
     def save(self, commit=True):
         return ApiUser.objects.create_api_user(
-            username=self.cleaned_data["username"],
+            username=self.cleaned_data["email"],
             first_name=self.cleaned_data["first_name"],
             last_name=self.cleaned_data["last_name"],
         )
 
     def clean_username(self):
-        username = self.cleaned_data["username"]
+        username = self.cleaned_data["email"]
         validate_email(username)
         return username
 

vulnerabilities/views.py

@@ -8,10 +8,12 @@
 #
 
 from django.contrib import messages
+from django.core.exceptions import ValidationError
 from django.core.mail import send_mail
 from django.db.models import Count
 from django.db.models import Q
 from django.http.response import Http404
+from django.shortcuts import redirect
 from django.shortcuts import render
 from django.urls import reverse_lazy
 from django.views import View
@@ -235,7 +237,12 @@ class ApiUserCreateView(generic.CreateView):
     template_name = "api_user_creation_form.html"
 
     def form_valid(self, form):
-        response = super().form_valid(form)
+
+        try:
+            response = super().form_valid(form)
+        except ValidationError as e:
+            messages.error(self.request, "Email is invalid or already taken")
+            return redirect(self.get_success_url())
 
         send_mail(
             subject="VulnerableCode.io API key token",
@@ -251,12 +258,5 @@ def form_valid(self, form):
 
         return response
 
-    def form_invalid(self, form):
-        response = super().form_invalid(form)
-
-        messages.error(self.request, str(form.errors))
-
-        return response
-
     def get_success_url(self):
         return reverse_lazy("api_user_request")