Bring in latest updates to comments from source PR branch

docs/developer/generating-emails-guide.md

@@ -0,0 +1,86 @@
+**Below is a step by step guide for generating emails (of each type) in our application. These instructions are UI facing, with the assumption that the user has analyst (or above) permissions.**
+
+## Domain Invitation
+- Starting Location: Home page
+- Workflow: (Domains Table) Manage domain
+- Workflow Step: Click "Manage" -> Click "Domain managers" -> Click "Add a domain manager" -> (enter email) -> Click "Add user"
+- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/domain_invitation.txt)
+
+### Domain Invitation Subject
+- Notes: Subject line of the "Domain Invitation" email
+- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/domain_invitation_subject.txt)
+
+## Domain Request Withdrawn
+- Starting Location: Home page
+- Workflow: (Domain requests Table) Manage domain
+- Workflow Step: Click "Manage" -> Click "Withdraw request" -> (confirmation prompt) -> Click "Withdraw request" (inside prompt)
+- Notes: You can also do this through Django Admin by switching a domain of status "submitted" to "withdrawn", but you need to be the submitter (email listed on Your Contact Information).
+- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/domain_request_withdrawn.txt)
+
+### Domain Request Withdrawn Subject
+- Notes: Subject line of the "Domain Request Withdrawn" email
+- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/domain_request_withdrawn_subject.txt)
+
+## Status Change Action Needed
+- Starting Location: Django Admin
+- Workflow: Analyst Admin
+- Workflow Step: Click "Domain applications" -> Click an application with a status of "in review" or "rejected" -> Click status dropdown -> (select "action needed") -> click "Save"
+- Notes: Note that this will send an email to the submitter (email listed on Your Contact Information). To test this with your own email, you need to create an application, set the status to either "in review" or "rejected" (and click save), then set the status to "action needed". This will send you an email.
+- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/status_change_action_needed.txt)
+
+### Status Change Action Needed Subject
+- Notes: Subject line of the "Status Change Action Needed" email
+- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/status_change_action_needed_subject.txt)
+
+## Status Change in Review
+- Starting Location: Django Admin
+- Workflow: Analyst Admin
+- Workflow Step: Click "Domain applications" -> Click an application with a status of "submitted" -> Click status dropdown -> (select "In review") -> click "Save"
+- Notes: Note that this will send an email to the submitter (email listed on Your Contact Information). To test this with your own email, you need to create an application, then set the status to "In review". This will send you an email.
+- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/status_change_approved.txt)
+
+### Status Change in Review Subject
+- Notes: This is the subject line of the "Status Change In Review" email
+- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/status_change_in_review_subject.txt)
+
+## Status Change Approved
+- Starting Location: Django Admin
+- Workflow: Analyst Admin
+- Workflow Step: Click "Domain applications" -> Click an application in a status of "submitted", "In review", "rejected", or "ineligible" -> Click status dropdown -> (select "approved") -> click "Save"
+- Notes: Note that this will send an email to the submitter (email listed on Your Contact Information). To test this with your own email, you need to create an application, then set the status to "approved". This will send you an email.
+- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/status_change_approved.txt)
+
+### Status Change Approved Subject
+- Notes: This is the subject line of the "Status Change Approved" email
+- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/status_change_approved_subject.txt)
+
+## Status Change Rejected
+- Starting Location: Django Admin
+- Workflow: Analyst Admin
+- Workflow Step: Click "Domain applications" -> Click an application in a status of "In review", or "approved" -> Click status dropdown -> (select "rejected") -> click "Save"
+- Notes: Note that this will send an email to the submitter (email listed on Your Contact Information). To test this with your own email, you need to create an application, then set the status to "in review" (and click save). Then, go back to the same application and set the status to "rejected". This will send you an email.
+- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/status_change_rejected.txt)
+
+### Status Change Rejected Subject
+- Notes: Subject line of the "Status Change Rejected" email
+- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/status_change_rejected_subject.txt)
+
+## Submission Confirmation
+- Starting Location: Home Page
+- Workflow: Start domain request
+- Workflow Step: Click "Start a new domain request" -> (fill out the form) -> On the last step ("Review and submit your domain request "), click "Submit your domain request"
+- Notes: Note that this will send an email to the submitter (email listed on Your Contact Information)
+- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/submission_confirmation.txt)
+
+### Submission Confirmation Subject
+- Notes: This is the subject line of the "Submission Confirmation Subject" email
+- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/submission_confirmation_subject.txt)
+
+## Transition Domain Invitation
+- Notes: This email is generated during the migration process, meaning that there is no using-facing method to receive this email. This email will be sent out when the following conditions are true: a) The domain exists in the data that Verisign sent us, b) the transition domain script ran successfully, and c) invitations are sent out
+- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/transition_domain_invitation.txt)
+
+### Transition Domain Invitation Subject
+- Notes: This is the subject line of the "Transition Domain Invitation" email
+- [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/transition_domain_invitation_subject.txt)
+

docs/developer/migration-troubleshooting.md

@@ -0,0 +1,123 @@
+## Troubleshooting
+
+### Your toolkit
+For a general overview, read [this documentation](https://www.algotech.solutions/blog/python/django-migrations-and-how-to-manage-conflicts/)
+
+
+Some common commands:
+- docker-compose exec app bash -- gets you into bash
+- ./manage.py showmigrations -- shows the current migrations that are finished, all should have [x]
+- ./manage.py makemigrations -- makes the migration
+- ./manage.py showmigrations -- now you should see the new/updated migration with a [ ]
+- ./manage.py migrate [folder name here, ie registrar] -- applies those changes to db for specific folder
+- ./manage.py showmigrations -- the migration changes should now have a [x] by it
+
+
+## Scenarios
+
+### Scenario 1: Conflicting migrations on local
+
+If you get conflicting migrations on local, you probably have a new migration on your branch and you merged main which had new migrations as well. Do NOT merge migrations together. 
+
+Assuming your local migration is `40_local_migration` and the migration from main is `40_some_migration_from_main`:
+- Delete `40_local_migration`
+- Run `docker-compose exec app ./manage.py makemigrations`
+- Run `docker-compose down`
+- Run `docker-compose up` 
+- Run `docker-compose exec app ./manage.py migrate`
+
+You should end up with `40_some_migration_from_main`, `41_local_migration`
+
+Alternatively, assuming that the conflicting migrations are not dependent on each other, you can manually edit the migration file such that your new migration is incremented by one (file name, and definition inside the file) but this approach is not recommended.
+
+### Scenario 2: Conflicting migrations on sandbox
+
+This occurs when the logs return the following:
+>Conflicting migrations detected; multiple leaf nodes in the migration graph: (0040_example, 0041_example in base).
+To fix them run 'python manage.py makemigrations --merge'
+
+This happens when you swap branches on your sandbox that contain diverging leaves (eg: 0040_example, 0041_example). The fix is to go into the sandbox, delete one of these leaves, fake run the preceding migration, hand run the remaining previously conflicting leaf, fake run the last migration:
+
+- `cf login -a api.fr.cloud.gov --sso`
+- `cf ssh getgov-<app>`
+- `/tmp/lifecycle/shell`
+- `cf run-task getgov-<app> --wait --command 'python manage.py migrate registrar 39_previous_miration --fake' --name migrate`
+- `cf run-task getgov-<app> --wait --command 'python manage.py migrate registrar 41_example_migration'  --name migrate`
+- `cf run-task getgov-<app> --wait --command 'python manage.py migrate registrar 45_last_migration --fake'  --name migrate`
+
+Then, navigate to and delete the offending migration. In this case, it is 0041_example_migration.
+
+### Scenario 3: Migrations ran incorrectly, and migrate no longer works (sandbox)
+
+This has happened when updating user perms (so running a new data migration). Something is off with the update on the sandbox and you need to run that last data migration again:
+- `cf login -a api.fr.cloud.gov --sso`
+- `cf run-task getgov-<app> --wait --command 'python manage.py migrate registrar 39_penultimate_miration --fake' --name migrate`
+- `cf run-task getgov-<app> --wait --command 'python manage.py migrate' --name migrate`
+
+### Scenario 4: All migrations refuse to load due to existing duplicates on sandboxes
+
+This typically happens with a DB conflict that prevents 001_initial from loading. For instance, let's say all migrations have ran successfully before, and a zero command is ran to reset everything. This can lead to a catastrophic issue with your postgres database.
+
+To diagnose this issue, you will have to manually delete tables using the psql shell environment. If you are in a production environment and cannot lose that data, then you will need some method of backing that up and reattaching it to the table.
+
+1. `cf login -a api.fr.cloud.gov --sso`
+2. Run `cf connect-to-service -no-client getgov-{environment_name} getgov-{environment_name}-database` to open a SSH tunnel
+3. Run `psql -h localhost -p {port} -U {username} -d {broker_name}`
+4. Open a new terminal window and run `cf ssh getgov{environment_name}`
+5. Within that window, run `tmp/lifecycle/shell`
+6. Within that window, run `./manage.py migrate` and observe which tables are duplicates
+
+Afterwards, go back to your psql instance. Run the following for each problematic table:
+
+7. `DROP TABLE {table_name} CASCADE` 
+
+**WARNING:** this will permanently erase data! Be careful when doing this and exercise common sense.
+
+Then, run `./manage.py migrate` again and repeat step 7 for each table which returns this error.
+After these errors are resolved, follow instructions in the other scenarios if applicable.   
+
+### Scenario 5: Permissions group exist, but my users cannot log onto the sandbox
+
+This is most likely due to fixtures not running or fixtures running before the data creating migration. Simple run fixtures again (WARNING: This applies to dev sandboxes only. We never want to rerun fixtures on a stable environment)
+
+- `cf login -a api.fr.cloud.gov --sso`
+- `cf run-task getgov-<app> --command "./manage.py load" --name fixtures` 
+
+### Scenario 6: Data is corrupted on the sandbox
+
+Example: there are extra columns created on a table by an old migration long since gone from the code. In that case, you may have to tunnel into your DB on the sandbox and hand-delete these columns. See scenario #4 if you are running into duplicate table definitions. Also see [this documentation](docs/developer/database-access.md) for a good reference here:
+
+- `cf login -a api.fr.cloud.gov --sso`
+- Open a new terminal window and run `cf ssh getgov{environment_name}`
+- Run `tmp/lifecycle/shell`
+- Run `./manage.py migrate` and observe which tables have invalid column definitions
+- Run the `\l` command to see all of the databases that are present
+- `\c cgawsbrokerprodlgi635s6c0afp8w` (assume cgawsbrokerprodlgi635s6c0afp8w is your DB)
+‘\dt’ to see the tables
+- `SELECT * FROM {bad_table};`
+- `alter table registrar_domain drop {bad_column};`
+
+### Scenario 7: Continual 500 error for the registrar + your requests (login, clicking around, etc) are not showing up in the logstream
+
+Example: You are able to log in and access the /admin page, but when you arrive at the registrar you keep getting 500 errors and your log-ins any API calls you make via the UI does not show up in the log stream. And you feel like you’re starting to lose your marbles.
+
+In the CLI, run the command `cf routes`
+If you notice that your route of `getgov-<app>.app.cloud.gov` is pointing two apps, then that is probably the major issue of the 500 error. (ie mine was pointing at `getgov-<app>.app.cloud.gov` AND `cisa-dotgov`
+In the CLI, run the command `cf apps` to check that it has an app running called `cisa-dotgov`. If so, there’s the error!
+Essentially this shows that your requests were being handled by two completely separate applications and that’s why some requests aren’t being located. 
+To resolve this issue, remove the app named `cisa-dotgov` from this space.
+Test out the sandbox from there and it should be working!
+
+**Debug connectivity**
+
+dig https://getgov-<app>.app.cloud.gov (domain information groper, gets DNS nameserver information)
+curl -v https://getgov-<app>.app.cloud.gov/ --resolve 'getgov-<app>.app.cloud.gov:<your-ip-address-from-dig-command-above-here>' (this gets you access to ping to it)
+You should be able to play around with your sandbox and see from the curl command above that it’s being pinged. This command is basically log stream, but gives you full access to make sure you can ping the sandbox manually
+https://cisa-corp.slack.com/archives/C05BGB4L5NF/p1697810600723069
+
+### Scenario 8: Can’t log into sandbox, permissions do not exist
+
+- Fake migrate the migration that’s before the last data creation migration
+- Run the last data creation migration (AND ONLY THAT ONE)
+- Fake migrate the last migration in the migration list
+- Rerun fixtures

src/api/tests/test_available.py

@@ -15,7 +15,7 @@ from epplibwrapper import (
     commands,
 )
 
-API_BASE_PATH = "/api/v1/available/"
+API_BASE_PATH = "/api/v1/available/?domain="
 
 
 class AvailableViewTest(MockEppLib):

src/api/views.py

@@ -84,6 +84,7 @@ def available(request, domain=""):
     Response is a JSON dictionary with the key "available" and value true or
     false.
     """
+    domain = request.GET.get("domain", "")
     DraftDomain = apps.get_model("registrar.DraftDomain")
     # validate that the given domain could be a domain name and fail early if
     # not.

src/djangooidc/tests/test_oidc.py

@@ -0,0 +1,30 @@
+import logging
+
+from django.test import TestCase
+
+from django.conf import settings
+
+from djangooidc.oidc import Client
+
+logger = logging.getLogger(__name__)
+
+
+class OidcTest(TestCase):
+    def test_oidc_create_authn_request_with_acr_value(self):
+        """Test that create_authn_request returns a redirect with an acr_value
+        when an acr_value is passed through session.
+
+        This test is only valid locally.  On local, client can be initialized.
+        Client initialization does not work in pipeline, so test is useless in
+        pipeline. However, it will not fail in pipeline."""
+        try:
+            # Initialize provider using pyOICD
+            OP = getattr(settings, "OIDC_ACTIVE_PROVIDER")
+            CLIENT = Client(OP)
+            session = {"acr_value": "some_acr_value_maybe_ial2"}
+            response = CLIENT.create_authn_request(session)
+            self.assertEqual(response.status_code, 302)
+            self.assertIn("some_acr_value_maybe_ial2", response.url)
+        except Exception as err:
+            logger.warning(err)
+            logger.warning("Unable to configure OpenID Connect provider in pipeline. Cannot execute this test.")

src/djangooidc/tests/test_views.py

@@ -84,9 +84,7 @@ class ViewsTest(TestCase):
 
     def test_requires_step_up_auth(self, mock_client):
         """Invoke login_callback passing it a request when requires_step_up_auth returns True
-        and assert that session is updated and create_authn_request (mock) is called.
-
-        Possibly redundant with test_login_callback_no_step_up_auth"""
+        and assert that session is updated and create_authn_request (mock) is called."""
         # Configure the mock to return an expected value for get_step_up_acr_value
         mock_client.return_value.get_step_up_acr_value.return_value = "step_up_acr_value"
 
@@ -101,7 +99,10 @@ class ViewsTest(TestCase):
         ) as mock_create_authn_request:
             login_callback(request)
 
-        # Assert that get_step_up_acr_value was called and session was updated
+        # create_authn_request only gets called when requires_step_up_auth is True
+        # and it changes this acr_value in request.session
+
+        # Assert that acr_value is no longer empty string
         self.assertNotEqual(request.session["acr_value"], "")
         # And create_authn_request was called again
         mock_create_authn_request.assert_called_once()
@@ -122,9 +123,12 @@ class ViewsTest(TestCase):
         ) as mock_create_authn_request:
             login_callback(request)
 
-        # Assert that get_step_up_acr_value was NOT called and session was NOT updated
+        # create_authn_request only gets called when requires_step_up_auth is True
+        # and it changes this acr_value in request.session
+
+        # Assert that acr_value is NOT updated by testing that it is still an empty string
         self.assertEqual(request.session["acr_value"], "")
-        # create_authn_request was not called
+        # Assert create_authn_request was not called
         mock_create_authn_request.assert_not_called()
 
     @patch("djangooidc.views.authenticate")
@@ -180,34 +184,3 @@ class ViewsTest(TestCase):
         # assert
         self.assertEqual(response.status_code, 302)
         self.assertEqual(response.url, reverse("logout"))
-
-
-class ViewsTestUnpatched(TestCase):
-    def setUp(self):
-        self.client = Client()
-        self.factory = RequestFactory()
-
-    def say_hi(*args):
-        return HttpResponse("Hi")
-
-    def user_info(*args):
-        return {
-            "sub": "TEST",
-            "email": "test@example.com",
-            "first_name": "Testy",
-            "last_name": "Tester",
-            "phone": "814564000",
-        }
-
-    def test_login_callback_requires_step_up_auth(self):
-        """Walk through login_callback when requires_step_up_auth returns True
-        and assert that create_authn_request is returned."""
-
-        with patch("djangooidc.views.requires_step_up_auth", return_value=True), patch(
-            "djangooidc.views.Client.callback", return_value=self.user_info
-        ), patch("djangooidc.views.Client.create_authn_request", side_effect=self.say_hi):
-            response = self.client.get(reverse("openid_login_callback"))
-
-        # assert
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, "Hi")

src/djangooidc/views.py

@@ -108,7 +108,14 @@ def requires_step_up_auth(userinfo):
     acr_value = userinfo.get("ial", "")
     uuid = userinfo.get("sub", "")
     email = userinfo.get("email", "")
-    return User.needs_identity_verification(email, uuid) and acr_value != step_up_acr_value
+    if acr_value != step_up_acr_value:
+        # The acr of this attempt is not at the highest level
+        # so check if the user needs the higher level
+        return User.needs_identity_verification(email, uuid)
+    else:
+        # This attempt already came back at the highest level
+        # so does not require step up
+        return False
 
 
 def logout(request, next_page=None):

src/registrar/assets/js/get-gov.js

@@ -142,7 +142,7 @@ function _checkDomainAvailability(el) {
       inlineToast(el.parentElement, el.id, ERROR, response.message);
     }
   }
-  fetchJSON(`available/${el.value}`, callback);
+  fetchJSON(`available/?domain=${el.value}`, callback);
 }
 
 /** Call the API to see if the domain is good. */

src/registrar/assets/sass/_theme/_base.scss

@@ -39,7 +39,7 @@ body {
 }
 
 .usa-nav__primary {
-  margin-top: units(1);
+  margin-top:units(1);
 }
 
 .section--outlined {

src/registrar/config/urls.py

@@ -73,7 +73,7 @@ urlpatterns = [
     path("health/", views.health),
     path("openid/", include("djangooidc.urls")),
     path("register/", include((application_urls, APPLICATION_NAMESPACE))),
-    path("api/v1/available/<domain>", available, name="available"),
+    path("api/v1/available/", available, name="available"),
     path("api/v1/get-report/current-federal", get_current_federal, name="get-current-federal"),
     path("api/v1/get-report/current-full", get_current_full, name="get-current-full"),
     path(

src/registrar/migrations/0054_alter_domainapplication_federal_agency_and_more.py

@@ -0,0 +1,771 @@
+# Generated by Django 4.2.7 on 2023-11-29 22:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registrar", "0053_create_groups_v05"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="domainapplication",
+            name="federal_agency",
+            field=models.TextField(
+                blank=True,
+                choices=[
+                    (
+                        "Administrative Conference of the United States",
+                        "Administrative Conference of the United States",
+                    ),
+                    ("Advisory Council on Historic Preservation", "Advisory Council on Historic Preservation"),
+                    ("American Battle Monuments Commission", "American Battle Monuments Commission"),
+                    ("AMTRAK", "AMTRAK"),
+                    ("Appalachian Regional Commission", "Appalachian Regional Commission"),
+                    (
+                        "Appraisal Subcommittee of the Federal Financial Institutions Examination Council",
+                        "Appraisal Subcommittee of the Federal Financial Institutions Examination Council",
+                    ),
+                    ("Appraisal Subcommittee", "Appraisal Subcommittee"),
+                    ("Architect of the Capitol", "Architect of the Capitol"),
+                    ("Armed Forces Retirement Home", "Armed Forces Retirement Home"),
+                    (
+                        "Barry Goldwater Scholarship and Excellence in Education Foundation",
+                        "Barry Goldwater Scholarship and Excellence in Education Foundation",
+                    ),
+                    (
+                        "Barry Goldwater Scholarship and Excellence in Education Program",
+                        "Barry Goldwater Scholarship and Excellence in Education Program",
+                    ),
+                    ("Central Intelligence Agency", "Central Intelligence Agency"),
+                    ("Chemical Safety Board", "Chemical Safety Board"),
+                    ("Christopher Columbus Fellowship Foundation", "Christopher Columbus Fellowship Foundation"),
+                    ("Civil Rights Cold Case Records Review Board", "Civil Rights Cold Case Records Review Board"),
+                    (
+                        "Commission for the Preservation of America's Heritage Abroad",
+                        "Commission for the Preservation of America's Heritage Abroad",
+                    ),
+                    ("Commission of Fine Arts", "Commission of Fine Arts"),
+                    (
+                        "Committee for Purchase From People Who Are Blind or Severely Disabled",
+                        "Committee for Purchase From People Who Are Blind or Severely Disabled",
+                    ),
+                    ("Commodity Futures Trading Commission", "Commodity Futures Trading Commission"),
+                    ("Congressional Budget Office", "Congressional Budget Office"),
+                    ("Consumer Financial Protection Bureau", "Consumer Financial Protection Bureau"),
+                    ("Consumer Product Safety Commission", "Consumer Product Safety Commission"),
+                    ("Corporation for National & Community Service", "Corporation for National & Community Service"),
+                    (
+                        "Corporation for National and Community Service",
+                        "Corporation for National and Community Service",
+                    ),
+                    (
+                        "Council of Inspectors General on Integrity and Efficiency",
+                        "Council of Inspectors General on Integrity and Efficiency",
+                    ),
+                    ("Court Services and Offender Supervision", "Court Services and Offender Supervision"),
+                    ("Cyberspace Solarium Commission", "Cyberspace Solarium Commission"),
+                    (
+                        "DC Court Services and Offender Supervision Agency",
+                        "DC Court Services and Offender Supervision Agency",
+                    ),
+                    ("DC Pre-trial Services", "DC Pre-trial Services"),
+                    ("Defense Nuclear Facilities Safety Board", "Defense Nuclear Facilities Safety Board"),
+                    ("Delta Regional Authority", "Delta Regional Authority"),
+                    ("Denali Commission", "Denali Commission"),
+                    ("Department of Agriculture", "Department of Agriculture"),
+                    ("Department of Commerce", "Department of Commerce"),
+                    ("Department of Defense", "Department of Defense"),
+                    ("Department of Education", "Department of Education"),
+                    ("Department of Energy", "Department of Energy"),
+                    ("Department of Health and Human Services", "Department of Health and Human Services"),
+                    ("Department of Homeland Security", "Department of Homeland Security"),
+                    ("Department of Housing and Urban Development", "Department of Housing and Urban Development"),
+                    ("Department of Justice", "Department of Justice"),
+                    ("Department of Labor", "Department of Labor"),
+                    ("Department of State", "Department of State"),
+                    ("Department of the Interior", "Department of the Interior"),
+                    ("Department of the Treasury", "Department of the Treasury"),
+                    ("Department of Transportation", "Department of Transportation"),
+                    ("Department of Veterans Affairs", "Department of Veterans Affairs"),
+                    ("Director of National Intelligence", "Director of National Intelligence"),
+                    ("Dwight D. Eisenhower Memorial Commission", "Dwight D. Eisenhower Memorial Commission"),
+                    ("Election Assistance Commission", "Election Assistance Commission"),
+                    ("Environmental Protection Agency", "Environmental Protection Agency"),
+                    ("Equal Employment Opportunity Commission", "Equal Employment Opportunity Commission"),
+                    ("Executive Office of the President", "Executive Office of the President"),
+                    ("Export-Import Bank of the United States", "Export-Import Bank of the United States"),
+                    ("Export/Import Bank of the U.S.", "Export/Import Bank of the U.S."),
+                    ("Farm Credit Administration", "Farm Credit Administration"),
+                    ("Farm Credit System Insurance Corporation", "Farm Credit System Insurance Corporation"),
+                    ("Federal Communications Commission", "Federal Communications Commission"),
+                    ("Federal Deposit Insurance Corporation", "Federal Deposit Insurance Corporation"),
+                    ("Federal Election Commission", "Federal Election Commission"),
+                    ("Federal Energy Regulatory Commission", "Federal Energy Regulatory Commission"),
+                    (
+                        "Federal Financial Institutions Examination Council",
+                        "Federal Financial Institutions Examination Council",
+                    ),
+                    ("Federal Housing Finance Agency", "Federal Housing Finance Agency"),
+                    ("Federal Judiciary", "Federal Judiciary"),
+                    ("Federal Labor Relations Authority", "Federal Labor Relations Authority"),
+                    ("Federal Maritime Commission", "Federal Maritime Commission"),
+                    ("Federal Mediation and Conciliation Service", "Federal Mediation and Conciliation Service"),
+                    (
+                        "Federal Mine Safety and Health Review Commission",
+                        "Federal Mine Safety and Health Review Commission",
+                    ),
+                    (
+                        "Federal Permitting Improvement Steering Council",
+                        "Federal Permitting Improvement Steering Council",
+                    ),
+                    ("Federal Reserve Board of Governors", "Federal Reserve Board of Governors"),
+                    ("Federal Reserve System", "Federal Reserve System"),
+                    ("Federal Trade Commission", "Federal Trade Commission"),
+                    ("General Services Administration", "General Services Administration"),
+                    ("gov Administration", "gov Administration"),
+                    ("Government Accountability Office", "Government Accountability Office"),
+                    ("Government Publishing Office", "Government Publishing Office"),
+                    ("Gulf Coast Ecosystem Restoration Council", "Gulf Coast Ecosystem Restoration Council"),
+                    ("Harry S Truman Scholarship Foundation", "Harry S Truman Scholarship Foundation"),
+                    ("Harry S. Truman Scholarship Foundation", "Harry S. Truman Scholarship Foundation"),
+                    ("Institute of Museum and Library Services", "Institute of Museum and Library Services"),
+                    ("Institute of Peace", "Institute of Peace"),
+                    ("Inter-American Foundation", "Inter-American Foundation"),
+                    (
+                        "International Boundary and Water Commission: United States and Mexico",
+                        "International Boundary and Water Commission: United States and Mexico",
+                    ),
+                    (
+                        "International Boundary Commission: United States and Canada",
+                        "International Boundary Commission: United States and Canada",
+                    ),
+                    (
+                        "International Joint Commission: United States and Canada",
+                        "International Joint Commission: United States and Canada",
+                    ),
+                    ("James Madison Memorial Fellowship Foundation", "James Madison Memorial Fellowship Foundation"),
+                    ("Japan-United States Friendship Commission", "Japan-United States Friendship Commission"),
+                    ("Japan-US Friendship Commission", "Japan-US Friendship Commission"),
+                    ("John F. Kennedy Center for Performing Arts", "John F. Kennedy Center for Performing Arts"),
+                    (
+                        "John F. Kennedy Center for the Performing Arts",
+                        "John F. Kennedy Center for the Performing Arts",
+                    ),
+                    ("Legal Services Corporation", "Legal Services Corporation"),
+                    ("Legislative Branch", "Legislative Branch"),
+                    ("Library of Congress", "Library of Congress"),
+                    ("Marine Mammal Commission", "Marine Mammal Commission"),
+                    (
+                        "Medicaid and CHIP Payment and Access Commission",
+                        "Medicaid and CHIP Payment and Access Commission",
+                    ),
+                    ("Medical Payment Advisory Commission", "Medical Payment Advisory Commission"),
+                    ("Medicare Payment Advisory Commission", "Medicare Payment Advisory Commission"),
+                    ("Merit Systems Protection Board", "Merit Systems Protection Board"),
+                    ("Millennium Challenge Corporation", "Millennium Challenge Corporation"),
+                    (
+                        "Morris K. Udall and Stewart L. Udall Foundation",
+                        "Morris K. Udall and Stewart L. Udall Foundation",
+                    ),
+                    ("National Aeronautics and Space Administration", "National Aeronautics and Space Administration"),
+                    ("National Archives and Records Administration", "National Archives and Records Administration"),
+                    ("National Capital Planning Commission", "National Capital Planning Commission"),
+                    ("National Council on Disability", "National Council on Disability"),
+                    ("National Credit Union Administration", "National Credit Union Administration"),
+                    ("National Endowment for the Arts", "National Endowment for the Arts"),
+                    ("National Endowment for the Humanities", "National Endowment for the Humanities"),
+                    (
+                        "National Foundation on the Arts and the Humanities",
+                        "National Foundation on the Arts and the Humanities",
+                    ),
+                    ("National Gallery of Art", "National Gallery of Art"),
+                    ("National Indian Gaming Commission", "National Indian Gaming Commission"),
+                    ("National Labor Relations Board", "National Labor Relations Board"),
+                    ("National Mediation Board", "National Mediation Board"),
+                    ("National Science Foundation", "National Science Foundation"),
+                    (
+                        "National Security Commission on Artificial Intelligence",
+                        "National Security Commission on Artificial Intelligence",
+                    ),
+                    ("National Transportation Safety Board", "National Transportation Safety Board"),
+                    (
+                        "Networking Information Technology Research and Development",
+                        "Networking Information Technology Research and Development",
+                    ),
+                    ("Non-Federal Agency", "Non-Federal Agency"),
+                    ("Northern Border Regional Commission", "Northern Border Regional Commission"),
+                    ("Nuclear Regulatory Commission", "Nuclear Regulatory Commission"),
+                    ("Nuclear Safety Oversight Committee", "Nuclear Safety Oversight Committee"),
+                    ("Nuclear Waste Technical Review Board", "Nuclear Waste Technical Review Board"),
+                    (
+                        "Occupational Safety & Health Review Commission",
+                        "Occupational Safety & Health Review Commission",
+                    ),
+                    (
+                        "Occupational Safety and Health Review Commission",
+                        "Occupational Safety and Health Review Commission",
+                    ),
+                    ("Office of Compliance", "Office of Compliance"),
+                    ("Office of Congressional Workplace Rights", "Office of Congressional Workplace Rights"),
+                    ("Office of Government Ethics", "Office of Government Ethics"),
+                    ("Office of Navajo and Hopi Indian Relocation", "Office of Navajo and Hopi Indian Relocation"),
+                    ("Office of Personnel Management", "Office of Personnel Management"),
+                    ("Open World Leadership Center", "Open World Leadership Center"),
+                    ("Overseas Private Investment Corporation", "Overseas Private Investment Corporation"),
+                    ("Peace Corps", "Peace Corps"),
+                    ("Pension Benefit Guaranty Corporation", "Pension Benefit Guaranty Corporation"),
+                    ("Postal Regulatory Commission", "Postal Regulatory Commission"),
+                    ("Presidio Trust", "Presidio Trust"),
+                    ("Privacy and Civil Liberties Oversight Board", "Privacy and Civil Liberties Oversight Board"),
+                    ("Public Buildings Reform Board", "Public Buildings Reform Board"),
+                    (
+                        "Public Defender Service for the District of Columbia",
+                        "Public Defender Service for the District of Columbia",
+                    ),
+                    ("Railroad Retirement Board", "Railroad Retirement Board"),
+                    ("Securities and Exchange Commission", "Securities and Exchange Commission"),
+                    ("Selective Service System", "Selective Service System"),
+                    ("Small Business Administration", "Small Business Administration"),
+                    ("Smithsonian Institution", "Smithsonian Institution"),
+                    ("Social Security Administration", "Social Security Administration"),
+                    ("Social Security Advisory Board", "Social Security Advisory Board"),
+                    ("Southeast Crescent Regional Commission", "Southeast Crescent Regional Commission"),
+                    ("Southwest Border Regional Commission", "Southwest Border Regional Commission"),
+                    ("State Justice Institute", "State Justice Institute"),
+                    ("State, Local, and Tribal Government", "State, Local, and Tribal Government"),
+                    ("Stennis Center for Public Service", "Stennis Center for Public Service"),
+                    ("Surface Transportation Board", "Surface Transportation Board"),
+                    ("Tennessee Valley Authority", "Tennessee Valley Authority"),
+                    ("The Executive Office of the President", "The Executive Office of the President"),
+                    ("The Intelligence Community", "The Intelligence Community"),
+                    ("The Legislative Branch", "The Legislative Branch"),
+                    ("The Supreme Court", "The Supreme Court"),
+                    (
+                        "The United States World War One Centennial Commission",
+                        "The United States World War One Centennial Commission",
+                    ),
+                    ("U.S. Access Board", "U.S. Access Board"),
+                    ("U.S. Agency for Global Media", "U.S. Agency for Global Media"),
+                    ("U.S. Agency for International Development", "U.S. Agency for International Development"),
+                    ("U.S. Capitol Police", "U.S. Capitol Police"),
+                    ("U.S. Chemical Safety Board", "U.S. Chemical Safety Board"),
+                    (
+                        "U.S. China Economic and Security Review Commission",
+                        "U.S. China Economic and Security Review Commission",
+                    ),
+                    (
+                        "U.S. Commission for the Preservation of Americas Heritage Abroad",
+                        "U.S. Commission for the Preservation of Americas Heritage Abroad",
+                    ),
+                    ("U.S. Commission of Fine Arts", "U.S. Commission of Fine Arts"),
+                    ("U.S. Commission on Civil Rights", "U.S. Commission on Civil Rights"),
+                    (
+                        "U.S. Commission on International Religious Freedom",
+                        "U.S. Commission on International Religious Freedom",
+                    ),
+                    ("U.S. Courts", "U.S. Courts"),
+                    ("U.S. Department of Agriculture", "U.S. Department of Agriculture"),
+                    ("U.S. Interagency Council on Homelessness", "U.S. Interagency Council on Homelessness"),
+                    ("U.S. International Trade Commission", "U.S. International Trade Commission"),
+                    ("U.S. Nuclear Waste Technical Review Board", "U.S. Nuclear Waste Technical Review Board"),
+                    ("U.S. Office of Special Counsel", "U.S. Office of Special Counsel"),
+                    ("U.S. Peace Corps", "U.S. Peace Corps"),
+                    ("U.S. Postal Service", "U.S. Postal Service"),
+                    ("U.S. Semiquincentennial Commission", "U.S. Semiquincentennial Commission"),
+                    ("U.S. Trade and Development Agency", "U.S. Trade and Development Agency"),
+                    (
+                        "U.S.-China Economic and Security Review Commission",
+                        "U.S.-China Economic and Security Review Commission",
+                    ),
+                    ("Udall Foundation", "Udall Foundation"),
+                    ("United States AbilityOne", "United States AbilityOne"),
+                    ("United States Access Board", "United States Access Board"),
+                    ("United States African Development Foundation", "United States African Development Foundation"),
+                    ("United States Agency for Global Media", "United States Agency for Global Media"),
+                    ("United States Arctic Research Commission", "United States Arctic Research Commission"),
+                    ("United States Global Change Research Program", "United States Global Change Research Program"),
+                    ("United States Holocaust Memorial Museum", "United States Holocaust Memorial Museum"),
+                    ("United States Institute of Peace", "United States Institute of Peace"),
+                    (
+                        "United States Interagency Council on Homelessness",
+                        "United States Interagency Council on Homelessness",
+                    ),
+                    (
+                        "United States International Development Finance Corporation",
+                        "United States International Development Finance Corporation",
+                    ),
+                    ("United States International Trade Commission", "United States International Trade Commission"),
+                    ("United States Postal Service", "United States Postal Service"),
+                    ("United States Senate", "United States Senate"),
+                    ("United States Trade and Development Agency", "United States Trade and Development Agency"),
+                    (
+                        "Utah Reclamation Mitigation and Conservation Commission",
+                        "Utah Reclamation Mitigation and Conservation Commission",
+                    ),
+                    ("Vietnam Education Foundation", "Vietnam Education Foundation"),
+                    ("Western Hemisphere Drug Policy Commission", "Western Hemisphere Drug Policy Commission"),
+                    (
+                        "Woodrow Wilson International Center for Scholars",
+                        "Woodrow Wilson International Center for Scholars",
+                    ),
+                    ("World War I Centennial Commission", "World War I Centennial Commission"),
+                ],
+                help_text="Federal agency",
+                null=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="domainapplication",
+            name="state_territory",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("AL", "Alabama (AL)"),
+                    ("AK", "Alaska (AK)"),
+                    ("AS", "American Samoa (AS)"),
+                    ("AZ", "Arizona (AZ)"),
+                    ("AR", "Arkansas (AR)"),
+                    ("CA", "California (CA)"),
+                    ("CO", "Colorado (CO)"),
+                    ("CT", "Connecticut (CT)"),
+                    ("DE", "Delaware (DE)"),
+                    ("DC", "District of Columbia (DC)"),
+                    ("FL", "Florida (FL)"),
+                    ("GA", "Georgia (GA)"),
+                    ("GU", "Guam (GU)"),
+                    ("HI", "Hawaii (HI)"),
+                    ("ID", "Idaho (ID)"),
+                    ("IL", "Illinois (IL)"),
+                    ("IN", "Indiana (IN)"),
+                    ("IA", "Iowa (IA)"),
+                    ("KS", "Kansas (KS)"),
+                    ("KY", "Kentucky (KY)"),
+                    ("LA", "Louisiana (LA)"),
+                    ("ME", "Maine (ME)"),
+                    ("MD", "Maryland (MD)"),
+                    ("MA", "Massachusetts (MA)"),
+                    ("MI", "Michigan (MI)"),
+                    ("MN", "Minnesota (MN)"),
+                    ("MS", "Mississippi (MS)"),
+                    ("MO", "Missouri (MO)"),
+                    ("MT", "Montana (MT)"),
+                    ("NE", "Nebraska (NE)"),
+                    ("NV", "Nevada (NV)"),
+                    ("NH", "New Hampshire (NH)"),
+                    ("NJ", "New Jersey (NJ)"),
+                    ("NM", "New Mexico (NM)"),
+                    ("NY", "New York (NY)"),
+                    ("NC", "North Carolina (NC)"),
+                    ("ND", "North Dakota (ND)"),
+                    ("MP", "Northern Mariana Islands (MP)"),
+                    ("OH", "Ohio (OH)"),
+                    ("OK", "Oklahoma (OK)"),
+                    ("OR", "Oregon (OR)"),
+                    ("PA", "Pennsylvania (PA)"),
+                    ("PR", "Puerto Rico (PR)"),
+                    ("RI", "Rhode Island (RI)"),
+                    ("SC", "South Carolina (SC)"),
+                    ("SD", "South Dakota (SD)"),
+                    ("TN", "Tennessee (TN)"),
+                    ("TX", "Texas (TX)"),
+                    ("UM", "United States Minor Outlying Islands (UM)"),
+                    ("UT", "Utah (UT)"),
+                    ("VT", "Vermont (VT)"),
+                    ("VI", "Virgin Islands (VI)"),
+                    ("VA", "Virginia (VA)"),
+                    ("WA", "Washington (WA)"),
+                    ("WV", "West Virginia (WV)"),
+                    ("WI", "Wisconsin (WI)"),
+                    ("WY", "Wyoming (WY)"),
+                    ("AA", "Armed Forces Americas (AA)"),
+                    ("AE", "Armed Forces Africa, Canada, Europe, Middle East (AE)"),
+                    ("AP", "Armed Forces Pacific (AP)"),
+                ],
+                help_text="State, territory, or military post",
+                max_length=2,
+                null=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="domaininformation",
+            name="federal_agency",
+            field=models.TextField(
+                blank=True,
+                choices=[
+                    (
+                        "Administrative Conference of the United States",
+                        "Administrative Conference of the United States",
+                    ),
+                    ("Advisory Council on Historic Preservation", "Advisory Council on Historic Preservation"),
+                    ("American Battle Monuments Commission", "American Battle Monuments Commission"),
+                    ("AMTRAK", "AMTRAK"),
+                    ("Appalachian Regional Commission", "Appalachian Regional Commission"),
+                    (
+                        "Appraisal Subcommittee of the Federal Financial Institutions Examination Council",
+                        "Appraisal Subcommittee of the Federal Financial Institutions Examination Council",
+                    ),
+                    ("Appraisal Subcommittee", "Appraisal Subcommittee"),
+                    ("Architect of the Capitol", "Architect of the Capitol"),
+                    ("Armed Forces Retirement Home", "Armed Forces Retirement Home"),
+                    (
+                        "Barry Goldwater Scholarship and Excellence in Education Foundation",
+                        "Barry Goldwater Scholarship and Excellence in Education Foundation",
+                    ),
+                    (
+                        "Barry Goldwater Scholarship and Excellence in Education Program",
+                        "Barry Goldwater Scholarship and Excellence in Education Program",
+                    ),
+                    ("Central Intelligence Agency", "Central Intelligence Agency"),
+                    ("Chemical Safety Board", "Chemical Safety Board"),
+                    ("Christopher Columbus Fellowship Foundation", "Christopher Columbus Fellowship Foundation"),
+                    ("Civil Rights Cold Case Records Review Board", "Civil Rights Cold Case Records Review Board"),
+                    (
+                        "Commission for the Preservation of America's Heritage Abroad",
+                        "Commission for the Preservation of America's Heritage Abroad",
+                    ),
+                    ("Commission of Fine Arts", "Commission of Fine Arts"),
+                    (
+                        "Committee for Purchase From People Who Are Blind or Severely Disabled",
+                        "Committee for Purchase From People Who Are Blind or Severely Disabled",
+                    ),
+                    ("Commodity Futures Trading Commission", "Commodity Futures Trading Commission"),
+                    ("Congressional Budget Office", "Congressional Budget Office"),
+                    ("Consumer Financial Protection Bureau", "Consumer Financial Protection Bureau"),
+                    ("Consumer Product Safety Commission", "Consumer Product Safety Commission"),
+                    ("Corporation for National & Community Service", "Corporation for National & Community Service"),
+                    (
+                        "Corporation for National and Community Service",
+                        "Corporation for National and Community Service",
+                    ),
+                    (
+                        "Council of Inspectors General on Integrity and Efficiency",
+                        "Council of Inspectors General on Integrity and Efficiency",
+                    ),
+                    ("Court Services and Offender Supervision", "Court Services and Offender Supervision"),
+                    ("Cyberspace Solarium Commission", "Cyberspace Solarium Commission"),
+                    (
+                        "DC Court Services and Offender Supervision Agency",
+                        "DC Court Services and Offender Supervision Agency",
+                    ),
+                    ("DC Pre-trial Services", "DC Pre-trial Services"),
+                    ("Defense Nuclear Facilities Safety Board", "Defense Nuclear Facilities Safety Board"),
+                    ("Delta Regional Authority", "Delta Regional Authority"),
+                    ("Denali Commission", "Denali Commission"),
+                    ("Department of Agriculture", "Department of Agriculture"),
+                    ("Department of Commerce", "Department of Commerce"),
+                    ("Department of Defense", "Department of Defense"),
+                    ("Department of Education", "Department of Education"),
+                    ("Department of Energy", "Department of Energy"),
+                    ("Department of Health and Human Services", "Department of Health and Human Services"),
+                    ("Department of Homeland Security", "Department of Homeland Security"),
+                    ("Department of Housing and Urban Development", "Department of Housing and Urban Development"),
+                    ("Department of Justice", "Department of Justice"),
+                    ("Department of Labor", "Department of Labor"),
+                    ("Department of State", "Department of State"),
+                    ("Department of the Interior", "Department of the Interior"),
+                    ("Department of the Treasury", "Department of the Treasury"),
+                    ("Department of Transportation", "Department of Transportation"),
+                    ("Department of Veterans Affairs", "Department of Veterans Affairs"),
+                    ("Director of National Intelligence", "Director of National Intelligence"),
+                    ("Dwight D. Eisenhower Memorial Commission", "Dwight D. Eisenhower Memorial Commission"),
+                    ("Election Assistance Commission", "Election Assistance Commission"),
+                    ("Environmental Protection Agency", "Environmental Protection Agency"),
+                    ("Equal Employment Opportunity Commission", "Equal Employment Opportunity Commission"),
+                    ("Executive Office of the President", "Executive Office of the President"),
+                    ("Export-Import Bank of the United States", "Export-Import Bank of the United States"),
+                    ("Export/Import Bank of the U.S.", "Export/Import Bank of the U.S."),
+                    ("Farm Credit Administration", "Farm Credit Administration"),
+                    ("Farm Credit System Insurance Corporation", "Farm Credit System Insurance Corporation"),
+                    ("Federal Communications Commission", "Federal Communications Commission"),
+                    ("Federal Deposit Insurance Corporation", "Federal Deposit Insurance Corporation"),
+                    ("Federal Election Commission", "Federal Election Commission"),
+                    ("Federal Energy Regulatory Commission", "Federal Energy Regulatory Commission"),
+                    (
+                        "Federal Financial Institutions Examination Council",
+                        "Federal Financial Institutions Examination Council",
+                    ),
+                    ("Federal Housing Finance Agency", "Federal Housing Finance Agency"),
+                    ("Federal Judiciary", "Federal Judiciary"),
+                    ("Federal Labor Relations Authority", "Federal Labor Relations Authority"),
+                    ("Federal Maritime Commission", "Federal Maritime Commission"),
+                    ("Federal Mediation and Conciliation Service", "Federal Mediation and Conciliation Service"),
+                    (
+                        "Federal Mine Safety and Health Review Commission",
+                        "Federal Mine Safety and Health Review Commission",
+                    ),
+                    (
+                        "Federal Permitting Improvement Steering Council",
+                        "Federal Permitting Improvement Steering Council",
+                    ),
+                    ("Federal Reserve Board of Governors", "Federal Reserve Board of Governors"),
+                    ("Federal Reserve System", "Federal Reserve System"),
+                    ("Federal Trade Commission", "Federal Trade Commission"),
+                    ("General Services Administration", "General Services Administration"),
+                    ("gov Administration", "gov Administration"),
+                    ("Government Accountability Office", "Government Accountability Office"),
+                    ("Government Publishing Office", "Government Publishing Office"),
+                    ("Gulf Coast Ecosystem Restoration Council", "Gulf Coast Ecosystem Restoration Council"),
+                    ("Harry S Truman Scholarship Foundation", "Harry S Truman Scholarship Foundation"),
+                    ("Harry S. Truman Scholarship Foundation", "Harry S. Truman Scholarship Foundation"),
+                    ("Institute of Museum and Library Services", "Institute of Museum and Library Services"),
+                    ("Institute of Peace", "Institute of Peace"),
+                    ("Inter-American Foundation", "Inter-American Foundation"),
+                    (
+                        "International Boundary and Water Commission: United States and Mexico",
+                        "International Boundary and Water Commission: United States and Mexico",
+                    ),
+                    (
+                        "International Boundary Commission: United States and Canada",
+                        "International Boundary Commission: United States and Canada",
+                    ),
+                    (
+                        "International Joint Commission: United States and Canada",
+                        "International Joint Commission: United States and Canada",
+                    ),
+                    ("James Madison Memorial Fellowship Foundation", "James Madison Memorial Fellowship Foundation"),
+                    ("Japan-United States Friendship Commission", "Japan-United States Friendship Commission"),
+                    ("Japan-US Friendship Commission", "Japan-US Friendship Commission"),
+                    ("John F. Kennedy Center for Performing Arts", "John F. Kennedy Center for Performing Arts"),
+                    (
+                        "John F. Kennedy Center for the Performing Arts",
+                        "John F. Kennedy Center for the Performing Arts",
+                    ),
+                    ("Legal Services Corporation", "Legal Services Corporation"),
+                    ("Legislative Branch", "Legislative Branch"),
+                    ("Library of Congress", "Library of Congress"),
+                    ("Marine Mammal Commission", "Marine Mammal Commission"),
+                    (
+                        "Medicaid and CHIP Payment and Access Commission",
+                        "Medicaid and CHIP Payment and Access Commission",
+                    ),
+                    ("Medical Payment Advisory Commission", "Medical Payment Advisory Commission"),
+                    ("Medicare Payment Advisory Commission", "Medicare Payment Advisory Commission"),
+                    ("Merit Systems Protection Board", "Merit Systems Protection Board"),
+                    ("Millennium Challenge Corporation", "Millennium Challenge Corporation"),
+                    (
+                        "Morris K. Udall and Stewart L. Udall Foundation",
+                        "Morris K. Udall and Stewart L. Udall Foundation",
+                    ),
+                    ("National Aeronautics and Space Administration", "National Aeronautics and Space Administration"),
+                    ("National Archives and Records Administration", "National Archives and Records Administration"),
+                    ("National Capital Planning Commission", "National Capital Planning Commission"),
+                    ("National Council on Disability", "National Council on Disability"),
+                    ("National Credit Union Administration", "National Credit Union Administration"),
+                    ("National Endowment for the Arts", "National Endowment for the Arts"),
+                    ("National Endowment for the Humanities", "National Endowment for the Humanities"),
+                    (
+                        "National Foundation on the Arts and the Humanities",
+                        "National Foundation on the Arts and the Humanities",
+                    ),
+                    ("National Gallery of Art", "National Gallery of Art"),
+                    ("National Indian Gaming Commission", "National Indian Gaming Commission"),
+                    ("National Labor Relations Board", "National Labor Relations Board"),
+                    ("National Mediation Board", "National Mediation Board"),
+                    ("National Science Foundation", "National Science Foundation"),
+                    (
+                        "National Security Commission on Artificial Intelligence",
+                        "National Security Commission on Artificial Intelligence",
+                    ),
+                    ("National Transportation Safety Board", "National Transportation Safety Board"),
+                    (
+                        "Networking Information Technology Research and Development",
+                        "Networking Information Technology Research and Development",
+                    ),
+                    ("Non-Federal Agency", "Non-Federal Agency"),
+                    ("Northern Border Regional Commission", "Northern Border Regional Commission"),
+                    ("Nuclear Regulatory Commission", "Nuclear Regulatory Commission"),
+                    ("Nuclear Safety Oversight Committee", "Nuclear Safety Oversight Committee"),
+                    ("Nuclear Waste Technical Review Board", "Nuclear Waste Technical Review Board"),
+                    (
+                        "Occupational Safety & Health Review Commission",
+                        "Occupational Safety & Health Review Commission",
+                    ),
+                    (
+                        "Occupational Safety and Health Review Commission",
+                        "Occupational Safety and Health Review Commission",
+                    ),
+                    ("Office of Compliance", "Office of Compliance"),
+                    ("Office of Congressional Workplace Rights", "Office of Congressional Workplace Rights"),
+                    ("Office of Government Ethics", "Office of Government Ethics"),
+                    ("Office of Navajo and Hopi Indian Relocation", "Office of Navajo and Hopi Indian Relocation"),
+                    ("Office of Personnel Management", "Office of Personnel Management"),
+                    ("Open World Leadership Center", "Open World Leadership Center"),
+                    ("Overseas Private Investment Corporation", "Overseas Private Investment Corporation"),
+                    ("Peace Corps", "Peace Corps"),
+                    ("Pension Benefit Guaranty Corporation", "Pension Benefit Guaranty Corporation"),
+                    ("Postal Regulatory Commission", "Postal Regulatory Commission"),
+                    ("Presidio Trust", "Presidio Trust"),
+                    ("Privacy and Civil Liberties Oversight Board", "Privacy and Civil Liberties Oversight Board"),
+                    ("Public Buildings Reform Board", "Public Buildings Reform Board"),
+                    (
+                        "Public Defender Service for the District of Columbia",
+                        "Public Defender Service for the District of Columbia",
+                    ),
+                    ("Railroad Retirement Board", "Railroad Retirement Board"),
+                    ("Securities and Exchange Commission", "Securities and Exchange Commission"),
+                    ("Selective Service System", "Selective Service System"),
+                    ("Small Business Administration", "Small Business Administration"),
+                    ("Smithsonian Institution", "Smithsonian Institution"),
+                    ("Social Security Administration", "Social Security Administration"),
+                    ("Social Security Advisory Board", "Social Security Advisory Board"),
+                    ("Southeast Crescent Regional Commission", "Southeast Crescent Regional Commission"),
+                    ("Southwest Border Regional Commission", "Southwest Border Regional Commission"),
+                    ("State Justice Institute", "State Justice Institute"),
+                    ("State, Local, and Tribal Government", "State, Local, and Tribal Government"),
+                    ("Stennis Center for Public Service", "Stennis Center for Public Service"),
+                    ("Surface Transportation Board", "Surface Transportation Board"),
+                    ("Tennessee Valley Authority", "Tennessee Valley Authority"),
+                    ("The Executive Office of the President", "The Executive Office of the President"),
+                    ("The Intelligence Community", "The Intelligence Community"),
+                    ("The Legislative Branch", "The Legislative Branch"),
+                    ("The Supreme Court", "The Supreme Court"),
+                    (
+                        "The United States World War One Centennial Commission",
+                        "The United States World War One Centennial Commission",
+                    ),
+                    ("U.S. Access Board", "U.S. Access Board"),
+                    ("U.S. Agency for Global Media", "U.S. Agency for Global Media"),
+                    ("U.S. Agency for International Development", "U.S. Agency for International Development"),
+                    ("U.S. Capitol Police", "U.S. Capitol Police"),
+                    ("U.S. Chemical Safety Board", "U.S. Chemical Safety Board"),
+                    (
+                        "U.S. China Economic and Security Review Commission",
+                        "U.S. China Economic and Security Review Commission",
+                    ),
+                    (
+                        "U.S. Commission for the Preservation of Americas Heritage Abroad",
+                        "U.S. Commission for the Preservation of Americas Heritage Abroad",
+                    ),
+                    ("U.S. Commission of Fine Arts", "U.S. Commission of Fine Arts"),
+                    ("U.S. Commission on Civil Rights", "U.S. Commission on Civil Rights"),
+                    (
+                        "U.S. Commission on International Religious Freedom",
+                        "U.S. Commission on International Religious Freedom",
+                    ),
+                    ("U.S. Courts", "U.S. Courts"),
+                    ("U.S. Department of Agriculture", "U.S. Department of Agriculture"),
+                    ("U.S. Interagency Council on Homelessness", "U.S. Interagency Council on Homelessness"),
+                    ("U.S. International Trade Commission", "U.S. International Trade Commission"),
+                    ("U.S. Nuclear Waste Technical Review Board", "U.S. Nuclear Waste Technical Review Board"),
+                    ("U.S. Office of Special Counsel", "U.S. Office of Special Counsel"),
+                    ("U.S. Peace Corps", "U.S. Peace Corps"),
+                    ("U.S. Postal Service", "U.S. Postal Service"),
+                    ("U.S. Semiquincentennial Commission", "U.S. Semiquincentennial Commission"),
+                    ("U.S. Trade and Development Agency", "U.S. Trade and Development Agency"),
+                    (
+                        "U.S.-China Economic and Security Review Commission",
+                        "U.S.-China Economic and Security Review Commission",
+                    ),
+                    ("Udall Foundation", "Udall Foundation"),
+                    ("United States AbilityOne", "United States AbilityOne"),
+                    ("United States Access Board", "United States Access Board"),
+                    ("United States African Development Foundation", "United States African Development Foundation"),
+                    ("United States Agency for Global Media", "United States Agency for Global Media"),
+                    ("United States Arctic Research Commission", "United States Arctic Research Commission"),
+                    ("United States Global Change Research Program", "United States Global Change Research Program"),
+                    ("United States Holocaust Memorial Museum", "United States Holocaust Memorial Museum"),
+                    ("United States Institute of Peace", "United States Institute of Peace"),
+                    (
+                        "United States Interagency Council on Homelessness",
+                        "United States Interagency Council on Homelessness",
+                    ),
+                    (
+                        "United States International Development Finance Corporation",
+                        "United States International Development Finance Corporation",
+                    ),
+                    ("United States International Trade Commission", "United States International Trade Commission"),
+                    ("United States Postal Service", "United States Postal Service"),
+                    ("United States Senate", "United States Senate"),
+                    ("United States Trade and Development Agency", "United States Trade and Development Agency"),
+                    (
+                        "Utah Reclamation Mitigation and Conservation Commission",
+                        "Utah Reclamation Mitigation and Conservation Commission",
+                    ),
+                    ("Vietnam Education Foundation", "Vietnam Education Foundation"),
+                    ("Western Hemisphere Drug Policy Commission", "Western Hemisphere Drug Policy Commission"),
+                    (
+                        "Woodrow Wilson International Center for Scholars",
+                        "Woodrow Wilson International Center for Scholars",
+                    ),
+                    ("World War I Centennial Commission", "World War I Centennial Commission"),
+                ],
+                help_text="Federal agency",
+                null=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="domaininformation",
+            name="state_territory",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("AL", "Alabama (AL)"),
+                    ("AK", "Alaska (AK)"),
+                    ("AS", "American Samoa (AS)"),
+                    ("AZ", "Arizona (AZ)"),
+                    ("AR", "Arkansas (AR)"),
+                    ("CA", "California (CA)"),
+                    ("CO", "Colorado (CO)"),
+                    ("CT", "Connecticut (CT)"),
+                    ("DE", "Delaware (DE)"),
+                    ("DC", "District of Columbia (DC)"),
+                    ("FL", "Florida (FL)"),
+                    ("GA", "Georgia (GA)"),
+                    ("GU", "Guam (GU)"),
+                    ("HI", "Hawaii (HI)"),
+                    ("ID", "Idaho (ID)"),
+                    ("IL", "Illinois (IL)"),
+                    ("IN", "Indiana (IN)"),
+                    ("IA", "Iowa (IA)"),
+                    ("KS", "Kansas (KS)"),
+                    ("KY", "Kentucky (KY)"),
+                    ("LA", "Louisiana (LA)"),
+                    ("ME", "Maine (ME)"),
+                    ("MD", "Maryland (MD)"),
+                    ("MA", "Massachusetts (MA)"),
+                    ("MI", "Michigan (MI)"),
+                    ("MN", "Minnesota (MN)"),
+                    ("MS", "Mississippi (MS)"),
+                    ("MO", "Missouri (MO)"),
+                    ("MT", "Montana (MT)"),
+                    ("NE", "Nebraska (NE)"),
+                    ("NV", "Nevada (NV)"),
+                    ("NH", "New Hampshire (NH)"),
+                    ("NJ", "New Jersey (NJ)"),
+                    ("NM", "New Mexico (NM)"),
+                    ("NY", "New York (NY)"),
+                    ("NC", "North Carolina (NC)"),
+                    ("ND", "North Dakota (ND)"),
+                    ("MP", "Northern Mariana Islands (MP)"),
+                    ("OH", "Ohio (OH)"),
+                    ("OK", "Oklahoma (OK)"),
+                    ("OR", "Oregon (OR)"),
+                    ("PA", "Pennsylvania (PA)"),
+                    ("PR", "Puerto Rico (PR)"),
+                    ("RI", "Rhode Island (RI)"),
+                    ("SC", "South Carolina (SC)"),
+                    ("SD", "South Dakota (SD)"),
+                    ("TN", "Tennessee (TN)"),
+                    ("TX", "Texas (TX)"),
+                    ("UM", "United States Minor Outlying Islands (UM)"),
+                    ("UT", "Utah (UT)"),
+                    ("VT", "Vermont (VT)"),
+                    ("VI", "Virgin Islands (VI)"),
+                    ("VA", "Virginia (VA)"),
+                    ("WA", "Washington (WA)"),
+                    ("WV", "West Virginia (WV)"),
+                    ("WI", "Wisconsin (WI)"),
+                    ("WY", "Wyoming (WY)"),
+                    ("AA", "Armed Forces Americas (AA)"),
+                    ("AE", "Armed Forces Africa, Canada, Europe, Middle East (AE)"),
+                    ("AP", "Armed Forces Pacific (AP)"),
+                ],
+                help_text="State, territory, or military post",
+                max_length=2,
+                null=True,
+                verbose_name="State, territory, or military post",
+            ),
+        ),
+    ]

src/registrar/models/__init__.py

@@ -38,6 +38,7 @@ auditlog.register(DomainApplication)
 auditlog.register(Domain)
 auditlog.register(DraftDomain)
 auditlog.register(DomainInvitation)
+auditlog.register(DomainInformation)
 auditlog.register(HostIP)
 auditlog.register(Host)
 auditlog.register(Nameserver)

src/registrar/models/domain_application.py

@@ -409,6 +409,7 @@ class DomainApplication(TimeStampedModel):
     )
 
     federal_agency = models.TextField(
+        choices=AGENCY_CHOICES,
         null=True,
         blank=True,
         help_text="Federal agency",
@@ -451,6 +452,7 @@ class DomainApplication(TimeStampedModel):
     )
     state_territory = models.CharField(
         max_length=2,
+        choices=StateTerritoryChoices.choices,
         null=True,
         blank=True,
         help_text="State, territory, or military post",

src/registrar/models/domain_information.py

@@ -72,6 +72,7 @@ class DomainInformation(TimeStampedModel):
     )
 
     federal_agency = models.TextField(
+        choices=AGENCY_CHOICES,
         null=True,
         blank=True,
         help_text="Federal agency",
@@ -116,6 +117,7 @@ class DomainInformation(TimeStampedModel):
     )
     state_territory = models.CharField(
         max_length=2,
+        choices=StateTerritoryChoices.choices,
         null=True,
         blank=True,
         help_text="State, territory, or military post",

src/registrar/models/user.py

@@ -91,7 +91,7 @@ class User(AbstractUser):
 
         # A new incoming user who is being invited to be a domain manager (that is,
         # their email address is in DomainInvitation for an invitation that is not yet "retrieved").
-        if DomainInvitation.objects.filter(email=email, status=DomainInvitation.INVITED):
+        if DomainInvitation.objects.filter(email=email, status=DomainInvitation.INVITED).exists():
             return False
 
         return True

src/registrar/templates/base.html

@@ -1,5 +1,7 @@
 <!doctype html>{# keep this on the first line #}
 {% load i18n static %}
+{% load static url_helpers %}
+
 <html class="no-js" lang="{{ LANGUAGE_CODE }}">
 
 <head>
@@ -144,13 +146,13 @@
   <header class="usa-header usa-header-basic">
     <div class="usa-nav-container">
       <div class="usa-navbar">
-        {% block logo %}
-        <div class="usa-logo" id="extended-logo">
-          <strong class="usa-logo__text" >
-            <a href="{% url 'home' %}"> .gov </a>
-          </strong>
-        </div>
-        {% endblock %}
+          {% block logo %}
+            <div class="usa-logo display-inline-block" id="extended-logo">
+              <strong class="usa-logo__text" >
+                <a href="{% url 'home' %}">.gov registrar </a>
+              </strong>    
+            </div>
+          {% endblock %}
         <button type="button" class="usa-menu-btn">Menu</button>
       </div>
       {% block usa_nav %}

src/registrar/templates/domain_base.html

@@ -5,17 +5,15 @@
 
 {% block content %}
 <div class="grid-container">
-  <div class="grid-row">
-    {% if not is_analyst_or_superuser or not analyst_action or analyst_action_location != domain.pk %}
-    <p class="font-body-md margin-top-0 margin-bottom-2
-              text-primary-darker text-semibold"
-    >
-      <span class="usa-sr-only"> Domain name:</span> {{ domain.name }}
-    </p>
-    {% endif %}
-  </div>
+
   <div class="grid-row grid-gap">
     <div class="tablet:grid-col-3">
+      <p class="font-body-md margin-top-0 margin-bottom-2
+                text-primary-darker text-semibold"
+      >
+        <span class="usa-sr-only"> Domain name:</span> {{ domain.name }}
+      </p>
+
       {% if domain.domain_info %}
         {% include 'domain_sidebar.html' %}
       {% endif %}
@@ -42,16 +40,6 @@
             </p>
           </div>
         </div>
-        {% else %}
-        <a href="{% url 'home' %}" class="breadcrumb__back">
-          <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-          <use xlink:href="{% static 'img/sprite.svg' %}#arrow_back"></use>
-          </svg>
-
-          <p class="margin-left-05 margin-top-0 margin-bottom-0 line-height-sans-1">
-          Back to manage your domains
-          </p>
-        </a>
         {% endif %}
         {# messages block is under the back breadcrumb link #}
         {% if messages %}

src/registrar/templates/includes/footer.html

@@ -26,6 +26,10 @@
           >
             <address class="usa-footer__address">
               <div class="usa-footer__contact-info grid-row grid-gap-md">
+                <div class="grid-col-auto">
+                  <a class="usa-link" rel="noopener noreferrer" href="{% url 'home' %}">Manage your domains</a>
+                </div>
+                <span class=""> | </span>
                 <div class="grid-col-auto">
                    <a class="usa-link" rel="noopener noreferrer" target="_blank" href="{% public_site_url 'help/' %}">Help </a>
                 </div>

src/registrar/tests/test_forms.py

@@ -74,6 +74,24 @@ class TestFormValidation(MockEppLib):
             ["Enter the .gov domain you want without any periods."],
         )
 
+    def test_requested_domain_two_dots_invalid(self):
+        """don't accept domains that are subdomains"""
+        form = DotGovDomainForm(data={"requested_domain": "sub.top-level-agency.gov"})
+        self.assertEqual(
+            form.errors["requested_domain"],
+            ["Enter the .gov domain you want without any periods."],
+        )
+        form = DotGovDomainForm(data={"requested_domain": ".top-level-agency.gov"})
+        self.assertEqual(
+            form.errors["requested_domain"],
+            ["Enter the .gov domain you want without any periods."],
+        )
+        form = DotGovDomainForm(data={"requested_domain": "..gov"})
+        self.assertEqual(
+            form.errors["requested_domain"],
+            ["Enter the .gov domain you want without any periods."],
+        )
+
     def test_requested_domain_invalid_characters(self):
         """must be a valid .gov domain name."""
         form = DotGovDomainForm(data={"requested_domain": "underscores_forever"})

src/registrar/tests/test_models.py

@@ -623,7 +623,6 @@ class TestUser(TestCase):
         TransitionDomain.objects.all().delete()
         User.objects.all().delete()
         UserDomainRole.objects.all().delete()
-        TransitionDomain.objects.get_or_create(username="mayor@igorville.gov", domain_name=self.domain_name)
 
     def test_check_transition_domains_without_domains_on_login(self):
         """A user's on_each_login callback does not check transition domains.

src/registrar/tests/test_url_auth.py

@@ -110,7 +110,7 @@ class TestURLAuth(TestCase):
         "/openid/callback",
         "/openid/callback/login/",
         "/openid/callback/logout/",
-        "/api/v1/available/whitehouse.gov",
+        "/api/v1/available/",
         "/api/v1/get-report/current-federal",
         "/api/v1/get-report/current-full",
     ]

src/registrar/tests/test_views.py

@@ -1083,7 +1083,7 @@ class DomainApplicationTests(TestWithUser, WebTest):
         home_page = self.app.get("/")
         self.assertContains(home_page, "city.gov")
         # click the "Edit" link
-        detail_page = home_page.click("Manage")
+        detail_page = home_page.click("Manage", index=0)
         self.assertContains(detail_page, "Federal: an agency of the U.S. government")
 
 
@@ -2123,7 +2123,7 @@ class TestApplicationStatus(TestWithUser, WebTest):
         home_page = self.app.get("/")
         self.assertContains(home_page, "city.gov")
         # click the "Manage" link
-        detail_page = home_page.click("Manage")
+        detail_page = home_page.click("Manage", index=0)
         self.assertContains(detail_page, "city.gov")
         self.assertContains(detail_page, "city1.gov")
         self.assertContains(detail_page, "Chief Tester")
@@ -2143,7 +2143,7 @@ class TestApplicationStatus(TestWithUser, WebTest):
         home_page = self.app.get("/")
         self.assertContains(home_page, "city.gov")
         # click the "Manage" link
-        detail_page = home_page.click("Manage")
+        detail_page = home_page.click("Manage", index=0)
         self.assertContains(detail_page, "city.gov")
         self.assertContains(detail_page, "Chief Tester")
         self.assertContains(detail_page, "testy@town.com")
@@ -2158,7 +2158,7 @@ class TestApplicationStatus(TestWithUser, WebTest):
         home_page = self.app.get("/")
         self.assertContains(home_page, "city.gov")
         # click the "Manage" link
-        detail_page = home_page.click("Manage")
+        detail_page = home_page.click("Manage", index=0)
         self.assertContains(detail_page, "city.gov")
         self.assertContains(detail_page, "city1.gov")
         self.assertContains(detail_page, "Chief Tester")