diff --git a/core/src/main/java/google/registry/tools/CheckDomainCommand.java b/core/src/main/java/google/registry/tools/CheckDomainCommand.java index 40ee334f4..64ba8e3b8 100644 --- a/core/src/main/java/google/registry/tools/CheckDomainCommand.java +++ b/core/src/main/java/google/registry/tools/CheckDomainCommand.java @@ -14,6 +14,8 @@ package google.registry.tools; +import static com.google.common.base.Strings.isNullOrEmpty; + import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.google.common.collect.Multimap; @@ -39,6 +41,11 @@ final class CheckDomainCommand extends NonMutatingEppToolCommand { required = true) private List mainParameters; + @Parameter( + names = {"-t", "--token"}, + description = "Allocation token to use in the command, if desired") + private String allocationToken; + @Inject @Config("registryAdminClientId") String registryAdminClientId; @@ -53,7 +60,11 @@ final class CheckDomainCommand extends NonMutatingEppToolCommand { Multimap domainNameMap = validateAndGroupDomainNamesByTld(mainParameters); for (Collection values : domainNameMap.asMap().values()) { setSoyTemplate(DomainCheckSoyInfo.getInstance(), DomainCheckSoyInfo.DOMAINCHECK); - addSoyRecord(clientId, new SoyMapData("domainNames", values)); + SoyMapData soyMapData = new SoyMapData("domainNames", values); + if (!isNullOrEmpty(allocationToken)) { + soyMapData.put("allocationToken", allocationToken); + } + addSoyRecord(clientId, soyMapData); } } } diff --git a/core/src/main/resources/google/registry/tools/soy/DomainCheck.soy b/core/src/main/resources/google/registry/tools/soy/DomainCheck.soy index 35dfa8c36..04d9a5b2f 100644 --- a/core/src/main/resources/google/registry/tools/soy/DomainCheck.soy +++ b/core/src/main/resources/google/registry/tools/soy/DomainCheck.soy @@ -19,6 +19,7 @@ */ {template .domaincheck stricthtml="false"} {@param domainNames: list} +{@param? allocationToken: string|null} @@ -39,6 +40,12 @@ {/for} + {if isNonnull($allocationToken)} + + {$allocationToken} + + {/if} RegistryTool diff --git a/core/src/test/java/google/registry/tools/CheckDomainCommandTest.java b/core/src/test/java/google/registry/tools/CheckDomainCommandTest.java index 8684338fc..8854bd325 100644 --- a/core/src/test/java/google/registry/tools/CheckDomainCommandTest.java +++ b/core/src/test/java/google/registry/tools/CheckDomainCommandTest.java @@ -76,6 +76,12 @@ public class CheckDomainCommandTest extends EppToolCommandTestCase runCommand("--client=NewRegistrar")); diff --git a/core/src/test/resources/google/registry/tools/server/domain_check_fee_allocationtoken.xml b/core/src/test/resources/google/registry/tools/server/domain_check_fee_allocationtoken.xml new file mode 100644 index 000000000..4c4e4a10d --- /dev/null +++ b/core/src/test/resources/google/registry/tools/server/domain_check_fee_allocationtoken.xml @@ -0,0 +1,24 @@ + + + + + + example.tld + + + + + + example.tld + create + 1 + + + + abc123 + + + RegistryTool + +