Deploy to test

.pre-commit-config.yaml

@@ -34,14 +34,14 @@ repos:
         args: ["--maxkb=1500"]
 
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 23.7.0
     hooks:
       - id: black
         types:
           - python
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+    rev: 6.1.0
     hooks:
       - id: flake8
         types:
@@ -55,12 +55,12 @@ repos:
         files: .py$
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0-alpha.9-for-vscode
+    rev: v3.0.1
     hooks:
       - id: prettier
         types_or: [javascript, css]
 
   - repo: https://github.com/Riverside-Healthcare/djLint
-    rev: v1.31.1
+    rev: v1.32.1
     hooks:
       - id: djlint-django

.vscode/settings.json

@@ -1,12 +1,10 @@
 {
-  "djlint.guessProfile": false,
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.formatOnSave": true,
-  "[html]": {
-    "editor.defaultFormatter": "monosans.djlint"
-  },
-  "[django-html]": {
-    "editor.defaultFormatter": "monosans.djlint"
+  "[django-html][html]": {
+    "editor.defaultFormatter": "monosans.djlint",
+    "djlint.enableLinting": true,
+    "djlint.profile": "django"
   },
   "files.encoding": "utf8",
   "files.eol": "\n",

appcontainer/nginx.conf

@@ -44,15 +44,15 @@ http {
 
     # 404 known scraping path targets
     # case-insensitive regex matches the given path fragment anywhere in the request path
-    location ~* /(\.?git|api|app|assets|ats|bootstrap|bower|cgi|content|credentials|docker|doc|env|example|swagger|web) {
+    location ~* /(\.?git|api|app|assets|ats|bootstrap|bower|cgi|content|cpanel|credentials|debug|docker|doc|env|example|jenkins|robots|swagger|web|yq) {
         access_log off;
         log_not_found off;
         return 404;
     }
 
     # 404 known scraping file targets
     # case-insensitive regex matches the given file extension anywhere in the request path
-    location ~* /.*\.(asp|axd|cgi|com|env|json|php|xml|ya?ml) {
+    location ~* /.*\.(ash|asp|axd|cgi|com|env|json|php|ping|xml|ya?ml) {
         access_log off;
         log_not_found off;
         return 404;

benefits/core/context_processors.py

@@ -2,9 +2,37 @@
 The core application: context processors for enriching request context data.
 """
 from django.conf import settings
-from django.urls import reverse
 
-from . import session
+from . import models, session
+
+
+def _agency_context(agency):
+    return {
+        "eligibility_index_url": agency.eligibility_index_url,
+        "help_template": agency.help_template,
+        "info_url": agency.info_url,
+        "long_name": agency.long_name,
+        "phone": agency.phone,
+        "short_name": agency.short_name,
+        "slug": agency.slug,
+    }
+
+
+def agency(request):
+    """Context processor adds some information about the active agency to the request context."""
+    agency = session.agency(request)
+
+    if agency is None:
+        return {}
+
+    return {"agency": _agency_context(agency)}
+
+
+def active_agencies(request):
+    """Context processor adds some information about all active agencies to the request context."""
+    agencies = models.TransitAgency.all_active()
+
+    return {"active_agencies": [_agency_context(agency) for agency in agencies]}
 
 
 def analytics(request):
@@ -18,16 +46,12 @@ def authentication(request):
 
     if verifier:
         data = {
-            "required": verifier.is_auth_required,
             "logged_in": session.logged_in(request),
-            "supports_sign_out": verifier.supports_sign_out,
-            "sign_out_route": reverse("oauth:logout"),
         }
 
         if verifier.is_auth_required:
-            auth_provider = verifier.auth_provider
-            data["sign_in_button_label"] = auth_provider.sign_in_button_label
-            data["sign_out_button_label"] = auth_provider.sign_out_button_label
+            data["sign_out_button_template"] = verifier.auth_provider.sign_out_button_template
+            data["sign_out_link_template"] = verifier.auth_provider.sign_out_link_template
 
         return {"authentication": data}
     else:
@@ -37,3 +61,13 @@ def authentication(request):
 def debug(request):
     """Context processor adds debug information to request context."""
     return {"debug": session.context_dict(request)}
+
+
+def origin(request):
+    """Context processor adds session.origin to request context."""
+    origin = session.origin(request)
+
+    if origin:
+        return {"origin": origin}
+    else:
+        return {}

benefits/core/middleware.py

@@ -7,23 +7,23 @@
 from django.http import HttpResponse
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
+from django.urls import reverse
 from django.utils.decorators import decorator_from_middleware
 from django.utils.deprecation import MiddlewareMixin
 from django.views import i18n
 
-from . import analytics, recaptcha, session, viewmodels
+from . import analytics, recaptcha, session
 
 
 logger = logging.getLogger(__name__)
+
 HEALTHCHECK_PATH = "/healthcheck"
-TEMPLATE_USER_ERROR = "200_user_error.html"
+ROUTE_INDEX = "core:index"
+TEMPLATE_USER_ERROR = "200-user-error.html"
 
 
 def user_error(request):
-    home = viewmodels.Button.home(request)
-    page = viewmodels.ErrorPage.user_error(button=home)
-
-    return TemplateResponse(request, TEMPLATE_USER_ERROR, page.context_dict())
+    return TemplateResponse(request, TEMPLATE_USER_ERROR)
 
 
 class AgencySessionRequired(MiddlewareMixin):
@@ -115,9 +115,12 @@ class ChangedLanguageEvent(MiddlewareMixin):
 
     def process_view(self, request, view_func, view_args, view_kwargs):
         if view_func == i18n.set_language:
-            new_lang = request.POST["language"]
-            event = analytics.ChangedLanguageEvent(request, new_lang)
-            analytics.send_event(event)
+            new_lang = request.POST.get("language")
+            if new_lang:
+                event = analytics.ChangedLanguageEvent(request, new_lang)
+                analytics.send_event(event)
+            else:
+                logger.warning("i18n.set_language POST without language")
         return None
 
 
@@ -145,3 +148,17 @@ def process_request(self, request):
                 "site_key": settings.RECAPTCHA_SITE_KEY,
             }
         return None
+
+
+class IndexOrAgencyIndexOrigin(MiddlewareMixin):
+    """Middleware sets the session.origin to either the core:index or core:agency_index depending on agency config."""
+
+    def process_request(self, request):
+        if session.active_agency(request):
+            session.update(request, origin=session.agency(request).index_url)
+        else:
+            session.update(request, origin=reverse(ROUTE_INDEX))
+        return None
+
+
+index_or_agencyindex_origin_decorator = decorator_from_middleware(IndexOrAgencyIndexOrigin)

benefits/core/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2 on 2023-06-29 18:48
+# Generated by Django 4.2.4 on 2023-08-16 15:06
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -14,8 +14,8 @@ class Migration(migrations.Migration):
             name="AuthProvider",
             fields=[
                 ("id", models.AutoField(primary_key=True, serialize=False)),
-                ("sign_in_button_label", models.TextField()),
-                ("sign_out_button_label", models.TextField(null=True)),
+                ("sign_out_button_template", models.TextField(null=True)),
+                ("sign_out_link_template", models.TextField(null=True)),
                 ("client_name", models.TextField()),
                 ("client_id", models.TextField()),
                 ("authority", models.TextField()),
@@ -37,42 +37,17 @@ class Migration(migrations.Migration):
             name="EligibilityVerifier",
             fields=[
                 ("id", models.AutoField(primary_key=True, serialize=False)),
-                ("bullets", models.JSONField(null=True)),
                 ("name", models.TextField()),
+                ("active", models.BooleanField(default=False)),
                 ("api_url", models.TextField(null=True)),
                 ("api_auth_header", models.TextField(null=True)),
                 ("api_auth_key", models.TextField(null=True)),
                 ("jwe_cek_enc", models.TextField(null=True)),
                 ("jwe_encryption_alg", models.TextField(null=True)),
                 ("jws_signing_alg", models.TextField(null=True)),
-                ("selection_label", models.TextField()),
-                ("selection_label_description", models.TextField(null=True)),
-                ("start_title", models.TextField()),
-                ("start_headline", models.TextField()),
-                ("start_item_heading", models.TextField()),
-                ("start_item_details", models.TextField()),
-                ("start_item_secondary_details", models.TextField()),
-                ("start_help_anchor", models.TextField()),
-                ("form_title", models.TextField(null=True)),
-                ("form_headline", models.TextField(null=True)),
-                ("form_blurb", models.TextField(null=True)),
-                ("form_sub_label", models.TextField(null=True)),
-                ("form_sub_help_text", models.TextField(null=True)),
-                ("form_sub_placeholder", models.TextField(null=True)),
-                ("form_sub_pattern", models.TextField(null=True)),
-                ("form_input_mode", models.TextField(null=True)),
-                ("form_max_length", models.PositiveSmallIntegerField(null=True)),
-                ("form_name_label", models.TextField(null=True)),
-                ("form_name_help_text", models.TextField(null=True)),
-                ("form_name_placeholder", models.TextField(null=True)),
-                ("form_name_max_length", models.PositiveSmallIntegerField(null=True)),
-                ("unverified_title", models.TextField()),
-                ("unverified_blurb", models.TextField()),
-                ("eligibility_confirmed_item_heading", models.TextField(null=True)),
-                ("eligibility_confirmed_item_details", models.TextField(null=True)),
-                ("enrollment_success_confirm_item_details", models.TextField()),
-                ("enrollment_success_expiry_item_heading", models.TextField(null=True)),
-                ("enrollment_success_expiry_item_details", models.TextField(null=True)),
+                ("selection_label_template", models.TextField()),
+                ("start_template", models.TextField(null=True)),
+                ("form_class", models.TextField(null=True)),
                 (
                     "auth_provider",
                     models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to="core.authprovider"),
@@ -122,7 +97,10 @@ class Migration(migrations.Migration):
                 ("phone", models.TextField()),
                 ("active", models.BooleanField(default=False)),
                 ("jws_signing_alg", models.TextField()),
-                ("eligibility_index_intro", models.TextField()),
+                ("index_template", models.TextField()),
+                ("eligibility_index_template", models.TextField()),
+                ("enrollment_success_template", models.TextField()),
+                ("help_template", models.TextField(null=True)),
                 ("eligibility_types", models.ManyToManyField(to="core.eligibilitytype")),
                 ("eligibility_verifiers", models.ManyToManyField(to="core.eligibilityverifier")),
                 (