darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-24 16:23:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added option flag to the _get_png_preview method to determine if the

Browse Source 
post method content is data or json format.
This commit is contained in:
Richard Chapman
2018-03-06 15:35:00 +00:00
parent ed9936bba0
commit 77a3397ce5
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/template/rest.py
View File

@@ -8,7 +8,6 @@ from flask import (
request) request)
from requests import post as requests_post from requests import post as requests_post
from app.dao.notifications_dao import get_notification_by_id from app.dao.notifications_dao import get_notification_by_id
from app.dao.templates_dao import ( from app.dao.templates_dao import (
dao_update_template, dao_update_template,
@@ -33,7 +32,6 @@ from app.utils import get_template_instance, get_public_notify_type_text
template_blueprint = Blueprint('template', __name__, url_prefix='/service/<uuid:service_id>/template') template_blueprint = Blueprint('template', __name__, url_prefix='/service/<uuid:service_id>/template')
register_errors(template_blueprint) register_errors(template_blueprint)
@@ -189,7 +187,6 @@ def redact_template(template, data):
@template_blueprint.route('/preview/<uuid:notification_id>/<file_type>', methods=['GET']) @template_blueprint.route('/preview/<uuid:notification_id>/<file_type>', methods=['GET'])
def preview_letter_template_by_notification_id(service_id, notification_id, file_type): def preview_letter_template_by_notification_id(service_id, notification_id, file_type):
if file_type not in ('pdf', 'png'): if file_type not in ('pdf', 'png'):
raise InvalidRequest({'content': ["file_type must be pdf or png"]}, status_code=400) raise InvalidRequest({'content': ["file_type must be pdf or png"]}, status_code=400)
@@ -214,13 +211,12 @@ def preview_letter_template_by_notification_id(service_id, notification_id, file
content = base64.b64encode(pdf_file).decode('utf-8') content = base64.b64encode(pdf_file).decode('utf-8')
if file_type == 'png': if file_type == 'png':
url = '{}/precompiled-preview.png{}'.format( url = '{}/precompiled-preview.png{}'.format(
current_app.config['TEMPLATE_PREVIEW_API_HOST'], current_app.config['TEMPLATE_PREVIEW_API_HOST'],
'?page={}'.format(page) if page else '' '?page={}'.format(page) if page else ''
) )
content = _get_png_preview(url, content, notification.id) content = _get_png_preview(url, content, notification.id, json=False)
else: else:
@@ -246,17 +242,24 @@ def preview_letter_template_by_notification_id(service_id, notification_id, file
'?page={}'.format(page) if page else '' '?page={}'.format(page) if page else ''
) )
content = _get_png_preview(url, data, notification.id) content = _get_png_preview(url, data, notification.id, json=True)
return jsonify({"content": content}) return jsonify({"content": content})
def _get_png_preview(url, data, notification_id): def _get_png_preview(url, data, notification_id, json=True):
if json:
resp = requests_post( resp = requests_post(
url, url,
json=data, json=data,
headers={'Authorization': 'Token {}'.format(current_app.config['TEMPLATE_PREVIEW_API_KEY'])} headers={'Authorization': 'Token {}'.format(current_app.config['TEMPLATE_PREVIEW_API_KEY'])}
) )
else:
resp = requests_post(
url,
data=data,
headers={'Authorization': 'Token {}'.format(current_app.config['TEMPLATE_PREVIEW_API_KEY'])}
)
if resp.status_code != 200: if resp.status_code != 200:
current_app.logger.exception( current_app.logger.exception(