From 9f9abce732675c198068f0a8a2c6f34094005de7 Mon Sep 17 00:00:00 2001
From: Keshav Priyadarshi <git@keshav.space>
Date: Tue, 8 Jul 2025 18:30:25 +0530
Subject: [PATCH] Preserve field values on unsuccessful form submission

Signed-off-by: Keshav Priyadarshi <git@keshav.space>
---
 vulnerabilities/forms.py                      | 27 +++++-----------
 .../templates/api_user_creation_form.html     | 32 ++++++-------------
 2 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/vulnerabilities/forms.py b/vulnerabilities/forms.py
index 7ee348354..03829cd52 100644
--- a/vulnerabilities/forms.py
+++ b/vulnerabilities/forms.py
@@ -46,11 +46,7 @@ class AdvisorySearchForm(forms.Form):
 class ApiUserCreationForm(forms.ModelForm):
     """Support a simplified creation for API-only users directly from the UI."""
 
-    captcha = AltchaField(
-        floating=True,
-        hidefooter=True,
-        hidelogo=True,
-    )
+    captcha = AltchaField(floating=True, hidefooter=True)
 
     class Meta:
         model = ApiUser
@@ -66,18 +62,15 @@ def __init__(self, *args, **kwargs):
         first_name_field = self.fields["first_name"]
         last_name_field = self.fields["last_name"]
         email_field.required = True
-        email_field.label = "Email"
         email_field.widget.attrs["class"] = "input"
-        email_field.widget.attrs["style"] = "width: 50%"
-        email_field.widget.attrs["placeholder"] = "foo@bar.com"
-        first_name_field.label = "First Name"
+        email_field.widget.attrs["placeholder"] = "Email"
         first_name_field.widget.attrs["class"] = "input"
-        first_name_field.widget.attrs["style"] = "width: 50%"
-        first_name_field.widget.attrs["placeholder"] = "Jon"
-        last_name_field.label = "Last Name"
+        first_name_field.widget.attrs["placeholder"] = "First Name"
         last_name_field.widget.attrs["class"] = "input"
-        last_name_field.widget.attrs["style"] = "width: 50%"
-        last_name_field.widget.attrs["placeholder"] = "Doe"
+        last_name_field.widget.attrs["placeholder"] = "Last Name"
+        email_field.label = ""
+        first_name_field.label = ""
+        last_name_field.label = ""
 
     def save(self, commit=True):
         return ApiUser.objects.create_api_user(
@@ -109,8 +102,4 @@ class PipelineSchedulePackageForm(forms.Form):
 
 
 class AdminLoginForm(AdminAuthenticationForm):
-    captcha = AltchaField(
-        floating=True,
-        hidefooter=True,
-        hidelogo=True,
-    )
+    captcha = AltchaField(floating=True, hidefooter=True)
diff --git a/vulnerabilities/templates/api_user_creation_form.html b/vulnerabilities/templates/api_user_creation_form.html
index 5a913f5ae..62c3a6614 100644
--- a/vulnerabilities/templates/api_user_creation_form.html
+++ b/vulnerabilities/templates/api_user_creation_form.html
@@ -4,6 +4,8 @@
 VulnerableCode API key request
 {% endblock %}
 
+
+
 {% block content %}
     <section class="section pt-0">
         {% for message in messages %}
@@ -44,31 +46,15 @@ <h1 class="title is-4">VulnerableCode API Key Request</h1>
 
     <br/>
       <div class="columns is-centered">
-        <div class="column is-half">
+        <div class="column is-one-third">
           <form method = "post">
               {% csrf_token %}
-              <div class="field">
-                <div class="control">
-                  <input class="input" placeholder="Email" type="email" name="email" id="{{form.email.id_for_label}}"
-                  autofocus required >
-                </div>
-              </div>
-              <div class="field">
-                <div class="control">
-                  <input class="input" placeholder="First Name" type="text" name="first_name" id="{{form.first_name.id_for_label}}"
-                  autofocus required>
-                </div>
-              </div>
-              <div class="field">
-                <div class="control">
-                  <input class="input" placeholder="Last Name" type="text" name="last_name" id="{{form.last_name.id_for_label}}"
-                  autofocus required>
-                </div>
-              </div>
-              <div class="field">
-                {{ form.captcha }}
-              </div>
-              <input class="button is-link mt-5" type="submit" value="Request my API Key">
+                  {% for field in form %}
+                      <p class="mb-4">
+                          {{ field }}
+                      </p>
+                  {% endfor %}
+              <input class="button is-link mt-2" type="submit" value="Request my API Key">
           </form>
         </div>
       </div>