Passing unit tests for auth.py

Author: chriscarrollsmith

tests/test_authentication.py renamed to tests/test_account.py

@@ -9,7 +9,7 @@
 from html import unescape
 
 from main import app
-from utils.models import User, PasswordResetToken, UserPassword, EmailUpdateToken
+from utils.models import User, PasswordResetToken, EmailUpdateToken, Account
 from utils.auth import (
     create_access_token,
     verify_password,
@@ -299,7 +299,7 @@ def test_request_email_update_already_registered(auth_client: TestClient, sessio
     existing_user = User(
         name="Existing User",
         email=existing_email,
-        password=UserPassword(hashed_password=get_password_hash("Test123!@#"))
+        password=Account(hashed_password=get_password_hash("Test123!@#"))
     )
     session.add(existing_user)
     session.commit()

tests/test_auth.py

@@ -1,7 +1,7 @@
 import re
 import string
 import random
-from datetime import timedelta, UTC, datetime
+from datetime import timedelta
 from urllib.parse import urlparse, parse_qs
 from starlette.datastructures import URLPath
 from main import app
@@ -15,11 +15,10 @@
     COMPILED_PASSWORD_PATTERN,
     convert_python_regex_to_html,
     generate_email_update_url,
-    send_email_update_confirmation,
-    get_user_from_email_update_token
+    send_email_update_confirmation
 )
 from unittest.mock import patch, MagicMock
-from utils.models import User, EmailUpdateToken
+from utils.models import Account, EmailUpdateToken
 
 
 def test_convert_python_regex_to_html() -> None:
@@ -157,11 +156,11 @@ def test_email_update_url_generation() -> None:
     Tests that the email update confirmation URL is correctly formatted and contains
     the required query parameters.
     """
-    test_user_id = 123
+    test_account_id = 123
     test_token = "abc123"
     test_new_email = "[email protected]"
 
-    url = generate_email_update_url(test_user_id, test_token, test_new_email)
+    url = generate_email_update_url(test_account_id, test_token, test_new_email)
 
     # Parse the URL
     parsed = urlparse(url)
@@ -174,10 +173,10 @@ def test_email_update_url_generation() -> None:
     assert parsed.path == str(confirm_email_path)
 
     # Verify query parameters
-    assert "user_id" in query_params
+    assert "account_id" in query_params
     assert "token" in query_params
     assert "new_email" in query_params
-    assert query_params["user_id"][0] == str(test_user_id)
+    assert query_params["account_id"][0] == str(test_account_id)
     assert query_params["token"][0] == test_token
     assert query_params["new_email"][0] == test_new_email
 
@@ -192,13 +191,13 @@ def test_send_email_update_confirmation(mock_send: MagicMock) -> None:
 
     current_email = "[email protected]"
     new_email = "[email protected]"
-    user_id = 123
+    account_id = 123
 
     # Mock successful email send
     mock_send.return_value = {"id": "test_email_id"}
 
     # Test successful email sending
-    send_email_update_confirmation(current_email, new_email, user_id, session)
+    send_email_update_confirmation(current_email, new_email, account_id, session)
 
     # Verify session interactions
     assert session.add.called
@@ -216,35 +215,9 @@ def test_send_email_update_confirmation(mock_send: MagicMock) -> None:
     session.reset_mock()
     session.exec.return_value.first.return_value = EmailUpdateToken()  # Existing token
 
-    send_email_update_confirmation(current_email, new_email, user_id, session)
+    send_email_update_confirmation(current_email, new_email, account_id, session)
 
     # Verify no new token was created or email sent
     assert not session.add.called
     assert not session.commit.called
     assert mock_send.call_count == 1  # Still just one call from before
-
-def test_get_user_from_email_update_token() -> None:
-    """
-    Tests retrieving a user using an email update token.
-    """
-    session = MagicMock()
-
-    # Test valid token
-    mock_user = User(id=1, email="[email protected]")
-    mock_token = EmailUpdateToken(
-        user_id=1,
-        token="valid_token",
-        expires_at=datetime.now(UTC) + timedelta(hours=1),
-        used=False
-    )
-    session.exec.return_value.first.return_value = (mock_user, mock_token)
-
-    user, token = get_user_from_email_update_token(1, "valid_token", session)
-    assert user == mock_user
-    assert token == mock_token
-
-    # Test invalid token
-    session.exec.return_value.first.return_value = None
-    user, token = get_user_from_email_update_token(1, "invalid_token", session)
-    assert user is None
-    assert token is None

tests/test_dependencies.py

@@ -0,0 +1,31 @@
+from unittest.mock import MagicMock
+from datetime import datetime, timedelta, UTC
+from utils.models import EmailUpdateToken, User
+from utils.dependencies import get_user_from_email_update_token
+
+
+def test_get_user_from_email_update_token() -> None:
+    """
+    Tests retrieving a user using an email update token.
+    """
+    session = MagicMock()
+
+    # Test valid token
+    mock_user = User(id=1, email="[email protected]")
+    mock_token = EmailUpdateToken(
+        user_id=1,
+        token="valid_token",
+        expires_at=datetime.now(UTC) + timedelta(hours=1),
+        used=False
+    )
+    session.exec.return_value.first.return_value = (mock_user, mock_token)
+
+    user, token = get_user_from_email_update_token(1, "valid_token", session)
+    assert user == mock_user
+    assert token == mock_token
+
+    # Test invalid token
+    session.exec.return_value.first.return_value = None
+    user, token = get_user_from_email_update_token(1, "invalid_token", session)
+    assert user is None
+    assert token is None

utils/auth.py

@@ -14,7 +14,7 @@
 from jinja2.environment import Template
 from fastapi.templating import Jinja2Templates
 from fastapi import Cookie
-from utils.models import User, PasswordResetToken, EmailUpdateToken, Account
+from utils.models import PasswordResetToken, EmailUpdateToken, Account
 from exceptions.http_exceptions import PasswordValidationError, PasswordMismatchError
 
 load_dotenv()
@@ -220,7 +220,7 @@ def generate_password_reset_url(email: str, token: str) -> str:
         Complete password reset URL
     """
     base_url = os.getenv('BASE_URL')
-    return f"{base_url}/auth/reset_password?email={email}&token={token}"
+    return f"{base_url}/account/reset_password?email={email}&token={token}"
 
 
 def send_reset_email(email: str, session: Session) -> None:
@@ -280,7 +280,7 @@ def generate_email_update_url(account_id: int, token: str, new_email: str) -> st
     Generates the email update confirmation URL with proper query parameters.
     """
     base_url = os.getenv('BASE_URL')
-    return f"{base_url}/auth/confirm_email_update?account_id={account_id}&token={token}&new_email={new_email}"
+    return f"{base_url}/account/confirm_email_update?account_id={account_id}&token={token}&new_email={new_email}"
 
 
 def send_email_update_confirmation(