Remove email endpoints for future implementation

Author: lealre

backend/poetry.lock

@@ -7,14 +7,12 @@ readme = 'README.md'
 packages = [{include = 'src'}]
 
 [tool.poetry.dependencies]
+python = '3.12.*'
 alembic = '^1.13.2'
 aiosqlite = '^0.20.0'
 asyncpg = '^0.30.0'
 email-validator = '^2.2.0'
 fastapi = {extras = ['standard'], version = '^0.112.0'}
-fastapi-mail = "^1.4.2"
-itsdangerous = "^2.2.0"
-python = '3.12.*'
 python-multipart = '^0.0.9'
 pydantic-settings = '^2.4.0'
 pyjwt = '^2.9.0'

backend/pyproject.toml

@@ -7,12 +7,7 @@
     CurrentUser,
     SessionDep,
 )
-from src.core.security import (
-    create_url_safe_token,
-    decode_url_safe_token,
-)
-from src.email.email import create_email_message, email
-from src.schemas.base import Email, Message
+from src.schemas.base import Message
 from src.schemas.users import (
     PasswordChange,
     UserRequestCreate,
@@ -128,170 +123,3 @@ async def delete_user_me(
     )
 
     return Message(message='User deleted.')
-
-
-# -- Email verification routes --
-
-
-@router.get('/check-verification-status/{user_id}', response_model=Message)
-async def is_verified(
-    session: SessionDep, current_user: CurrentUser, user_id: int
-) -> Message:
-    """
-    Check if own account is verified.
-    """
-    user_db = await user_service.get_user_by_id(
-        session=session, user_id=user_id
-    )
-
-    if not user_db:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND, detail='User not found.'
-        )
-    if current_user.id != user_id:
-        raise HTTPException(
-            status_code=HTTPStatus.FORBIDDEN, detail='Not enough permissions.'
-        )
-
-    if user_db.is_verified:
-        return Message(message='User is already verified.')
-
-    return Message(message='User has not been verified yet.')
-
-
-@router.get('/verify-account', response_model=Message)
-async def verify_account(current_user: CurrentUser) -> Message:
-    """
-    Send an email to the user to verify their account.
-    """
-    email_token = create_url_safe_token(data={'email': current_user.email})
-
-    link = f'http://127.0.0.1:8000/users/verify/{email_token}'
-
-    html_message = f"""
-        <h1>Verify your account</h1>
-        <p>Click in this <a href={link}>link</a> to verify your account </p>
-    """
-
-    message = create_email_message(
-        recipients=[current_user.email],
-        subject='Verify your email',
-        body=html_message,
-    )
-
-    await email.send_message(message)
-
-    return Message(message=f'Email sent to {current_user.email}')
-
-
-@router.get('/verify/{token}', response_model=Message)
-async def verify(
-    session: SessionDep, current_user: CurrentUser, token: str
-) -> Message:
-    """
-    Verify the user account based on the verification email sent.
-    """
-    email_token = decode_url_safe_token(token)
-
-    if not email_token:
-        raise HTTPException(
-            status_code=HTTPStatus.UNAUTHORIZED,
-            detail='Could not validate credentials.',
-        )
-
-    user_email = email_token.get('email')
-
-    if not user_email or user_email != current_user.email:
-        raise HTTPException(
-            status_code=HTTPStatus.FORBIDDEN,
-            detail='Could not validate account',
-        )
-
-    user_updated = current_user
-    user_updated.is_verified = True
-    session.add(user_updated)
-    await session.commit()
-
-    return Message(message='Account verified sucessfully!')
-
-
-@router.post('/test-email', response_model=Message)
-async def test_email(emails: Email) -> Message:
-    recipient_email_addresses = emails.addresses
-    html = '<h1>Testing Email</h1>'
-    message = create_email_message(
-        recipients=recipient_email_addresses,
-        subject='Welcome to the test',
-        body=html,
-    )
-    await email.send_message(message)
-
-    return Message(message='Email sent')
-
-
-# -- Email recovery access routes --
-
-
-@router.get('/recover-access', response_model=Message)
-async def recover_access(current_user: CurrentUser) -> Message:
-    """
-    Recover account access (WIP).
-    """
-    email_token = create_url_safe_token(data={'email': current_user.email})
-
-    link = f'http://127.0.0.1:8000/users/change-password/{email_token}'
-
-    html_message = f"""
-        <h1>Reset Password</h1>
-        <p>Click in this <a href={link}>link</a> to reset your password</p>
-    """
-
-    message = create_email_message(
-        recipients=[current_user.email],
-        subject='Reset Password',
-        body=html_message,
-    )
-
-    await email.send_message(message)
-
-    return Message(message=f'Email sent to {current_user.email}')
-
-
-@router.post('/change-password/{token}', response_model=Message)
-async def change_password_by_email(
-    session: SessionDep,
-    passwords: PasswordChange,
-    current_user: CurrentUser,
-    token: str,
-) -> Message:
-    """
-    Change password when account recovery is requested (WIP).
-    """
-    email_token = decode_url_safe_token(token)
-
-    if not email_token:
-        raise HTTPException(
-            status_code=HTTPStatus.UNAUTHORIZED,
-            detail='Could not validate credentials.',
-        )
-
-    user_email = email_token.get('email')
-
-    if not user_email or user_email != current_user.email:
-        raise HTTPException(
-            status_code=HTTPStatus.FORBIDDEN,
-            detail='Password change could not be completed.',
-        )
-
-    if passwords.password != passwords.password_confirmation:
-        raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST, detail='Passwords dont match.'
-        )
-
-    await user_service.change_password(
-        session=session,
-        user_to_update=current_user,
-        password=passwords.password,
-    )
-
-    return Message(message='Password has been changed!')

backend/src/api/routes/users.py

@@ -1,9 +1,7 @@
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-from starlette.middleware.sessions import SessionMiddleware
 
 from src.api.main import api_router
-from src.core.settings import settings
 from src.schemas.base import Message
 
 app = FastAPI()
@@ -18,8 +16,6 @@
     allow_headers=['*'],
 )
 
-app.add_middleware(SessionMiddleware, secret_key=settings.SECRET_KEY)
-
 app.include_router(api_router)
 
 

backend/src/app.py

@@ -3,7 +3,6 @@
 from zoneinfo import ZoneInfo
 
 from fastapi.security import OAuth2PasswordBearer
-from itsdangerous import URLSafeTimedSerializer
 from jwt import encode
 from pwdlib import PasswordHash
 
@@ -33,21 +32,3 @@ def create_access_token(data: dict[str, Any]) -> str:
     )
 
     return encoded_jwt
-
-
-serializer = URLSafeTimedSerializer(
-    secret_key=settings.SECRET_KEY, salt='email-configuration'
-)
-
-
-def create_url_safe_token(data: dict[str, str]) -> str:
-    token = serializer.dumps(data)
-    return token
-
-
-def decode_url_safe_token(token: str) -> dict[str, Any] | None:
-    try:
-        token_data: dict[str, Any] = serializer.loads(token)
-        return token_data
-    except Exception:
-        return None

backend/src/core/security.py

@@ -1,12 +1,9 @@
-from pathlib import Path
-
-from pydantic import DirectoryPath, SecretStr
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class Settings(BaseSettings):
     model_config = SettingsConfigDict(
-        env_file='.env', env_file_encoding='utf-8'
+        env_file='.env', env_file_encoding='utf-8', extra='allow'
     )
 
     DATABASE_URL: str = 'sqlite+aiosqlite:///./database.db'
@@ -19,17 +16,5 @@ class Settings(BaseSettings):
     FIRST_SUPERUSER_EMAIL: str = 'admin@admin.com'
     FIRST_SUPERUSER_PASSWORD: str = 'admin'
 
-    EMAIL_USERNAME: str = ''
-    EMAIL_PASSWORD: SecretStr = SecretStr('')
-    EMAIL_FROM: str = ''
-    EMAIL_PORT: int = 587
-    EMAIL_SERVER: str = ''
-    EMAIL_FROM_NAME: str = ''
-    EMAIL_STARTTLS: bool = True
-    EMAIL_SSL_TLS: bool = False
-    USE_CREDENTIALS: bool = True
-    VALIDATE_CERTS: bool = True
-    TEMPLATE_FOLDER: DirectoryPath = Path('src/email/templates')
-
 
 settings = Settings()