From 9431a5c1b4c62af2a2c8ce2b6eea381f0b3d8c3f Mon Sep 17 00:00:00 2001 From: ZTatman Date: Thu, 1 Oct 2026 16:50:42 -0400 Subject: [PATCH] style(web): apply ruff formatting and tidy cruft --- web/app/auth/crypto.py | 10 ++-------- web/app/auth/session.py | 2 +- web/app/deps.py | 3 ++- web/app/middleware.py | 2 +- web/app/models/app_settings.py | 8 ++++++-- web/app/models/grant.py | 4 +++- web/app/models/session.py | 4 +++- web/app/models/user.py | 9 +++++++++ 8 files changed, 27 insertions(+), 15 deletions(-) diff --git a/web/app/auth/crypto.py b/web/app/auth/crypto.py index c0a0eff..6475afe 100644 --- a/web/app/auth/crypto.py +++ b/web/app/auth/crypto.py @@ -29,10 +29,7 @@ def encrypt_optional(fernet: Fernet | None, raw_token: str | None) -> str | None if raw_token is None: return None if fernet is None: - msg = ( - "Token encryption is not configured. " - "Set TOKEN_ENCRYPTION_KEY in your .env file or deployment environment." - ) + msg = "Token encryption is not configured. Set TOKEN_ENCRYPTION_KEY in your .env file or deployment environment." raise ValueError(msg) return encrypt_token(fernet, raw_token) @@ -51,9 +48,6 @@ def decrypt_optional(fernet: Fernet | None, encrypted_token: str | None) -> str if encrypted_token is None: return None if fernet is None: - msg = ( - "Token encryption is not configured. " - "Set TOKEN_ENCRYPTION_KEY in your .env file or deployment environment." - ) + msg = "Token encryption is not configured. Set TOKEN_ENCRYPTION_KEY in your .env file or deployment environment." raise ValueError(msg) return decrypt_token(fernet, encrypted_token) diff --git a/web/app/auth/session.py b/web/app/auth/session.py index 0f3753c..51a22c9 100644 --- a/web/app/auth/session.py +++ b/web/app/auth/session.py @@ -117,7 +117,7 @@ async def revoke_session( if not firebreak_session: return token_hash = hashlib.sha256(firebreak_session.encode()).hexdigest() - result = await db.execute( + await db.execute( update(Session) .where(Session.token_hash == token_hash, Session.revoked_at.is_(None)) .values(revoked_at=datetime.now(UTC)) diff --git a/web/app/deps.py b/web/app/deps.py index 2c9e69b..2dffc38 100644 --- a/web/app/deps.py +++ b/web/app/deps.py @@ -4,7 +4,8 @@ from fastapi import Request from sqlalchemy.ext.asyncio import AsyncSession -async def get_db(request: Request) -> AsyncGenerator[AsyncSession, None]: +async def get_db(request: Request) -> AsyncGenerator[AsyncSession]: """Yield a request-scoped async database session.""" + async with request.app.state.db_session() as session: yield session diff --git a/web/app/middleware.py b/web/app/middleware.py index 29ea3cf..f110d6e 100644 --- a/web/app/middleware.py +++ b/web/app/middleware.py @@ -8,7 +8,7 @@ class SetupRequiredMiddleware(BaseHTTPMiddleware): async def dispatch(self, request: Request, call_next) -> Response: path = request.url.path - if path.startswith("/setup") or path.startswith("/static") or path == "/favicon.ico": + if path.startswith(("/setup", "/static")) or path == "/favicon.ico": return await call_next(request) if request.app.state.app_settings is None: diff --git a/web/app/models/app_settings.py b/web/app/models/app_settings.py index af1f370..3c23c5e 100644 --- a/web/app/models/app_settings.py +++ b/web/app/models/app_settings.py @@ -15,8 +15,12 @@ class AppSettings(Base): id: Mapped[int] = mapped_column(primary_key=True, default=1) forgejo_base_url: Mapped[str] = mapped_column(String, nullable=False) forgejo_oauth_client_id: Mapped[str] = mapped_column(String, nullable=False) - forgejo_oauth_client_secret_encrypted: Mapped[str] = mapped_column(Text, nullable=False) - firebreak_public_base_url: Mapped[str] = mapped_column(String, nullable=False, default="") + forgejo_oauth_client_secret_encrypted: Mapped[str] = mapped_column( + Text, nullable=False + ) + firebreak_public_base_url: Mapped[str] = mapped_column( + String, nullable=False, default="" + ) setup_completed_at: Mapped[datetime.datetime] = mapped_column( DateTime(timezone=True), server_default=func.now() ) diff --git a/web/app/models/grant.py b/web/app/models/grant.py index dc9a3fe..e52ff78 100644 --- a/web/app/models/grant.py +++ b/web/app/models/grant.py @@ -23,7 +23,9 @@ class Grant(Base): primary_key=True, server_default=func.gen_random_uuid(), ) - token_hash: Mapped[str] = mapped_column(String, unique=True, nullable=False, index=True) + token_hash: Mapped[str] = mapped_column( + String, unique=True, nullable=False, index=True + ) user_id: Mapped[uuid.UUID] = mapped_column( Uuid, ForeignKey("users.id", ondelete="CASCADE"), nullable=False ) diff --git a/web/app/models/session.py b/web/app/models/session.py index a9bbb61..e7ad325 100644 --- a/web/app/models/session.py +++ b/web/app/models/session.py @@ -22,7 +22,9 @@ class Session(Base): user_id: Mapped[uuid.UUID] = mapped_column( Uuid, ForeignKey("users.id", ondelete="CASCADE"), nullable=False ) - token_hash: Mapped[str] = mapped_column(String(64), unique=True, nullable=False, index=True) + token_hash: Mapped[str] = mapped_column( + String(64), unique=True, nullable=False, index=True + ) created_at: Mapped[datetime] = mapped_column(server_default=func.now()) expires_at: Mapped[datetime] = mapped_column(nullable=False, index=True) last_seen_at: Mapped[datetime | None] = mapped_column(nullable=True) diff --git a/web/app/models/user.py b/web/app/models/user.py index ac707f4..530808e 100644 --- a/web/app/models/user.py +++ b/web/app/models/user.py @@ -30,15 +30,24 @@ class User(Base): def has_pat(self) -> bool: return self.pat_encrypted is not None + # One-to-many relationship with LinkedIdentity: A user could have multiple identitiy providers + # LinkedIdentity is a table that stores all the identities of the user + # for example, GitHub, GitLab, etc. identities: Mapped[list[LinkedIdentity]] = relationship( back_populates="user", cascade="all, delete-orphan", ) + + # One-to-many relationship with Session: A user could have multiple cross-browser sessions + # Session is a table that stores all the possible browser sessions of the user sessions: Mapped[list[Session]] = relationship( "Session", back_populates="user", cascade="all, delete-orphan", ) + + # One-to-many relationship with Grant + # Grant is a table that stores all the share links a user creates grants: Mapped[list[Grant]] = relationship( "Grant", back_populates="user",