darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-01-31 15:15:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor the api_key_dao.

Browse Source 
The only update we should be doing to an api key is to expire/revoke the api key.
Removed the update_dict from the the save method.
Added an expire_api_key method that only updates the api key with an expiry date.
This commit is contained in:
Rebecca Law
2016-06-22 15:27:28 +01:00
parent 1659b64f9e
commit acee87fc63
5 changed files with 39 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/dao/api_key_dao.py
View File

@@ -1,4 +1,6 @@
import uuid
from datetime import datetime
from flask import current_app
from itsdangerous import URLSafeSerializer
@@ -13,17 +15,19 @@ from app.dao.dao_utils import (
@transactional
@version_class(ApiKey)
def save_model_api_key(api_key, update_dict={}):
if update_dict:
update_dict.pop('id', None)
for key, value in update_dict.items():
setattr(api_key, key, value)
db.session.add(api_key)
else:
if not api_key.id:
api_key.id = uuid.uuid4() # must be set now so version history model can use same id
api_key.secret = _generate_secret()
db.session.add(api_key)
def save_model_api_key(api_key):
if not api_key.id:
api_key.id = uuid.uuid4() # must be set now so version history model can use same id
api_key.secret = _generate_secret()
db.session.add(api_key)
@transactional
@version_class(ApiKey)
def expire_api_key(service_id, api_key_id):
api_key = ApiKey.query.filter_by(id=api_key_id, service_id=service_id).one()
api_key.expiry_date = datetime.utcnow()
db.session.add(api_key)
def get_model_api_keys(service_id, id=None):
@@ -49,9 +53,8 @@ def get_unsigned_secret(key_id):
return _get_secret(api_key.secret)
def _generate_secret(token=None):
if not token:
token = uuid.uuid4()
def _generate_secret():
token = uuid.uuid4()
serializer = URLSafeSerializer(current_app.config.get('SECRET_KEY'))
return serializer.dumps(str(token), current_app.config.get('DANGEROUS_SALT'))

8
app/service/rest.py
View File

@@ -14,8 +14,8 @@ from sqlalchemy.orm.exc import NoResultFound
from app.dao.api_key_dao import (
save_model_api_key,
get_model_api_keys,
get_unsigned_secret
)
get_unsigned_secret,
expire_api_key)
from app.dao.services_dao import (
dao_fetch_service_by_id_and_user,
dao_fetch_service_by_id,
@@ -95,6 +95,7 @@ def update_service(service_id):
return jsonify(data=service_schema.dump(fetched_service).data), 200
# is this used.
@service.route('/<uuid:service_id>/api-key', methods=['POST'])
def renew_api_key(service_id=None):
fetched_service = dao_fetch_service_by_id(service_id=service_id)
@@ -107,8 +108,7 @@ def renew_api_key(service_id=None):
@service.route('/<uuid:service_id>/api-key/revoke/<uuid:api_key_id>', methods=['POST'])
def revoke_api_key(service_id, api_key_id):
service_api_key = get_model_api_keys(service_id=service_id, id=api_key_id)
save_model_api_key(service_api_key, update_dict={'expiry_date': datetime.utcnow()})
expire_api_key(service_id=service_id, api_key_id=api_key_id)
return jsonify(), 202