mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-11 09:28:27 -04:00
52acf890dd
We were previously persisting the logo for the email branding and deleting the temp files that get created before trying to update the database with the new email branding. This meant that if there was an error when saving (e.g. the domain used was a duplicate) the final logo was already in S3 and trying to go 'back' in the browser would give an error since the temp files needed to display the create branding page had already been deleted. This changes the order we do things in, so that we try persisting the email branding to the database first.
137 lines
4.4 KiB
Python
137 lines
4.4 KiB
Python
from flask import current_app, redirect, render_template, session, url_for
|
|
from flask_login import login_required
|
|
|
|
from app import email_branding_client
|
|
from app.main import main
|
|
from app.main.forms import SearchTemplatesForm, ServiceUpdateEmailBranding
|
|
from app.main.s3_client import (
|
|
TEMP_TAG,
|
|
delete_temp_file,
|
|
delete_temp_files_created_by,
|
|
permanent_logo_name,
|
|
persist_logo,
|
|
upload_logo,
|
|
)
|
|
from app.utils import AgreementInfo, get_logo_cdn_domain, user_is_platform_admin
|
|
|
|
|
|
@main.route("/email-branding", methods=['GET', 'POST'])
|
|
@login_required
|
|
@user_is_platform_admin
|
|
def email_branding():
|
|
brandings = email_branding_client.get_all_email_branding(sort_key='name')
|
|
|
|
return render_template(
|
|
'views/email-branding/select-branding.html',
|
|
email_brandings=brandings,
|
|
search_form=SearchTemplatesForm(),
|
|
show_search_box=len(brandings) > 9,
|
|
agreement_info=AgreementInfo,
|
|
)
|
|
|
|
|
|
@main.route("/email-branding/<branding_id>/edit", methods=['GET', 'POST'])
|
|
@main.route("/email-branding/<branding_id>/edit/<logo>", methods=['GET', 'POST'])
|
|
@login_required
|
|
@user_is_platform_admin
|
|
def update_email_branding(branding_id, logo=None):
|
|
email_branding = email_branding_client.get_email_branding(branding_id)['email_branding']
|
|
|
|
form = ServiceUpdateEmailBranding(
|
|
name=email_branding['name'],
|
|
text=email_branding['text'],
|
|
colour=email_branding['colour'],
|
|
domain=email_branding['domain'],
|
|
brand_type=email_branding['brand_type']
|
|
)
|
|
|
|
logo = logo if logo else email_branding.get('logo') if email_branding else None
|
|
|
|
if form.validate_on_submit():
|
|
if form.file.data:
|
|
upload_filename = upload_logo(
|
|
form.file.data.filename,
|
|
form.file.data,
|
|
current_app.config['AWS_REGION'],
|
|
user_id=session["user_id"]
|
|
)
|
|
|
|
if logo and logo.startswith(TEMP_TAG.format(user_id=session['user_id'])):
|
|
delete_temp_file(logo)
|
|
|
|
return redirect(url_for('.update_email_branding', branding_id=branding_id, logo=upload_filename))
|
|
|
|
updated_logo_name = permanent_logo_name(logo, session["user_id"]) if logo else None
|
|
|
|
email_branding_client.update_email_branding(
|
|
branding_id=branding_id,
|
|
logo=updated_logo_name,
|
|
name=form.name.data,
|
|
text=form.text.data,
|
|
colour=form.colour.data,
|
|
domain=form.domain.data,
|
|
brand_type=form.brand_type.data,
|
|
)
|
|
|
|
if logo:
|
|
persist_logo(logo, updated_logo_name)
|
|
|
|
delete_temp_files_created_by(session["user_id"])
|
|
|
|
return redirect(url_for('.email_branding', branding_id=branding_id))
|
|
|
|
return render_template(
|
|
'views/email-branding/manage-branding.html',
|
|
form=form,
|
|
email_branding=email_branding,
|
|
cdn_url=get_logo_cdn_domain(),
|
|
logo=logo
|
|
)
|
|
|
|
|
|
@main.route("/email-branding/create", methods=['GET', 'POST'])
|
|
@main.route("/email-branding/create/<logo>", methods=['GET', 'POST'])
|
|
@login_required
|
|
@user_is_platform_admin
|
|
def create_email_branding(logo=None):
|
|
form = ServiceUpdateEmailBranding(brand_type='org')
|
|
|
|
if form.validate_on_submit():
|
|
if form.file.data:
|
|
upload_filename = upload_logo(
|
|
form.file.data.filename,
|
|
form.file.data,
|
|
current_app.config['AWS_REGION'],
|
|
user_id=session["user_id"]
|
|
)
|
|
|
|
if logo and logo.startswith(TEMP_TAG.format(user_id=session['user_id'])):
|
|
delete_temp_file(logo)
|
|
|
|
return redirect(url_for('.create_email_branding', logo=upload_filename))
|
|
|
|
updated_logo_name = permanent_logo_name(logo, session["user_id"]) if logo else None
|
|
|
|
email_branding_client.create_email_branding(
|
|
logo=updated_logo_name,
|
|
name=form.name.data,
|
|
text=form.text.data,
|
|
colour=form.colour.data,
|
|
domain=form.domain.data,
|
|
brand_type=form.brand_type.data,
|
|
)
|
|
|
|
if logo:
|
|
persist_logo(logo, updated_logo_name)
|
|
|
|
delete_temp_files_created_by(session["user_id"])
|
|
|
|
return redirect(url_for('.email_branding'))
|
|
|
|
return render_template(
|
|
'views/email-branding/manage-branding.html',
|
|
form=form,
|
|
cdn_url=get_logo_cdn_domain(),
|
|
logo=logo
|
|
)
|