mirror of
https://github.com/google/nomulus
synced 2026-08-01 04:46:08 +00:00
Always require acknowledgment of premium fees
This removes the configuration ability on both Registry and Registrar entities to allow operations on premium domains to succeed without acking the fees using the fee extension. We only ever used this ability during the minna launch, and it was a fiasco. We have no intention of ever allowing creation, renewal, transfer, restoring, etc. of premium domains without acking the fees ever again, and haven't done so since 2013, so removing this ability allows us to simplify our code, data model, and tests. Note that all TLDs in our production system currently require price ACKing anyway, so from an external partner perspective this commit is a noop. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=229423650
This commit is contained in:
@@ -87,8 +87,7 @@ registry.json.Response.prototype.results;
|
||||
* localizedAddress: registry.json.RegistrarAddress,
|
||||
* whoisServer: (string?|undefined),
|
||||
* referralUrl: (string?|undefined),
|
||||
* contacts: !Array.<registry.json.RegistrarContact>,
|
||||
* premiumPriceAckRequired: boolean
|
||||
* contacts: !Array.<registry.json.RegistrarContact>
|
||||
* }}
|
||||
*/
|
||||
registry.json.Registrar;
|
||||
|
||||
@@ -279,9 +279,6 @@ public final class RegistrarFormFields {
|
||||
args, L10N_STREET_FIELD, L10N_CITY_FIELD, L10N_STATE_FIELD, L10N_ZIP_FIELD))
|
||||
.build();
|
||||
|
||||
public static final FormField<Boolean, Boolean> PREMIUM_PRICE_ACK_REQUIRED =
|
||||
FormField.named("premiumPriceAckRequired", Boolean.class).build();
|
||||
|
||||
private static @Nullable RegistrarAddress toNewAddress(
|
||||
@Nullable Map<String, ?> args,
|
||||
final FormField<List<String>, List<String>> streetField,
|
||||
|
||||
@@ -35,7 +35,6 @@ import com.google.template.soy.data.SoyMapData;
|
||||
import com.google.template.soy.shared.SoyCssRenamingMap;
|
||||
import com.google.template.soy.tofu.SoyTofu;
|
||||
import google.registry.config.RegistryConfig.Config;
|
||||
import google.registry.model.registrar.Registrar;
|
||||
import google.registry.request.Action;
|
||||
import google.registry.request.Parameter;
|
||||
import google.registry.request.Response;
|
||||
@@ -149,8 +148,7 @@ public final class ConsoleUiAction implements Runnable {
|
||||
// since we double check the access to the registrar on any read / update request. We have to
|
||||
// - since the access might get revoked between the initial page load and the request! (also
|
||||
// because the requests come from the browser, and can easily be faked)
|
||||
Registrar registrar = registrarAccessor.getRegistrar(clientId);
|
||||
data.put("requireFeeExtension", registrar.getPremiumPriceAckRequired());
|
||||
registrarAccessor.getRegistrar(clientId);
|
||||
} catch (RegistrarAccessDeniedException e) {
|
||||
logger.atWarning().withCause(e).log(
|
||||
"User %s doesn't have access to registrar console.", authResult.userIdForLogging());
|
||||
|
||||
@@ -260,11 +260,6 @@ public class RegistrarSettingsAction implements Runnable, JsonActionRunner.JsonA
|
||||
|
||||
Registrar.Builder builder = initialRegistrar.asBuilder();
|
||||
|
||||
// BILLING
|
||||
RegistrarFormFields.PREMIUM_PRICE_ACK_REQUIRED
|
||||
.extractUntyped(args)
|
||||
.ifPresent(builder::setPremiumPriceAckRequired);
|
||||
|
||||
// WHOIS
|
||||
//
|
||||
// Because of how whoisServer handles "default value", it's possible that setting the existing
|
||||
|
||||
@@ -315,8 +315,6 @@
|
||||
{template .resources}
|
||||
{@param? driveFolderId: string}
|
||||
{@param technicalDocsUrl: string}
|
||||
{@param premiumPriceAckRequired: bool}
|
||||
{@param readonly: bool}
|
||||
<div id="domain-registrar-resources">
|
||||
<h1>Resources & billing</h1>
|
||||
<p>
|
||||
@@ -341,15 +339,6 @@
|
||||
{else}
|
||||
<em>Your billing folder is pending allocation.</em>
|
||||
{/if}
|
||||
<h2><img src="/assets/images/folder.png">EPP Settings</h2>
|
||||
<p>Use the 'Edit' button above to switch to enable editing the information
|
||||
below. <i>Updates may require up to 10 minutes to take effect.</i>
|
||||
<form name="item" class="{css('item')} {css('registrar')}">
|
||||
<input type="checkbox" id="premiumPriceAckRequired" name="premiumPriceAckRequired"
|
||||
{if $premiumPriceAckRequired} checked{/if}
|
||||
{if $readonly} disabled{/if}>
|
||||
Require use of fee extension to acknowledge all premium domain prices.
|
||||
</form>
|
||||
</div>
|
||||
{/template}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user