Fix mypy type lints

Author: chriscarrollsmith

exceptions/__init__.py

@@ -47,7 +47,8 @@ def mock_resend_send(mock_email_response):
 def test_register_endpoint(unauth_client: TestClient, session: Session):
     # Debug: Print the tables in the database
     inspector = inspect(session.bind)
-    print("Tables in the database:", inspector.get_table_names())
+    if inspector:  # Add null check
+        print("Tables in the database:", inspector.get_table_names())
 
     # Create a mock register response
     response = unauth_client.post(
@@ -154,9 +155,6 @@ def test_password_reset_flow(unauth_client: TestClient, session: Session, test_a
                                .where(PasswordResetToken.account_id == test_account.id)).first()
     assert reset_token is not None
     assert not reset_token.used
-
-    # Create a mock response for password reset
-    response = RedirectResponse(url="/login", status_code=303)
 
     # Update password and mark token as used directly in the database
     test_account.hashed_password = get_password_hash("NewPass123!@#")

tests/test_account.py

@@ -2,6 +2,7 @@
 from httpx import Response
 from sqlmodel import Session
 from unittest.mock import patch
+from typing import cast
 
 from main import app
 from utils.models import User
@@ -24,9 +25,20 @@ def test_read_profile_authorized(auth_client: TestClient, test_user: User):
     """Test that authorized users can view their profile"""
     response = auth_client.get(app.url_path_for("read_profile"))
     assert response.status_code == 200
-    # Check that the response contains the expected HTML content
-    assert test_user.account.email in response.text
-    assert test_user.name in response.text
+    
+    # Get the response text
+    response_text = response.text
+    
+    # Verify account exists
+    assert test_user.account is not None
+    
+    # Verify email is in the response if it exists
+    if test_user.account.email is not None:
+        assert response_text.find(str(test_user.account.email)) != -1
+    
+    # Verify name is in the response if it exists
+    if test_user.name is not None:
+        assert response_text.find(str(test_user.name)) != -1
 
 
 def test_update_profile_unauthorized(unauth_client: TestClient):
@@ -109,7 +121,7 @@ def test_delete_account_wrong_password(auth_client: TestClient, test_user: User)
     response: Response = auth_client.post(
         app.url_path_for("delete_account"),
         data={
-            "email": test_user.account.email,
+            "email": test_user.account.email if test_user.account else "",
             "password": "WrongPassword123!"
         },
         follow_redirects=False
@@ -128,7 +140,7 @@ def test_delete_account_success(auth_client: TestClient, test_user: User, sessio
     response: Response = auth_client.post(
         app.url_path_for("delete_account"),
         data={
-            "email": test_user.account.email,
+            "email": test_user.account.email if test_user.account else "",
             "password": "Test123!@#"
         },
         follow_redirects=False
@@ -155,7 +167,7 @@ def test_get_avatar_authorized(mock_validate, auth_client: TestClient, test_user
     auth_client.post(
         app.url_path_for("update_profile"),
         data={
-            "name": test_user.name
+            "name": test_user.name or ""  # Ensure name is not None
         },
         files={
             "avatar_file": ("test_avatar.jpg", b"fake image data", "image/jpeg")

tests/test_user.py

@@ -10,7 +10,7 @@
 )
 from utils.db import get_session
 from utils.models import User, Role, PasswordResetToken, EmailUpdateToken, Account
-from exceptions.http_exceptions import AuthenticationError, CredentialsError
+from exceptions.http_exceptions import AuthenticationError, CredentialsError, DataIntegrityError
 from exceptions.exceptions import NeedsNewTokens
 
 
@@ -134,7 +134,10 @@ def get_authenticated_account(
     if account:
         if new_access_token and new_refresh_token:
             # This will be caught by middleware to set new cookies
-            raise NeedsNewTokens(account.user, new_access_token, new_refresh_token)
+            if account.user:
+                raise NeedsNewTokens(account.user, new_access_token, new_refresh_token)
+            else:
+                raise   DataIntegrityError("User")
         return account
 
     raise AuthenticationError()