diff --git a/core/src/main/java/google/registry/model/console/User.java b/core/src/main/java/google/registry/model/console/User.java index 60f0ca8fc..ddffd0aee 100644 --- a/core/src/main/java/google/registry/model/console/User.java +++ b/core/src/main/java/google/registry/model/console/User.java @@ -35,21 +35,16 @@ import javax.persistence.Table; /** A console user, either a registry employee or a registrar partner. */ @Entity -@Table( - indexes = { - @Index(columnList = "gaiaId", name = "user_gaia_id_idx"), - @Index(columnList = "emailAddress", name = "user_email_address_idx") - }) +@Table(indexes = {@Index(columnList = "emailAddress", name = "user_email_address_idx")}) public class User extends UpdateAutoTimestampEntity implements Buildable { + private static final long serialVersionUID = 6936728603828566721L; + /** Autogenerated unique ID of this user. */ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - /** GAIA ID associated with the user in question. */ - private String gaiaId; - /** Email address of the user in question. */ @Column(nullable = false) private String emailAddress; @@ -71,10 +66,6 @@ public class User extends UpdateAutoTimestampEntity implements Buildable { return id; } - public String getGaiaId() { - return gaiaId; - } - public String getEmailAddress() { return emailAddress; } @@ -139,12 +130,6 @@ public class User extends UpdateAutoTimestampEntity implements Buildable { return super.build(); } - public Builder setGaiaId(String gaiaId) { - checkArgument(!isNullOrEmpty(gaiaId), "Gaia ID cannot be null or empty"); - getInstance().gaiaId = gaiaId; - return this; - } - public Builder setEmailAddress(String emailAddress) { getInstance().emailAddress = checkValidEmail(emailAddress); return this; diff --git a/core/src/test/java/google/registry/model/console/UserDaoTest.java b/core/src/test/java/google/registry/model/console/UserDaoTest.java index 2d1fa7439..47359da25 100644 --- a/core/src/test/java/google/registry/model/console/UserDaoTest.java +++ b/core/src/test/java/google/registry/model/console/UserDaoTest.java @@ -30,13 +30,11 @@ public class UserDaoTest extends EntityTestCase { User user1 = new User.Builder() .setEmailAddress("email@email.com") - .setGaiaId("gaiaId") .setUserRoles(new UserRoles.Builder().setGlobalRole(GlobalRole.SUPPORT_AGENT).build()) .build(); User user2 = new User.Builder() .setEmailAddress("foo@bar.com") - .setGaiaId("otherId") .setUserRoles(new UserRoles.Builder().setGlobalRole(GlobalRole.SUPPORT_AGENT).build()) .build(); UserDao.saveUser(user1); @@ -54,7 +52,6 @@ public class UserDaoTest extends EntityTestCase { User user = new User.Builder() .setEmailAddress("email@email.com") - .setGaiaId("gaiaId") .setUserRoles(new UserRoles.Builder().setGlobalRole(GlobalRole.SUPPORT_AGENT).build()) .build(); UserDao.saveUser(user); @@ -71,13 +68,11 @@ public class UserDaoTest extends EntityTestCase { User user1 = new User.Builder() .setEmailAddress("email@email.com") - .setGaiaId("gaiaId") .setUserRoles(new UserRoles.Builder().setGlobalRole(GlobalRole.SUPPORT_AGENT).build()) .build(); User user2 = new User.Builder() .setEmailAddress("email@email.com") - .setGaiaId("otherId") .setUserRoles(new UserRoles.Builder().setGlobalRole(GlobalRole.SUPPORT_AGENT).build()) .build(); UserDao.saveUser(user1); diff --git a/core/src/test/java/google/registry/model/console/UserTest.java b/core/src/test/java/google/registry/model/console/UserTest.java index 70f2ae92e..d2955470c 100644 --- a/core/src/test/java/google/registry/model/console/UserTest.java +++ b/core/src/test/java/google/registry/model/console/UserTest.java @@ -30,10 +30,9 @@ public class UserTest extends EntityTestCase { } @Test - void testPersistence_lookupByGaiaId() { + void testPersistence_lookupByEmail() { User user = new User.Builder() - .setGaiaId("gaiaId") .setEmailAddress("email@email.com") .setUserRoles( new UserRoles.Builder().setGlobalRole(GlobalRole.FTE).setIsAdmin(true).build()) @@ -43,10 +42,11 @@ public class UserTest extends EntityTestCase { () -> { assertAboutImmutableObjects() .that( - tm().query("FROM User WHERE gaiaId = 'gaiaId'", User.class).getSingleResult()) + tm().query("FROM User WHERE emailAddress = 'email@email.com'", User.class) + .getSingleResult()) .isEqualExceptFields(user, "id", "updateTimestamp"); assertThat( - tm().query("FROM User WHERE gaiaId = 'badGaiaId'", User.class) + tm().query("FROM User WHERE emailAddress = 'nobody@email.com'", User.class) .getResultList()) .isEmpty(); }); @@ -55,9 +55,6 @@ public class UserTest extends EntityTestCase { @Test void testFailure_badInputs() { User.Builder builder = new User.Builder(); - assertThat(assertThrows(IllegalArgumentException.class, () -> builder.setGaiaId(null))) - .hasMessageThat() - .isEqualTo("Gaia ID cannot be null or empty"); assertThat(assertThrows(IllegalArgumentException.class, () -> builder.setEmailAddress(""))) .hasMessageThat() .isEqualTo("Provided email is not a valid email address"); @@ -72,7 +69,7 @@ public class UserTest extends EntityTestCase { assertThat(assertThrows(IllegalArgumentException.class, () -> builder.setUserRoles(null))) .hasMessageThat() .isEqualTo("User roles cannot be null"); - + assertThat(assertThrows(IllegalArgumentException.class, builder::build)) .hasMessageThat() .isEqualTo("Email address cannot be null"); @@ -99,7 +96,6 @@ public class UserTest extends EntityTestCase { User user = new User.Builder() - .setGaiaId("gaiaId") .setEmailAddress("email@email.com") .setUserRoles(new UserRoles.Builder().setGlobalRole(GlobalRole.FTE).build()) .build(); diff --git a/core/src/test/java/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java b/core/src/test/java/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java index c1f594061..bbb0af9dc 100644 --- a/core/src/test/java/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java +++ b/core/src/test/java/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java @@ -417,7 +417,6 @@ class AuthenticatedRegistrarAccessorTest { void testConsoleUser_admin() { google.registry.model.console.User consoleUser = new google.registry.model.console.User.Builder() - .setGaiaId("gaiaId") .setEmailAddress("email@email.com") .setUserRoles( new UserRoles.Builder().setIsAdmin(true).setGlobalRole(GlobalRole.FTE).build()) @@ -444,7 +443,6 @@ class AuthenticatedRegistrarAccessorTest { // not admins google.registry.model.console.User consoleUser = new google.registry.model.console.User.Builder() - .setGaiaId("gaiaId") .setEmailAddress("email@email.com") .setUserRoles(new UserRoles.Builder().setGlobalRole(GlobalRole.SUPPORT_AGENT).build()) .build(); @@ -462,7 +460,6 @@ class AuthenticatedRegistrarAccessorTest { // Registrar employees should have OWNER access to their registrars google.registry.model.console.User consoleUser = new google.registry.model.console.User.Builder() - .setGaiaId("gaiaId") .setEmailAddress("email@email.com") .setUserRoles( new UserRoles.Builder() diff --git a/core/src/test/java/google/registry/request/auth/OidcTokenAuthenticationMechanismTest.java b/core/src/test/java/google/registry/request/auth/OidcTokenAuthenticationMechanismTest.java index f600135aa..2f57a9723 100644 --- a/core/src/test/java/google/registry/request/auth/OidcTokenAuthenticationMechanismTest.java +++ b/core/src/test/java/google/registry/request/auth/OidcTokenAuthenticationMechanismTest.java @@ -61,7 +61,6 @@ public class OidcTokenAuthenticationMechanismTest { private final User user = new User.Builder() .setEmailAddress(email) - .setGaiaId(gaiaId) .setUserRoles( new UserRoles.Builder().setIsAdmin(true).setGlobalRole(GlobalRole.FTE).build()) .build(); @@ -141,7 +140,6 @@ public class OidcTokenAuthenticationMechanismTest { User serviceUser = new User.Builder() .setEmailAddress("service@email.test") - .setGaiaId("service-gaia-id") .setUserRoles( new UserRoles.Builder().setIsAdmin(true).setGlobalRole(GlobalRole.FTE).build()) .build(); diff --git a/core/src/test/java/google/registry/schema/integration/SqlIntegrationTestSuite.java b/core/src/test/java/google/registry/schema/integration/SqlIntegrationTestSuite.java index 27b674b60..15d44278e 100644 --- a/core/src/test/java/google/registry/schema/integration/SqlIntegrationTestSuite.java +++ b/core/src/test/java/google/registry/schema/integration/SqlIntegrationTestSuite.java @@ -61,7 +61,7 @@ import org.junit.runner.RunWith; * and have at least one test method that persists a JPA entity declared in persistence.xml. * *

Note that with {@link JpaIntegrationWithCoverageExtension}, each method starts with an empty - * database. Therefore this is not the right place for verifying backwards data compatibility in + * database. Therefore, this is not the right place for verifying backwards data compatibility in * end-to-end functional tests. * *

As of April 2020, none of the before/after annotations ({@code BeforeClass} and {@code @@ -107,7 +107,9 @@ import org.junit.runner.RunWith; // AfterSuiteTest must be the last entry. See class javadoc for details. AfterSuiteTest.class }) -public class SqlIntegrationTestSuite { +public final class SqlIntegrationTestSuite { + + private SqlIntegrationTestSuite() {} @BeforeAll // Not yet supported in JUnit 5. Called through BeforeSuiteTest. public static void initJpaEntityCoverage() { diff --git a/core/src/test/java/google/registry/server/RegistryTestServerMain.java b/core/src/test/java/google/registry/server/RegistryTestServerMain.java index cf525a6e5..762fe3132 100644 --- a/core/src/test/java/google/registry/server/RegistryTestServerMain.java +++ b/core/src/test/java/google/registry/server/RegistryTestServerMain.java @@ -144,7 +144,6 @@ public final class RegistryTestServerMain { User user = new User.Builder() .setEmailAddress(loginEmail) - .setGaiaId("123457890") .setUserRoles(userRoles) .setRegistryLockPassword("registryLockPassword") .build(); diff --git a/core/src/test/java/google/registry/ui/server/console/ConsoleDomainGetActionTest.java b/core/src/test/java/google/registry/ui/server/console/ConsoleDomainGetActionTest.java index 94fc4022f..e75f5990d 100644 --- a/core/src/test/java/google/registry/ui/server/console/ConsoleDomainGetActionTest.java +++ b/core/src/test/java/google/registry/ui/server/console/ConsoleDomainGetActionTest.java @@ -128,7 +128,6 @@ public class ConsoleDomainGetActionTest { private User createUser(UserRoles userRoles) { return new User.Builder() .setEmailAddress("email@email.com") - .setGaiaId("gaiaId") .setUserRoles(userRoles) .build(); } diff --git a/core/src/test/java/google/registry/ui/server/console/ConsoleUserDataActionTest.java b/core/src/test/java/google/registry/ui/server/console/ConsoleUserDataActionTest.java index 17168931f..424560ace 100644 --- a/core/src/test/java/google/registry/ui/server/console/ConsoleUserDataActionTest.java +++ b/core/src/test/java/google/registry/ui/server/console/ConsoleUserDataActionTest.java @@ -47,7 +47,6 @@ class ConsoleUserDataActionTest { User user = new User.Builder() .setEmailAddress("email@email.com") - .setGaiaId("gaiaId") .setUserRoles(new UserRoles.Builder().setGlobalRole(GlobalRole.FTE).build()) .build(); diff --git a/core/src/test/java/google/registry/ui/server/console/RegistrarsActionTest.java b/core/src/test/java/google/registry/ui/server/console/RegistrarsActionTest.java index eafad284e..5cd6f8226 100644 --- a/core/src/test/java/google/registry/ui/server/console/RegistrarsActionTest.java +++ b/core/src/test/java/google/registry/ui/server/console/RegistrarsActionTest.java @@ -232,7 +232,6 @@ class RegistrarsActionTest { private User createUser(UserRoles userRoles) { return new User.Builder() .setEmailAddress("email@email.com") - .setGaiaId("gaiaId") .setUserRoles(userRoles) .build(); } 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 923f395c5..33441f208 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 @@ -226,7 +226,6 @@ class ContactActionTest { private User createUser(UserRoles userRoles) { return new User.Builder() .setEmailAddress("email@email.com") - .setGaiaId("gaiaId") .setUserRoles(userRoles) .build(); } diff --git a/core/src/test/java/google/registry/ui/server/console/settings/SecurityActionTest.java b/core/src/test/java/google/registry/ui/server/console/settings/SecurityActionTest.java index bde45c304..ee47a729f 100644 --- a/core/src/test/java/google/registry/ui/server/console/settings/SecurityActionTest.java +++ b/core/src/test/java/google/registry/ui/server/console/settings/SecurityActionTest.java @@ -109,7 +109,6 @@ class SecurityActionTest { private User createUser(UserRoles userRoles) { return new User.Builder() .setEmailAddress("email@email.com") - .setGaiaId("TestUserId") .setUserRoles(userRoles) .build(); } diff --git a/core/src/test/java/google/registry/ui/server/registrar/RegistryLockGetActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/RegistryLockGetActionTest.java index 01db1c326..a9e1f5c2f 100644 --- a/core/src/test/java/google/registry/ui/server/registrar/RegistryLockGetActionTest.java +++ b/core/src/test/java/google/registry/ui/server/registrar/RegistryLockGetActionTest.java @@ -101,7 +101,6 @@ final class RegistryLockGetActionTest { google.registry.model.console.User consoleUser = new google.registry.model.console.User.Builder() .setEmailAddress("johndoe@theregistrar.com") - .setGaiaId("gaiaId") .setUserRoles( new UserRoles.Builder() .setRegistrarRoles( diff --git a/core/src/test/java/google/registry/ui/server/registrar/RegistryLockPostActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/RegistryLockPostActionTest.java index 61a557a61..b2a7c96c3 100644 --- a/core/src/test/java/google/registry/ui/server/registrar/RegistryLockPostActionTest.java +++ b/core/src/test/java/google/registry/ui/server/registrar/RegistryLockPostActionTest.java @@ -231,7 +231,6 @@ final class RegistryLockPostActionTest { google.registry.model.console.User consoleUser = new google.registry.model.console.User.Builder() .setEmailAddress("johndoe@theregistrar.com") - .setGaiaId("gaiaId") .setUserRoles( new UserRoles.Builder() .setRegistrarRoles( @@ -252,7 +251,6 @@ final class RegistryLockPostActionTest { google.registry.model.console.User consoleUser = new google.registry.model.console.User.Builder() .setEmailAddress("johndoe@theregistrar.com") - .setGaiaId("gaiaId") .setUserRoles(new UserRoles.Builder().setIsAdmin(true).build()) .build(); AuthResult consoleAuthResult = @@ -447,7 +445,6 @@ final class RegistryLockPostActionTest { google.registry.model.console.User consoleUser = new google.registry.model.console.User.Builder() .setEmailAddress("johndoe@theregistrar.com") - .setGaiaId("gaiaId") .setUserRoles( new UserRoles.Builder() .setRegistrarRoles( 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 4feca52f8..9933c7d90 100644 --- a/db/src/main/resources/sql/schema/db-schema.sql.generated +++ b/db/src/main/resources/sql/schema/db-schema.sql.generated @@ -756,7 +756,6 @@ id bigserial not null, update_timestamp timestamptz, email_address text not null, - gaia_id text, registry_lock_password_hash text, registry_lock_password_salt text, global_role text not null, @@ -852,7 +851,6 @@ create index reservedlist_name_idx on "ReservedList" (name); create index spec11threatmatch_registrar_id_idx on "Spec11ThreatMatch" (registrar_id); create index spec11threatmatch_tld_idx on "Spec11ThreatMatch" (tld); create index spec11threatmatch_check_date_idx on "Spec11ThreatMatch" (check_date); -create index user_gaia_id_idx on "User" (gaia_id); create index user_email_address_idx on "User" (email_address); alter table if exists "DelegationSignerData"