Initial Claude implementation
This commit is contained in:
Ian Roddis committed
commit
e2d3ab9c2a
63 files changed
+3930
No files matched your search
Whitespace-only changes.
@@ -0,0 +1,86 @@
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.models.permission import Permission
|
||||
from app.models.role import Role
|
||||
|
||||
|
||||
async def get(db: AsyncSession, role_id: int) -> Role | None:
|
||||
return await db.get(Role, role_id)
|
||||
|
||||
|
||||
async def get_by_name(db: AsyncSession, name: str) -> Role | None:
|
||||
result = await db.execute(select(Role).where(Role.name == name))
|
||||
return result.scalar_one_or_none()
|
||||
|
||||
|
||||
async def list_roles(db: AsyncSession) -> list[Role]:
|
||||
result = await db.execute(select(Role).order_by(Role.id))
|
||||
return list(result.scalars().all())
|
||||
|
||||
|
||||
async def _resolve_permissions(db: AsyncSession, ids: list[int]) -> list[Permission]:
|
||||
if not ids:
|
||||
return []
|
||||
result = await db.execute(select(Permission).where(Permission.id.in_(ids)))
|
||||
return list(result.scalars().all())
|
||||
|
||||
|
||||
async def create(
|
||||
db: AsyncSession,
|
||||
*,
|
||||
name: str,
|
||||
description: str | None = None,
|
||||
permission_ids: list[int] | None = None,
|
||||
) -> Role:
|
||||
role = Role(
|
||||
name=name,
|
||||
description=description,
|
||||
permissions=await _resolve_permissions(db, permission_ids or []),
|
||||
)
|
||||
db.add(role)
|
||||
await db.commit()
|
||||
await db.refresh(role)
|
||||
return role
|
||||
|
||||
|
||||
async def update(db: AsyncSession, role: Role, data: dict) -> Role:
|
||||
if "permission_ids" in data and data["permission_ids"] is not None:
|
||||
role.permissions = await _resolve_permissions(db, data.pop("permission_ids"))
|
||||
else:
|
||||
data.pop("permission_ids", None)
|
||||
|
||||
for field, value in data.items():
|
||||
if value is not None:
|
||||
setattr(role, field, value)
|
||||
|
||||
await db.commit()
|
||||
await db.refresh(role)
|
||||
return role
|
||||
|
||||
|
||||
async def delete(db: AsyncSession, role: Role) -> None:
|
||||
await db.delete(role)
|
||||
await db.commit()
|
||||
|
||||
|
||||
# --- Permissions -------------------------------------------------------------
|
||||
|
||||
async def list_permissions(db: AsyncSession) -> list[Permission]:
|
||||
result = await db.execute(select(Permission).order_by(Permission.name))
|
||||
return list(result.scalars().all())
|
||||
|
||||
|
||||
async def get_permission_by_name(db: AsyncSession, name: str) -> Permission | None:
|
||||
result = await db.execute(select(Permission).where(Permission.name == name))
|
||||
return result.scalar_one_or_none()
|
||||
|
||||
|
||||
async def create_permission(
|
||||
db: AsyncSession, *, name: str, description: str | None = None
|
||||
) -> Permission:
|
||||
perm = Permission(name=name, description=description)
|
||||
db.add(perm)
|
||||
await db.commit()
|
||||
await db.refresh(perm)
|
||||
return perm
|
||||
@@ -0,0 +1,66 @@
|
||||
from datetime import UTC, datetime
|
||||
|
||||
from sqlalchemy import select, update
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.core.security import hash_token
|
||||
from app.models.refresh_token import RefreshToken
|
||||
|
||||
|
||||
async def store(
|
||||
db: AsyncSession,
|
||||
*,
|
||||
user_id: int,
|
||||
jti: str,
|
||||
raw_token: str,
|
||||
expires_at: datetime,
|
||||
) -> RefreshToken:
|
||||
record = RefreshToken(
|
||||
jti=jti,
|
||||
token_hash=hash_token(raw_token),
|
||||
user_id=user_id,
|
||||
expires_at=expires_at,
|
||||
)
|
||||
db.add(record)
|
||||
await db.commit()
|
||||
await db.refresh(record)
|
||||
return record
|
||||
|
||||
|
||||
async def get_active(
|
||||
db: AsyncSession, *, jti: str, raw_token: str
|
||||
) -> RefreshToken | None:
|
||||
"""Return the token row only if it exists, matches, is not revoked, not expired."""
|
||||
result = await db.execute(select(RefreshToken).where(RefreshToken.jti == jti))
|
||||
record = result.scalar_one_or_none()
|
||||
if record is None or record.revoked:
|
||||
return None
|
||||
if record.token_hash != hash_token(raw_token):
|
||||
return None
|
||||
expires_at = record.expires_at
|
||||
if expires_at.tzinfo is None:
|
||||
expires_at = expires_at.replace(tzinfo=UTC)
|
||||
if expires_at < datetime.now(UTC):
|
||||
return None
|
||||
return record
|
||||
|
||||
|
||||
async def revoke(db: AsyncSession, record: RefreshToken) -> None:
|
||||
record.revoked = True
|
||||
await db.commit()
|
||||
|
||||
|
||||
async def revoke_by_jti(db: AsyncSession, jti: str) -> None:
|
||||
await db.execute(
|
||||
update(RefreshToken).where(RefreshToken.jti == jti).values(revoked=True)
|
||||
)
|
||||
await db.commit()
|
||||
|
||||
|
||||
async def revoke_all_for_user(db: AsyncSession, user_id: int) -> None:
|
||||
await db.execute(
|
||||
update(RefreshToken)
|
||||
.where(RefreshToken.user_id == user_id, RefreshToken.revoked.is_(False))
|
||||
.values(revoked=True)
|
||||
)
|
||||
await db.commit()
|
||||
@@ -0,0 +1,86 @@
|
||||
from sqlalchemy import func, select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.core.security import hash_password, verify_password
|
||||
from app.models.role import Role
|
||||
from app.models.user import User
|
||||
|
||||
|
||||
async def get(db: AsyncSession, user_id: int) -> User | None:
|
||||
return await db.get(User, user_id)
|
||||
|
||||
|
||||
async def get_by_email(db: AsyncSession, email: str) -> User | None:
|
||||
result = await db.execute(select(User).where(User.email == email))
|
||||
return result.scalar_one_or_none()
|
||||
|
||||
|
||||
async def list_users(db: AsyncSession, skip: int = 0, limit: int = 100) -> list[User]:
|
||||
result = await db.execute(select(User).order_by(User.id).offset(skip).limit(limit))
|
||||
return list(result.scalars().all())
|
||||
|
||||
|
||||
async def count(db: AsyncSession) -> int:
|
||||
result = await db.execute(select(func.count()).select_from(User))
|
||||
return result.scalar_one()
|
||||
|
||||
|
||||
async def _resolve_roles(db: AsyncSession, role_ids: list[int]) -> list[Role]:
|
||||
if not role_ids:
|
||||
return []
|
||||
result = await db.execute(select(Role).where(Role.id.in_(role_ids)))
|
||||
return list(result.scalars().all())
|
||||
|
||||
|
||||
async def create(
|
||||
db: AsyncSession,
|
||||
*,
|
||||
email: str,
|
||||
password: str,
|
||||
full_name: str | None = None,
|
||||
is_superuser: bool = False,
|
||||
role_ids: list[int] | None = None,
|
||||
) -> User:
|
||||
user = User(
|
||||
email=email,
|
||||
hashed_password=hash_password(password),
|
||||
full_name=full_name,
|
||||
is_superuser=is_superuser,
|
||||
roles=await _resolve_roles(db, role_ids or []),
|
||||
)
|
||||
db.add(user)
|
||||
await db.commit()
|
||||
await db.refresh(user)
|
||||
return user
|
||||
|
||||
|
||||
async def update(db: AsyncSession, user: User, data: dict) -> User:
|
||||
if "password" in data and data["password"]:
|
||||
user.hashed_password = hash_password(data.pop("password"))
|
||||
else:
|
||||
data.pop("password", None)
|
||||
|
||||
if "role_ids" in data and data["role_ids"] is not None:
|
||||
user.roles = await _resolve_roles(db, data.pop("role_ids"))
|
||||
else:
|
||||
data.pop("role_ids", None)
|
||||
|
||||
for field, value in data.items():
|
||||
if value is not None:
|
||||
setattr(user, field, value)
|
||||
|
||||
await db.commit()
|
||||
await db.refresh(user)
|
||||
return user
|
||||
|
||||
|
||||
async def delete(db: AsyncSession, user: User) -> None:
|
||||
await db.delete(user)
|
||||
await db.commit()
|
||||
|
||||
|
||||
async def authenticate(db: AsyncSession, email: str, password: str) -> User | None:
|
||||
user = await get_by_email(db, email)
|
||||
if not user or not verify_password(password, user.hashed_password):
|
||||
return None
|
||||
return user
|
||||
Reference in new issue
Block a user