Refactor ApiKeys.secret and ServiceInboundApi.bearer_token to use the same encryption method and get rid of the duplicate code.

This commit is contained in:
Rebecca Law
2017-06-19 14:32:22 +01:00
parent 6202da7dea
commit 3a66027d6a
15 changed files with 55 additions and 79 deletions

View File

@@ -11,7 +11,7 @@ def create_authorization_header(service_id=None, key_type=KEY_TYPE_NORMAL):
client_id = str(service_id)
secrets = ApiKey.query.filter_by(service_id=service_id, key_type=key_type).all()
if secrets:
secret = secrets[0].unsigned_secret
secret = secrets[0].secret
else:
service = dao_fetch_service_by_id(service_id)
data = {
@@ -22,7 +22,7 @@ def create_authorization_header(service_id=None, key_type=KEY_TYPE_NORMAL):
}
api_key = ApiKey(**data)
save_model_api_key(api_key)
secret = api_key.unsigned_secret
secret = api_key.secret
else:
client_id = current_app.config.get('ADMIN_CLIENT_USER_NAME')