allow webhook-generated 2fa to display on 2fa creds - for customers with many creds (#4040)

This commit is contained in:
Marc Kelechava
2025-11-19 16:17:26 -08:00
committed by GitHub
parent 0dbe9f6d36
commit 895d553d0e

View File

@@ -3311,14 +3311,9 @@ class AgentDB:
- totp_identifier
- workflow_run_id (optional)
2. make sure created_at is within the valid lifespan
3. sort by task_id/workflow_id/workflow_run_id nullslast and created_at desc
3. sort by created_at desc
4. apply an optional limit at the DB layer
"""
all_null = and_(
TOTPCodeModel.task_id.is_(None),
TOTPCodeModel.workflow_id.is_(None),
TOTPCodeModel.workflow_run_id.is_(None),
)
async with self.Session() as session:
query = (
select(TOTPCodeModel)
@@ -3330,7 +3325,7 @@ class AgentDB:
query = query.filter(TOTPCodeModel.otp_type == otp_type)
if workflow_run_id is not None:
query = query.filter(TOTPCodeModel.workflow_run_id == workflow_run_id)
query = query.order_by(asc(all_null), TOTPCodeModel.created_at.desc())
query = query.order_by(TOTPCodeModel.created_at.desc())
if limit is not None:
query = query.limit(limit)
totp_code = (await session.scalars(query)).all()
@@ -3348,11 +3343,6 @@ class AgentDB:
Return recent otp codes for an organization ordered by newest first with optional
workflow_run_id filtering.
"""
all_null = and_(
TOTPCodeModel.task_id.is_(None),
TOTPCodeModel.workflow_id.is_(None),
TOTPCodeModel.workflow_run_id.is_(None),
)
async with self.Session() as session:
query = select(TOTPCodeModel).filter_by(organization_id=organization_id)
@@ -3365,7 +3355,7 @@ class AgentDB:
query = query.filter(TOTPCodeModel.otp_type == otp_type)
if workflow_run_id is not None:
query = query.filter(TOTPCodeModel.workflow_run_id == workflow_run_id)
query = query.order_by(asc(all_null), TOTPCodeModel.created_at.desc()).limit(limit)
query = query.order_by(TOTPCodeModel.created_at.desc()).limit(limit)
totp_codes = (await session.scalars(query)).all()
return [TOTPCode.model_validate(totp_code) for totp_code in totp_codes]