{escape(label)}
' + f'{escape(value)}
| ' + f'' + f"{escape(action_label)} |
' + f'Or open {escaped_url}
' + ) + + template = Template((Path(__file__).parents[1] / "templates" / "transactional_email.html").read_text()) + + return template.substitute( + subject=escape(subject), + preheader=escape(preheader), + category=escape(category), + heading=escape(heading), + greeting=escape(greeting), + summary=escape(summary), + detail=detail_html, + guidance=escape(guidance), + action=action_html, + security_note=escape(security_note), + ) + + def is_email_delivery_configured() -> bool: """Return whether SMTP-backed email delivery is configured.""" settings = get_settings() return bool(settings.email_delivery_enabled and settings.smtp_host and settings.smtp_from_email) -def send_email(recipient: str, subject: str, body: str) -> None: - """Send a plain-text email through the configured SMTP server.""" +def send_email(recipient: str, subject: str, body: str, *, html_body: str | None = None) -> None: + """Send plain text with an optional HTML alternative through the configured SMTP server.""" settings = get_settings() if not is_email_delivery_configured(): @@ -37,6 +97,10 @@ def send_email(recipient: str, subject: str, body: str) -> None: message["To"] = recipient message["Subject"] = subject message.set_content(body) + + if html_body is not None: + message.add_alternative(html_body, subtype="html") + smtp_host = settings.smtp_host if smtp_host is None: diff --git a/papyrus/services/media.py b/papyrus/services/media.py index e1ed681..0554ce5 100644 --- a/papyrus/services/media.py +++ b/papyrus/services/media.py @@ -270,7 +270,12 @@ async def _used_bytes(session: AsyncSession, user_id: UUID) -> int: async def _lock_user_uploads(session: AsyncSession, user_id: UUID) -> None: """Serialize quota and replacement decisions for one user's uploads.""" - await session.execute(select(User.user_id).where(User.user_id == user_id).with_for_update()) + user = await session.scalar( + select(User).where(User.user_id == user_id).with_for_update().execution_options(populate_existing=True) + ) + + if user is None or user.disabled_at is not None: + raise ForbiddenError("User account is unavailable") async def _write_upload_to_temp_file( diff --git a/papyrus/services/sync.py b/papyrus/services/sync.py index b7d4bd5..9681a46 100644 --- a/papyrus/services/sync.py +++ b/papyrus/services/sync.py @@ -6,6 +6,7 @@ from sqlalchemy import select from sqlalchemy.ext.asyncio import AsyncSession +from papyrus.core.exceptions import ForbiddenError from papyrus.models import User from papyrus.schemas.sync import PowerSyncCrudMutation from papyrus.services import media as media_service @@ -14,7 +15,12 @@ async def lock_owner_mutations(session: AsyncSession, user_id: UUID) -> None: """Hold the owner's mutation lock until the surrounding transaction ends.""" - await session.execute(select(User.user_id).where(User.user_id == user_id).with_for_update()) + user = await session.scalar( + select(User).where(User.user_id == user_id).with_for_update().execution_options(populate_existing=True) + ) + + if user is None or user.disabled_at is not None: + raise ForbiddenError("User account is unavailable") async def apply_powersync_upload_batch( diff --git a/papyrus/services/users.py b/papyrus/services/users.py index 17b8f4d..0e4be63 100644 --- a/papyrus/services/users.py +++ b/papyrus/services/users.py @@ -10,8 +10,9 @@ from papyrus.core.exceptions import ForbiddenError, NotFoundError, UnauthorizedError, ValidationError from papyrus.core.security import hash_password, verify_password -from papyrus.models import AuthSession, PasswordCredential, User +from papyrus.models import AuthSession, PasswordCredential, User, UserIdentity from papyrus.schemas.user import UpdateUserRequest +from papyrus.schemas.user import User as UserResponse def _now() -> datetime: @@ -57,18 +58,6 @@ async def update_user_profile(session: AsyncSession, user_id: UUID, request: Upd return user -async def delete_user_account(session: AsyncSession, user_id: UUID, password: str) -> None: - user = await _get_active_user(session, user_id) - credential = await session.get(PasswordCredential, user_id) - - if credential is not None and not verify_password(password, credential.password_hash): - raise UnauthorizedError("Current password is incorrect") - - user.disabled_at = _now() - await _revoke_user_sessions(session, user_id) - await session.commit() - - async def change_user_password(session: AsyncSession, user_id: UUID, current_password: str, new_password: str) -> None: user = await _get_active_user(session, user_id) credential = await session.get(PasswordCredential, user.user_id) @@ -83,3 +72,10 @@ async def change_user_password(session: AsyncSession, user_id: UUID, current_pas credential.password_changed_at = _now() await _revoke_user_sessions(session, user_id) await session.commit() + + +async def user_response(session: AsyncSession, user: User) -> UserResponse: + providers = await session.scalars(select(UserIdentity.provider).where(UserIdentity.user_id == user.user_id)) + response = UserResponse.model_validate(user) + response.connected_providers = sorted(set(providers)) + return response diff --git a/papyrus/templates/transactional_email.html b/papyrus/templates/transactional_email.html new file mode 100644 index 0000000..0b15366 --- /dev/null +++ b/papyrus/templates/transactional_email.html @@ -0,0 +1,31 @@ + + + + + +
+
|
Your account and synced library will be permanently deleted after 30 days. Sign in to continue.
+ + +Your profile, synced books, notes, bookmarks and reading history will be permanently deleted after 30 days. Sign in before then and choose Keep account to cancel deletion.
+Files on your devices or in external storage won’t be removed.
+ +