zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-25 12:08:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Implement "premium price ack required" checkbox

Browse source 
Implement a checkbox in the "Resources" tab to allow registrars to toggle
their "premium price ack required" flag.

Tested:
  Verfied the console functionality by hand.  I've started work on an
  automated test, but we can't actually test those from blaze and the
  kokoro tests are way too time-consuming to be practical for development, so
  we're going to have to either find a way to run those locally outside of
  the normal process or make do without a test.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=190212177
This commit is contained in:
mmuller 2018-03-23 06:42:32 -07:00 • committed by jianglai
parent f47965d5f6
commit 785225fc28
22 changed files with 423 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

28
java/google/registry/ui/server/registrar/SessionUtils.java
View file

@ -48,7 +48,8 @@ public class SessionUtils {
@Config("registryAdminClientId")
String registryAdminClientId;
@Inject public SessionUtils() {}
@Inject
public SessionUtils() {}
/**
* Checks that the authentication result indicates a user that has access to the registrar
@ -58,7 +59,8 @@ public class SessionUtils {
* the registrar console.
*/
@CheckReturnValue
Registrar getRegistrarForAuthResult(HttpServletRequest request, AuthResult authResult) {
Registrar getRegistrarForAuthResult(
HttpServletRequest request, AuthResult authResult, boolean bypassCache) {
if (!authResult.userAuthInfo().isPresent()) {
throw new ForbiddenException("Not logged in");
}
@ -67,7 +69,11 @@ public class SessionUtils {
}
String clientId = getRegistrarClientId(request);
return checkArgumentPresent(
Registrar.loadByClientIdCached(clientId), "Registrar %s not found", clientId);
bypassCache
? Registrar.loadByClientId(clientId)
: Registrar.loadByClientIdCached(clientId),
"Registrar %s not found",
clientId);
}
/**
@ -77,11 +83,11 @@ public class SessionUtils {
* {@code clientId} attribute:
*
* <ul>
* <li>If it does not exist, then we will attempt to guess the {@link Registrar} with which the
* user is associated. The {@code clientId} of the first matching {@code Registrar} will then
* be stored to the HTTP session.
* <li>If it does exist, then we'll fetch the Registrar from Datastore to make sure access
* wasn't revoked.
* <li>If it does not exist, then we will attempt to guess the {@link Registrar} with which the
* user is associated. The {@code clientId} of the first matching {@code Registrar} will
* then be stored to the HTTP session.
* <li>If it does exist, then we'll fetch the Registrar from Datastore to make sure access
* wasn't revoked.
* </ul>
*
* <p><b>Note:</b> You must ensure the user has logged in before calling this method.
@ -162,10 +168,8 @@ public class SessionUtils {
/** Returns first {@link Registrar} that {@code gaeUserId} is authorized to administer. */
private static Optional<Registrar> findRegistrarForUser(String gaeUserId) {
RegistrarContact contact = ofy().load()
.type(RegistrarContact.class)
.filter("gaeUserId", gaeUserId)
.first().now();
RegistrarContact contact =
ofy().load().type(RegistrarContact.class).filter("gaeUserId", gaeUserId).first().now();
if (contact == null) {
return Optional.empty();
}