copilot-swe-agent[bot]
e518bce922
Resolve all merge conflicts between our automation feature branch and current main (v0.163.0, 920 commits ahead). Conflicts resolved: - app/api/__init__.py: add automation_router alongside main's new routers (classification_rules, qr_auth, sessions, system_reset) - app/config.py: add main's new settings (dropbox_use_global_credentials, factory_reset_on_startup, enable_factory_reset) - app/models.py: add main's new models (ClassificationRuleModel, UserSession, QRLoginChallenge, SharePoint integration type) - app/utils/settings_service.py: merge automation_hooks_enabled with main's new metadata entries - docs/API.md: merge automation API docs with main's classification rules docs - docs/ConfigurationGuide.md: add factory reset settings - tests/conftest.py: import both AutomationHook and new main models Migration renumbered: - 037_add_automation_hooks → 040_add_automation_hooks - down_revision: 039_add_classification_rules (was 036_add_document_translation_fields) - Chain: 036 → 037 → 038 → 039 → 040 (automation hooks) For all non-automation files with conflicts, main's version was taken since our branch did not modify those files (conflicts were from a stale prior merge). Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com> Agent-Logs-Url: https://github.com/christianlouis/DocuElevate/sessions/cb62f012-3b69-4415-835e-3857ce3e9f45
73 lines
3.2 KiB
Python
73 lines
3.2 KiB
Python
"""Add user_sessions and qr_login_challenges tables.
|
|
|
|
Adds server-side session tracking (user_sessions) for the "log off
|
|
everywhere" feature and per-session revocation, and QR login challenges
|
|
(qr_login_challenges) for secure mobile app authentication via QR code.
|
|
|
|
Revision ID: 037_add_user_sessions_and_qr_challenges
|
|
Revises: 036_add_document_translation_fields
|
|
Create Date: 2026-03-16
|
|
"""
|
|
|
|
from typing import Union
|
|
|
|
import sqlalchemy as sa
|
|
from alembic import op
|
|
|
|
revision: str = "037_add_user_sessions_and_qr_challenges"
|
|
down_revision: Union[str, None] = "036_add_document_translation_fields"
|
|
depends_on: Union[str, None] = None
|
|
|
|
|
|
def upgrade() -> None:
|
|
"""Create user_sessions and qr_login_challenges tables."""
|
|
conn = op.get_bind()
|
|
inspector = sa.inspect(conn)
|
|
existing_tables = set(inspector.get_table_names())
|
|
|
|
if "user_sessions" not in existing_tables:
|
|
op.create_table(
|
|
"user_sessions",
|
|
sa.Column("id", sa.Integer(), primary_key=True, autoincrement=True),
|
|
sa.Column("session_token", sa.String(128), nullable=False, unique=True, index=True),
|
|
sa.Column("user_id", sa.String(), nullable=False, index=True),
|
|
sa.Column("ip_address", sa.String(45), nullable=True),
|
|
sa.Column("user_agent", sa.String(512), nullable=True),
|
|
sa.Column("device_info", sa.String(255), nullable=True),
|
|
sa.Column("is_revoked", sa.Boolean(), nullable=False, server_default="0"),
|
|
sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
|
|
sa.Column("last_active_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
|
|
sa.Column("expires_at", sa.DateTime(timezone=True), nullable=False),
|
|
sa.Column("revoked_at", sa.DateTime(timezone=True), nullable=True),
|
|
)
|
|
|
|
if "qr_login_challenges" not in existing_tables:
|
|
op.create_table(
|
|
"qr_login_challenges",
|
|
sa.Column("id", sa.Integer(), primary_key=True, autoincrement=True),
|
|
sa.Column("challenge_token", sa.String(128), nullable=False, unique=True, index=True),
|
|
sa.Column("user_id", sa.String(), nullable=False, index=True),
|
|
sa.Column("is_claimed", sa.Boolean(), nullable=False, server_default="0"),
|
|
sa.Column("is_cancelled", sa.Boolean(), nullable=False, server_default="0"),
|
|
sa.Column("created_by_ip", sa.String(45), nullable=True),
|
|
sa.Column("claimed_by_ip", sa.String(45), nullable=True),
|
|
sa.Column("device_name", sa.String(255), nullable=True),
|
|
sa.Column("issued_token_id", sa.Integer(), nullable=True),
|
|
sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now()),
|
|
sa.Column("expires_at", sa.DateTime(timezone=True), nullable=False),
|
|
sa.Column("claimed_at", sa.DateTime(timezone=True), nullable=True),
|
|
)
|
|
|
|
|
|
def downgrade() -> None:
|
|
"""Drop user_sessions and qr_login_challenges tables."""
|
|
conn = op.get_bind()
|
|
inspector = sa.inspect(conn)
|
|
existing_tables = set(inspector.get_table_names())
|
|
|
|
if "qr_login_challenges" in existing_tables:
|
|
op.drop_table("qr_login_challenges")
|
|
|
|
if "user_sessions" in existing_tables:
|
|
op.drop_table("user_sessions")
|