Steven
7558637567
CI / backend (push) Canceled after 0s
用户要求：内测的固定验证码 123456 等于"知道手机号就能进任何账号"，先关掉； 登录改用账号密码，并多一种"邮箱当账号名"的方式；发信邮箱要能在后台改。 短信那条路（默认关）： - `SMS_LOGIN_ENABLED=false`，`/auth/sms/send` 与 `/auth/login` 统一回 2017，不是静默失败； - 生产校验改成"开着短信登录就必须配真通道"，不开时 provider 是 dev 也不拦； - 新增 `GET /auth/methods`，登录页据此渲染，关着的路不出现（少一次"点进去才发现不能用"）。 邮箱登录： - `app_user.email` + `uq_app_user_email`（`lower(email)` 部分索引），登录与绑定都归一成小写； - `POST /auth/login/password` 收 `phone` 或 `email`（二选一），失败统一 2013、连错 10 次锁 15 分钟； - 绑定在 `PATCH /auth/me`：格式错 2018、被占用 2019、留空串表示解绑。 系统设置（跨租户，只有平台管理员能改）： - 新表 `system_setting`（不挂租户、无 RLS，写权限由 `deps.platform_admin` 把关）； - `GET/PUT /settings/smtp`、`POST /settings/smtp/test`，授权码只写不读，留空表示沿用旧值； - `services/mail.py` 只用标准库 smtplib：465 走 SSL、587 走 STARTTLS，认证/拒收/网络失败都归 2020 但消息不同； - Web 新增「系统设置」页（状态卡 + 测试发信），侧栏只对平台管理员显示入口；账号页补「邮箱」。 验证：pytest 130 passed、ruff check/format 全绿、tsc 通过、vite build 通过； `web/e2e/login-email-smtp.mjs` 15 项全绿（含用 126 授权码真发一封测试邮件）。 顺带记下的两个坑：`platform_admin_phones` 是 list，pydantic-settings 会按 JSON 解析， 要用 `NoDecode` 交给 before-validator 拆逗号；迁移号写成 0009 会撞既有的 0009，一并改成 0010。
174 lines
7.4 KiB
Python
174 lines
7.4 KiB
Python
"""数据模型（M0 范围：workspace / user / member / invitation / audit_log）。
|
||
|
||
M1 之后的任务、工单、知识表另起模块，但**继承同样的约定**：
|
||
- 主键 uuid，应用侧生成（不依赖数据库扩展，方便迁移与分库）
|
||
- 通用列 created_at / updated_at / version / deleted_at
|
||
- 所有租户表必须有 workspace_id NOT NULL（AGENTS.md 第 2.5 条）
|
||
"""
|
||
|
||
from __future__ import annotations
|
||
|
||
import uuid
|
||
from datetime import datetime
|
||
|
||
from sqlalchemy import DateTime, ForeignKey, Index, String, UniqueConstraint, func
|
||
from sqlalchemy.dialects.postgresql import JSONB
|
||
from sqlalchemy.dialects.postgresql import UUID as PgUUID
|
||
from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
|
||
|
||
|
||
class Base(DeclarativeBase):
|
||
pass
|
||
|
||
|
||
def new_uuid() -> uuid.UUID:
|
||
return uuid.uuid4()
|
||
|
||
|
||
class Timestamps:
|
||
created_at: Mapped[datetime] = mapped_column(
|
||
DateTime(timezone=True), nullable=False, server_default=func.now()
|
||
)
|
||
updated_at: Mapped[datetime] = mapped_column(
|
||
DateTime(timezone=True), nullable=False, server_default=func.now(), onupdate=func.now()
|
||
)
|
||
version: Mapped[int] = mapped_column(nullable=False, default=1, server_default="1")
|
||
|
||
|
||
class AppUser(Base, Timestamps):
|
||
"""全局用户，**不挂租户**（一个人可以属于多个工作区）。"""
|
||
|
||
__tablename__ = "app_user"
|
||
|
||
id: Mapped[uuid.UUID] = mapped_column(PgUUID(as_uuid=True), primary_key=True, default=new_uuid)
|
||
phone: Mapped[str] = mapped_column(String(32), nullable=False, unique=True)
|
||
nickname: Mapped[str] = mapped_column(String(64), nullable=False, default="")
|
||
avatar_url: Mapped[str | None] = mapped_column(String(512))
|
||
status: Mapped[str] = mapped_column(String(16), nullable=False, default="active")
|
||
# 登录密码（scrypt 串，见 security.hash_password）。为空表示只用验证码登录。
|
||
password_hash: Mapped[str | None] = mapped_column(String(255))
|
||
# 邮箱：既是「邮箱 + 密码」登录的账号名，也是以后找回密码/发通知的去处。
|
||
# 可空（老用户还没有），唯一性由迁移里的 lower(email) 部分唯一索引保证。
|
||
email: Mapped[str | None] = mapped_column(String(255))
|
||
|
||
|
||
class SystemSetting(Base, Timestamps):
|
||
"""平台级键值设置（SMTP 等），**不挂租户、没有 RLS**。
|
||
|
||
刻意不做成租户表：发信账号是整台服务共用的，某个工作区的 owner 不该看到
|
||
平台的 SMTP 授权码。写权限由 API 层的「平台管理员」依赖把关（见 deps.py）。
|
||
"""
|
||
|
||
__tablename__ = "system_setting"
|
||
|
||
key: Mapped[str] = mapped_column(String(64), primary_key=True)
|
||
value: Mapped[dict] = mapped_column(JSONB, nullable=False, default=dict)
|
||
updated_by: Mapped[uuid.UUID | None] = mapped_column(
|
||
PgUUID(as_uuid=True), ForeignKey("app_user.id", ondelete="SET NULL")
|
||
)
|
||
|
||
|
||
class Workspace(Base, Timestamps):
|
||
"""租户根。RLS 策略：workspace_id(id) = current_setting('app.ws_id')。"""
|
||
|
||
__tablename__ = "workspace"
|
||
|
||
id: Mapped[uuid.UUID] = mapped_column(PgUUID(as_uuid=True), primary_key=True, default=new_uuid)
|
||
name: Mapped[str] = mapped_column(String(64), nullable=False)
|
||
slug: Mapped[str] = mapped_column(String(64), nullable=False, unique=True)
|
||
plan: Mapped[str] = mapped_column(String(16), nullable=False, default="free")
|
||
owner_id: Mapped[uuid.UUID] = mapped_column(
|
||
PgUUID(as_uuid=True), ForeignKey("app_user.id", ondelete="RESTRICT"), nullable=False
|
||
)
|
||
deleted_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
|
||
|
||
|
||
class Member(Base, Timestamps):
|
||
"""成员关系。RLS 策略：本租户可见 OR 自己是本人（用于"我加入了哪些工作区"）。"""
|
||
|
||
__tablename__ = "member"
|
||
__table_args__ = (
|
||
UniqueConstraint("workspace_id", "user_id", name="uq_member_ws_user"),
|
||
Index("ix_member_user", "user_id"),
|
||
)
|
||
|
||
id: Mapped[uuid.UUID] = mapped_column(PgUUID(as_uuid=True), primary_key=True, default=new_uuid)
|
||
workspace_id: Mapped[uuid.UUID] = mapped_column(
|
||
PgUUID(as_uuid=True), ForeignKey("workspace.id", ondelete="CASCADE"), nullable=False
|
||
)
|
||
user_id: Mapped[uuid.UUID] = mapped_column(
|
||
PgUUID(as_uuid=True), ForeignKey("app_user.id", ondelete="CASCADE"), nullable=False
|
||
)
|
||
role: Mapped[str] = mapped_column(String(16), nullable=False, default="member")
|
||
status: Mapped[str] = mapped_column(String(16), nullable=False, default="active")
|
||
joined_at: Mapped[datetime] = mapped_column(
|
||
DateTime(timezone=True), nullable=False, server_default=func.now()
|
||
)
|
||
|
||
|
||
class Invitation(Base, Timestamps):
|
||
__tablename__ = "invitation"
|
||
__table_args__ = (
|
||
UniqueConstraint("code", name="uq_invitation_code"),
|
||
Index("ix_invitation_ws", "workspace_id"),
|
||
)
|
||
|
||
id: Mapped[uuid.UUID] = mapped_column(PgUUID(as_uuid=True), primary_key=True, default=new_uuid)
|
||
workspace_id: Mapped[uuid.UUID] = mapped_column(
|
||
PgUUID(as_uuid=True), ForeignKey("workspace.id", ondelete="CASCADE"), nullable=False
|
||
)
|
||
code: Mapped[str] = mapped_column(String(32), nullable=False)
|
||
role: Mapped[str] = mapped_column(String(16), nullable=False, default="member")
|
||
invited_by: Mapped[uuid.UUID] = mapped_column(
|
||
PgUUID(as_uuid=True), ForeignKey("app_user.id", ondelete="RESTRICT"), nullable=False
|
||
)
|
||
expires_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False)
|
||
accepted_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True))
|
||
accepted_by: Mapped[uuid.UUID | None] = mapped_column(
|
||
PgUUID(as_uuid=True), ForeignKey("app_user.id", ondelete="SET NULL")
|
||
)
|
||
|
||
|
||
class AuditLog(Base):
|
||
"""审计日志。**只增不改**；租户内可见，平台侧另有运维通道（M7）。"""
|
||
|
||
__tablename__ = "audit_log"
|
||
__table_args__ = (Index("ix_audit_ws_created", "workspace_id", "created_at"),)
|
||
|
||
id: Mapped[uuid.UUID] = mapped_column(PgUUID(as_uuid=True), primary_key=True, default=new_uuid)
|
||
workspace_id: Mapped[uuid.UUID | None] = mapped_column(
|
||
PgUUID(as_uuid=True), ForeignKey("workspace.id", ondelete="SET NULL")
|
||
)
|
||
actor_user_id: Mapped[uuid.UUID | None] = mapped_column(
|
||
PgUUID(as_uuid=True), ForeignKey("app_user.id", ondelete="SET NULL")
|
||
)
|
||
action: Mapped[str] = mapped_column(String(64), nullable=False)
|
||
target_type: Mapped[str] = mapped_column(String(32), nullable=False, default="")
|
||
target_id: Mapped[str] = mapped_column(String(64), nullable=False, default="")
|
||
payload: Mapped[dict | None] = mapped_column(JSONB)
|
||
ip: Mapped[str] = mapped_column(String(64), nullable=False, default="")
|
||
created_at: Mapped[datetime] = mapped_column(
|
||
DateTime(timezone=True), nullable=False, server_default=func.now()
|
||
)
|
||
|
||
|
||
# 需要 RLS 的租户表（迁移与测试共用这一份清单，避免漏加）
|
||
#
|
||
# 任务域的表在 models_task.py、工单域在 models_ticket.py —— 它们 import 本模块的 Base，
|
||
# 所以只能在文件末尾反向 import，否则循环导入。
|
||
from .models_attachment import ATTACHMENT_TENANT_TABLES # noqa: E402
|
||
from .models_knowledge import KNOWLEDGE_TENANT_TABLES # noqa: E402
|
||
from .models_task import TASK_TENANT_TABLES # noqa: E402
|
||
from .models_ticket import TICKET_TENANT_TABLES # noqa: E402
|
||
|
||
TENANT_TABLES: tuple[str, ...] = (
|
||
"workspace",
|
||
"member",
|
||
"invitation",
|
||
"audit_log",
|
||
*TASK_TENANT_TABLES,
|
||
*TICKET_TENANT_TABLES,
|
||
*KNOWLEDGE_TENANT_TABLES,
|
||
*ATTACHMENT_TENANT_TABLES,
|
||
)
|