mirror of
https://github.com/ZTatman/myst.git
synced 2026-11-21 12:27:59 +00:00
Implement Myst-owned sessions after Forgejo OAuth per auth design: User and LinkedIdentity with encrypted OAuth tokens, Session in its own module, Grant token_hash plus user_id and expires_at. Add auth/identity and auth/session helpers, Forgejo login/callback/logout routes, and a minimal /dashboard that requires get_current_session. Move get_db to app/deps.py so routers and auth avoid importing app.main. Add httpx and cryptography; extend Settings with OAuth client fields, optional MYST_PUBLIC_BASE_URL for redirect_uri, and OAUTH_TOKEN_ENCRYPTION_KEY (Fernet) required when persisting OAuth tokens. Co-authored-by: Cursor <cursoragent@cursor.com>
67 lines
2.1 KiB
Python
67 lines
2.1 KiB
Python
from __future__ import annotations
|
|
|
|
from datetime import datetime
|
|
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.auth.crypto import encrypt_optional, fernet_from_encryption_key
|
|
from app.config import Settings
|
|
from app.models.user import LinkedIdentity, User
|
|
|
|
|
|
async def find_or_create_user(
|
|
db: AsyncSession,
|
|
settings: Settings,
|
|
*,
|
|
provider: str,
|
|
provider_user_id: str,
|
|
provider_username: str,
|
|
email: str | None,
|
|
access_token_plain: str | None,
|
|
access_token_expires_at: datetime | None,
|
|
refresh_token_plain: str | None,
|
|
) -> User:
|
|
fernet = fernet_from_encryption_key(settings.oauth_token_encryption_key)
|
|
|
|
result = await db.execute(
|
|
select(LinkedIdentity).where(
|
|
LinkedIdentity.provider == provider,
|
|
LinkedIdentity.provider_user_id == provider_user_id,
|
|
)
|
|
)
|
|
identity = result.scalar_one_or_none()
|
|
|
|
if identity:
|
|
identity.provider_username = provider_username
|
|
if access_token_plain is not None:
|
|
identity.access_token_encrypted = encrypt_optional(fernet, access_token_plain)
|
|
identity.access_token_expires_at = access_token_expires_at
|
|
if refresh_token_plain is not None:
|
|
identity.refresh_token_encrypted = encrypt_optional(fernet, refresh_token_plain)
|
|
user = identity.user
|
|
if email:
|
|
user.email = email
|
|
if not user.display_name:
|
|
user.display_name = provider_username
|
|
await db.commit()
|
|
await db.refresh(user)
|
|
return user
|
|
|
|
user = User(email=email, display_name=provider_username)
|
|
db.add(user)
|
|
await db.flush()
|
|
|
|
linked = LinkedIdentity(
|
|
user_id=user.id,
|
|
provider=provider,
|
|
provider_user_id=provider_user_id,
|
|
provider_username=provider_username,
|
|
access_token_encrypted=encrypt_optional(fernet, access_token_plain),
|
|
access_token_expires_at=access_token_expires_at,
|
|
refresh_token_encrypted=encrypt_optional(fernet, refresh_token_plain),
|
|
)
|
|
db.add(linked)
|
|
await db.commit()
|
|
await db.refresh(user)
|
|
return user
|