Return-Path: X-Original-To: apmail-usergrid-commits-archive@minotaur.apache.org Delivered-To: apmail-usergrid-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A26C21094D for ; Tue, 3 Mar 2015 20:01:03 +0000 (UTC) Received: (qmail 45014 invoked by uid 500); 3 Mar 2015 20:00:41 -0000 Delivered-To: apmail-usergrid-commits-archive@usergrid.apache.org Received: (qmail 44922 invoked by uid 500); 3 Mar 2015 20:00:41 -0000 Mailing-List: contact commits-help@usergrid.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@usergrid.incubator.apache.org Delivered-To: mailing list commits@usergrid.incubator.apache.org Received: (qmail 44806 invoked by uid 99); 3 Mar 2015 20:00:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Mar 2015 20:00:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0B12FE0FC8; Tue, 3 Mar 2015 20:00:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: grey@apache.org To: commits@usergrid.apache.org Date: Tue, 03 Mar 2015 20:00:46 -0000 Message-Id: In-Reply-To: <31613d817b9b4e14abf7adb913ddece6@git.apache.org> References: <31613d817b9b4e14abf7adb913ddece6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/37] incubator-usergrid git commit: Fixed another test that uses the superuser token, and added a different endpoint to facilitate using the superuser token or the default endpoint. Fixed another test that uses the superuser token, and added a different endpoint to facilitate using the superuser token or the default endpoint. Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ff7b1a4a Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ff7b1a4a Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ff7b1a4a Branch: refs/heads/USERGRID-422 Commit: ff7b1a4a4e244310152ba698334a6e568b351e9d Parents: 760a09c Author: grey Authored: Tue Feb 3 15:56:08 2015 -0800 Committer: grey Committed: Tue Feb 3 15:56:08 2015 -0800 ---------------------------------------------------------------------- .../usergrid/rest/management/AdminUsersIT.java | 34 ++++++++------------ .../rest/test/resource2point0/ClientSetup.java | 14 ++++++-- .../endpoints/mgmt/PasswordResource.java | 17 ++++++++-- 3 files changed, 38 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ff7b1a4a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java index d9a250d..c5ca4d5 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AdminUsersIT.java @@ -177,39 +177,31 @@ public class AdminUsersIT extends AbstractRestIT { String username = clientSetup.getUsername(); String password = clientSetup.getPassword(); - String superToken = superAdminToken(); - - String newPassword = "foo"; Map passwordPayload = new HashMap(); - data.put( "newpassword", newPassword ); + passwordPayload.put( "newpassword", "testPassword" ); // change the password as admin. The old password isn't required - management.users().user( username ).password().post( passwordPayload ); + //management.users().user( username ).password(). + management.users().user( username ).password().post( clientSetup.getSuperuserToken(), passwordPayload ); + + this.refreshIndex(); // JsonNode node = mapper.readTree( resource().path( "/management/users/test/password" ).queryParam( "access_token", superToken ) // .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE ) // .post( String.class, data )); - assertNull( getError( node ) ); - - refreshIndex(); - - // log in with the new password - String token = mgmtToken( "test", newPassword ); - - assertNotNull( token ); - - data.put( "newpassword", "test" ); + assertNotNull( management.token().post( new Token( username, "testPassword" ) ) ); - // now change the password back - node = mapper.readTree( resource().path( "/management/users/test/password" ).queryParam( "access_token", superToken ) - .accept( MediaType.APPLICATION_JSON ).type( MediaType.APPLICATION_JSON_TYPE ) - .post( String.class, data )); - - assertNull( getError( node ) ); + //Check that we cannot get the token using the old password + try { + management.token().post( new Token( username, password ) ); + fail( "We shouldn't be able to get a token using the old password" ); + }catch(UniformInterfaceException uie) { + errorParse( 400,"invalid_grant",uie ); + } } // // @Test http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ff7b1a4a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java index 45c9976..819cd85 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/ClientSetup.java @@ -42,7 +42,12 @@ public class ClientSetup implements TestRule { RestClient restClient; - protected String username, password,orgName, appName, superuserToken; + protected String username; + protected String password; + protected String orgName; + protected String appName; + protected Token superuserToken; + protected Organization organization; protected Application application; @@ -84,8 +89,7 @@ public class ClientSetup implements TestRule { String name = testClass + "." + methodName; restClient.superuserSetup(); - Token superuserResponse = restClient.management().token().post( new Token("superuser","superpassword") ); - superuserToken=superuserResponse.getAccessToken(); + superuserToken = restClient.management().token().post( new Token( "superuser", "superpassword" ) ); username = "user_"+name + UUIDUtils.newTimeUUID(); password = username; @@ -110,6 +114,10 @@ public class ClientSetup implements TestRule { public String getAppName() {return appName;} + public Token getSuperuserToken() { + return superuserToken; + } + public void refreshIndex() { this.restClient.refreshIndex(getOrganizationName(),getAppName()); } http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ff7b1a4a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/PasswordResource.java ---------------------------------------------------------------------- diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/PasswordResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/PasswordResource.java index 779e057..c901022 100644 --- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/PasswordResource.java +++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/mgmt/PasswordResource.java @@ -25,6 +25,7 @@ import org.apache.usergrid.rest.test.resource2point0.endpoints.NamedResource; import org.apache.usergrid.rest.test.resource2point0.endpoints.UrlResource; import org.apache.usergrid.rest.test.resource2point0.model.ApiResponse; import org.apache.usergrid.rest.test.resource2point0.model.Entity; +import org.apache.usergrid.rest.test.resource2point0.model.Token; import org.apache.usergrid.rest.test.resource2point0.state.ClientContext; import com.sun.jersey.api.client.WebResource; @@ -41,10 +42,20 @@ public class PasswordResource extends NamedResource { super( "password", context, parent ); } - public Entity post(Map payload){ - WebResource resource = getResource(true); + public Entity post(Token token, Map payload){ + WebResource resource; + + if(token != null) { + resource = getResource( true, token ); + } + else + resource = getResource( true ); return resource.type( MediaType.APPLICATION_JSON_TYPE ) - .accept( MediaType.APPLICATION_JSON ).post( Entity.class, payload ); + .accept( MediaType.APPLICATION_JSON ).post( Entity.class, payload ); + } + + public Entity post(Map payload){ + return post( null, payload ); } }