mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-07-13 14:35:14 +02:00
Merge branch 'main' of github.com:cisagov/manage.get.gov into za/1212-extend-expiration-dates
This commit is contained in:
commit
c0a9f1eb0f
25 changed files with 848 additions and 80 deletions
|
@ -46,8 +46,14 @@ class OpenIdConnectBackend(ModelBackend):
|
|||
# defaults _will_ be updated, these are not fallbacks
|
||||
"defaults": openid_data,
|
||||
}
|
||||
user, created = UserModel.objects.update_or_create(**args)
|
||||
if created:
|
||||
|
||||
user, created = UserModel.objects.get_or_create(**args)
|
||||
|
||||
if not created:
|
||||
# If user exists, update existing user
|
||||
self.update_existing_user(user, args["defaults"])
|
||||
else:
|
||||
# If user is created, configure the user
|
||||
user = self.configure_user(user, **kwargs)
|
||||
else:
|
||||
try:
|
||||
|
@ -58,6 +64,16 @@ class OpenIdConnectBackend(ModelBackend):
|
|||
user.on_each_login()
|
||||
return user
|
||||
|
||||
def update_existing_user(self, user, kwargs):
|
||||
"""Update other fields without overwriting first_name and last_name.
|
||||
Overwrite first_name and last_name if not empty string"""
|
||||
|
||||
for key, value in kwargs.items():
|
||||
# Check if the key is not first_name or last_name or value is not empty string
|
||||
if key not in ["first_name", "last_name"] or value:
|
||||
setattr(user, key, value)
|
||||
user.save()
|
||||
|
||||
def clean_username(self, username):
|
||||
"""
|
||||
Performs any cleaning on the "username" prior to using it to get or
|
||||
|
|
99
src/djangooidc/tests/test_backends.py
Normal file
99
src/djangooidc/tests/test_backends.py
Normal file
|
@ -0,0 +1,99 @@
|
|||
from django.test import TestCase
|
||||
from registrar.models import User
|
||||
from ..backends import OpenIdConnectBackend # Adjust the import path based on your project structure
|
||||
|
||||
|
||||
class OpenIdConnectBackendTestCase(TestCase):
|
||||
def setUp(self):
|
||||
self.backend = OpenIdConnectBackend()
|
||||
self.kwargs = {
|
||||
"sub": "test_user",
|
||||
"given_name": "John",
|
||||
"family_name": "Doe",
|
||||
"email": "john.doe@example.com",
|
||||
"phone": "123456789",
|
||||
}
|
||||
|
||||
def tearDown(self) -> None:
|
||||
User.objects.all().delete()
|
||||
|
||||
def test_authenticate_with_create_user(self):
|
||||
"""Test that authenticate creates a new user if it does not find
|
||||
existing user"""
|
||||
# Ensure that the authenticate method creates a new user
|
||||
user = self.backend.authenticate(request=None, **self.kwargs)
|
||||
self.assertIsNotNone(user)
|
||||
self.assertIsInstance(user, User)
|
||||
self.assertEqual(user.username, "test_user")
|
||||
|
||||
# Verify that user fields are correctly set
|
||||
self.assertEqual(user.first_name, "John")
|
||||
self.assertEqual(user.last_name, "Doe")
|
||||
self.assertEqual(user.email, "john.doe@example.com")
|
||||
self.assertEqual(user.phone, "123456789")
|
||||
|
||||
def test_authenticate_with_existing_user(self):
|
||||
"""Test that authenticate updates an existing user if it finds one.
|
||||
For this test, given_name and family_name are supplied"""
|
||||
# Create an existing user with the same username
|
||||
existing_user = User.objects.create_user(username="test_user")
|
||||
|
||||
# Ensure that the authenticate method updates the existing user
|
||||
user = self.backend.authenticate(request=None, **self.kwargs)
|
||||
self.assertIsNotNone(user)
|
||||
self.assertIsInstance(user, User)
|
||||
self.assertEqual(user, existing_user) # The same user instance should be returned
|
||||
|
||||
# Verify that user fields are correctly updated
|
||||
self.assertEqual(user.first_name, "John")
|
||||
self.assertEqual(user.last_name, "Doe")
|
||||
self.assertEqual(user.email, "john.doe@example.com")
|
||||
self.assertEqual(user.phone, "123456789")
|
||||
|
||||
def test_authenticate_with_existing_user_no_name(self):
|
||||
"""Test that authenticate updates an existing user if it finds one.
|
||||
For this test, given_name and family_name are not supplied"""
|
||||
# Create an existing user with the same username and with first and last names
|
||||
existing_user = User.objects.create_user(username="test_user", first_name="John", last_name="Doe")
|
||||
|
||||
# Remove given_name and family_name from the input, self.kwargs
|
||||
self.kwargs.pop("given_name", None)
|
||||
self.kwargs.pop("family_name", None)
|
||||
|
||||
# Ensure that the authenticate method updates the existing user
|
||||
# and preserves existing first and last names
|
||||
user = self.backend.authenticate(request=None, **self.kwargs)
|
||||
self.assertIsNotNone(user)
|
||||
self.assertIsInstance(user, User)
|
||||
self.assertEqual(user, existing_user) # The same user instance should be returned
|
||||
|
||||
# Verify that user fields are correctly updated
|
||||
self.assertEqual(user.first_name, "John")
|
||||
self.assertEqual(user.last_name, "Doe")
|
||||
self.assertEqual(user.email, "john.doe@example.com")
|
||||
self.assertEqual(user.phone, "123456789")
|
||||
|
||||
def test_authenticate_with_existing_user_different_name(self):
|
||||
"""Test that authenticate updates an existing user if it finds one.
|
||||
For this test, given_name and family_name are supplied and overwrite"""
|
||||
# Create an existing user with the same username and with first and last names
|
||||
existing_user = User.objects.create_user(username="test_user", first_name="WillBe", last_name="Replaced")
|
||||
|
||||
# Ensure that the authenticate method updates the existing user
|
||||
# and preserves existing first and last names
|
||||
user = self.backend.authenticate(request=None, **self.kwargs)
|
||||
self.assertIsNotNone(user)
|
||||
self.assertIsInstance(user, User)
|
||||
self.assertEqual(user, existing_user) # The same user instance should be returned
|
||||
|
||||
# Verify that user fields are correctly updated
|
||||
self.assertEqual(user.first_name, "John")
|
||||
self.assertEqual(user.last_name, "Doe")
|
||||
self.assertEqual(user.email, "john.doe@example.com")
|
||||
self.assertEqual(user.phone, "123456789")
|
||||
|
||||
def test_authenticate_with_unknown_user(self):
|
||||
"""Test that authenticate returns None when no kwargs are supplied"""
|
||||
# Ensure that the authenticate method handles the case when the user is not found
|
||||
user = self.backend.authenticate(request=None, **{})
|
||||
self.assertIsNone(user)
|
|
@ -752,6 +752,7 @@ class TransitionDomainAdmin(ListHeaderAdmin):
|
|||
"domain_name",
|
||||
"status",
|
||||
"email_sent",
|
||||
"processed",
|
||||
]
|
||||
|
||||
search_fields = ["username", "domain_name"]
|
||||
|
|
|
@ -28,6 +28,17 @@ class DomainAddUserForm(forms.Form):
|
|||
|
||||
email = forms.EmailField(label="Email")
|
||||
|
||||
def clean(self):
|
||||
"""clean form data by lowercasing email"""
|
||||
cleaned_data = super().clean()
|
||||
|
||||
# Lowercase the value of the 'email' field
|
||||
email_value = cleaned_data.get("email")
|
||||
if email_value:
|
||||
cleaned_data["email"] = email_value.lower()
|
||||
|
||||
return cleaned_data
|
||||
|
||||
|
||||
class DomainNameserverForm(forms.Form):
|
||||
"""Form for changing nameservers."""
|
||||
|
|
|
@ -0,0 +1,235 @@
|
|||
import logging
|
||||
import argparse
|
||||
import sys
|
||||
|
||||
from django.core.management import BaseCommand
|
||||
|
||||
from registrar.management.commands.utility.terminal_helper import (
|
||||
TerminalColors,
|
||||
TerminalHelper,
|
||||
)
|
||||
from registrar.models.contact import Contact
|
||||
from registrar.models.user import User
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class Command(BaseCommand):
|
||||
help = """Copy first and last names from a contact to
|
||||
a related user if it exists and if its first and last name
|
||||
properties are null or blank strings."""
|
||||
|
||||
# ======================================================
|
||||
# ===================== ARGUMENTS =====================
|
||||
# ======================================================
|
||||
def add_arguments(self, parser):
|
||||
parser.add_argument("--debug", action=argparse.BooleanOptionalAction)
|
||||
|
||||
# ======================================================
|
||||
# ===================== PRINTING ======================
|
||||
# ======================================================
|
||||
def print_debug_mode_statements(self, debug_on: bool):
|
||||
"""Prints additional terminal statements to indicate if --debug
|
||||
or --limitParse are in use"""
|
||||
TerminalHelper.print_conditional(
|
||||
debug_on,
|
||||
f"""{TerminalColors.OKCYAN}
|
||||
----------DEBUG MODE ON----------
|
||||
Detailed print statements activated.
|
||||
{TerminalColors.ENDC}
|
||||
""",
|
||||
)
|
||||
|
||||
def print_summary_of_findings(
|
||||
self,
|
||||
skipped_contacts,
|
||||
eligible_users,
|
||||
processed_users,
|
||||
debug_on,
|
||||
):
|
||||
"""Prints to terminal a summary of findings from
|
||||
copying first and last names from contacts to users"""
|
||||
|
||||
total_eligible_users = len(eligible_users)
|
||||
total_skipped_contacts = len(skipped_contacts)
|
||||
total_processed_users = len(processed_users)
|
||||
|
||||
logger.info(
|
||||
f"""{TerminalColors.OKGREEN}
|
||||
============= FINISHED ===============
|
||||
Skipped {total_skipped_contacts} contacts
|
||||
Found {total_eligible_users} users linked to contacts
|
||||
Processed {total_processed_users} users
|
||||
{TerminalColors.ENDC}
|
||||
""" # noqa
|
||||
)
|
||||
|
||||
# DEBUG:
|
||||
TerminalHelper.print_conditional(
|
||||
debug_on,
|
||||
f"""{TerminalColors.YELLOW}
|
||||
======= DEBUG OUTPUT =======
|
||||
Users who have a linked contact:
|
||||
{eligible_users}
|
||||
|
||||
Processed users (users who have a linked contact and a missing first or last name):
|
||||
{processed_users}
|
||||
|
||||
===== SKIPPED CONTACTS =====
|
||||
{skipped_contacts}
|
||||
|
||||
{TerminalColors.ENDC}
|
||||
""",
|
||||
)
|
||||
|
||||
# ======================================================
|
||||
# =================== USER =====================
|
||||
# ======================================================
|
||||
def update_user(self, contact: Contact, debug_on: bool):
|
||||
"""Given a contact with a first_name and last_name, find & update an existing
|
||||
corresponding user if her first_name and last_name are null.
|
||||
|
||||
Returns tuple of eligible (is linked to the contact) and processed
|
||||
(first and last are blank) users.
|
||||
"""
|
||||
|
||||
user_exists = User.objects.filter(contact=contact).exists()
|
||||
if user_exists:
|
||||
try:
|
||||
# ----------------------- UPDATE USER -----------------------
|
||||
# ---- GET THE USER
|
||||
eligible_user = User.objects.get(contact=contact)
|
||||
processed_user = None
|
||||
# DEBUG:
|
||||
TerminalHelper.print_conditional(
|
||||
debug_on,
|
||||
f"""{TerminalColors.YELLOW}
|
||||
> Found linked user for contact:
|
||||
{contact} {contact.email} {contact.first_name} {contact.last_name}
|
||||
> The linked user is {eligible_user} {eligible_user.username}
|
||||
{TerminalColors.ENDC}""", # noqa
|
||||
)
|
||||
|
||||
# ---- UPDATE THE USER IF IT DOES NOT HAVE A FIRST AND LAST NAMES
|
||||
# ---- LET'S KEEP A LIGHT TOUCH
|
||||
if not eligible_user.first_name and not eligible_user.last_name:
|
||||
# (expression has type "str | None", variable has type "str | int | Combinable")
|
||||
# so we'll ignore type
|
||||
eligible_user.first_name = contact.first_name # type: ignore
|
||||
eligible_user.last_name = contact.last_name # type: ignore
|
||||
eligible_user.save()
|
||||
processed_user = eligible_user
|
||||
|
||||
return (
|
||||
eligible_user,
|
||||
processed_user,
|
||||
)
|
||||
|
||||
except Exception as error:
|
||||
logger.warning(
|
||||
f"""
|
||||
{TerminalColors.FAIL}
|
||||
!!! ERROR: An exception occured in the
|
||||
User table for the following user:
|
||||
{contact.email} {contact.first_name} {contact.last_name}
|
||||
|
||||
Exception is: {error}
|
||||
----------TERMINATING----------"""
|
||||
)
|
||||
sys.exit()
|
||||
else:
|
||||
return None, None
|
||||
|
||||
# ======================================================
|
||||
# ================= PROCESS CONTACTS ==================
|
||||
# ======================================================
|
||||
|
||||
def process_contacts(
|
||||
self,
|
||||
debug_on,
|
||||
skipped_contacts=[],
|
||||
eligible_users=[],
|
||||
processed_users=[],
|
||||
):
|
||||
for contact in Contact.objects.all():
|
||||
TerminalHelper.print_conditional(
|
||||
debug_on,
|
||||
f"{TerminalColors.OKCYAN}"
|
||||
"Processing Contact: "
|
||||
f"{contact.email},"
|
||||
f" {contact.first_name},"
|
||||
f" {contact.last_name}"
|
||||
f"{TerminalColors.ENDC}",
|
||||
)
|
||||
|
||||
# ======================================================
|
||||
# ====================== USER =======================
|
||||
(eligible_user, processed_user) = self.update_user(contact, debug_on)
|
||||
|
||||
debug_string = ""
|
||||
if eligible_user:
|
||||
# ---------------- UPDATED ----------------
|
||||
eligible_users.append(contact.email)
|
||||
debug_string = f"eligible user: {eligible_user}"
|
||||
if processed_user:
|
||||
processed_users.append(contact.email)
|
||||
debug_string = f"processed user: {processed_user}"
|
||||
else:
|
||||
skipped_contacts.append(contact.email)
|
||||
debug_string = f"skipped user: {contact.email}"
|
||||
|
||||
# DEBUG:
|
||||
TerminalHelper.print_conditional(
|
||||
debug_on,
|
||||
(f"{TerminalColors.OKCYAN} {debug_string} {TerminalColors.ENDC}"),
|
||||
)
|
||||
|
||||
return (
|
||||
skipped_contacts,
|
||||
eligible_users,
|
||||
processed_users,
|
||||
)
|
||||
|
||||
# ======================================================
|
||||
# ===================== HANDLE ========================
|
||||
# ======================================================
|
||||
def handle(
|
||||
self,
|
||||
**options,
|
||||
):
|
||||
"""Parse entries in Contact table
|
||||
and update valid corresponding entries in the
|
||||
User table."""
|
||||
|
||||
# grab command line arguments and store locally...
|
||||
debug_on = options.get("debug")
|
||||
|
||||
self.print_debug_mode_statements(debug_on)
|
||||
|
||||
logger.info(
|
||||
f"""{TerminalColors.OKCYAN}
|
||||
==========================
|
||||
Beginning Data Transfer
|
||||
==========================
|
||||
{TerminalColors.ENDC}"""
|
||||
)
|
||||
|
||||
logger.info(
|
||||
f"""{TerminalColors.OKCYAN}
|
||||
========= Adding Domains and Domain Invitations =========
|
||||
{TerminalColors.ENDC}"""
|
||||
)
|
||||
(
|
||||
skipped_contacts,
|
||||
eligible_users,
|
||||
processed_users,
|
||||
) = self.process_contacts(
|
||||
debug_on,
|
||||
)
|
||||
|
||||
self.print_summary_of_findings(
|
||||
skipped_contacts,
|
||||
eligible_users,
|
||||
processed_users,
|
||||
debug_on,
|
||||
)
|
|
@ -536,19 +536,27 @@ class Command(BaseCommand):
|
|||
domain_name=new_entry_domain_name,
|
||||
)
|
||||
|
||||
if existing_entry.status != new_entry_status:
|
||||
# DEBUG:
|
||||
if not existing_entry.processed:
|
||||
if existing_entry.status != new_entry_status:
|
||||
TerminalHelper.print_conditional(
|
||||
debug_on,
|
||||
f"{TerminalColors.OKCYAN}"
|
||||
f"Updating entry: {existing_entry}"
|
||||
f"Status: {existing_entry.status} > {new_entry_status}" # noqa
|
||||
f"Email Sent: {existing_entry.email_sent} > {new_entry_emailSent}" # noqa
|
||||
f"{TerminalColors.ENDC}",
|
||||
)
|
||||
existing_entry.status = new_entry_status
|
||||
existing_entry.email_sent = new_entry_emailSent
|
||||
existing_entry.save()
|
||||
else:
|
||||
TerminalHelper.print_conditional(
|
||||
debug_on,
|
||||
f"{TerminalColors.OKCYAN}"
|
||||
f"Updating entry: {existing_entry}"
|
||||
f"Status: {existing_entry.status} > {new_entry_status}" # noqa
|
||||
f"Email Sent: {existing_entry.email_sent} > {new_entry_emailSent}" # noqa
|
||||
f"{TerminalColors.YELLOW}"
|
||||
f"Skipping update on processed domain: {existing_entry}"
|
||||
f"{TerminalColors.ENDC}",
|
||||
)
|
||||
existing_entry.status = new_entry_status
|
||||
existing_entry.email_sent = new_entry_emailSent
|
||||
existing_entry.save()
|
||||
|
||||
except TransitionDomain.MultipleObjectsReturned:
|
||||
logger.info(
|
||||
f"{TerminalColors.FAIL}"
|
||||
|
@ -558,6 +566,7 @@ class Command(BaseCommand):
|
|||
f"----------TERMINATING----------"
|
||||
)
|
||||
sys.exit()
|
||||
|
||||
else:
|
||||
# no matching entry, make one
|
||||
new_entry = TransitionDomain(
|
||||
|
@ -565,6 +574,7 @@ class Command(BaseCommand):
|
|||
domain_name=new_entry_domain_name,
|
||||
status=new_entry_status,
|
||||
email_sent=new_entry_emailSent,
|
||||
processed=False,
|
||||
)
|
||||
to_create.append(new_entry)
|
||||
total_new_entries += 1
|
||||
|
|
|
@ -559,7 +559,8 @@ class Command(BaseCommand):
|
|||
debug_max_entries_to_parse,
|
||||
total_rows_parsed,
|
||||
):
|
||||
for transition_domain in TransitionDomain.objects.all():
|
||||
changed_transition_domains = TransitionDomain.objects.filter(processed=False)
|
||||
for transition_domain in changed_transition_domains:
|
||||
(
|
||||
target_domain_information,
|
||||
associated_domain,
|
||||
|
@ -644,7 +645,8 @@ class Command(BaseCommand):
|
|||
debug_max_entries_to_parse,
|
||||
total_rows_parsed,
|
||||
):
|
||||
for transition_domain in TransitionDomain.objects.all():
|
||||
changed_transition_domains = TransitionDomain.objects.filter(processed=False)
|
||||
for transition_domain in changed_transition_domains:
|
||||
# Create some local variables to make data tracing easier
|
||||
transition_domain_name = transition_domain.domain_name
|
||||
transition_domain_status = transition_domain.status
|
||||
|
@ -796,6 +798,7 @@ class Command(BaseCommand):
|
|||
|
||||
# First, save all Domain objects to the database
|
||||
Domain.objects.bulk_create(domains_to_create)
|
||||
|
||||
# DomainInvitation.objects.bulk_create(domain_invitations_to_create)
|
||||
|
||||
# TODO: this is to resolve an error where bulk_create
|
||||
|
@ -847,6 +850,15 @@ class Command(BaseCommand):
|
|||
)
|
||||
DomainInformation.objects.bulk_create(domain_information_to_create)
|
||||
|
||||
# Loop through the list of everything created, and mark it as processed
|
||||
for domain in domains_to_create:
|
||||
name = domain.name
|
||||
TransitionDomain.objects.filter(domain_name=name).update(processed=True)
|
||||
|
||||
# Loop through the list of everything updated, and mark it as processed
|
||||
for name in updated_domain_entries:
|
||||
TransitionDomain.objects.filter(domain_name=name).update(processed=True)
|
||||
|
||||
self.print_summary_of_findings(
|
||||
domains_to_create,
|
||||
updated_domain_entries,
|
||||
|
|
|
@ -155,13 +155,13 @@ class LoadExtraTransitionDomain:
|
|||
def update_transition_domain_models(self):
|
||||
"""Updates TransitionDomain objects based off the file content
|
||||
given in self.parsed_data_container"""
|
||||
all_transition_domains = TransitionDomain.objects.all()
|
||||
if not all_transition_domains.exists():
|
||||
raise ValueError("No TransitionDomain objects exist.")
|
||||
valid_transition_domains = TransitionDomain.objects.filter(processed=False)
|
||||
if not valid_transition_domains.exists():
|
||||
raise ValueError("No updatable TransitionDomain objects exist.")
|
||||
|
||||
updated_transition_domains = []
|
||||
failed_transition_domains = []
|
||||
for transition_domain in all_transition_domains:
|
||||
for transition_domain in valid_transition_domains:
|
||||
domain_name = transition_domain.domain_name
|
||||
updated_transition_domain = transition_domain
|
||||
try:
|
||||
|
@ -228,7 +228,7 @@ class LoadExtraTransitionDomain:
|
|||
# DATA INTEGRITY CHECK
|
||||
# Make sure every Transition Domain got updated
|
||||
total_transition_domains = len(updated_transition_domains)
|
||||
total_updates_made = TransitionDomain.objects.all().count()
|
||||
total_updates_made = TransitionDomain.objects.filter(processed=False).count()
|
||||
if total_transition_domains != total_updates_made:
|
||||
# noqa here for line length
|
||||
logger.error(
|
||||
|
@ -787,7 +787,7 @@ class OrganizationDataLoader:
|
|||
self.tds_to_update: List[TransitionDomain] = []
|
||||
|
||||
def update_organization_data_for_all(self):
|
||||
"""Updates org address data for all TransitionDomains"""
|
||||
"""Updates org address data for valid TransitionDomains"""
|
||||
all_transition_domains = TransitionDomain.objects.all()
|
||||
if len(all_transition_domains) == 0:
|
||||
raise LoadOrganizationError(code=LoadOrganizationErrorCodes.EMPTY_TRANSITION_DOMAIN_TABLE)
|
||||
|
|
21
src/registrar/migrations/0055_transitiondomain_processed.py
Normal file
21
src/registrar/migrations/0055_transitiondomain_processed.py
Normal file
|
@ -0,0 +1,21 @@
|
|||
# Generated by Django 4.2.7 on 2023-12-12 21:46
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
("registrar", "0054_alter_domainapplication_federal_agency_and_more"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="transitiondomain",
|
||||
name="processed",
|
||||
field=models.BooleanField(
|
||||
default=True,
|
||||
help_text="Indicates whether this TransitionDomain was already processed",
|
||||
verbose_name="Processed",
|
||||
),
|
||||
),
|
||||
]
|
|
@ -6,7 +6,7 @@ import django_fsm
|
|||
|
||||
class Migration(migrations.Migration):
|
||||
dependencies = [
|
||||
("registrar", "0054_alter_domainapplication_federal_agency_and_more"),
|
||||
("registrar", "0055_transitiondomain_processed"),
|
||||
]
|
||||
|
||||
operations = [
|
|
@ -59,6 +59,16 @@ class Contact(TimeStampedModel):
|
|||
names = [n for n in [self.first_name, self.middle_name, self.last_name] if n]
|
||||
return " ".join(names) if names else "Unknown"
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
# Call the parent class's save method to perform the actual save
|
||||
super().save(*args, **kwargs)
|
||||
|
||||
# Update the related User object's first_name and last_name
|
||||
if self.user:
|
||||
self.user.first_name = self.first_name
|
||||
self.user.last_name = self.last_name
|
||||
self.user.save()
|
||||
|
||||
def __str__(self):
|
||||
if self.first_name or self.last_name:
|
||||
return self.get_formatted_name()
|
||||
|
|
|
@ -43,6 +43,12 @@ class TransitionDomain(TimeStampedModel):
|
|||
verbose_name="email sent",
|
||||
help_text="indicates whether email was sent",
|
||||
)
|
||||
processed = models.BooleanField(
|
||||
null=False,
|
||||
default=True,
|
||||
verbose_name="Processed",
|
||||
help_text="Indicates whether this TransitionDomain was already processed",
|
||||
)
|
||||
organization_type = models.TextField(
|
||||
max_length=255,
|
||||
null=True,
|
||||
|
|
|
@ -101,7 +101,7 @@ class User(AbstractUser):
|
|||
"""When a user first arrives on the site, we need to retrieve any domain
|
||||
invitations that match their email address."""
|
||||
for invitation in DomainInvitation.objects.filter(
|
||||
email=self.email, status=DomainInvitation.DomainInvitationStatus.INVITED
|
||||
email__iexact=self.email, status=DomainInvitation.DomainInvitationStatus.INVITED
|
||||
):
|
||||
try:
|
||||
invitation.retrieve()
|
||||
|
|
|
@ -12,9 +12,11 @@
|
|||
<p>You can enter your name servers, as well as other DNS-related information, in the following sections:</p>
|
||||
|
||||
{% url 'domain-dns-nameservers' pk=domain.id as url %}
|
||||
<p><a href="{{ url }}">DNS name servers</a></p>
|
||||
<ul>
|
||||
<li><a href="{{ url }}">Name servers</a></li>
|
||||
|
||||
{% url 'domain-dns-dnssec' pk=domain.id as url %}
|
||||
<p><a href="{{ url }}">DNSSEC</a></p>
|
||||
<li><a href="{{ url }}">DNSSEC</a></li>
|
||||
</ul>
|
||||
|
||||
{% endblock %} {# domain_content #}
|
||||
|
|
|
@ -14,7 +14,7 @@ Now that your .gov domain has been approved, there are a few more things to do b
|
|||
YOU MUST ADD DOMAIN NAME SERVER INFORMATION
|
||||
|
||||
Before your .gov domain can be used, you have to connect it to your Domain Name System (DNS) hosting service. At this time, we don’t provide DNS hosting services.
|
||||
Go to the domain management page to add your domain name server information <https://registrar.get.gov/domain/{{ application.id }}/nameservers>.
|
||||
Go to the domain management page to add your domain name server information <https://manage.get.gov/domain/{{ application.approved_domain.id }}/nameservers>.
|
||||
|
||||
Get help with adding your domain name server information <https://get.gov/help/domain-management/#manage-dns-information-for-your-domain>.
|
||||
|
||||
|
@ -23,7 +23,7 @@ ADD DOMAIN MANAGERS, SECURITY EMAIL
|
|||
|
||||
We strongly recommend that you add other points of contact who will help manage your domain. We also recommend that you provide a security email. This email will allow the public to report security issues on your domain. Security emails are made public.
|
||||
|
||||
Go to the domain management page to add domain contacts <https://registrar.get.gov/domain/{{ application.id }}/your-contact-information> and a security email <https://registrar.get.gov/domain/{{ application.id }}/security-email>.
|
||||
Go to the domain management page to add domain contacts <https://manage.get.gov/domain/{{ application.approved_domain.id }}/your-contact-information> and a security email <https://manage.get.gov/domain/{{ application.approved_domain.id }}/security-email>.
|
||||
|
||||
Get help with managing your .gov domain <https://get.gov/help/domain-management/>.
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ NEXT STEPS
|
|||
- We’re reviewing your request. This usually takes 20 business days.
|
||||
|
||||
- You can check the status of your request at any time.
|
||||
<https://registrar.get.gov/application/{{ application.id }}>
|
||||
<https://manage.get.gov/application/{{ application.id }}>
|
||||
|
||||
- We’ll email you with questions or when we complete our review.
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@ NEXT STEPS
|
|||
- We’ll review your request. This usually takes 20 business days.
|
||||
|
||||
- You can check the status of your request at any time.
|
||||
<https://registrar.get.gov/application/{{ application.id }}>
|
||||
<https://manage.get.gov/application/{{ application.id }}>
|
||||
|
||||
- We’ll email you with questions or when we complete our review.
|
||||
|
||||
|
|
|
@ -87,7 +87,7 @@
|
|||
aria-live="polite"
|
||||
></div>
|
||||
{% else %}
|
||||
<p>You don't have any registered domains yet</p>
|
||||
<p>You don't have any registered domains.</p>
|
||||
{% endif %}
|
||||
</section>
|
||||
|
||||
|
@ -95,7 +95,7 @@
|
|||
<h2>Domain requests</h2>
|
||||
{% if domain_applications %}
|
||||
<table class="usa-table usa-table--borderless usa-table--stacked dotgov-table dotgov-table--stacked">
|
||||
<caption class="sr-only">Your domain applications</caption>
|
||||
<caption class="sr-only">Your domain requests</caption>
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-sortable scope="col" role="columnheader">Domain name</th>
|
||||
|
@ -138,7 +138,7 @@
|
|||
aria-live="polite"
|
||||
></div>
|
||||
{% else %}
|
||||
<p>You don't have any active domain requests right now</p>
|
||||
<p>You haven't requested any domains.</p>
|
||||
<!-- <p><a href="{% url 'application:' %}" class="usa-button">Start a new domain request</a></p> -->
|
||||
{% endif %}
|
||||
</section>
|
||||
|
|
|
@ -1,50 +1,62 @@
|
|||
{% if is_federal %}
|
||||
{% if federal_type == 'executive' %}
|
||||
<p>Domain requests from executive branch agencies must be authorized by <strong>Chief Information Officers</strong> or <strong>agency heads</strong>.</p>
|
||||
<p>Domain requests from executive branch agencies are subject to guidance issued by the U.S. Office of Management and Budget. </p>
|
||||
<h3>Executive branch federal agencies</h3>
|
||||
<p>Domain requests from executive branch federal agencies must be authorized by the agency's CIO or the head of the agency.</p>
|
||||
<p>See <a class="usa-link usa-link--external" rel="noopener noreferrer" target="_blank" href="https://www.whitehouse.gov/wp-content/uploads/2023/02/M-23-10-DOTGOV-Act-Guidance.pdf">OMB Memorandum M-23-10</a> for more information.</p>
|
||||
|
||||
{% elif federal_type == 'judicial' %}
|
||||
<p>Domain requests from the U.S. Supreme Court must be authorized by the <strong>director of information technology for the U.S. Supreme Court.</strong></p>
|
||||
<p>Domain requests from other judicial branch agencies must be authorized by the <strong>director</strong> or <strong>Chief Information Officer of the Administrative Office (AO)</strong> of the United States Courts.
|
||||
</p>
|
||||
<h3>Judicial branch federal agencies</h3>
|
||||
<p>Domain requests for judicial branch federal agencies, except the U.S. Supreme Court, must be authorized by the director or CIO of the Administrative Office (AO) of the United States Courts.</p>
|
||||
<p>Domain requests from the U.S. Supreme Court must be authorized by the director of information technology for the U.S. Supreme Court.</p>
|
||||
|
||||
{% elif federal_type == 'legislative' %}
|
||||
<h3> U.S. Senate </h3>
|
||||
<p>Domain requests from the U.S. Senate must come from the <strong>Senate Sergeant at Arms.</strong></p>
|
||||
<h3>Legislative branch federal agencies</h3>
|
||||
|
||||
<h3> U.S. House of Representatives </h3>
|
||||
<p class="">Domain requests from the U.S. House of Representatives must come from the <strong>House Chief Administrative Officer.</strong>
|
||||
<h4>U.S. Senate</h4>
|
||||
<p>Domain requests from the U.S. Senate must come from the Senate Sergeant at Arms.</p>
|
||||
|
||||
<h3> Other legislative branch agencies </h3>
|
||||
<p class="margin-top-1">Domain requests from legislative branch agencies must come from the <strong>agency’s head</strong> or <strong>Chief Information Officer.</strong></p>
|
||||
<p class="margin-top-1">Domain requests from legislative commissions must come from the <strong>head of the commission</strong>, or the <strong>head or Chief Information Officer of the parent agency,</strong> if there is one.
|
||||
</p>
|
||||
<h4>U.S. House of Representatives</h4>
|
||||
<p>Domain requests from the U.S. House of Representatives must come from the House Chief Administrative Officer.</p>
|
||||
|
||||
<h4>Other legislative branch agencies</h4>
|
||||
<p>Domain requests from legislative branch agencies must come from the agency’s head or CIO.</p>
|
||||
<p>Domain requests from legislative commissions must come from the head of the commission, or the head or CIO of the parent agency, if there is one.</p>
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% elif organization_type == 'city' %}
|
||||
<p>Domain requests from cities must be authorized by <strong>the mayor</strong> or the equivalent <strong>highest-elected official.</strong></p>
|
||||
<h3>Cities</h3>
|
||||
<p>Domain requests from cities must be authorized by someone in a role of significant, executive responsibility within the city (mayor, council president, city manager, township/village supervisor, select board chairperson, chief, senior technology officer, or equivalent).</p>
|
||||
|
||||
{% elif organization_type == 'county' %}
|
||||
<p>Domain requests from counties must be authorized by the <strong>chair of the county commission </strong>or <strong>the equivalent highest-elected official.</strong></p>
|
||||
<h3>Counties</h3>
|
||||
<p>Domain requests from counties must be authorized by the commission chair or someone in a role of significant, executive responsibility within the county (county judge, county mayor, parish/borough president, senior technology officer, or equivalent). Other county-level offices (county clerk, sheriff, county auditor, comptroller) may qualify, as well, in some instances.</p>
|
||||
|
||||
{% elif organization_type == 'interstate' %}
|
||||
<p>Domain requests from interstate organizations must be authorized by the <strong>highest-ranking executive</strong> (president, director, chair, or equivalent) or <strong>one of the state’s governors or Chief Information Officers.</strong></p>
|
||||
<h3>Interstate organizations</h3>
|
||||
<p>Domain requests from interstate organizations must be authorized by someone in a role of significant, executive responsibility within the organization (president, director, chair, senior technology officer, or equivalent) or one of the state’s governors or CIOs.</p>
|
||||
|
||||
{% elif organization_type == 'school_district' %}
|
||||
<p>Domain requests from school district governments must be authorized by the <strong>highest-ranking executive (the chair of a school district’s board or a superintendent)</strong>.</p>
|
||||
<h3>School districts</h3>
|
||||
<p>Domain requests from school district governments must be authorized by someone in a role of significant, executive responsibility within the district (board chair, superintendent, senior technology officer, or equivalent).</p>
|
||||
|
||||
{% elif organization_type == 'special_district' %}
|
||||
<p>Domain requests from special districts must be authorized by the <strong>highest-ranking executive (president, director, chair, or equivalent)</strong> or <strong>state Chief Information Officers for state-based organizations</strong>.</p>
|
||||
<h3>Special districts</h3>
|
||||
<p>Domain requests from special districts must be authorized by someone in a role of significant, executive responsibility within the district (CEO, chair, executive director, senior technology officer, or equivalent).
|
||||
</p>
|
||||
|
||||
{% elif organization_type == 'state_or_territory' %}
|
||||
<h3>States and territories: executive branch</h3>
|
||||
<p>Domain requests from states and territories must be authorized by the <strong>governor</strong> or the <strong>state Chief Information Officer.</strong></p>
|
||||
<h3>States and territories: judicial and legislative branches</h3>
|
||||
<p>Domain requests from state legislatures and courts must be authorized by an agency’s <strong>Chief Information Officer</strong> or <strong>highest-ranking executive</strong>.</p>
|
||||
<h3>U.S. states and territories</h3>
|
||||
|
||||
<h4>States and territories: executive branch</h4>
|
||||
<p>Domain requests from states and territories must be authorized by the governor or someone in a role of significant, executive responsibility within the agency (department secretary, senior technology officer, or equivalent).</p>
|
||||
|
||||
<h4>States and territories: judicial and legislative branches</h4>
|
||||
<p>Domain requests from state legislatures and courts must be authorized by an agency’s CIO or someone in a role of significant, executive responsibility within the agency.</p>
|
||||
|
||||
{% elif organization_type == 'tribal' %}
|
||||
<p><strong>Domain requests from federally-recognized tribal governments must be authorized by the leader of the tribe</strong>, as recognized by the <a class="usa-link usa-link--external" rel="noopener noreferrer" target="_blank" href="https://www.bia.gov/service/tribal-leaders-directory">Bureau of Indian Affairs</a>.</p>
|
||||
<p><strong>Domain requests from state-recognized tribal governments must be authorized by the leader of the tribe</strong>, as determined by the state’s tribal recognition initiative.</p>
|
||||
<h3>Tribal governments</h3>
|
||||
<p>Domain requests from federally-recognized tribal governments must be authorized by the tribal leader the <a class="usa-link usa-link--external" rel="noopener noreferrer" target="_blank" href="https://www.bia.gov/service/tribal-leaders-directory">Bureau of Indian Affairs</a> recognizes.</p>
|
||||
<p>Domain requests from state-recognized tribal governments must be authorized by the tribal leader the individual state recognizes.</p>
|
||||
|
||||
{% endif %}
|
||||
|
|
|
@ -5,6 +5,7 @@ import logging
|
|||
from contextlib import contextmanager
|
||||
import random
|
||||
from string import ascii_uppercase
|
||||
import uuid
|
||||
from django.test import TestCase
|
||||
from unittest.mock import MagicMock, Mock, patch
|
||||
from typing import List, Dict
|
||||
|
@ -161,7 +162,7 @@ class AuditedAdminMockData:
|
|||
user = User.objects.get_or_create(
|
||||
first_name="{} first_name:{}".format(item_name, short_hand),
|
||||
last_name="{} last_name:{}".format(item_name, short_hand),
|
||||
username="{} username:{}".format(item_name, short_hand),
|
||||
username="{} username:{}".format(item_name + str(uuid.uuid4())[:8], short_hand),
|
||||
)[0]
|
||||
return user
|
||||
|
||||
|
@ -405,8 +406,8 @@ def mock_user():
|
|||
"""A simple user."""
|
||||
user_kwargs = dict(
|
||||
id=4,
|
||||
first_name="Rachid",
|
||||
last_name="Mrad",
|
||||
first_name="Jeff",
|
||||
last_name="Lebowski",
|
||||
)
|
||||
mock_user, _ = User.objects.get_or_create(**user_kwargs)
|
||||
return mock_user
|
||||
|
|
|
@ -1023,7 +1023,7 @@ class ListHeaderAdminTest(TestCase):
|
|||
# Set the GET parameters for testing
|
||||
request.GET = {
|
||||
"status": "started",
|
||||
"investigator": "Rachid Mrad",
|
||||
"investigator": "Jeff Lebowski",
|
||||
"q": "search_value",
|
||||
}
|
||||
# Call the get_filters method
|
||||
|
@ -1034,7 +1034,7 @@ class ListHeaderAdminTest(TestCase):
|
|||
filters,
|
||||
[
|
||||
{"parameter_name": "status", "parameter_value": "started"},
|
||||
{"parameter_name": "investigator", "parameter_value": "Rachid Mrad"},
|
||||
{"parameter_name": "investigator", "parameter_value": "Jeff Lebowski"},
|
||||
],
|
||||
)
|
||||
|
||||
|
@ -1110,8 +1110,8 @@ class AuditedAdminTest(TestCase):
|
|||
tested_fields = [
|
||||
DomainApplication.authorizing_official.field,
|
||||
DomainApplication.submitter.field,
|
||||
DomainApplication.investigator.field,
|
||||
DomainApplication.creator.field,
|
||||
# DomainApplication.investigator.field,
|
||||
# DomainApplication.creator.field,
|
||||
DomainApplication.requested_domain.field,
|
||||
]
|
||||
|
||||
|
@ -1166,7 +1166,7 @@ class AuditedAdminTest(TestCase):
|
|||
tested_fields = [
|
||||
DomainInformation.authorizing_official.field,
|
||||
DomainInformation.submitter.field,
|
||||
DomainInformation.creator.field,
|
||||
# DomainInformation.creator.field,
|
||||
(DomainInformation.domain.field, ["name"]),
|
||||
(DomainInformation.domain_application.field, ["requested_domain__name"]),
|
||||
]
|
||||
|
|
|
@ -0,0 +1,98 @@
|
|||
from django.test import TestCase
|
||||
|
||||
from registrar.models import (
|
||||
User,
|
||||
Contact,
|
||||
)
|
||||
|
||||
from registrar.management.commands.copy_names_from_contacts_to_users import Command
|
||||
|
||||
|
||||
class TestDataUpdates(TestCase):
|
||||
def setUp(self):
|
||||
"""We cannot setup the user details because contacts will override the first and last names in its save method
|
||||
so we will initiate the users, setup the contacts and link them, and leave the rest of the setup to the test(s).
|
||||
"""
|
||||
|
||||
self.user1 = User.objects.create(username="user1")
|
||||
self.user2 = User.objects.create(username="user2")
|
||||
self.user3 = User.objects.create(username="user3")
|
||||
self.user4 = User.objects.create(username="user4")
|
||||
# The last user created triggers the creation of a contact and attaches itself to it. @Neil wth is going on?
|
||||
# This bs_user defuses that situation so we can test the code.
|
||||
self.bs_user = User.objects.create()
|
||||
|
||||
self.contact1 = Contact.objects.create(
|
||||
user=self.user1, email="email1@igorville.gov", first_name="first1", last_name="last1"
|
||||
)
|
||||
self.contact2 = Contact.objects.create(
|
||||
user=self.user2, email="email2@igorville.gov", first_name="first2", last_name="last2"
|
||||
)
|
||||
self.contact3 = Contact.objects.create(
|
||||
user=self.user3, email="email3@igorville.gov", first_name="first3", last_name="last3"
|
||||
)
|
||||
self.contact4 = Contact.objects.create(email="email4@igorville.gov", first_name="first4", last_name="last4")
|
||||
|
||||
self.command = Command()
|
||||
|
||||
def tearDown(self):
|
||||
"""Clean up"""
|
||||
# Delete users and contacts
|
||||
User.objects.all().delete()
|
||||
Contact.objects.all().delete()
|
||||
|
||||
def test_script_updates_linked_users(self):
|
||||
"""Test the script that copies contacts' first and last names into associated users that
|
||||
are eligible (first or last are blank or undefined)"""
|
||||
|
||||
# Set up the users' first and last names here so
|
||||
# they that they don't get overwritten by Contact's save()
|
||||
# User with no first or last names
|
||||
self.user1.first_name = ""
|
||||
self.user1.last_name = ""
|
||||
self.user1.save()
|
||||
|
||||
# User with a first name but no last name
|
||||
self.user2.first_name = "First name but no last name"
|
||||
self.user2.last_name = ""
|
||||
self.user2.save()
|
||||
|
||||
# User with a first and last name
|
||||
self.user3.first_name = "An existing first name"
|
||||
self.user3.last_name = "An existing last name"
|
||||
self.user3.save()
|
||||
|
||||
# Call the parent method the same way we do it in the script
|
||||
skipped_contacts = []
|
||||
eligible_users = []
|
||||
processed_users = []
|
||||
(
|
||||
skipped_contacts,
|
||||
eligible_users,
|
||||
processed_users,
|
||||
) = self.command.process_contacts(
|
||||
# Set debugging to False
|
||||
False,
|
||||
skipped_contacts,
|
||||
eligible_users,
|
||||
processed_users,
|
||||
)
|
||||
|
||||
# Trigger DB refresh
|
||||
self.user1.refresh_from_db()
|
||||
self.user2.refresh_from_db()
|
||||
self.user3.refresh_from_db()
|
||||
|
||||
# Asserts
|
||||
# The user that has no first and last names will get them from the contact
|
||||
self.assertEqual(self.user1.first_name, "first1")
|
||||
self.assertEqual(self.user1.last_name, "last1")
|
||||
# The user that has a first but no last will be left alone
|
||||
self.assertEqual(self.user2.first_name, "First name but no last name")
|
||||
self.assertEqual(self.user2.last_name, "")
|
||||
# The user that has a first and a last will be left alone
|
||||
self.assertEqual(self.user3.first_name, "An existing first name")
|
||||
self.assertEqual(self.user3.last_name, "An existing last name")
|
||||
# The unlinked user will be left alone
|
||||
self.assertEqual(self.user4.first_name, "")
|
||||
self.assertEqual(self.user4.last_name, "")
|
|
@ -654,3 +654,62 @@ class TestUser(TestCase):
|
|||
"""A new user who's neither transitioned nor invited should
|
||||
return True when tested with class method needs_identity_verification"""
|
||||
self.assertTrue(User.needs_identity_verification(self.user.email, self.user.username))
|
||||
|
||||
def test_check_domain_invitations_on_login_caps_email(self):
|
||||
"""A DomainInvitation with an email address with capital letters should match
|
||||
a User record whose email address is not in caps"""
|
||||
# create DomainInvitation with CAPS email that matches User email
|
||||
# on a case-insensitive match
|
||||
caps_email = "MAYOR@igorville.gov"
|
||||
# mock the domain invitation save routine
|
||||
with patch("registrar.models.DomainInvitation.save") as save_mock:
|
||||
DomainInvitation.objects.get_or_create(email=caps_email, domain=self.domain)
|
||||
self.user.check_domain_invitations_on_login()
|
||||
# if check_domain_invitations_on_login properly matches exactly one
|
||||
# Domain Invitation, then save routine should be called exactly once
|
||||
save_mock.assert_called_once()
|
||||
|
||||
|
||||
class TestContact(TestCase):
|
||||
def setUp(self):
|
||||
self.email = "mayor@igorville.gov"
|
||||
self.user, _ = User.objects.get_or_create(email=self.email, first_name="Jeff", last_name="Lebowski")
|
||||
self.contact, _ = Contact.objects.get_or_create(user=self.user)
|
||||
|
||||
def tearDown(self):
|
||||
super().tearDown()
|
||||
Contact.objects.all().delete()
|
||||
User.objects.all().delete()
|
||||
|
||||
def test_saving_contact_updates_user_first_last_names(self):
|
||||
"""When a contact is updated, we propagate the changes to the linked user if it exists."""
|
||||
# User and Contact are created and linked as expected
|
||||
self.assertEqual(self.contact.first_name, "Jeff")
|
||||
self.assertEqual(self.contact.last_name, "Lebowski")
|
||||
self.assertEqual(self.user.first_name, "Jeff")
|
||||
self.assertEqual(self.user.last_name, "Lebowski")
|
||||
|
||||
self.contact.first_name = "Joey"
|
||||
self.contact.last_name = "Baloney"
|
||||
self.contact.save()
|
||||
|
||||
# Refresh the user object to reflect the changes made in the database
|
||||
self.user.refresh_from_db()
|
||||
|
||||
# Updating the contact's first and last names propagate to the user
|
||||
self.assertEqual(self.contact.first_name, "Joey")
|
||||
self.assertEqual(self.contact.last_name, "Baloney")
|
||||
self.assertEqual(self.user.first_name, "Joey")
|
||||
self.assertEqual(self.user.last_name, "Baloney")
|
||||
|
||||
def test_saving_contact_does_not_update_user_email(self):
|
||||
"""When a contact's email is updated, the change is not propagated to the lined user."""
|
||||
self.contact.email = "joey.baloney@diaperville.com"
|
||||
self.contact.save()
|
||||
|
||||
# Refresh the user object to reflect the changes made in the database
|
||||
self.user.refresh_from_db()
|
||||
|
||||
# Updating the contact's email does not propagate
|
||||
self.assertEqual(self.contact.email, "joey.baloney@diaperville.com")
|
||||
self.assertEqual(self.user.email, "mayor@igorville.gov")
|
||||
|
|
|
@ -161,6 +161,155 @@ class TestExtendExpirationDates(MockEppLib):
|
|||
self.assertEqual(desired_domain.expiration_date, datetime.date(2024, 11, 15))
|
||||
|
||||
|
||||
class TestProcessedMigrations(TestCase):
|
||||
"""This test case class is designed to verify the idempotency of migrations
|
||||
related to domain transitions in the application."""
|
||||
|
||||
def setUp(self):
|
||||
"""Defines the file name of migration_json and the folder its contained in"""
|
||||
self.test_data_file_location = "registrar/tests/data"
|
||||
self.migration_json_filename = "test_migrationFilepaths.json"
|
||||
self.user, _ = User.objects.get_or_create(username="igorvillian")
|
||||
|
||||
def tearDown(self):
|
||||
"""Deletes all DB objects related to migrations"""
|
||||
# Delete domain information
|
||||
Domain.objects.all().delete()
|
||||
DomainInformation.objects.all().delete()
|
||||
DomainInvitation.objects.all().delete()
|
||||
TransitionDomain.objects.all().delete()
|
||||
|
||||
# Delete users
|
||||
User.objects.all().delete()
|
||||
UserDomainRole.objects.all().delete()
|
||||
|
||||
def run_load_domains(self):
|
||||
"""
|
||||
This method executes the load_transition_domain command.
|
||||
|
||||
It uses 'unittest.mock.patch' to mock the TerminalHelper.query_yes_no_exit method,
|
||||
which is a user prompt in the terminal. The mock function always returns True,
|
||||
allowing the test to proceed without manual user input.
|
||||
|
||||
The 'call_command' function from Django's management framework is then used to
|
||||
execute the load_transition_domain command with the specified arguments.
|
||||
"""
|
||||
# noqa here because splitting this up makes it confusing.
|
||||
# ES501
|
||||
with patch(
|
||||
"registrar.management.commands.utility.terminal_helper.TerminalHelper.query_yes_no_exit", # noqa
|
||||
return_value=True,
|
||||
):
|
||||
call_command(
|
||||
"load_transition_domain",
|
||||
self.migration_json_filename,
|
||||
directory=self.test_data_file_location,
|
||||
)
|
||||
|
||||
def run_transfer_domains(self):
|
||||
"""
|
||||
This method executes the transfer_transition_domains_to_domains command.
|
||||
|
||||
The 'call_command' function from Django's management framework is then used to
|
||||
execute the load_transition_domain command with the specified arguments.
|
||||
"""
|
||||
call_command("transfer_transition_domains_to_domains")
|
||||
|
||||
def test_domain_idempotent(self):
|
||||
"""
|
||||
This test ensures that the domain transfer process
|
||||
is idempotent on Domain and DomainInformation.
|
||||
"""
|
||||
unchanged_domain, _ = Domain.objects.get_or_create(
|
||||
name="testdomain.gov",
|
||||
state=Domain.State.READY,
|
||||
expiration_date=datetime.date(2000, 1, 1),
|
||||
)
|
||||
unchanged_domain_information, _ = DomainInformation.objects.get_or_create(
|
||||
domain=unchanged_domain, organization_name="test org name", creator=self.user
|
||||
)
|
||||
self.run_load_domains()
|
||||
|
||||
# Test that a given TransitionDomain isn't set to "processed"
|
||||
transition_domain_object = TransitionDomain.objects.get(domain_name="fakewebsite3.gov")
|
||||
self.assertFalse(transition_domain_object.processed)
|
||||
|
||||
self.run_transfer_domains()
|
||||
|
||||
# Test that old data isn't corrupted
|
||||
actual_unchanged = Domain.objects.filter(name="testdomain.gov").get()
|
||||
actual_unchanged_information = DomainInformation.objects.filter(domain=actual_unchanged).get()
|
||||
self.assertEqual(unchanged_domain, actual_unchanged)
|
||||
self.assertEqual(unchanged_domain_information, actual_unchanged_information)
|
||||
|
||||
# Test that a given TransitionDomain is set to "processed" after we transfer domains
|
||||
transition_domain_object = TransitionDomain.objects.get(domain_name="fakewebsite3.gov")
|
||||
self.assertTrue(transition_domain_object.processed)
|
||||
|
||||
# Manually change Domain/DomainInformation objects
|
||||
changed_domain = Domain.objects.filter(name="fakewebsite3.gov").get()
|
||||
changed_domain.expiration_date = datetime.date(1999, 1, 1)
|
||||
|
||||
changed_domain.save()
|
||||
|
||||
changed_domain_information = DomainInformation.objects.filter(domain=changed_domain).get()
|
||||
changed_domain_information.organization_name = "changed"
|
||||
|
||||
changed_domain_information.save()
|
||||
|
||||
# Rerun transfer domains
|
||||
self.run_transfer_domains()
|
||||
|
||||
# Test that old data isn't corrupted after running this twice
|
||||
actual_unchanged = Domain.objects.filter(name="testdomain.gov").get()
|
||||
actual_unchanged_information = DomainInformation.objects.filter(domain=actual_unchanged).get()
|
||||
self.assertEqual(unchanged_domain, actual_unchanged)
|
||||
self.assertEqual(unchanged_domain_information, actual_unchanged_information)
|
||||
|
||||
# Ensure that domain hasn't changed
|
||||
actual_domain = Domain.objects.filter(name="fakewebsite3.gov").get()
|
||||
self.assertEqual(changed_domain, actual_domain)
|
||||
|
||||
# Ensure that DomainInformation hasn't changed
|
||||
actual_domain_information = DomainInformation.objects.filter(domain=changed_domain).get()
|
||||
self.assertEqual(changed_domain_information, actual_domain_information)
|
||||
|
||||
def test_transition_domain_is_processed(self):
|
||||
"""
|
||||
This test checks if a domain is correctly marked as processed in the transition.
|
||||
"""
|
||||
old_transition_domain, _ = TransitionDomain.objects.get_or_create(domain_name="testdomain.gov")
|
||||
# Asser that old records default to 'True'
|
||||
self.assertTrue(old_transition_domain.processed)
|
||||
|
||||
unchanged_domain, _ = Domain.objects.get_or_create(
|
||||
name="testdomain.gov",
|
||||
state=Domain.State.READY,
|
||||
expiration_date=datetime.date(2000, 1, 1),
|
||||
)
|
||||
unchanged_domain_information, _ = DomainInformation.objects.get_or_create(
|
||||
domain=unchanged_domain, organization_name="test org name", creator=self.user
|
||||
)
|
||||
self.run_load_domains()
|
||||
|
||||
# Test that a given TransitionDomain isn't set to "processed"
|
||||
transition_domain_object = TransitionDomain.objects.get(domain_name="fakewebsite3.gov")
|
||||
self.assertFalse(transition_domain_object.processed)
|
||||
|
||||
self.run_transfer_domains()
|
||||
|
||||
# Test that old data isn't corrupted
|
||||
actual_unchanged = Domain.objects.filter(name="testdomain.gov").get()
|
||||
actual_unchanged_information = DomainInformation.objects.filter(domain=actual_unchanged).get()
|
||||
self.assertEqual(unchanged_domain, actual_unchanged)
|
||||
self.assertTrue(old_transition_domain.processed)
|
||||
self.assertEqual(unchanged_domain_information, actual_unchanged_information)
|
||||
|
||||
# Test that a given TransitionDomain is set to "processed" after we transfer domains
|
||||
transition_domain_object = TransitionDomain.objects.get(domain_name="fakewebsite3.gov")
|
||||
self.assertTrue(transition_domain_object.processed)
|
||||
|
||||
|
||||
class TestOrganizationMigration(TestCase):
|
||||
def setUp(self):
|
||||
"""Defines the file name of migration_json and the folder its contained in"""
|
||||
|
|
|
@ -804,7 +804,7 @@ class DomainApplicationTests(TestWithUser, WebTest):
|
|||
# ---- AO CONTACT PAGE ----
|
||||
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
|
||||
ao_page = org_contact_result.follow()
|
||||
self.assertContains(ao_page, "Domain requests from executive branch agencies")
|
||||
self.assertContains(ao_page, "Executive branch federal agencies")
|
||||
|
||||
# Go back to organization type page and change type
|
||||
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
|
||||
|
@ -1355,29 +1355,55 @@ class TestDomainManagers(TestDomainOverview):
|
|||
out the boto3 SES email sending here.
|
||||
"""
|
||||
# make sure there is no user with this email
|
||||
EMAIL = "mayor@igorville.gov"
|
||||
User.objects.filter(email=EMAIL).delete()
|
||||
email_address = "mayor@igorville.gov"
|
||||
User.objects.filter(email=email_address).delete()
|
||||
|
||||
self.domain_information, _ = DomainInformation.objects.get_or_create(creator=self.user, domain=self.domain)
|
||||
|
||||
add_page = self.app.get(reverse("domain-users-add", kwargs={"pk": self.domain.id}))
|
||||
session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
|
||||
add_page.form["email"] = EMAIL
|
||||
add_page.form["email"] = email_address
|
||||
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
|
||||
success_result = add_page.form.submit()
|
||||
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
|
||||
success_page = success_result.follow()
|
||||
|
||||
self.assertContains(success_page, EMAIL)
|
||||
self.assertContains(success_page, email_address)
|
||||
self.assertContains(success_page, "Cancel") # link to cancel invitation
|
||||
self.assertTrue(DomainInvitation.objects.filter(email=EMAIL).exists())
|
||||
self.assertTrue(DomainInvitation.objects.filter(email=email_address).exists())
|
||||
|
||||
@boto3_mocking.patching
|
||||
def test_domain_invitation_created_for_caps_email(self):
|
||||
"""Add user on a nonexistent email with CAPS creates an invitation to lowercase email.
|
||||
|
||||
Adding a non-existent user sends an email as a side-effect, so mock
|
||||
out the boto3 SES email sending here.
|
||||
"""
|
||||
# make sure there is no user with this email
|
||||
email_address = "mayor@igorville.gov"
|
||||
caps_email_address = "MAYOR@igorville.gov"
|
||||
User.objects.filter(email=email_address).delete()
|
||||
|
||||
self.domain_information, _ = DomainInformation.objects.get_or_create(creator=self.user, domain=self.domain)
|
||||
|
||||
add_page = self.app.get(reverse("domain-users-add", kwargs={"pk": self.domain.id}))
|
||||
session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
|
||||
add_page.form["email"] = caps_email_address
|
||||
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
|
||||
success_result = add_page.form.submit()
|
||||
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
|
||||
success_page = success_result.follow()
|
||||
|
||||
self.assertContains(success_page, email_address)
|
||||
self.assertContains(success_page, "Cancel") # link to cancel invitation
|
||||
self.assertTrue(DomainInvitation.objects.filter(email=email_address).exists())
|
||||
|
||||
@boto3_mocking.patching
|
||||
def test_domain_invitation_email_sent(self):
|
||||
"""Inviting a non-existent user sends them an email."""
|
||||
# make sure there is no user with this email
|
||||
EMAIL = "mayor@igorville.gov"
|
||||
User.objects.filter(email=EMAIL).delete()
|
||||
email_address = "mayor@igorville.gov"
|
||||
User.objects.filter(email=email_address).delete()
|
||||
|
||||
self.domain_information, _ = DomainInformation.objects.get_or_create(creator=self.user, domain=self.domain)
|
||||
|
||||
|
@ -1386,28 +1412,28 @@ class TestDomainManagers(TestDomainOverview):
|
|||
with boto3_mocking.clients.handler_for("sesv2", mock_client):
|
||||
add_page = self.app.get(reverse("domain-users-add", kwargs={"pk": self.domain.id}))
|
||||
session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
|
||||
add_page.form["email"] = EMAIL
|
||||
add_page.form["email"] = email_address
|
||||
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
|
||||
add_page.form.submit()
|
||||
# check the mock instance to see if `send_email` was called right
|
||||
mock_client_instance.send_email.assert_called_once_with(
|
||||
FromEmailAddress=settings.DEFAULT_FROM_EMAIL,
|
||||
Destination={"ToAddresses": [EMAIL]},
|
||||
Destination={"ToAddresses": [email_address]},
|
||||
Content=ANY,
|
||||
)
|
||||
|
||||
def test_domain_invitation_cancel(self):
|
||||
"""Posting to the delete view deletes an invitation."""
|
||||
EMAIL = "mayor@igorville.gov"
|
||||
invitation, _ = DomainInvitation.objects.get_or_create(domain=self.domain, email=EMAIL)
|
||||
email_address = "mayor@igorville.gov"
|
||||
invitation, _ = DomainInvitation.objects.get_or_create(domain=self.domain, email=email_address)
|
||||
self.client.post(reverse("invitation-delete", kwargs={"pk": invitation.id}))
|
||||
with self.assertRaises(DomainInvitation.DoesNotExist):
|
||||
DomainInvitation.objects.get(id=invitation.id)
|
||||
|
||||
def test_domain_invitation_cancel_no_permissions(self):
|
||||
"""Posting to the delete view as a different user should fail."""
|
||||
EMAIL = "mayor@igorville.gov"
|
||||
invitation, _ = DomainInvitation.objects.get_or_create(domain=self.domain, email=EMAIL)
|
||||
email_address = "mayor@igorville.gov"
|
||||
invitation, _ = DomainInvitation.objects.get_or_create(domain=self.domain, email=email_address)
|
||||
|
||||
other_user = User()
|
||||
other_user.save()
|
||||
|
@ -1419,20 +1445,20 @@ class TestDomainManagers(TestDomainOverview):
|
|||
@boto3_mocking.patching
|
||||
def test_domain_invitation_flow(self):
|
||||
"""Send an invitation to a new user, log in and load the dashboard."""
|
||||
EMAIL = "mayor@igorville.gov"
|
||||
User.objects.filter(email=EMAIL).delete()
|
||||
email_address = "mayor@igorville.gov"
|
||||
User.objects.filter(email=email_address).delete()
|
||||
|
||||
add_page = self.app.get(reverse("domain-users-add", kwargs={"pk": self.domain.id}))
|
||||
|
||||
self.domain_information, _ = DomainInformation.objects.get_or_create(creator=self.user, domain=self.domain)
|
||||
|
||||
session_id = self.app.cookies[settings.SESSION_COOKIE_NAME]
|
||||
add_page.form["email"] = EMAIL
|
||||
add_page.form["email"] = email_address
|
||||
self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
|
||||
add_page.form.submit()
|
||||
|
||||
# user was invited, create them
|
||||
new_user = User.objects.create(username=EMAIL, email=EMAIL)
|
||||
new_user = User.objects.create(username=email_address, email=email_address)
|
||||
# log them in to `self.app`
|
||||
self.app.set_user(new_user.username)
|
||||
# and manually call the on each login callback
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue