filter revoked api keys older than 7 days

This commit is contained in:
chrisw
2018-03-12 11:55:19 +00:00
parent 40a0b8f03c
commit c98705696a
2 changed files with 27 additions and 3 deletions

View File

@@ -1,5 +1,5 @@
import uuid
from datetime import datetime
from datetime import datetime, timedelta
from app import db
from app.models import ApiKey
@@ -9,6 +9,8 @@ from app.dao.dao_utils import (
version_class
)
from sqlalchemy import or_, func
@transactional
@version_class(ApiKey)
@@ -30,7 +32,11 @@ def expire_api_key(service_id, api_key_id):
def get_model_api_keys(service_id, id=None):
if id:
return ApiKey.query.filter_by(id=id, service_id=service_id, expiry_date=None).one()
return ApiKey.query.filter_by(service_id=service_id).all()
seven_days_ago = datetime.utcnow() - timedelta(days=7)
return ApiKey.query.filter(
or_(ApiKey.expiry_date == None, func.date(ApiKey.expiry_date) > seven_days_ago), # noqa
ApiKey.service_id == service_id
).all()
def get_unsigned_secrets(service_id):