Minor cleanups, plus use standard TTL.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/bbc5e1a0 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/bbc5e1a0 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/bbc5e1a0 Branch: refs/heads/1.x Commit: bbc5e1a05976dc35d21807c31db9b9980f877624 Parents: bd54436 Author: Dave Johnson <[email protected]> Authored: Tue Feb 16 17:19:07 2016 -0500 Committer: Dave Johnson <[email protected]> Committed: Tue Feb 16 17:19:07 2016 -0500 ---------------------------------------------------------------------- .../rest/management/ManagementResource.java | 25 -------------------- .../rest/management/ManagementResourceIT.java | 8 +++---- .../tokens/cassandra/TokenServiceImpl.java | 7 ++---- 3 files changed, 6 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/bbc5e1a0/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java index d71f45d..1386767 100644 --- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/ManagementResource.java @@ -17,46 +17,24 @@ package org.apache.usergrid.rest.management; -import com.codahale.metrics.Counter; -import com.codahale.metrics.Timer; -import com.sun.jersey.api.client.Client; -import com.sun.jersey.api.client.config.ClientConfig; -import com.sun.jersey.api.client.config.DefaultClientConfig; -import com.sun.jersey.api.json.JSONConfiguration; import com.sun.jersey.api.view.Viewable; -import com.sun.jersey.client.apache.ApacheHttpClient; -import com.sun.jersey.client.apache.ApacheHttpClientHandler; import org.apache.amber.oauth2.common.error.OAuthError; import org.apache.amber.oauth2.common.exception.OAuthProblemException; import org.apache.amber.oauth2.common.message.OAuthResponse; import org.apache.amber.oauth2.common.message.types.GrantType; -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.HttpConnectionManager; -import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; -import org.apache.commons.httpclient.params.HttpClientParams; -import org.apache.commons.httpclient.params.HttpConnectionManagerParams; -import org.apache.commons.httpclient.params.HttpMethodParams; -import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringUtils; -import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.shiro.codec.Base64; -import org.apache.usergrid.exception.NotImplementedException; import org.apache.usergrid.management.ApplicationCreator; -import org.apache.usergrid.management.OrganizationInfo; -import org.apache.usergrid.management.OrganizationOwnerInfo; import org.apache.usergrid.management.UserInfo; import org.apache.usergrid.management.exceptions.DisabledAdminUserException; import org.apache.usergrid.management.exceptions.UnactivatedAdminUserException; import org.apache.usergrid.management.exceptions.UnconfirmedAdminUserException; -import org.apache.usergrid.metrics.MetricsFactory; -import org.apache.usergrid.persistence.exceptions.EntityNotFoundException; import org.apache.usergrid.rest.AbstractContextResource; import org.apache.usergrid.rest.exceptions.RedirectionException; import org.apache.usergrid.rest.management.organizations.OrganizationsResource; import org.apache.usergrid.rest.management.users.UsersResource; import org.apache.usergrid.security.oauth.AccessInfo; import org.apache.usergrid.security.shiro.utils.SubjectUtils; -import org.codehaus.jackson.JsonNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -69,10 +47,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import java.net.URLEncoder; -import java.util.Collections; -import java.util.Iterator; import java.util.Map; -import java.util.UUID; import static javax.servlet.http.HttpServletResponse.*; import static javax.ws.rs.core.MediaType.*; http://git-wip-us.apache.org/repos/asf/usergrid/blob/bbc5e1a0/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java index 3a535c4..91904be 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/ManagementResourceIT.java @@ -678,10 +678,10 @@ public class ManagementResourceIT extends AbstractRestIT { // TODO: how do we unit test SSO now that we have no external token end-point? - Map<String, String> payload = hashMap( "access_token", accessToken ); - - JsonNode node = resource().path( "/management/me" ).accept( MediaType.APPLICATION_JSON ) - .type( MediaType.APPLICATION_JSON_TYPE ).post( JsonNode.class, payload ); + JsonNode node = resource().path( "/management/me" ) + .queryParam( "access_token", accessToken ) + .accept( MediaType.APPLICATION_JSON ) + .get( JsonNode.class ); logNode( node ); String token = node.get( "access_token" ).getTextValue(); http://git-wip-us.apache.org/repos/asf/usergrid/blob/bbc5e1a0/stack/services/src/main/java/org/apache/usergrid/security/tokens/cassandra/TokenServiceImpl.java ---------------------------------------------------------------------- diff --git a/stack/services/src/main/java/org/apache/usergrid/security/tokens/cassandra/TokenServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/security/tokens/cassandra/TokenServiceImpl.java index 970e205..3e58f24 100644 --- a/stack/services/src/main/java/org/apache/usergrid/security/tokens/cassandra/TokenServiceImpl.java +++ b/stack/services/src/main/java/org/apache/usergrid/security/tokens/cassandra/TokenServiceImpl.java @@ -18,7 +18,6 @@ package org.apache.usergrid.security.tokens.cassandra; import com.codahale.metrics.Counter; -import com.google.inject.Injector; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.config.ClientConfig; import com.sun.jersey.api.client.config.DefaultClientConfig; @@ -298,16 +297,14 @@ public class TokenServiceImpl implements TokenService { UUID uuid = getUUIDForToken( token ); - long ssoTtl = 1000000L; // TODO: property for this - if ( uuid == null ) { - return isSSOEnabled() ? validateExternalToken( token, ssoTtl ) : null; + return null; } TokenInfo tokenInfo = getTokenInfo( uuid ); if ( tokenInfo == null ) { - return isSSOEnabled() ? validateExternalToken( token, ssoTtl ) : null; + return isSSOEnabled() ? validateExternalToken( token, maxPersistenceTokenAge ) : null; } //update the token
