notify-api-412 use black to enforce python coding style

This commit is contained in:
Kenneth Kehl
2023-08-25 09:12:23 -07:00
parent c6eb007386
commit 8c9721d8e2
201 changed files with 31660 additions and 28105 deletions

View File

@@ -29,7 +29,7 @@ from app.utils.user_permissions import permission_options
@user_has_permissions(allow_org_user=True)
def manage_users(service_id):
return render_template(
'views/manage-users.html',
"views/manage-users.html",
users=current_service.team_members,
current_user=current_user,
show_search_box=(len(current_service.team_members) > 7),
@@ -38,29 +38,30 @@ def manage_users(service_id):
)
@main.route("/services/<uuid:service_id>/users/invite", methods=['GET', 'POST'])
@main.route("/services/<uuid:service_id>/users/invite/<uuid:user_id>", methods=['GET', 'POST'])
@user_has_permissions('manage_service')
@main.route("/services/<uuid:service_id>/users/invite", methods=["GET", "POST"])
@main.route(
"/services/<uuid:service_id>/users/invite/<uuid:user_id>", methods=["GET", "POST"]
)
@user_has_permissions("manage_service")
def invite_user(service_id, user_id=None):
form_class = InviteUserForm
form = form_class(
inviter_email_address=current_user.email_address,
all_template_folders=current_service.all_template_folders,
folder_permissions=[f['id'] for f in current_service.all_template_folders]
folder_permissions=[f["id"] for f in current_service.all_template_folders],
)
if user_id:
user_to_invite = User.from_id(user_id)
if user_to_invite.belongs_to_service(current_service.id):
return render_template(
'views/user-already-team-member.html',
"views/user-already-team-member.html",
user_to_invite=user_to_invite,
)
if current_service.invite_pending_for(user_to_invite.email_address):
return render_template(
'views/user-already-invited.html',
"views/user-already-invited.html",
user_to_invite=user_to_invite,
)
if not user_to_invite.default_organization:
@@ -71,9 +72,9 @@ def invite_user(service_id, user_id=None):
else:
user_to_invite = None
service_has_email_auth = current_service.has_permission('email_auth')
service_has_email_auth = current_service.has_permission("email_auth")
if not service_has_email_auth:
form.login_authentication.data = 'sms_auth'
form.login_authentication.data = "sms_auth"
if form.validate_on_submit():
email_address = form.email_address.data
@@ -92,11 +93,13 @@ def invite_user(service_id, user_id=None):
ui_permissions=form.permissions,
)
flash('Invite sent to {}'.format(invited_user.email_address), 'default_with_tick')
return redirect(url_for('.manage_users', service_id=service_id))
flash(
"Invite sent to {}".format(invited_user.email_address), "default_with_tick"
)
return redirect(url_for(".manage_users", service_id=service_id))
return render_template(
'views/invite-user.html',
"views/invite-user.html",
form=form,
service_has_email_auth=service_has_email_auth,
mobile_number=True,
@@ -104,10 +107,10 @@ def invite_user(service_id, user_id=None):
)
@main.route("/services/<uuid:service_id>/users/<uuid:user_id>", methods=['GET', 'POST'])
@user_has_permissions('manage_service')
@main.route("/services/<uuid:service_id>/users/<uuid:user_id>", methods=["GET", "POST"])
@user_has_permissions("manage_service")
def edit_user_permissions(service_id, user_id):
service_has_email_auth = current_service.has_permission('email_auth')
service_has_email_auth = current_service.has_permission("email_auth")
user = current_service.get_team_member(user_id)
mobile_number = None
@@ -119,11 +122,16 @@ def edit_user_permissions(service_id, user_id):
form = form_class.from_user(
user,
service_id,
folder_permissions=None if user.platform_admin else [
f['id'] for f in current_service.all_template_folders
folder_permissions=None
if user.platform_admin
else [
f["id"]
for f in current_service.all_template_folders
if user.has_template_folder_permission(f)
],
all_template_folders=None if user.platform_admin else current_service.all_template_folders
all_template_folders=None
if user.platform_admin
else current_service.all_template_folders,
)
if form.validate_on_submit():
@@ -136,87 +144,86 @@ def edit_user_permissions(service_id, user_id):
# Only change the auth type if this is supported for a service.
if service_has_email_auth:
user.update(auth_type=form.login_authentication.data)
return redirect(url_for('.manage_users', service_id=service_id))
return redirect(url_for(".manage_users", service_id=service_id))
return render_template(
'views/edit-user-permissions.html',
"views/edit-user-permissions.html",
user=user,
form=form,
service_has_email_auth=service_has_email_auth,
mobile_number=mobile_number,
delete=request.args.get('delete'),
delete=request.args.get("delete"),
)
@main.route("/services/<uuid:service_id>/users/<uuid:user_id>/delete", methods=['POST'])
@user_has_permissions('manage_service')
@main.route("/services/<uuid:service_id>/users/<uuid:user_id>/delete", methods=["POST"])
@user_has_permissions("manage_service")
def remove_user_from_service(service_id, user_id):
try:
service_api_client.remove_user_from_service(service_id, user_id)
except HTTPError as e:
msg = "You cannot remove the only user for a service"
if e.status_code == 400 and msg in e.message:
flash(msg, 'info')
return redirect(url_for(
'.manage_users',
service_id=service_id))
flash(msg, "info")
return redirect(url_for(".manage_users", service_id=service_id))
else:
abort(500, e)
else:
create_remove_user_from_service_event(
user_id=user_id,
removed_by_id=current_user.id,
service_id=service_id
user_id=user_id, removed_by_id=current_user.id, service_id=service_id
)
return redirect(url_for(
'.manage_users',
service_id=service_id
))
return redirect(url_for(".manage_users", service_id=service_id))
@main.route("/services/<uuid:service_id>/users/<uuid:user_id>/edit-email", methods=['GET', 'POST'])
@user_has_permissions('manage_service')
@main.route(
"/services/<uuid:service_id>/users/<uuid:user_id>/edit-email",
methods=["GET", "POST"],
)
@user_has_permissions("manage_service")
def edit_user_email(service_id, user_id):
user = current_service.get_team_member(user_id)
user_email = user.email_address
session_key = 'team_member_email_change-{}'.format(user_id)
session_key = "team_member_email_change-{}".format(user_id)
if is_gov_user(user_email):
form = ChangeEmailForm(User.already_registered, email_address=user_email)
else:
form = ChangeNonGovEmailForm(User.already_registered, email_address=user_email)
if request.form.get('email_address', '').strip() == user_email:
return redirect(url_for('.manage_users', service_id=current_service.id))
if request.form.get("email_address", "").strip() == user_email:
return redirect(url_for(".manage_users", service_id=current_service.id))
if form.validate_on_submit():
session[session_key] = form.email_address.data
return redirect(url_for('.confirm_edit_user_email', user_id=user.id, service_id=service_id))
return redirect(
url_for(".confirm_edit_user_email", user_id=user.id, service_id=service_id)
)
return render_template(
'views/manage-users/edit-user-email.html',
"views/manage-users/edit-user-email.html",
user=user,
form=form,
service_id=service_id
service_id=service_id,
)
@main.route("/services/<uuid:service_id>/users/<uuid:user_id>/edit-email/confirm", methods=['GET', 'POST'])
@user_has_permissions('manage_service')
@main.route(
"/services/<uuid:service_id>/users/<uuid:user_id>/edit-email/confirm",
methods=["GET", "POST"],
)
@user_has_permissions("manage_service")
def confirm_edit_user_email(service_id, user_id):
user = current_service.get_team_member(user_id)
session_key = 'team_member_email_change-{}'.format(user_id)
session_key = "team_member_email_change-{}".format(user_id)
if session_key in session:
new_email = session[session_key]
else:
return redirect(url_for(
'.edit_user_email',
service_id=service_id,
user_id=user_id
))
if request.method == 'POST':
return redirect(
url_for(".edit_user_email", service_id=service_id, user_id=user_id)
)
if request.method == "POST":
try:
user.update(email_address=new_email, updated_by=current_user.id)
except HTTPError as e:
@@ -226,60 +233,64 @@ def confirm_edit_user_email(service_id, user_id):
user_id=user.id,
updated_by_id=current_user.id,
original_email_address=user.email_address,
new_email_address=new_email
new_email_address=new_email,
)
finally:
session.pop(session_key, None)
return redirect(url_for(
'.manage_users',
service_id=service_id
))
return redirect(url_for(".manage_users", service_id=service_id))
return render_template(
'views/manage-users/confirm-edit-user-email.html',
"views/manage-users/confirm-edit-user-email.html",
user=user,
service_id=service_id,
new_email=new_email
new_email=new_email,
)
@main.route("/services/<uuid:service_id>/users/<uuid:user_id>/edit-mobile-number", methods=['GET', 'POST'])
@user_has_permissions('manage_service')
@main.route(
"/services/<uuid:service_id>/users/<uuid:user_id>/edit-mobile-number",
methods=["GET", "POST"],
)
@user_has_permissions("manage_service")
def edit_user_mobile_number(service_id, user_id):
user = current_service.get_team_member(user_id)
user_mobile_number = redact_mobile_number(user.mobile_number)
form = ChangeMobileNumberForm(mobile_number=user_mobile_number)
if form.mobile_number.data == user_mobile_number and request.method == 'POST':
return redirect(url_for(
'.manage_users',
service_id=service_id
))
if form.mobile_number.data == user_mobile_number and request.method == "POST":
return redirect(url_for(".manage_users", service_id=service_id))
if form.validate_on_submit():
session['team_member_mobile_change'] = form.mobile_number.data
session["team_member_mobile_change"] = form.mobile_number.data
return redirect(url_for('.confirm_edit_user_mobile_number', user_id=user.id, service_id=service_id))
return redirect(
url_for(
".confirm_edit_user_mobile_number",
user_id=user.id,
service_id=service_id,
)
)
return render_template(
'views/manage-users/edit-user-mobile.html',
"views/manage-users/edit-user-mobile.html",
user=user,
form=form,
service_id=service_id
service_id=service_id,
)
@main.route("/services/<uuid:service_id>/users/<uuid:user_id>/edit-mobile-number/confirm", methods=['GET', 'POST'])
@user_has_permissions('manage_service')
@main.route(
"/services/<uuid:service_id>/users/<uuid:user_id>/edit-mobile-number/confirm",
methods=["GET", "POST"],
)
@user_has_permissions("manage_service")
def confirm_edit_user_mobile_number(service_id, user_id):
user = current_service.get_team_member(user_id)
if 'team_member_mobile_change' in session:
new_number = session['team_member_mobile_change']
if "team_member_mobile_change" in session:
new_number = session["team_member_mobile_change"]
else:
return redirect(url_for(
'.edit_user_mobile_number',
service_id=service_id,
user_id=user_id
))
if request.method == 'POST':
return redirect(
url_for(".edit_user_mobile_number", service_id=service_id, user_id=user_id)
)
if request.method == "POST":
try:
user.update(mobile_number=new_number, updated_by=current_user.id)
except HTTPError as e:
@@ -289,26 +300,26 @@ def confirm_edit_user_mobile_number(service_id, user_id):
user_id=user.id,
updated_by_id=current_user.id,
original_mobile_number=user.mobile_number,
new_mobile_number=new_number
new_mobile_number=new_number,
)
finally:
session.pop('team_member_mobile_change', None)
session.pop("team_member_mobile_change", None)
return redirect(url_for(
'.manage_users',
service_id=service_id
))
return redirect(url_for(".manage_users", service_id=service_id))
return render_template(
'views/manage-users/confirm-edit-user-mobile-number.html',
"views/manage-users/confirm-edit-user-mobile-number.html",
user=user,
service_id=service_id,
new_mobile_number=new_number
new_mobile_number=new_number,
)
@main.route("/services/<uuid:service_id>/cancel-invited-user/<uuid:invited_user_id>", methods=['GET'])
@user_has_permissions('manage_service')
@main.route(
"/services/<uuid:service_id>/cancel-invited-user/<uuid:invited_user_id>",
methods=["GET"],
)
@user_has_permissions("manage_service")
def cancel_invited_user(service_id, invited_user_id):
current_service.cancel_invite(invited_user_id)
@@ -319,5 +330,5 @@ def cancel_invited_user(service_id, invited_user_id):
service_id=service_id,
)
flash(f'Invitation cancelled for {invited_user.email_address}', 'default_with_tick')
return redirect(url_for('main.manage_users', service_id=service_id))
flash(f"Invitation cancelled for {invited_user.email_address}", "default_with_tick")
return redirect(url_for("main.manage_users", service_id=service_id))