diff --git a/core/src/main/java/google/registry/model/registrar/RegistrarPoc.java b/core/src/main/java/google/registry/model/registrar/RegistrarPoc.java index 9a3a56569..bc011d2c5 100644 --- a/core/src/main/java/google/registry/model/registrar/RegistrarPoc.java +++ b/core/src/main/java/google/registry/model/registrar/RegistrarPoc.java @@ -25,8 +25,6 @@ import javax.persistence.AccessType; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.IdClass; -import javax.persistence.Index; -import javax.persistence.Table; /** * A contact for a Registrar. Note, equality, hashCode and comparable have been overridden to only @@ -37,7 +35,6 @@ import javax.persistence.Table; * set to true. */ @Entity -@Table(indexes = @Index(columnList = "loginEmailAddress", name = "registrarpoc_login_email_idx")) @IdClass(RegistrarPocId.class) @Access(AccessType.FIELD) public class RegistrarPoc extends RegistrarPocBase { diff --git a/core/src/main/java/google/registry/model/registrar/RegistrarPocBase.java b/core/src/main/java/google/registry/model/registrar/RegistrarPocBase.java index ad43446de..085475d33 100644 --- a/core/src/main/java/google/registry/model/registrar/RegistrarPocBase.java +++ b/core/src/main/java/google/registry/model/registrar/RegistrarPocBase.java @@ -98,12 +98,7 @@ public class RegistrarPocBase extends ImmutableObject implements Jsonifiable, Un /** The name of the contact. */ @Expose String name; - /** - * The contact email address of the contact. - * - *

This is different from the login email which is assgined to the regstrar and cannot be - * changed. - */ + /** The contact email address of the contact. */ @Expose @Transient String emailAddress; @Expose @Transient public String registrarId; @@ -123,9 +118,6 @@ public class RegistrarPocBase extends ImmutableObject implements Jsonifiable, Un */ @Expose Set types; - /** A GAIA email address that was assigned to the registrar for console login purpose. */ - String loginEmailAddress; - /** * Whether this contact is publicly visible in WHOIS registrar query results as an Admin contact. */ @@ -219,10 +211,6 @@ public class RegistrarPocBase extends ImmutableObject implements Jsonifiable, Un return visibleInDomainWhoisAsAbuse; } - public String getLoginEmailAddress() { - return loginEmailAddress; - } - public Builder asBuilder() { return new Builder<>(clone(this)); } @@ -286,13 +274,6 @@ public class RegistrarPocBase extends ImmutableObject implements Jsonifiable, Un + "Registrar Abuse contact info: ") .append(getVisibleInDomainWhoisAsAbuse() ? "Yes" : "No") .append('\n'); - result - .append("Registrar-Console access: ") - .append(getLoginEmailAddress() != null ? "Yes" : "No") - .append('\n'); - if (getLoginEmailAddress() != null) { - result.append("Login Email Address: ").append(getLoginEmailAddress()).append('\n'); - } return result.toString(); } @@ -310,7 +291,6 @@ public class RegistrarPocBase extends ImmutableObject implements Jsonifiable, Un .put("visibleInDomainWhoisAsAbuse", visibleInDomainWhoisAsAbuse) .put("allowedToSetRegistryLockPassword", allowedToSetRegistryLockPassword) .put("registryLockAllowed", isRegistryLockAllowed()) - .put("loginEmailAddress", loginEmailAddress) .build(); } @@ -411,11 +391,6 @@ public class RegistrarPocBase extends ImmutableObject implements Jsonifiable, Un return thisCastToDerived(); } - public B setLoginEmailAddress(String loginEmailAddress) { - getInstance().loginEmailAddress = loginEmailAddress; - return thisCastToDerived(); - } - public B setAllowedToSetRegistryLockPassword(boolean allowedToSetRegistryLockPassword) { if (allowedToSetRegistryLockPassword) { getInstance().registryLockPasswordSalt = null; diff --git a/core/src/main/java/google/registry/tools/RegistrarPocCommand.java b/core/src/main/java/google/registry/tools/RegistrarPocCommand.java index 64c6c2ce4..37b7b5d60 100644 --- a/core/src/main/java/google/registry/tools/RegistrarPocCommand.java +++ b/core/src/main/java/google/registry/tools/RegistrarPocCommand.java @@ -41,7 +41,6 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Optional; import java.util.Set; import javax.annotation.Nullable; @@ -87,12 +86,6 @@ final class RegistrarPocCommand extends MutatingCommand { + " and will be used as the console login email, if --login_email is not specified.") String email; - @Nullable - @Parameter( - names = "--login_email", - description = "Console login email address. If not specified, --email will be used.") - String loginEmail; - @Nullable @Parameter( names = "--registry_lock_email", @@ -115,13 +108,6 @@ final class RegistrarPocCommand extends MutatingCommand { validateWith = OptionalPhoneNumberParameter.class) private Optional fax; - @Nullable - @Parameter( - names = "--allow_console_access", - description = "Enable or disable access to the registrar console for this contact.", - arity = 1) - Boolean allowConsoleAccess; - @Nullable @Parameter( names = "--visible_in_whois_as_admin", @@ -173,7 +159,7 @@ final class RegistrarPocCommand extends MutatingCommand { protected void init() throws Exception { checkArgument(mainParameters.size() == 1, "Must specify exactly one client identifier: %s", ImmutableList.copyOf(mainParameters)); - String clientId = mainParameters.get(0); + String clientId = mainParameters.getFirst(); Registrar registrar = checkArgumentPresent( Registrar.loadByRegistrarId(clientId), "Registrar %s not found", clientId); @@ -261,9 +247,6 @@ final class RegistrarPocCommand extends MutatingCommand { } builder.setTypes(nullToEmpty(contactTypes)); - if (Objects.equals(allowConsoleAccess, Boolean.TRUE)) { - builder.setLoginEmailAddress(loginEmail == null ? email : loginEmail); - } if (visibleInWhoisAsAdmin != null) { builder.setVisibleInWhoisAsAdmin(visibleInWhoisAsAdmin); } @@ -308,13 +291,6 @@ final class RegistrarPocCommand extends MutatingCommand { if (visibleInDomainWhoisAsAbuse != null) { builder.setVisibleInDomainWhoisAsAbuse(visibleInDomainWhoisAsAbuse); } - if (allowConsoleAccess != null) { - if (allowConsoleAccess.equals(Boolean.TRUE)) { - builder.setLoginEmailAddress(loginEmail == null ? email : loginEmail); - } else { - builder.setLoginEmailAddress(null); - } - } if (allowedToSetRegistryLockPassword != null) { builder.setAllowedToSetRegistryLockPassword(allowedToSetRegistryLockPassword); } diff --git a/core/src/main/java/google/registry/ui/server/RegistrarFormFields.java b/core/src/main/java/google/registry/ui/server/RegistrarFormFields.java index 3f646c88c..5759d5c5f 100644 --- a/core/src/main/java/google/registry/ui/server/RegistrarFormFields.java +++ b/core/src/main/java/google/registry/ui/server/RegistrarFormFields.java @@ -193,9 +193,6 @@ public final class RegistrarFormFields { public static final FormField CONTACT_FAX_NUMBER_FIELD = FormFields.PHONE_NUMBER.asBuilderNamed("faxNumber").build(); - public static final FormField CONTACT_LOGIN_EMAIL_ADDRESS_FIELD = - FormFields.NAME.asBuilderNamed("loginEmailAddress").build(); - public static final FormField CONTACT_ALLOWED_TO_SET_REGISTRY_LOCK_PASSWORD = FormField.named("allowedToSetRegistryLockPassword", Object.class) .transform(Boolean.class, b -> Boolean.valueOf(Objects.toString(b))) @@ -384,8 +381,6 @@ public final class RegistrarFormFields { builder.setPhoneNumber(CONTACT_PHONE_NUMBER_FIELD.extractUntyped(args).orElse(null)); builder.setFaxNumber(CONTACT_FAX_NUMBER_FIELD.extractUntyped(args).orElse(null)); builder.setTypes(CONTACT_TYPES.extractUntyped(args).orElse(ImmutableSet.of())); - builder.setLoginEmailAddress( - CONTACT_LOGIN_EMAIL_ADDRESS_FIELD.extractUntyped(args).orElse(null)); // The parser is inconsistent with whether it retrieves boolean values as strings or booleans. // As a result, use a potentially-redundant converter that can deal with both. builder.setAllowedToSetRegistryLockPassword( diff --git a/core/src/main/java/google/registry/ui/server/console/RegistrarsAction.java b/core/src/main/java/google/registry/ui/server/console/RegistrarsAction.java index b181a5020..3d2bfe532 100644 --- a/core/src/main/java/google/registry/ui/server/console/RegistrarsAction.java +++ b/core/src/main/java/google/registry/ui/server/console/RegistrarsAction.java @@ -164,7 +164,6 @@ public class RegistrarsAction extends ConsoleApiAction { .setRegistrar(registrar) .setName(registrarParam.getEmailAddress()) .setEmailAddress(registrarParam.getEmailAddress()) - .setLoginEmailAddress(registrarParam.getEmailAddress()) .build(); tm().transact( diff --git a/core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetTest.java b/core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetTest.java index 0f025cc8d..f99ef2fcb 100644 --- a/core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetTest.java +++ b/core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetTest.java @@ -172,7 +172,6 @@ public class SyncRegistrarsSheetTest { // distinction to make sure we're not relying on it. Sigh. .setVisibleInWhoisAsAdmin(false) .setVisibleInWhoisAsTech(true) - .setLoginEmailAddress("john.doe@example.tld") .build(), new RegistrarPoc.Builder() .setRegistrar(registrar) @@ -191,7 +190,7 @@ public class SyncRegistrarsSheetTest { ImmutableList> rows = getOnlyElement(rowsCaptor.getAllValues()); assertThat(rows).hasSize(2); - ImmutableMap row = rows.get(0); + ImmutableMap row = rows.getFirst(); assertThat(row).containsEntry("registrarId", "aaaregistrar"); assertThat(row).containsEntry("registrarName", "AAA Registrar Inc."); assertThat(row).containsEntry("state", "SUSPENDED"); @@ -208,7 +207,6 @@ public class SyncRegistrarsSheetTest { Visible in registrar WHOIS query as Technical contact: No Phone number and email visible in domain WHOIS query as Registrar Abuse contact\ info: No - Registrar-Console access: No John Doe john.doe@example.tld @@ -219,8 +217,6 @@ public class SyncRegistrarsSheetTest { Visible in registrar WHOIS query as Technical contact: Yes Phone number and email visible in domain WHOIS query as Registrar Abuse contact\ info: No - Registrar-Console access: Yes - Login Email Address: john.doe@example.tld """); assertThat(row) .containsEntry( @@ -233,7 +229,6 @@ public class SyncRegistrarsSheetTest { Visible in registrar WHOIS query as Technical contact: No Phone number and email visible in domain WHOIS query as Registrar Abuse contact\ info: No - Registrar-Console access: No """); assertThat(row).containsEntry("marketingContacts", ""); assertThat(row).containsEntry("abuseContacts", ""); @@ -251,7 +246,6 @@ public class SyncRegistrarsSheetTest { Visible in registrar WHOIS query as Technical contact: No Phone number and email visible in domain WHOIS query as Registrar Abuse contact\ info: No - Registrar-Console access: No """); assertThat(row).containsEntry("contactsMarkedAsWhoisAdmin", ""); assertThat(row) @@ -267,8 +261,6 @@ public class SyncRegistrarsSheetTest { Visible in registrar WHOIS query as Technical contact: Yes Phone number and email visible in domain WHOIS query as Registrar Abuse contact\ info: No - Registrar-Console access: Yes - Login Email Address: john.doe@example.tld """); assertThat(row).containsEntry("emailAddress", "nowhere@example.org"); assertThat(row).containsEntry( diff --git a/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerExtension.java b/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerExtension.java index 203b5c7e4..929e9b7e9 100644 --- a/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerExtension.java +++ b/core/src/test/java/google/registry/persistence/transaction/JpaTransactionManagerExtension.java @@ -426,7 +426,6 @@ public abstract class JpaTransactionManagerExtension .setEmailAddress("johndoe@theregistrar.com") .setPhoneNumber("+1.1234567890") .setTypes(ImmutableSet.of(RegistrarPocBase.Type.ADMIN)) - .setLoginEmailAddress("johndoe@theregistrar.com") .build(); } @@ -438,7 +437,6 @@ public abstract class JpaTransactionManagerExtension .setRegistryLockEmailAddress("Marla.Singer.RegistryLock@crr.com") .setPhoneNumber("+1.2128675309") .setTypes(ImmutableSet.of(RegistrarPocBase.Type.TECH)) - .setLoginEmailAddress("Marla.Singer@crr.com") .setAllowedToSetRegistryLockPassword(true) .setRegistryLockPassword("hi") .build(); diff --git a/core/src/test/java/google/registry/tools/GenerateSqlSchemaCommandTest.java b/core/src/test/java/google/registry/tools/GenerateSqlSchemaCommandTest.java index 59022027a..365d015cb 100644 --- a/core/src/test/java/google/registry/tools/GenerateSqlSchemaCommandTest.java +++ b/core/src/test/java/google/registry/tools/GenerateSqlSchemaCommandTest.java @@ -23,7 +23,8 @@ import com.google.common.io.Resources; import google.registry.persistence.NomulusPostgreSql; import java.io.File; import java.nio.file.Path; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.junit.jupiter.Container; @@ -33,26 +34,31 @@ import org.testcontainers.junit.jupiter.Testcontainers; @Testcontainers class GenerateSqlSchemaCommandTest extends CommandTestCase { - private String containerHostName; - private int containerPort; + private static String containerHostName; + private static int containerPort; @Container - private static PostgreSQLContainer postgres = - new PostgreSQLContainer(NomulusPostgreSql.getDockerTag()) + private static final PostgreSQLContainer postgres = + new PostgreSQLContainer<>(NomulusPostgreSql.getDockerTag()) .withDatabaseName("postgres") .withUsername("postgres") .withPassword("domain-registry"); - @BeforeEach - void beforeEach() { - containerHostName = postgres.getContainerIpAddress(); + @BeforeAll + static void beforeAll() { + containerHostName = postgres.getHost(); containerPort = postgres.getMappedPort(GenerateSqlSchemaCommand.POSTGRESQL_PORT); } + @AfterAll + static void afterAll() { + postgres.close(); + } + @Test void testSchemaGeneration() throws Exception { runCommand( - "--out_file=" + tmpDir.resolve("schema.sql").toString(), + "--out_file=" + tmpDir.resolve("schema.sql"), "--db_host=" + containerHostName, "--db_port=" + containerPort); @@ -69,7 +75,7 @@ class GenerateSqlSchemaCommandTest extends CommandTestCase { "Visible in registrar WHOIS query as Admin contact: Yes", "Visible in registrar WHOIS query as Technical contact: No", "Phone number and email visible in domain WHOIS query as " - + "Registrar Abuse contact info: No", - "Registrar-Console access: No"); + + "Registrar Abuse contact info: No"); } @Test @@ -116,69 +115,6 @@ class RegistrarPocCommandTest extends CommandTestCase { .build()); } - @Test - void testUpdate_enableConsoleAccess() throws Exception { - Registrar registrar = loadRegistrar("NewRegistrar"); - persistSimpleResource( - new RegistrarPoc.Builder() - .setRegistrar(registrar) - .setName("Jane Doe") - .setEmailAddress("jane.doe@example.com") - .build()); - runCommandForced( - "--mode=UPDATE", - "--email=jane.doe@example.com", - "--allow_console_access=true", - "NewRegistrar"); - RegistrarPoc registrarPoc = - loadRegistrar("NewRegistrar").getContacts().stream() - .filter(rc -> "jane.doe@example.com".equals(rc.getEmailAddress())) - .findFirst() - .get(); - assertThat(registrarPoc.getLoginEmailAddress()).isEqualTo("jane.doe@example.com"); - } - - @Test - void testUpdate_enableConsoleAccess_specifyLoginEmail() throws Exception { - Registrar registrar = loadRegistrar("NewRegistrar"); - persistSimpleResource( - new RegistrarPoc.Builder() - .setRegistrar(registrar) - .setName("Jane Doe") - .setEmailAddress("jane.doe@example.com") - .build()); - runCommandForced( - "--mode=UPDATE", - "--email=jane.doe@example.com", - "--login_email=jim.doe@example.com", - "--allow_console_access=true", - "NewRegistrar"); - RegistrarPoc registrarPoc = - loadRegistrar("NewRegistrar").getContacts().stream() - .filter(rc -> "jane.doe@example.com".equals(rc.getEmailAddress())) - .findFirst() - .get(); - assertThat(registrarPoc.getLoginEmailAddress()).isEqualTo("jim.doe@example.com"); - } - - @Test - void testUpdate_disableConsoleAccess() throws Exception { - Registrar registrar = loadRegistrar("NewRegistrar"); - persistSimpleResource( - new RegistrarPoc.Builder() - .setRegistrar(registrar) - .setName("Judith Doe") - .setEmailAddress("judith.doe@example.com") - .build()); - runCommandForced( - "--mode=UPDATE", - "--email=judith.doe@example.com", - "--allow_console_access=false", - "NewRegistrar"); - RegistrarPoc registrarPoc = loadRegistrar("NewRegistrar").getContacts().asList().get(1); - assertThat(registrarPoc.getLoginEmailAddress()).isNull(); - } - @Test void testUpdate_unsetOtherWhoisAbuseFlags() throws Exception { Registrar registrar = loadRegistrar("NewRegistrar"); @@ -334,7 +270,6 @@ class RegistrarPocCommandTest extends CommandTestCase { .setVisibleInWhoisAsTech(false) .setVisibleInDomainWhoisAsAbuse(true) .build()); - assertThat(registrarPoc.getLoginEmailAddress()).isNull(); } @Test @@ -346,7 +281,7 @@ class RegistrarPocCommandTest extends CommandTestCase { @Test void testDelete_failsOnDomainWhoisAbuseContact() { - RegistrarPoc registrarPoc = loadRegistrar("NewRegistrar").getContacts().asList().get(0); + RegistrarPoc registrarPoc = loadRegistrar("NewRegistrar").getContacts().asList().getFirst(); putInDb(registrarPoc.asBuilder().setVisibleInDomainWhoisAsAbuse(true).build()); IllegalArgumentException thrown = assertThrows( @@ -358,33 +293,6 @@ class RegistrarPocCommandTest extends CommandTestCase { assertThat(loadRegistrar("NewRegistrar").getContacts()).isNotEmpty(); } - @Test - void testCreate_withConsoleAccessEnabled() throws Exception { - runCommandForced( - "--mode=CREATE", - "--name=Jim Doe", - "--email=jim.doe@example.com", - "--allow_console_access=true", - "--contact_type=ADMIN,ABUSE", - "NewRegistrar"); - RegistrarPoc registrarPoc = loadRegistrar("NewRegistrar").getContacts().asList().get(1); - assertThat(registrarPoc.getEmailAddress()).isEqualTo("jim.doe@example.com"); - } - - @Test - void testCreate_withConsoleAccessEnabled_specifyLoginEmail() throws Exception { - runCommandForced( - "--mode=CREATE", - "--name=Jim Doe", - "--email=jim.doe@example.com", - "--login_email=jane.doe@example.com", - "--allow_console_access=true", - "--contact_type=ADMIN,ABUSE", - "NewRegistrar"); - RegistrarPoc registrarPoc = loadRegistrar("NewRegistrar").getContacts().asList().get(1); - assertThat(registrarPoc.getLoginEmailAddress()).isEqualTo("jane.doe@example.com"); - } - @Test void testCreate_withNoContactTypes() throws Exception { runCommandForced( diff --git a/core/src/test/java/google/registry/ui/server/console/settings/ContactActionTest.java b/core/src/test/java/google/registry/ui/server/console/settings/ContactActionTest.java index eeef441a7..2887a9141 100644 --- a/core/src/test/java/google/registry/ui/server/console/settings/ContactActionTest.java +++ b/core/src/test/java/google/registry/ui/server/console/settings/ContactActionTest.java @@ -218,7 +218,7 @@ class ContactActionTest { + " {name=Test Registrar 1," + " emailAddress=test.registrar1@example.com, registrarId=registrarId," + " registryLockEmailAddress=null, phoneNumber=+1.9999999999," - + " faxNumber=+1.9999999991, types=[ADMIN, WHOIS], loginEmailAddress=null," + + " faxNumber=+1.9999999991, types=[ADMIN, WHOIS]," + " visibleInWhoisAsAdmin=true, visibleInWhoisAsTech=false," + " visibleInDomainWhoisAsAbuse=false," + " allowedToSetRegistryLockPassword=false}\n" @@ -226,14 +226,14 @@ class ContactActionTest { + " {name=Test Registrar 1, emailAddress=incorrect@email.com," + " registrarId=registrarId, registryLockEmailAddress=null," + " phoneNumber=+1.9999999999, faxNumber=+1.9999999991, types=[WHOIS," - + " ADMIN], loginEmailAddress=null, visibleInWhoisAsAdmin=true," + + " ADMIN], visibleInWhoisAsAdmin=true," + " visibleInWhoisAsTech=false, visibleInDomainWhoisAsAbuse=false," + " allowedToSetRegistryLockPassword=false}\n" + " FINAL CONTENTS:\n" + " {name=Test Registrar 1," + " emailAddress=test.registrar1@example.com, registrarId=registrarId," + " registryLockEmailAddress=null, phoneNumber=+1.9999999999," - + " faxNumber=+1.9999999991, types=[ADMIN, WHOIS], loginEmailAddress=null," + + " faxNumber=+1.9999999991, types=[ADMIN, WHOIS]," + " visibleInWhoisAsAdmin=true, visibleInWhoisAsTech=false," + " visibleInDomainWhoisAsAbuse=false," + " allowedToSetRegistryLockPassword=false}\n") diff --git a/core/src/test/resources/google/registry/ui/server/registrar/update_registrar_email.txt b/core/src/test/resources/google/registry/ui/server/registrar/update_registrar_email.txt index f8d4e6468..7377120b9 100644 --- a/core/src/test/resources/google/registry/ui/server/registrar/update_registrar_email.txt +++ b/core/src/test/resources/google/registry/ui/server/registrar/update_registrar_email.txt @@ -11,9 +11,9 @@ emailAddress: the.registrar@example.com -> thase@the.registrar url: http://my.fake.url -> http://my.new.url contacts: ADDED: - {name=Extra Terrestrial, emailAddress=etphonehome@example.com, registrarId=TheRegistrar, registryLockEmailAddress=null, phoneNumber=+1.2345678901, faxNumber=null, types=[ADMIN, BILLING, TECH, WHOIS], loginEmailAddress=null, visibleInWhoisAsAdmin=true, visibleInWhoisAsTech=false, visibleInDomainWhoisAsAbuse=false, allowedToSetRegistryLockPassword=false} + {name=Extra Terrestrial, emailAddress=etphonehome@example.com, registrarId=TheRegistrar, registryLockEmailAddress=null, phoneNumber=+1.2345678901, faxNumber=null, types=[ADMIN, BILLING, TECH, WHOIS], visibleInWhoisAsAdmin=true, visibleInWhoisAsTech=false, visibleInDomainWhoisAsAbuse=false, allowedToSetRegistryLockPassword=false} REMOVED: - {name=John Doe, emailAddress=johndoe@theregistrar.com, registrarId=TheRegistrar, registryLockEmailAddress=null, phoneNumber=+1.1234567890, faxNumber=null, types=[ADMIN], loginEmailAddress=johndoe@theregistrar.com, visibleInWhoisAsAdmin=false, visibleInWhoisAsTech=false, visibleInDomainWhoisAsAbuse=false, allowedToSetRegistryLockPassword=false} + {name=John Doe, emailAddress=johndoe@theregistrar.com, registrarId=TheRegistrar, registryLockEmailAddress=null, phoneNumber=+1.1234567890, faxNumber=null, types=[ADMIN], visibleInWhoisAsAdmin=false, visibleInWhoisAsTech=false, visibleInDomainWhoisAsAbuse=false, allowedToSetRegistryLockPassword=false} FINAL CONTENTS: - {name=Extra Terrestrial, emailAddress=etphonehome@example.com, registrarId=TheRegistrar, registryLockEmailAddress=null, phoneNumber=+1.2345678901, faxNumber=null, types=[ADMIN, BILLING, TECH, WHOIS], loginEmailAddress=null, visibleInWhoisAsAdmin=true, visibleInWhoisAsTech=false, visibleInDomainWhoisAsAbuse=false, allowedToSetRegistryLockPassword=false}, - {name=Marla Singer, emailAddress=Marla.Singer@crr.com, registrarId=TheRegistrar, registryLockEmailAddress=Marla.Singer.RegistryLock@crr.com, phoneNumber=+1.2128675309, faxNumber=null, types=[TECH], loginEmailAddress=Marla.Singer@crr.com, visibleInWhoisAsAdmin=false, visibleInWhoisAsTech=false, visibleInDomainWhoisAsAbuse=false, allowedToSetRegistryLockPassword=false} + {name=Extra Terrestrial, emailAddress=etphonehome@example.com, registrarId=TheRegistrar, registryLockEmailAddress=null, phoneNumber=+1.2345678901, faxNumber=null, types=[ADMIN, BILLING, TECH, WHOIS], visibleInWhoisAsAdmin=true, visibleInWhoisAsTech=false, visibleInDomainWhoisAsAbuse=false, allowedToSetRegistryLockPassword=false}, + {name=Marla Singer, emailAddress=Marla.Singer@crr.com, registrarId=TheRegistrar, registryLockEmailAddress=Marla.Singer.RegistryLock@crr.com, phoneNumber=+1.2128675309, faxNumber=null, types=[TECH], visibleInWhoisAsAdmin=false, visibleInWhoisAsTech=false, visibleInDomainWhoisAsAbuse=false, allowedToSetRegistryLockPassword=false} diff --git a/db/src/main/resources/sql/schema/db-schema.sql.generated b/db/src/main/resources/sql/schema/db-schema.sql.generated index de04f3480..fc6ba6efd 100644 --- a/db/src/main/resources/sql/schema/db-schema.sql.generated +++ b/db/src/main/resources/sql/schema/db-schema.sql.generated @@ -672,7 +672,6 @@ registrar_id text not null, allowed_to_set_registry_lock_password boolean not null, fax_number text, - login_email_address text, name text, phone_number text, registry_lock_email_address text, @@ -696,7 +695,6 @@ registrar_id text not null, allowed_to_set_registry_lock_password boolean not null, fax_number text, - login_email_address text, name text, phone_number text, registry_lock_email_address text, @@ -1004,7 +1002,6 @@ create index IDXaydgox62uno9qx8cjlj5lauye on "PollMessage" (event_time); create index premiumlist_name_idx on "PremiumList" (name); create index registrar_name_idx on "Registrar" (registrar_name); create index registrar_iana_identifier_idx on "Registrar" (iana_identifier); -create index registrarpoc_login_email_idx on "RegistrarPoc" (login_email_address); create index IDXrn6posxkx58de1cp09g5257cw on "RegistrarPocUpdateHistory" (history_acting_user); create index IDXr1cxua6it0rxgt9tpyugspxk on "RegistrarPocUpdateHistory" (email_address); create index IDXfr24wvpg8qalwqy4pni7evrpj on "RegistrarPocUpdateHistory" (registrar_id);