From 0f38c3d7a03a17ea5f791cab29b4503d8b57b765 Mon Sep 17 00:00:00 2001
From: Seamus Johnston <seamus.johnston@gsa.gov>
Date: Tue, 13 Jun 2023 08:25:12 -0500
Subject: [PATCH 1/2] Remove whoami page

---
 src/.pa11yci                        |  3 ---
 src/registrar/config/urls.py        |  1 -
 src/registrar/templates/base.html   |  2 +-
 src/registrar/templates/whoami.html | 10 ----------
 src/registrar/tests/test_views.py   | 13 -------------
 src/registrar/views/__init__.py     |  1 -
 src/registrar/views/whoami.py       |  8 --------
 7 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 src/registrar/templates/whoami.html
 delete mode 100644 src/registrar/views/whoami.py

diff --git a/src/.pa11yci b/src/.pa11yci
index e641d58e4..4efa264f9 100644
--- a/src/.pa11yci
+++ b/src/.pa11yci
@@ -2,13 +2,10 @@
     "defaults": {
         "concurrency": 1,
         "timeout": 30000,
-        "hideElements": "a[href='/whoami/']"
-
     },
     "urls": [
         "http://localhost:8080/",
         "http://localhost:8080/health/",
-        "http://localhost:8080/whoami/",
         "http://localhost:8080/register/",
         "http://localhost:8080/register/organization/",
         "http://localhost:8080/register/org_federal/",
diff --git a/src/registrar/config/urls.py b/src/registrar/config/urls.py
index 0ef9fbe36..c21d0206c 100644
--- a/src/registrar/config/urls.py
+++ b/src/registrar/config/urls.py
@@ -45,7 +45,6 @@ for step, view in [
 
 urlpatterns = [
     path("", views.index, name="home"),
-    path("whoami/", views.whoami, name="whoami"),
     path("admin/", admin.site.urls),
     path(
         "application/<id>/edit/",
diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html
index 3ca280a0b..977366e47 100644
--- a/src/registrar/templates/base.html
+++ b/src/registrar/templates/base.html
@@ -152,7 +152,7 @@
         <ul class="usa-nav__primary usa-accordion">
           <li class="usa-nav__primary-item">
             {% if user.is_authenticated %}
-            <a href="{% url 'whoami' %}"><span>{{ user.email }}</span></a>
+            <span>{{ user.email }}</span>
           </li>
           <li class="usa-nav__primary-item display-flex flex-align-center">
             <span class="text-base"> | </span>
diff --git a/src/registrar/templates/whoami.html b/src/registrar/templates/whoami.html
deleted file mode 100644
index 69c4d9672..000000000
--- a/src/registrar/templates/whoami.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends 'base.html' %}
-
-{% block title %} Hello {% endblock %}
-{% block content %}
-<main id="main-content" class="grid-container">
-  <p> Hello {{ user.last_name|default:"No last name given" }}, {{ user.first_name|default:"No first name given" }} &lt;{{ user.email }}&gt;!  </p>
-
-  <p><a href="{% url 'logout' %}">Click here to log out</a></p>        
-</main>
-{% endblock %}
diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index ffe4cb671..19324258b 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -39,12 +39,6 @@ class TestViews(TestCase):
         response = self.client.get("/")
         self.assertEqual(response.status_code, 302)
 
-    def test_whoami_page_no_user(self):
-        """Whoami page not accessible without a logged-in user."""
-        response = self.client.get("/whoami/")
-        self.assertEqual(response.status_code, 302)
-        self.assertIn("?next=/whoami/", response.headers["Location"])
-
     def test_application_form_not_logged_in(self):
         """Application form not accessible without a logged-in user."""
         response = self.client.get("/register/")
@@ -99,13 +93,6 @@ class LoggedInTests(TestWithUser):
         # clean up
         role.delete()
 
-    def test_whoami_page(self):
-        """User information appears on the whoami page."""
-        response = self.client.get("/whoami/")
-        self.assertContains(response, self.user.first_name)
-        self.assertContains(response, self.user.last_name)
-        self.assertContains(response, self.user.email)
-
     def test_application_form_view(self):
         response = self.client.get("/register/", follow=True)
         self.assertContains(
diff --git a/src/registrar/views/__init__.py b/src/registrar/views/__init__.py
index ed1d8ba39..f37d2724a 100644
--- a/src/registrar/views/__init__.py
+++ b/src/registrar/views/__init__.py
@@ -12,4 +12,3 @@ from .domain import (
 )
 from .health import *
 from .index import *
-from .whoami import *
diff --git a/src/registrar/views/whoami.py b/src/registrar/views/whoami.py
deleted file mode 100644
index 20bde778b..000000000
--- a/src/registrar/views/whoami.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from django.shortcuts import render
-from django.contrib.auth.decorators import login_required
-
-
-@login_required
-def whoami(request):
-    """This is the first page someone goes to after logging in."""
-    return render(request, "whoami.html")

From 5c18f05d05a08aaba97e29a67aef215c4ee28ae3 Mon Sep 17 00:00:00 2001
From: Seamus Johnston <seamus.johnston@gsa.gov>
Date: Fri, 16 Jun 2023 11:02:28 -0500
Subject: [PATCH 2/2] Fix missing comma

---
 src/.pa11yci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/.pa11yci b/src/.pa11yci
index 4efa264f9..6bb5727e0 100644
--- a/src/.pa11yci
+++ b/src/.pa11yci
@@ -1,7 +1,7 @@
 {
     "defaults": {
         "concurrency": 1,
-        "timeout": 30000,
+        "timeout": 30000
     },
     "urls": [
         "http://localhost:8080/",