Skip to content

fix: resolve error on multi-attendee invoice downloads #6110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 26, 2019
Merged

fix: resolve error on multi-attendee invoice downloads #6110

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions app/api/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,9 @@ def change_password():
})


def return_tickets(file_path, order_identifier):
def return_file(file_name_prefix, file_path, order_identifier):
response = make_response(send_file(file_path))
response.headers['Content-Disposition'] = 'attachment; filename=ticket-%s.pdf' % order_identifier
response.headers['Content-Disposition'] = 'attachment; filename=%s-%s.pdf' % (file_name_prefix, order_identifier)
return response


Expand All @@ -313,10 +313,10 @@ def ticket_attendee_authorized(order_identifier):
key = UPLOAD_PATHS['pdf']['tickets_all'].format(identifier=order_identifier)
file_path = '../generated/tickets/{}/{}/'.format(key, generate_hash(key)) + order_identifier + '.pdf'
try:
return return_tickets(file_path, order_identifier)
return return_file('ticket', file_path, order_identifier)
except FileNotFoundError:
create_pdf_tickets_for_holder(order)
return return_tickets(file_path, order_identifier)
return return_file('ticket', file_path, order_identifier)
else:
return ForbiddenError({'source': ''}, 'Unauthorized Access').respond()
else:
Expand All @@ -329,15 +329,16 @@ def order_invoices(order_identifier):
if current_user:
try:
order = Order.query.filter_by(identifier=order_identifier).first()
user_id = order.user.id
except NoResultFound:
return NotFoundError({'source': ''}, 'Order Invoice not found').respond()
if current_user.id == user_id:
if current_user.can_download_tickets(order):
key = UPLOAD_PATHS['pdf']['order'].format(identifier=order_identifier)
file_path = '../generated/invoices/{}/{}/'.format(key, generate_hash(key)) + order_identifier + '.pdf'
response = make_response(send_file(file_path))
response.headers['Content-Disposition'] = 'attachment; filename=invoice-%s.zip' % order_identifier
return response
try:
return return_file('invoice', file_path, order_identifier)
except FileNotFoundError:
create_pdf_tickets_for_holder(order)
return return_file('invoice', file_path, order_identifier)
else:
return ForbiddenError({'source': ''}, 'Unauthorized Access').respond()
else:
Expand Down