Merge remote-tracking branch 'origin/main' into feat/onboarding-prototype-v2

Author: joybytes

.pre-commit-config.yaml

@@ -1,4 +1,4 @@
-# This file was automatically copied from notifications-utils@101.0.0
+# This file was automatically copied from notifications-utils@101.1.0
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks

app/__init__.py

@@ -44,7 +44,7 @@
 # ruff: noqa: E402
 memo_resetters: list[Callable] = []
 
-from app import proxy_fix, webauthn_server
+from app import webauthn_server
 from app.commands import setup_commands
 from app.config import Config, configs
 from app.event_handlers import Events
@@ -193,7 +193,6 @@ def create_app(application):
         metrics,
         csrf,
         login_manager,
-        proxy_fix,
         request_helper,
         # External API clients
         redis_client,
@@ -629,3 +628,42 @@ def init_jinja(application):
 
     application.jinja_env.filters["format_provider"] = format_provider
     application.jinja_env.add_extension("jinja2.ext.do")
+    application.jinja_env.undefined = NotifyJinjaUndefined
+
+
+class NotifyJinjaUndefined(jinja2.Undefined):
+    """
+    The same as jinja2.StrictUndefined with a few exceptions, noted
+    in specific comments.
+
+    For more context see:
+    https://jinja.palletsprojects.com/en/stable/api/#undefined-types
+    """
+
+    __slots__ = ()
+    __iter__ = jinja2.Undefined._fail_with_undefined_error
+    __len__ = jinja2.Undefined._fail_with_undefined_error
+    __hash__ = jinja2.Undefined._fail_with_undefined_error
+    # __bool__: UndefinedErrors remain supressed
+    __contains__ = jinja2.Undefined._fail_with_undefined_error
+    __str__ = jinja2.Undefined._fail_with_undefined_error
+
+    def __eq__(self, other):
+        if isinstance(self._undefined_obj, dict):
+            # Accessing a missing field on a dict, we do this too
+            # often to be strict about it
+            return super().__eq__(other)
+
+        if isinstance(other, NotifyJinjaUndefined):
+            # Comparing to something else which is undefined, you are
+            # probably doing this on purpose
+            return True
+
+        if isinstance(self._undefined_obj, jinja2.utils._MissingType):
+            # Comparing to an internal Jinja type, you are probably
+            # doing this on purpose
+            return False
+
+        # In any other case comparing undefined to something is bad
+        # so raise an exception
+        jinja2.Undefined._fail_with_undefined_error(self, other)

app/assets/stylesheets/govuk-frontend/extensions.scss

@@ -184,6 +184,7 @@ $govuk-grid-widths: map.merge($govuk-grid-widths, $notify-grid-widths);
     white-space: pre-wrap;
     overflow-wrap: break-word;
     word-wrap: break-word;
+    box-sizing: border-box;
     padding: 4px 4px govuk-spacing(6) 4px;
     border: 2px solid transparent;
     z-index: 10;

app/main/views/send.py

@@ -89,7 +89,7 @@ def get_example_letter_address(key):
 
 
 @main.route("/services/<uuid:service_id>/send/<uuid:template_id>/csv", methods=["GET", "POST"])
-@user_has_permissions("send_messages", restrict_admin_usage=True)
+@user_has_permissions("send_messages")
 def send_messages(service_id, template_id):
     template = current_service.get_template_with_user_permission_or_403(
         template_id,
@@ -197,7 +197,7 @@ def _should_show_set_sender_page(service_id, template) -> bool:
 
 
 @main.route("/services/<uuid:service_id>/send/<uuid:template_id>/set-sender", methods=["GET", "POST"])
-@user_has_permissions("send_messages", restrict_admin_usage=True)
+@user_has_permissions("send_messages")
 def set_sender(service_id, template_id):
     template = current_service.get_template_with_user_permission_or_403(template_id, current_user)
 
@@ -333,7 +333,7 @@ def get_sender_details(service_id, template_type):
 
 
 @main.route("/services/<uuid:service_id>/send/<uuid:template_id>/one-off")
-@user_has_permissions("send_messages", restrict_admin_usage=True)
+@user_has_permissions("send_messages")
 def send_one_off(service_id, template_id):
     session["recipient"] = None
     session["placeholders"] = {}
@@ -375,7 +375,7 @@ def get_notification_check_endpoint(service_id, template):
 
 
 @main.route("/services/<uuid:service_id>/send/<uuid:template_id>/one-off/address", methods=["GET", "POST"])
-@user_has_permissions("send_messages", restrict_admin_usage=True)
+@user_has_permissions("send_messages")
 def send_one_off_letter_address(service_id, template_id):
     if {"recipient", "placeholders"} - set(session.keys()):
         # if someone has come here via a bookmark or back button they might have some stuff still in their session
@@ -439,7 +439,7 @@ def send_one_off_letter_address(service_id, template_id):
     "/services/<uuid:service_id>/send/<uuid:template_id>/one-off/step-<int:step_index>",
     methods=["GET", "POST"],
 )
-@user_has_permissions("send_messages", restrict_admin_usage=True)
+@user_has_permissions("send_messages")
 def send_one_off_step(service_id, template_id, step_index):  # noqa: C901
     if {"recipient", "placeholders"} - set(session.keys()):
         return redirect(
@@ -781,7 +781,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row, emergency_c
 @main.route(
     "/services/<uuid:service_id>/<uuid:template_id>/check/<uuid:upload_id>/row-<int:row_index>", methods=["GET"]
 )
-@user_has_permissions("send_messages", restrict_admin_usage=True)
+@user_has_permissions("send_messages")
 def check_messages(service_id, template_id, upload_id, row_index=2):
     emergency_contact = bool(request.args.get("emergency_contact"))
     data = _check_messages(service_id, template_id, upload_id, row_index, emergency_contact)
@@ -1005,7 +1005,7 @@ def get_skip_link(step_index, template):
 
 
 @main.route("/services/<uuid:service_id>/template/<uuid:template_id>/one-off/send-to-myself", methods=["GET"])
-@user_has_permissions("send_messages", restrict_admin_usage=True)
+@user_has_permissions("send_messages")
 def send_one_off_to_myself(service_id, template_id):
     # We aren't concerned with creating the exact template (for example adding recipient and sender names)
     # we just want to create enough to use `fields_to_fill_in`
@@ -1027,7 +1027,7 @@ def send_one_off_to_myself(service_id, template_id):
 
 
 @main.route("/services/<uuid:service_id>/template/<uuid:template_id>/notification/check", methods=["GET"])
-@user_has_permissions("send_messages", restrict_admin_usage=True)
+@user_has_permissions("send_messages")
 def check_notification(service_id, template_id):
     return render_template(
         "views/notifications/check.html",

app/main/views/uploads.py

@@ -127,6 +127,7 @@ def uploaded_letters(service_id, letter_print_day):
             service_id=current_service.id,
             from_uploaded_letters=letter_print_day,
         ),
+        limit_days=None,
     )
 
 

app/main/views/verify.py

@@ -25,7 +25,12 @@ def _check_code(code):
         session.pop("user_details", None)
         return activate_user(user_id)
 
-    return render_template("views/two-factor-sms.html", form=form, error_summary_enabled=True)
+    return render_template(
+        "views/two-factor-sms.html",
+        form=form,
+        error_summary_enabled=True,
+        redirect_url=None,
+    )
 
 
 @main.route("/verify-email/<string:token>")

app/models/organisation.py

@@ -113,6 +113,7 @@ def __init__(self, _dict):
             self.name = None
             self.crown = None
             self.agreement_signed = None
+            self.agreement_signed_by_id = None
             self.domains = []
             self.organisation_type = None
             self.request_to_go_live_notes = None

app/proxy_fix.py

@@ -55,7 +55,9 @@
     "homepageUrl": url_for('main.show_accounts_or_dashboard'),
     "productName": "Notify",
     "assetsPath": asset_path + "images",
-    "rebrand": govukRebrand
+    "rebrand": govukRebrand,
+    "serviceName": None,
+    "navigation": [],
   }) }}
 
   {{ govukServiceNavigation({

app/templates/admin_template.html

@@ -1,12 +1,12 @@
 {% macro copy_to_clipboard(value, name, thing) %}
-  {% if name|lower == thing|lower %}
+  {% if name and name|lower == thing|lower %}
     <h2 class="copy-to-clipboard__name">
       {{ name }}
     </h2>
   {% endif %}
-  <div data-notify-module="copy-to-clipboard" data-value="{{ value }}" data-thing="{{ thing }}" data-name="{{ name }}">
+  <div data-notify-module="copy-to-clipboard" data-value="{{ value }}" data-thing="{{ thing }}" data-name="{{ name or "" }}">
     <span class="copy-to-clipboard__value">
-      {%- if name|lower != thing|lower %}<span class="govuk-visually-hidden">{{ thing }}: </span>{% endif %}{{ value -}}
+      {%- if name and name|lower != thing|lower %}<span class="govuk-visually-hidden">{{ thing }}: </span>{% endif %}{{ value -}}
     </span>
     <span class="copy-to-clipboard__notice" aria-live="assertive"></span>
   </div>