formatting changes

This commit is contained in:
Beverly Nguyen
2025-07-29 13:46:57 -07:00
parent c1b071adea
commit 097548ee71
9 changed files with 40 additions and 15 deletions

View File

@@ -161,7 +161,7 @@
"filename": "app/config.py", "filename": "app/config.py",
"hashed_secret": "577a4c667e4af8682ca431857214b3a920883efc", "hashed_secret": "577a4c667e4af8682ca431857214b3a920883efc",
"is_verified": false, "is_verified": false,
"line_number": 123, "line_number": 121,
"is_secret": false "is_secret": false
} }
], ],
@@ -634,5 +634,5 @@
} }
] ]
}, },
"generated_at": "2025-07-22T17:07:31Z" "generated_at": "2025-07-29T20:46:51Z"
} }

View File

@@ -16,9 +16,7 @@ class Config(object):
API_PUBLIC_WS_URL = getenv("API_PUBLIC_WS_URL", "localhost") API_PUBLIC_WS_URL = getenv("API_PUBLIC_WS_URL", "localhost")
ADMIN_BASE_URL = getenv("ADMIN_BASE_URL", "http://localhost:6012") ADMIN_BASE_URL = getenv("ADMIN_BASE_URL", "http://localhost:6012")
HEADER_COLOUR = ( HEADER_COLOUR = "#81878b" # mix of dark-grey and mid-grey
"#81878b" # mix of dark-grey and mid-grey
)
LOGO_CDN_DOMAIN = ( LOGO_CDN_DOMAIN = (
"static-logos.notifications.service.gov.uk" # TODO use our own CDN "static-logos.notifications.service.gov.uk" # TODO use our own CDN
) )

View File

@@ -73,7 +73,9 @@ def invite_user(service_id, user_id=None):
else: else:
user_to_invite = None user_to_invite = None
service_has_email_auth = current_service.has_permission(ServicePermission.EMAIL_AUTH) service_has_email_auth = current_service.has_permission(
ServicePermission.EMAIL_AUTH
)
if not service_has_email_auth: if not service_has_email_auth:
form.login_authentication.data = "sms_auth" form.login_authentication.data = "sms_auth"
@@ -116,7 +118,9 @@ def invite_user(service_id, user_id=None):
@main.route("/services/<uuid:service_id>/users/<uuid:user_id>", methods=["GET", "POST"]) @main.route("/services/<uuid:service_id>/users/<uuid:user_id>", methods=["GET", "POST"])
@user_has_permissions(ServicePermission.MANAGE_SERVICE) @user_has_permissions(ServicePermission.MANAGE_SERVICE)
def edit_user_permissions(service_id, user_id): def edit_user_permissions(service_id, user_id):
service_has_email_auth = current_service.has_permission(ServicePermission.EMAIL_AUTH) service_has_email_auth = current_service.has_permission(
ServicePermission.EMAIL_AUTH
)
user = current_service.get_team_member(user_id) user = current_service.get_team_member(user_id)
mobile_number = None mobile_number = None

View File

@@ -94,7 +94,9 @@ def view_notification(service_id, notification_id, error_message=None):
updated_at=notification["sent_at"], updated_at=notification["sent_at"],
help=get_help_argument(), help=get_help_argument(),
notification_id=notification["id"], notification_id=notification["id"],
can_receive_inbound=(current_service.has_permission(ServicePermission.INBOUND_SMS)), can_receive_inbound=(
current_service.has_permission(ServicePermission.INBOUND_SMS)
),
sent_with_test_key=(notification.get("key_type") == KEY_TYPE_TEST), sent_with_test_key=(notification.get("key_type") == KEY_TYPE_TEST),
back_link=back_link, back_link=back_link,
) )

View File

@@ -560,7 +560,9 @@ def _check_messages(service_id, template_id, upload_id, preview_row, **kwargs):
max_errors_shown=50, max_errors_shown=50,
guestlist=allow_list, guestlist=allow_list,
remaining_messages=remaining_messages, remaining_messages=remaining_messages,
allow_international_sms=current_service.has_permission(ServicePermission.INTERNATIONAL_SMS), allow_international_sms=current_service.has_permission(
ServicePermission.INTERNATIONAL_SMS
),
) )
if request.args.get("from_test"): if request.args.get("from_test"):

View File

@@ -4,7 +4,10 @@ from app.enums import ServicePermission
permission_mappings = { permission_mappings = {
# TODO: consider turning off email-sending permissions during SMS pilot # TODO: consider turning off email-sending permissions during SMS pilot
ServicePermission.SEND_MESSAGES: [ServicePermission.SEND_TEXTS, ServicePermission.SEND_EMAILS], ServicePermission.SEND_MESSAGES: [
ServicePermission.SEND_TEXTS,
ServicePermission.SEND_EMAILS,
],
ServicePermission.MANAGE_TEMPLATES: [ServicePermission.MANAGE_TEMPLATES], ServicePermission.MANAGE_TEMPLATES: [ServicePermission.MANAGE_TEMPLATES],
ServicePermission.MANAGE_SERVICE: [ ServicePermission.MANAGE_SERVICE: [
ServicePermission.MANAGE_USERS, ServicePermission.MANAGE_USERS,

View File

@@ -202,7 +202,11 @@ def test_service_setting_link_toggles_index_error(
("permissions", "permissions_text", "visible"), ("permissions", "permissions_text", "visible"),
[ [
("sms", "inbound SMS", True), ("sms", "inbound SMS", True),
(ServicePermission.INBOUND_SMS, "inbound SMS", False), # no sms parent permission (
ServicePermission.INBOUND_SMS,
"inbound SMS",
False,
), # no sms parent permission
# also test no permissions set # also test no permissions set
("", "inbound SMS", False), ("", "inbound SMS", False),
], ],

View File

@@ -966,7 +966,7 @@ def test_menu_manage_service(
ServicePermission.VIEW_ACTIVITY, ServicePermission.VIEW_ACTIVITY,
ServicePermission.MANAGE_TEMPLATES, ServicePermission.MANAGE_TEMPLATES,
ServicePermission.MANAGE_USERS, ServicePermission.MANAGE_USERS,
ServicePermission.MANAGE_SETTINGS ServicePermission.MANAGE_SETTINGS,
], ],
) )
page = str(page) page = str(page)

View File

@@ -36,7 +36,11 @@ def test_permissions(
request.view_args.update({"service_id": "foo"}) request.view_args.update({"service_id": "foo"})
api_user_active["permissions"] = { api_user_active["permissions"] = {
"foo": [ServicePermission.MANAGE_USERS, ServicePermission.MANAGE_TEMPLATES, ServicePermission.MANAGE_SETTINGS] "foo": [
ServicePermission.MANAGE_USERS,
ServicePermission.MANAGE_TEMPLATES,
ServicePermission.MANAGE_SETTINGS,
]
} }
api_user_active["services"] = ["foo", "bar"] api_user_active["services"] = ["foo", "bar"]
@@ -66,7 +70,11 @@ def test_permissions_forbidden(
request.view_args.update({"service_id": "foo"}) request.view_args.update({"service_id": "foo"})
api_user_active["permissions"] = { api_user_active["permissions"] = {
"foo": [ServicePermission.MANAGE_USERS, ServicePermission.MANAGE_TEMPLATES, ServicePermission.MANAGE_SETTINGS] "foo": [
ServicePermission.MANAGE_USERS,
ServicePermission.MANAGE_TEMPLATES,
ServicePermission.MANAGE_SETTINGS,
]
} }
api_user_active["services"] = ["foo", "bar"] api_user_active["services"] = ["foo", "bar"]
@@ -179,7 +187,11 @@ def test_user_with_no_permissions_to_service_goes_to_templates(
api_user_active, api_user_active,
): ):
api_user_active["permissions"] = { api_user_active["permissions"] = {
"foo": [ServicePermission.MANAGE_USERS, ServicePermission.MANAGE_TEMPLATES, ServicePermission.MANAGE_SETTINGS] "foo": [
ServicePermission.MANAGE_USERS,
ServicePermission.MANAGE_TEMPLATES,
ServicePermission.MANAGE_SETTINGS,
]
} }
api_user_active["services"] = ["foo", "bar"] api_user_active["services"] = ["foo", "bar"]
client_request.login(api_user_active) client_request.login(api_user_active)