diff --git a/java/google/registry/model/registrar/RegistrarContact.java b/java/google/registry/model/registrar/RegistrarContact.java index 5fc16b14b..4c93e9c6d 100644 --- a/java/google/registry/model/registrar/RegistrarContact.java +++ b/java/google/registry/model/registrar/RegistrarContact.java @@ -230,7 +230,8 @@ public class RegistrarContact extends ImmutableObject implements Jsonifiable { * Types: [ADMIN, WHOIS] * Visible in WHOIS as Admin contact: Yes * Visible in WHOIS as Technical contact: No - * GAE-UserID: 1234567890} + * GAE-UserID: 1234567890 + * Registrar-Console access: Yes} */ public String toStringMultilinePlainText() { StringBuilder result = new StringBuilder(256); @@ -246,17 +247,21 @@ public class RegistrarContact extends ImmutableObject implements Jsonifiable { result .append("Visible in registrar WHOIS query as Admin contact: ") .append(getVisibleInWhoisAsAdmin() ? "Yes" : "No") - .append("\n"); + .append('\n'); result .append("Visible in registrar WHOIS query as Technical contact: ") .append(getVisibleInWhoisAsTech() ? "Yes" : "No") - .append("\n"); + .append('\n'); result .append( "Phone number and email visible in domain WHOIS query as " + "Registrar Abuse contact info: ") .append(getVisibleInDomainWhoisAsAbuse() ? "Yes" : "No") - .append("\n"); + .append('\n'); + result + .append("Registrar-Console access: ") + .append(getGaeUserId() != null ? "Yes" : "No") + .append('\n'); if (getGaeUserId() != null) { result.append("GAE-UserID: ").append(getGaeUserId()).append('\n'); } diff --git a/javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java b/javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java index 89a170501..f5d496f35 100644 --- a/javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java +++ b/javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java @@ -207,6 +207,7 @@ public class SyncRegistrarsSheetTest { + "Visible in registrar WHOIS query as Technical contact: No\n" + "Phone number and email visible in domain WHOIS query as " + "Registrar Abuse contact info: No\n" + + "Registrar-Console access: No\n" + "\n" + "John Doe\n" + "john.doe@example.tld\n" @@ -217,6 +218,7 @@ public class SyncRegistrarsSheetTest { + "Visible in registrar WHOIS query as Technical contact: Yes\n" + "Phone number and email visible in domain WHOIS query as " + "Registrar Abuse contact info: No\n" + + "Registrar-Console access: Yes\n" + "GAE-UserID: light\n"); assertThat(row) .containsEntry( @@ -228,7 +230,8 @@ public class SyncRegistrarsSheetTest { + "Visible in registrar WHOIS query as Admin contact: No\n" + "Visible in registrar WHOIS query as Technical contact: No\n" + "Phone number and email visible in domain WHOIS query as " - + "Registrar Abuse contact info: No\n"); + + "Registrar Abuse contact info: No\n" + + "Registrar-Console access: No\n"); assertThat(row).containsEntry("marketingContacts", ""); assertThat(row).containsEntry("abuseContacts", ""); assertThat(row).containsEntry("whoisInquiryContacts", ""); @@ -244,7 +247,8 @@ public class SyncRegistrarsSheetTest { + "Visible in registrar WHOIS query as Admin contact: No\n" + "Visible in registrar WHOIS query as Technical contact: No\n" + "Phone number and email visible in domain WHOIS query as " - + "Registrar Abuse contact info: No\n"); + + "Registrar Abuse contact info: No\n" + + "Registrar-Console access: No\n"); assertThat(row).containsEntry("contactsMarkedAsWhoisAdmin", ""); assertThat(row) .containsEntry( @@ -259,6 +263,7 @@ public class SyncRegistrarsSheetTest { + "Visible in registrar WHOIS query as Technical contact: Yes\n" + "Phone number and email visible in domain WHOIS query as " + "Registrar Abuse contact info: No\n" + + "Registrar-Console access: Yes\n" + "GAE-UserID: light\n"); assertThat(row).containsEntry("emailAddress", "nowhere@example.org"); assertThat(row).containsEntry( diff --git a/javatests/google/registry/tools/RegistrarContactCommandTest.java b/javatests/google/registry/tools/RegistrarContactCommandTest.java index 9eb4846d5..0d95efbd1 100644 --- a/javatests/google/registry/tools/RegistrarContactCommandTest.java +++ b/javatests/google/registry/tools/RegistrarContactCommandTest.java @@ -67,7 +67,8 @@ public class RegistrarContactCommandTest extends CommandTestCase