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

Don't throw an exception on orphaned contacts

Browse source 
Return Optional.absent() instead of throwing NotFoundException when a user has
a contact record but the Registrar entity is missing.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=138423965
This commit is contained in:
mmuller 2016-11-07 12:21:48 -08:00 • committed by Ben McIlwain
parent 7a77819977
commit cbe76e8615
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import com.google.appengine.api.users.UserService;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
import com.googlecode.objectify.Key;
import google.registry.model.registrar.Registrar; import google.registry.model.registrar.Registrar;
import google.registry.model.registrar.RegistrarContact; import google.registry.model.registrar.RegistrarContact;
import google.registry.util.FormattingLogger; import google.registry.util.FormattingLogger;
@ -121,7 +122,12 @@ public class SessionUtils {
if (contact == null) { if (contact == null) {
return Optional.absent(); return Optional.absent();
} }
return Optional.of(ofy().load().key(contact.getParent()).safe()); Optional<Registrar> result = Optional.fromNullable(ofy().load().key(contact.getParent()).now());
if (!result.isPresent()) {
logger.severefmt(
"A contact record exists for non-existent registrar: %s.", Key.create(contact));
}
return result;
} }
/** @see #hasAccessToRegistrar(Registrar, String) */ /** @see #hasAccessToRegistrar(Registrar, String) */

10
javatests/google/registry/ui/server/registrar/SessionUtilsTest.java
View file

@ -16,6 +16,7 @@ package google.registry.ui.server.registrar;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static google.registry.testing.AppEngineRule.THE_REGISTRAR_GAE_USER_ID; import static google.registry.testing.AppEngineRule.THE_REGISTRAR_GAE_USER_ID;
import static google.registry.testing.DatastoreHelper.deleteResource;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.verifyNoMoreInteractions;
@ -103,10 +104,17 @@ public class SessionUtilsTest {
verify(session).invalidate(); verify(session).invalidate();
} }
@Test
public void testCheckRegistrarConsoleLogin_orphanedContactIsDenied() throws Exception {
deleteResource(Registrar.loadByClientId("TheRegistrar"));
when(userService.getCurrentUser()).thenReturn(jart);
assertThat(sessionUtils.checkRegistrarConsoleLogin(req)).isFalse();
}
@Test @Test
public void testCheckRegistrarConsoleLogin_notLoggedIn_throwsIse() throws Exception { public void testCheckRegistrarConsoleLogin_notLoggedIn_throwsIse() throws Exception {
thrown.expect(IllegalStateException.class); thrown.expect(IllegalStateException.class);
assertThat(sessionUtils.checkRegistrarConsoleLogin(req)).isNull(); boolean unused = sessionUtils.checkRegistrarConsoleLogin(req);
} }
@Test @Test