Reconcile delete account form with new backend route expectations

Author: chriscarrollsmith

routers/account.py

@@ -102,8 +102,7 @@ async def delete_account(
         )
 
     # Delete the account and associated user
-    # Note: The user will be deleted automatically due to the cascade relationship,
-    # but we need to refresh the session to ensure the changes are committed properly
+    # Note: The user will be deleted automatically by cascade relationship
     session.delete(account)
     session.commit()
 
@@ -141,7 +140,7 @@ async def read_register(
 
     return templates.TemplateResponse(
         "authentication/register.html",
-        {"request": request, "user": user}
+        {"request": request, "user": user, "password_pattern": HTML_PASSWORD_PATTERN}
     )
 
 

templates/authentication/register.html

@@ -13,14 +13,14 @@
             <input type="text" class="form-control" id="name" name="name" placeholder="Enter your name" required
                    autocomplete="name">
         </div>
-        
+
         <!-- Email Input -->
         <div class="mb-3">
             <label for="email" class="form-label">Email</label>
             <input type="email" class="form-control" id="email" name="email" placeholder="Enter your email" required
                    autocomplete="email">
         </div>
-        
+
         <!-- Password Input -->
         <div class="mb-3">
             <label for="password" class="form-label">Password</label>
@@ -33,7 +33,7 @@
                 Must contain at least one number, one uppercase and lowercase letter, one special character, and at least 8 or more characters
             </div>
         </div>
-        
+
         <!-- Confirm Password Input -->
         <div class="mb-3">
             <label for="confirm_password" class="form-label">Confirm Password</label>
@@ -44,13 +44,13 @@
                 Passwords do not match.
             </div>
         </div>
-        
+
         <!-- Submit Button -->
         <div class="d-grid">
             <button type="submit" class="btn btn-primary">Register</button>
         </div>
     </form>
-    
+
     <!-- Login Link -->
     <p class="mt-3 text-center">Already have an account? <a href="{{ url_for('read_login') }}">Login here</a></p>
 </div>

templates/users/profile.html

@@ -115,11 +115,14 @@ <h1 class="mb-4">User Profile</h1>
         </div>
         <div class="card-body">
             <form action="{{ url_for('delete_account') }}" method="post">
-                <p class="text-danger">This action cannot be undone. Please confirm your password to delete your account.</p>
+                <p class="text-danger">This action cannot be undone. Please confirm your email and password to delete your account.</p>
                 <div class="mb-3">
-                    <input type="hidden" name="email" value="{{ user.account.email }}">
-                    <label for="password" class="form-label">Password</label>
-                    <input type="password" class="form-control" id="password" name="password" autocomplete="off">
+                    <label for="delete_email" class="form-label">Email</label>
+                    <input type="email" class="form-control" id="delete_email" name="email" autocomplete="off">
+                </div>
+                <div class="mb-3">
+                    <label for="delete_password" class="form-label">Password</label>
+                    <input type="password" class="form-control" id="delete_password" name="password" autocomplete="off">
                 </div>
                 <button type="submit" class="btn btn-danger">Delete Account</button>
             </form>

tests/test_auth.py

@@ -18,7 +18,7 @@
     send_email_update_confirmation
 )
 from unittest.mock import patch, MagicMock
-from utils.models import Account, EmailUpdateToken
+from utils.models import EmailUpdateToken
 
 
 def test_convert_python_regex_to_html() -> None: