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

Updates from review comments:

Browse Source 
Update api_key relationship.
Check that id in dict exists before deleting it
This commit is contained in:
Rebecca Law
2016-01-19 13:11:22 +00:00
parent 43d54b6ad3
commit 15b2d414cc
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/dao/api_key_dao.py
View File

@@ -7,7 +7,8 @@ from app.models import ApiKey
def save_model_api_key(api_key, update_dict={}): def save_model_api_key(api_key, update_dict={}):
if update_dict: if update_dict:
del update_dict['id'] if update_dict['id']:
del update_dict['id']
db.session.query(ApiKey).filter_by(id=api_key.id).update(update_dict) db.session.query(ApiKey).filter_by(id=api_key.id).update(update_dict)
else: else:
api_key.secret = _generate_secret() api_key.secret = _generate_secret()

2
app/models.py
View File

@@ -92,7 +92,7 @@ class ApiKey(db.Model):
name = db.Column(db.String(255), nullable=False) name = db.Column(db.String(255), nullable=False)
secret = db.Column(db.String(255), unique=True, nullable=False) secret = db.Column(db.String(255), unique=True, nullable=False)
service_id = db.Column(db.Integer, db.ForeignKey('services.id'), index=True, nullable=False) service_id = db.Column(db.Integer, db.ForeignKey('services.id'), index=True, nullable=False)
service = db.relationship('Service', backref=db.backref('api_key', lazy='dynamic')) service = db.relationship('Service', backref=db.backref('api_keys', lazy='dynamic'))
expiry_date = db.Column(db.DateTime) expiry_date = db.Column(db.DateTime)

4
app/schemas.py
View File

@@ -18,7 +18,7 @@ class UserSchema(ma.ModelSchema):
class ServiceSchema(ma.ModelSchema): class ServiceSchema(ma.ModelSchema):
class Meta: class Meta:
model = models.Service model = models.Service
exclude = ("updated_at", "created_at", "api_key", "templates", "jobs") exclude = ("updated_at", "created_at", "api_keys", "templates", "jobs")
class TemplateSchema(ma.ModelSchema): class TemplateSchema(ma.ModelSchema):
@@ -30,7 +30,7 @@ class TemplateSchema(ma.ModelSchema):
class ApiKeySchema(ma.ModelSchema): class ApiKeySchema(ma.ModelSchema):
class Meta: class Meta:
model = models.ApiKey model = models.ApiKey
exclude = ["service"] exclude = ("service", "secret", "expiry_date")
class JobSchema(ma.ModelSchema): class JobSchema(ma.ModelSchema):

4
app/service/rest.py
View File

@@ -78,7 +78,7 @@ def get_service(service_id=None):
@service.route('/<int:service_id>/api-key/renew', methods=['POST']) @service.route('/<int:service_id>/api-key/renew', methods=['POST'])
def renew_api_key(service_id=None): def renew_api_key(service_id=None):
try: try:
get_model_services(service_id=service_id) service = get_model_services(service_id=service_id)
except DataError: except DataError:
return jsonify(result="error", message="Invalid service id"), 400 return jsonify(result="error", message="Invalid service id"), 400
except NoResultFound: except NoResultFound:
@@ -92,7 +92,7 @@ def renew_api_key(service_id=None):
# create a new one # create a new one
# TODO: what validation should be done here? # TODO: what validation should be done here?
secret_name = request.get_json()['name'] secret_name = request.get_json()['name']
save_model_api_key(ApiKey(service_id=service_id, name=secret_name)) save_model_api_key(ApiKey(service=service, name=secret_name))
except DAOException as e: except DAOException as e:
return jsonify(result='error', message=str(e)), 400 return jsonify(result='error', message=str(e)), 400
unsigned_api_key = get_unsigned_secret(service_id) unsigned_api_key = get_unsigned_secret(service_id)

2
tests/app/conftest.py
View File

@@ -105,7 +105,7 @@ def sample_job(notify_db,
def sample_admin_service_id(notify_db, notify_db_session): def sample_admin_service_id(notify_db, notify_db_session):
admin_user = sample_user(notify_db, notify_db_session, email="notify_admin@digital.cabinet-office.gov.uk") admin_user = sample_user(notify_db, notify_db_session, email="notify_admin@digital.cabinet-office.gov.uk")
admin_service = sample_service(notify_db, notify_db_session, service_name="Sample Admin Service", user=admin_user) admin_service = sample_service(notify_db, notify_db_session, service_name="Sample Admin Service", user=admin_user)
data = {'service_id': admin_service.id, 'name': 'sample admin key'} data = {'service': admin_service, 'name': 'sample admin key'}
api_key = ApiKey(**data) api_key = ApiKey(**data)
save_model_api_key(api_key) save_model_api_key(api_key)
return admin_service.id return admin_service.id