From 8a70e5104c6d8483f50ab48186665c45965a4048 Mon Sep 17 00:00:00 2001
From: Bryce Willey <bryce.willey@suffolk.edu>
Date: Tue, 21 Apr 2026 17:16:27 -0400
Subject: [PATCH] Handle logins to different jurisdictions better

* don't act like logging in to one jurisdiction logs you into
  all of them
* don't make the template context always have `is_logged_in`
* Show the "Sign in" button in the profile if not already logged in
---
 .../efile/components/profile_header.html      | 52 +++++++++++++------
 .../efile/templates/efile/confirmation.html   |  2 +-
 efile_app/efile/templates/efile/options.html  |  3 +-
 efile_app/efile/views/confirmation.py         |  6 +++
 efile_app/efile/views/expert_form.py          |  6 +++
 efile_app/efile/views/filing_statuses.py      |  6 +++
 efile_app/efile/views/options.py              | 11 +++-
 efile_app/efile/views/payment.py              |  6 +++
 efile_app/efile/views/review.py               |  6 +++
 efile_app/efile/views/upload.py               |  6 +++
 efile_app/efile/views/upload_first.py         |  6 +++
 11 files changed, 90 insertions(+), 20 deletions(-)

diff --git a/efile_app/efile/templates/efile/components/profile_header.html b/efile_app/efile/templates/efile/components/profile_header.html
index f71356f..e01d627 100644
--- a/efile_app/efile/templates/efile/components/profile_header.html
+++ b/efile_app/efile/templates/efile/components/profile_header.html
@@ -26,25 +26,39 @@
      aria-hidden="true">
     <div class="modal-dialog modal-dialog-centered">
         <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="profileModalLabel">{% translate "Profile Info" %}</h5>
-                <button type="button"
-                        class="btn-close"
-                        data-bs-dismiss="modal"
-                        aria-label="Close"></button>
-            </div>
-            <div class="modal-body">
-                <p>
-                    {% blocktranslate %}Welcome to {{ config.jurisdiction.name }}. Here you can manage your filings and account.{% endblocktranslate %}
-                </p>
-                <div class="mb-3">
-                    <span class="form-label">{% translate "Current email" %}</span>: {{ user.username }}
+            {% if is_logged_in %}
+                <div class="modal-header">
+                    <h5 class="modal-title" id="profileModalLabel">{% translate "Profile Info" %}</h5>
+                    <button type="button"
+                            class="btn-close"
+                            data-bs-dismiss="modal"
+                            aria-label="Close"></button>
                 </div>
-                <div class="mb-3">
-                    <span class="form-label">{% translate "Current Jurisdiction" %}</span>: {{ jurisdiction }}
+                <div class="modal-body">
+                    <p>
+                        {% blocktranslate with name=config.jurisdiction.name %}Welcome to {{ name }}. Here you can manage your filings and account.{% endblocktranslate %}
+                    </p>
+                    <div class="mb-3">
+                        <span class="form-label">{% translate "Current email" %}</span>: {{ user.username }}
+                    </div>
+                    <div class="mb-3">
+                        <span class="form-label">{% translate "Current Jurisdiction" %}</span>: {{ jurisdiction }}
+                    </div>
+                    <button type="button" class="btn btn-danger w-100" onclick="logout()">{% translate "Sign out" %}</button>
                 </div>
-                <button type="button" class="btn btn-danger w-100" onclick="logout()">Logout</button>
-            </div>
+            {% else %}
+                <div class="modal-header">
+                    <h5 class="modal-title" id="profileModalLabel">{% translate "Sign in to get started" %}</h5>
+                    <button type="button"
+                            class="btn-close"
+                            data-bs-dismiss="modal"
+                            aria-label="Close"></button>
+                </div>
+                <div class="modal-body">
+                    <p>{% blocktranslate with name=config.jurisdiction.name %}Welcome to {{ name }}.{% endblocktranslate %}</p>
+                    <button type="button" class="btn btn-primary w-100" onclick="login()">{% translate "Sign in" %}</button>
+                </div>
+            {% endif %}
         </div>
     </div>
 </div>
@@ -92,4 +106,8 @@ <h5 class="modal-title" id="profileModalLabel">{% translate "Profile Info" %}</h
             window.location.href = '/jurisdiction/{{jurisdiction}}/logout/';
         });
     }
+
+    function login() {
+        window.location.href = '/jurisdiction/{{jurisdiction}}/login/';
+    }
 </script>
diff --git a/efile_app/efile/templates/efile/confirmation.html b/efile_app/efile/templates/efile/confirmation.html
index 66d0de2..2c8c553 100644
--- a/efile_app/efile/templates/efile/confirmation.html
+++ b/efile_app/efile/templates/efile/confirmation.html
@@ -34,7 +34,7 @@ <h1 class="h2 mb-3" style="color: #2c5aa0;">{% translate "Filing Submitted Succe
                     </a>
                     <a href="{% url 'efile_logout' jurisdiction %}"
                        class="btn btn-outline-secondary">
-                        <i class="fas fa-arrow-right me-2"></i>{% translate "Logout" %}
+                        <i class="fas fa-arrow-right me-2"></i>{% translate "Sign out" %}
                     </a>
                 </div>
             </div>
diff --git a/efile_app/efile/templates/efile/options.html b/efile_app/efile/templates/efile/options.html
index 681a47c..48cc806 100644
--- a/efile_app/efile/templates/efile/options.html
+++ b/efile_app/efile/templates/efile/options.html
@@ -93,6 +93,7 @@ <h2>{% translate "View past filings" %}</h2>
         <script src="{% url 'javascript-catalog' %}"></script>
         <script src="{% static 'js/api-utils.js' %}"></script>
         <script>
+            let is_logged_in = "{{is_logged_in}}" === "True";
             // Function to save existing_case data and redirect to expert form or case details
             function goToExpertForm(new_or_existing) {
                 if (new_or_existing === "new") {
@@ -109,7 +110,7 @@ <h2>{% translate "View past filings" %}</h2>
             async function checkExistingCaseData() {
                 // Check if there's an API endpoint to retrieve saved case data
                 const result = await apiUtils.getCaseData();
-                if (
+                if (is_logged_in &&
                     result.success &&
                     result.data &&
                     Object.keys(result.data).length > 0
diff --git a/efile_app/efile/views/confirmation.py b/efile_app/efile/views/confirmation.py
index 338d7af..597e27a 100644
--- a/efile_app/efile/views/confirmation.py
+++ b/efile_app/efile/views/confirmation.py
@@ -1,13 +1,19 @@
 from django.shortcuts import render
 
+from efile.api.suffolk_api_views import get_tyler_token
+
 
 def filing_confirmation(request, jurisdiction):
     """Confirmation page after successful filing submission."""
 
     # You can add logic here to retrieve filing details from session
     # or from database if you're storing submitted filings
+    is_logged_in = request.user.is_authenticated
+    if not get_tyler_token(request, jurisdiction):
+        is_logged_in = False
 
     context = {
+        "is_logged_in": is_logged_in,
         "page_title": "Filing Confirmation",
         "success_message": "Your filing has been successfully submitted!",
     }
diff --git a/efile_app/efile/views/expert_form.py b/efile_app/efile/views/expert_form.py
index d712421..64ecbf5 100644
--- a/efile_app/efile/views/expert_form.py
+++ b/efile_app/efile/views/expert_form.py
@@ -2,6 +2,8 @@
 
 from django.shortcuts import redirect, render
 
+from efile.api.suffolk_api_views import get_tyler_token
+
 from ..utils.case_data_utils import get_upload_data
 
 logger = logging.getLogger(__name__)
@@ -42,8 +44,12 @@ def efile_expert_form(request, jurisdiction):
         party_fields = ["petitioner_first_name", "petitioner_last_name", "new_first_name", "new_last_name"]
         has_party_info = all(case_data.get(field) for field in party_fields)
 
+    is_logged_in = request.user.is_authenticated
+    if not get_tyler_token(request, jurisdiction):
+        is_logged_in = False
     # Display the form for data collection with existing data populated
     context = {
+        "is_logged_in": is_logged_in,
         "case_data": case_data,
         "guessed_court": upload_data.get("guesses", {}).get("court"),
         "guessed_case_category": upload_data.get("guesses", {}).get("case type"),
diff --git a/efile_app/efile/views/filing_statuses.py b/efile_app/efile/views/filing_statuses.py
index 0813733..11a22da 100644
--- a/efile_app/efile/views/filing_statuses.py
+++ b/efile_app/efile/views/filing_statuses.py
@@ -1,5 +1,7 @@
 from django.shortcuts import redirect, render
 
+from efile.api.suffolk_api_views import get_tyler_token
+
 from ..utils.case_data_utils import get_case_data
 
 
@@ -11,8 +13,12 @@ def filing_statuses(request, jurisdiction):
     # Get case data from session
     case_data = get_case_data(request)
 
+    is_logged_in = request.user.is_authenticated
+    if not get_tyler_token(request, jurisdiction):
+        is_logged_in = False
     # Pass case data to template for display
     context = {
+        "is_logged_in": is_logged_in,
         "case_data": case_data,
         "has_case_data": bool(case_data),
     }
diff --git a/efile_app/efile/views/options.py b/efile_app/efile/views/options.py
index 738e7e6..f2c996d 100644
--- a/efile_app/efile/views/options.py
+++ b/efile_app/efile/views/options.py
@@ -1,5 +1,7 @@
 from django.shortcuts import render
 
+from efile.api.suffolk_api_views import get_tyler_token
+
 from ..utils.case_data_utils import get_case_data
 
 
@@ -11,9 +13,16 @@ def efile_options(request, jurisdiction):
     else:
         case_data = {}
 
+    is_logged_in = request.user.is_authenticated
+    if not get_tyler_token(request, jurisdiction):
+        is_logged_in = False
+
+    is_logged_in = request.user.is_authenticated
+    if not get_tyler_token(request, jurisdiction):
+        is_logged_in = False
     # Pass case data to template for display
     context = {
-        "is_logged_in": request.user.is_authenticated,
+        "is_logged_in": is_logged_in,
         "case_data": case_data,
         "has_case_data": bool(case_data),
     }
diff --git a/efile_app/efile/views/payment.py b/efile_app/efile/views/payment.py
index 5c5ce68..c6d15d9 100644
--- a/efile_app/efile/views/payment.py
+++ b/efile_app/efile/views/payment.py
@@ -4,6 +4,8 @@
 from django.contrib import messages
 from django.shortcuts import redirect, render
 
+from efile.api.suffolk_api_views import get_tyler_token
+
 from ..utils.case_data_utils import get_case_data
 
 logger = logging.getLogger(__name__)
@@ -27,7 +29,11 @@ def efile_payment(request, jurisdiction):
 
     new_toga_url = f"{settings.EFSP_URL}/jurisdictions/{jurisdiction}/payments/new-toga-account"
 
+    is_logged_in = request.user.is_authenticated
+    if not get_tyler_token(request, jurisdiction):
+        is_logged_in = False
     context = {
+        "is_logged_in": is_logged_in,
         "new_toga_url": new_toga_url,
         "case_data": case_data,
     }
diff --git a/efile_app/efile/views/review.py b/efile_app/efile/views/review.py
index 6fd0dfd..1b386e8 100644
--- a/efile_app/efile/views/review.py
+++ b/efile_app/efile/views/review.py
@@ -4,6 +4,8 @@
 from django.contrib import messages
 from django.shortcuts import redirect, render
 
+from efile.api.suffolk_api_views import get_tyler_token
+
 from ..utils.case_data_utils import get_case_classification, get_case_data, get_name_sought_info, get_petitioner_info
 
 logger = logging.getLogger(__name__)
@@ -94,7 +96,11 @@ def case_review(request, jurisdiction):
 
     new_toga_url = f"{settings.EFSP_URL}/jurisdictions/{jurisdiction}/payments/new-toga-account"
 
+    is_logged_in = request.user.is_authenticated
+    if not get_tyler_token(request, jurisdiction):
+        is_logged_in = False
     context = {
+        "is_logged_in": is_logged_in,
         "new_toga_url": new_toga_url,
         "case_data": case_data,
         "review_sections": review_sections,
diff --git a/efile_app/efile/views/upload.py b/efile_app/efile/views/upload.py
index 1dbc397..7e51641 100644
--- a/efile_app/efile/views/upload.py
+++ b/efile_app/efile/views/upload.py
@@ -4,6 +4,8 @@
 from django.shortcuts import redirect, render
 from django.utils.translation import gettext
 
+from efile.api.suffolk_api_views import get_tyler_token
+
 from ..utils.case_data_utils import (
     get_case_classification,
     get_case_data,
@@ -42,7 +44,11 @@ def efile_upload(request, jurisdiction):
 
     upload_data = get_upload_data(request)
 
+    is_logged_in = request.user.is_authenticated
+    if not get_tyler_token(request, jurisdiction):
+        is_logged_in = False
     context = {
+        "is_logged_in": is_logged_in,
         "case_data": case_data,
         "upload_data": upload_data,
         "petitioner_info": petitioner_info,
diff --git a/efile_app/efile/views/upload_first.py b/efile_app/efile/views/upload_first.py
index bf6e244..24c5858 100644
--- a/efile_app/efile/views/upload_first.py
+++ b/efile_app/efile/views/upload_first.py
@@ -3,6 +3,8 @@
 
 from django.shortcuts import redirect, render
 
+from efile.api.suffolk_api_views import get_tyler_token
+
 from ..utils.case_data_utils import (
     get_case_classification,
     get_name_sought_info,
@@ -43,7 +45,11 @@ def efile_upload_first(request, jurisdiction):
     name_sought_info = get_name_sought_info(request)
     case_classification = get_case_classification(request)
 
+    is_logged_in = request.user.is_authenticated
+    if not get_tyler_token(request, jurisdiction):
+        is_logged_in = False
     context = {
+        "is_logged_in": is_logged_in,
         "upload_data": upload_data,
         "petitioner_info": petitioner_info,
         "name_sought_info": name_sought_info,