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

Implement login/logout commands

Browse source 
Refactor the auth code into its own dagger module, add tests and use the new interfaces to implement the login and logout commands.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=149108266
This commit is contained in:
mmuller 2017-03-03 06:49:42 -08:00 • committed by Ben McIlwain
parent 80f0910899
commit 5614760d53
10 changed files with 380 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

71
javatests/google/registry/tools/DefaultRequestFactoryModuleTest.java
View file

@ -15,20 +15,11 @@
package google.registry.tools;
import static com.google.common.truth.Truth.assertThat;
import static google.registry.tools.DefaultRequestFactoryModule.createClientScopeQualifier;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import com.google.api.client.auth.oauth2.Credential;
import com.google.api.client.googleapis.auth.oauth2.GoogleClientSecrets;
import com.google.api.client.http.HttpRequest;
import com.google.api.client.http.HttpRequestFactory;
import com.google.api.client.http.HttpRequestInitializer;
import com.google.api.client.util.store.AbstractDataStoreFactory;
import com.google.common.collect.ImmutableList;
import com.google.common.net.HostAndPort;
import google.registry.testing.Providers;
import java.io.IOException;
@ -37,7 +28,6 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.mockito.ArgumentCaptor;
@RunWith(JUnit4.class)
public class DefaultRequestFactoryModuleTest {
@ -53,18 +43,8 @@ public class DefaultRequestFactoryModuleTest {
}
});
private static final String TEST_CLIENT_SECRET_FILENAME =
"/google/registry/tools/resources/client_secret_UNITTEST.json";
// Mocks.
AbstractDataStoreFactory dataStoreFactory = mock(AbstractDataStoreFactory.class);
DefaultRequestFactoryModule.Authorizer authorizer =
mock(DefaultRequestFactoryModule.Authorizer.class);
Provider<Credential> credentialProvider = Providers.of(FAKE_CREDENTIAL);
// Captor for client secrets.
ArgumentCaptor<GoogleClientSecrets> secrets = ArgumentCaptor.forClass(GoogleClientSecrets.class);
DefaultRequestFactoryModule module = new DefaultRequestFactoryModule();
@Before
@ -72,19 +52,6 @@ public class DefaultRequestFactoryModuleTest {
RegistryToolEnvironment.UNITTEST.setup();
}
@Test
public void test_getCredential() throws Exception {
when(authorizer.authorize(any(GoogleClientSecrets.class))).thenReturn(FAKE_CREDENTIAL);
Credential cred = module.provideCredential(
dataStoreFactory,
authorizer,
TEST_CLIENT_SECRET_FILENAME);
assertThat(cred).isSameAs(FAKE_CREDENTIAL);
verify(authorizer).authorize(secrets.capture());
assertThat(secrets.getValue().getDetails().getClientId()).isEqualTo(
"UNITTEST-CLIENT-ID");
}
@Test
public void test_provideHttpRequestFactory_localhost() throws Exception {
// Make sure that localhost creates a request factory with an initializer.
@ -95,7 +62,6 @@ public class DefaultRequestFactoryModuleTest {
HttpRequestInitializer initializer = factory.getInitializer();
assertThat(initializer).isNotNull();
assertThat(initializer).isNotSameAs(FAKE_CREDENTIAL);
verifyZeroInteractions(authorizer);
}
@Test
@ -108,41 +74,4 @@ public class DefaultRequestFactoryModuleTest {
credentialProvider);
assertThat(factory.getInitializer()).isSameAs(FAKE_CREDENTIAL);
}
@Test
public void test_createClientScopeQualifier() {
String simpleQualifier =
createClientScopeQualifier("client-id", ImmutableList.of("foo", "bar"));
// If we change the way we encode client id and scopes, this assertion will break. That's
// probably ok and you can just change the text. The things you have to be aware of are:
// - Names in the new encoding should have a low risk of collision with the old encoding.
// - Changing the encoding will force all OAuth users of the nomulus tool to do a new login
// (existing credentials will not be used).
assertThat(simpleQualifier).isEqualTo("client-id bar foo");
// Verify order independence.
assertThat(simpleQualifier).isEqualTo(
createClientScopeQualifier("client-id", ImmutableList.of("bar", "foo")));
// Verify changing client id produces a different value.
assertThat(simpleQualifier).isNotEqualTo(
createClientScopeQualifier("new-client", ImmutableList.of("bar", "foo")));
// Verify that adding/deleting/modifying scopes produces a different value.
assertThat(simpleQualifier).isNotEqualTo(
createClientScopeQualifier("client id", ImmutableList.of("bar", "foo", "baz")));
assertThat(simpleQualifier).isNotEqualTo(
createClientScopeQualifier("client id", ImmutableList.of("barx", "foo")));
assertThat(simpleQualifier).isNotEqualTo(
createClientScopeQualifier("client id", ImmutableList.of("bar", "foox")));
assertThat(simpleQualifier).isNotEqualTo(
createClientScopeQualifier("client id", ImmutableList.of("bar")));
// Verify that delimiting works.
assertThat(simpleQualifier).isNotEqualTo(
createClientScopeQualifier("client-id", ImmutableList.of("barf", "oo")));
assertThat(simpleQualifier).isNotEqualTo(
createClientScopeQualifier("client-idb", ImmutableList.of("ar", "foo")));
}
}