add api key expired message to the 403 when an api key is expired/invalid (#532)

This commit is contained in:
Kerem Yilmaz
2024-06-29 23:55:05 -07:00
committed by GitHub
parent 6a6119b406
commit 27da621f44
2 changed files with 17 additions and 9 deletions

View File

@@ -566,18 +566,19 @@ class AgentDB:
organization_id: str,
token_type: OrganizationAuthTokenType,
token: str,
valid: bool | None = True,
) -> OrganizationAuthToken | None:
try:
async with self.Session() as session:
if token_obj := (
await session.scalars(
select(OrganizationAuthTokenModel)
.filter_by(organization_id=organization_id)
.filter_by(token_type=token_type)
.filter_by(token=token)
.filter_by(valid=True)
)
).first():
query = (
select(OrganizationAuthTokenModel)
.filter_by(organization_id=organization_id)
.filter_by(token_type=token_type)
.filter_by(token=token)
)
if valid is not None:
query = query.filter_by(valid=valid)
if token_obj := (await session.scalars(query)).first():
return convert_to_organization_auth_token(token_obj)
else:
return None