You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/06/09 23:34:41 UTC
incubator-usergrid git commit: Fixes to add tokenless post and get
calls. Further refactoring as needed.
Repository: incubator-usergrid
Updated Branches:
refs/heads/rest-test-framework-token-fix [created] 139b9e669
Fixes to add tokenless post and get calls. Further refactoring as needed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/139b9e66
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/139b9e66
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/139b9e66
Branch: refs/heads/rest-test-framework-token-fix
Commit: 139b9e6691477d7f2841a9958cde17c23a0eba9e
Parents: 05f8172
Author: GERey <gr...@apigee.com>
Authored: Tue Jun 9 14:34:38 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Tue Jun 9 14:34:38 2015 -0700
----------------------------------------------------------------------
.../apache/usergrid/rest/NotificationsIT.java | 2 +-
.../rest/applications/ApplicationCreateIT.java | 7 +-
.../applications/ApplicationResourceIT.java | 18 ++++--
.../collection/users/UserResourceIT.java | 4 +-
.../usergrid/rest/management/AccessTokenIT.java | 25 +++++---
.../usergrid/rest/management/AdminUsersIT.java | 16 ++---
.../rest/management/ManagementResourceIT.java | 15 +++--
.../rest/management/OrganizationsIT.java | 26 ++++----
.../rest/management/RegistrationIT.java | 23 ++++---
.../organizations/AdminEmailEncodingIT.java | 4 +-
.../test/resource2point0/AbstractRestIT.java | 26 ++++++--
.../rest/test/resource2point0/RestClient.java | 8 ++-
.../endpoints/NamedResource.java | 67 +++++++++++++++++---
13 files changed, 166 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/139b9e66/stack/rest/src/test/java/org/apache/usergrid/rest/NotificationsIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/NotificationsIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/NotificationsIT.java
index d5fb2db..b4abbea 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/NotificationsIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/NotificationsIT.java
@@ -79,7 +79,7 @@ public class NotificationsIT extends org.apache.usergrid.rest.test.resource2poin
// create notifier
Entity notifier = new Entity().chainPut("name", "mynotifier").chainPut("provider", "noop");
- ApiResponse notifierNode = this.pathResource(getOrgAppPath("notifier")).post(ApiResponse.class,notifier);
+ ApiResponse notifierNode = this.pathResource(getOrgAppPath("notifier"),this.getAdminToken()).post(ApiResponse.class,notifier);
//logger.debug("Notifier is: " + notifierNode.toString());
assertEquals("noop", notifierNode.getEntities().get(0).get("provider").toString());
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/139b9e66/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java
index 921027f..03380c5 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationCreateIT.java
@@ -50,15 +50,16 @@ public class ApplicationCreateIT extends AbstractRestIT {
String orgName = clientSetup.getOrganizationName();
String appName = clientSetup.getAppName() + "_new_app";
+ String orgAppManagementEndpoint = "management/orgs/"+orgName+"/apps";
Token orgAdminToken = getAdminToken(clientSetup.getUsername(), clientSetup.getPassword());
+
Map applicationMap = new HashMap<String, Object>( );
applicationMap.put( "name", appName );
- this.management().token().setToken(orgAdminToken);
- this.management().orgs().organization( orgName ).apps().post(applicationMap );
+ this.pathResource( orgAppManagementEndpoint,orgAdminToken ).post(applicationMap);
- Entity response = this.management().orgs().organization( orgName ).addToPath( "apps" ).addToPath( appName ).get();
+ Entity response = this.pathResource( orgAppManagementEndpoint+"/"+appName,orgAdminToken ).get(Entity.class,null);
assertNotNull( response );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/139b9e66/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
index 4ce3396..e8fd42e 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/ApplicationResourceIT.java
@@ -442,14 +442,17 @@ public class ApplicationResourceIT extends AbstractRestIT {
assertNotNull(entity);
refreshIndex();
//Retrieve an authentication token for the user
- Token tokenResponse = this.app().getResource(false).path(String.format("/%s/%s/token", orgName, appName))
- .queryParam("grant_type", "password")
- .queryParam("username", username)
- .queryParam("password", "password")
- .accept(MediaType.APPLICATION_JSON)
- .type(MediaType.APPLICATION_JSON_TYPE)
- .get(Token.class);
+ Token tokenResponse = this.pathResource( getOrgAppPath( "token" ) ).post(Token.class,new Token( username,"password" ) );
+
+// Token tokenResponse = this.app().getResource(false).path(String.format("/%s/%s/token", orgName, appName))
+// .queryParam("grant_type", "password")
+// .queryParam("username", username)
+// .queryParam("password", "password")
+// .accept(MediaType.APPLICATION_JSON)
+// .type(MediaType.APPLICATION_JSON_TYPE)
+// .get(Token.class);
+//
String token = tokenResponse.getAccessToken();
assertNotNull(token);
@@ -457,6 +460,7 @@ public class ApplicationResourceIT extends AbstractRestIT {
long expires_in = tokenResponse.getExpirationDate();
assertEquals(604800, expires_in);
+ //TODO: broken because of put appDelete.
//Set the default TTL of the application to a date far in the future
this.app().getResource(false)
.queryParam("access_token", token)
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/139b9e66/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
index 06004bb..24bdeed 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/collection/users/UserResourceIT.java
@@ -871,7 +871,7 @@ public class UserResourceIT extends AbstractRestIT {
assertNotNull(entity1);
assertNotNull(entity2);
- Token adminToken = this.clientSetup.getRestClient().management().token().post(false,Token.class,new Token(clientSetup.getUsername(), clientSetup.getUsername()),null);
+ Token adminToken = getAdminToken();
// now revoke the tokens
this.app().token().setToken(adminToken);
@@ -919,7 +919,7 @@ public class UserResourceIT extends AbstractRestIT {
assertNotNull(entity2);
// now revoke the token3
- adminToken = this.clientSetup.getRestClient().management().token().post(false,Token.class,new Token(clientSetup.getUsername(), clientSetup.getUsername()),null);
+ adminToken = getAdminToken();
// now revoke the tokens
this.app().token().setToken(adminToken);
usersResource.entity("edanuff").connection("revoketokens").post();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/139b9e66/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
index 09b744c..fa11f55 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/AccessTokenIT.java
@@ -234,8 +234,10 @@ public class AccessTokenIT extends AbstractRestIT {
Token token2 = getAdminToken();
// using a superuser token, revoke all tokens associated with the admin user
- management().token().setToken( clientSetup.getSuperuserToken() );
- management().users().user( clientSetup.getUsername() ).revokeTokens().post(true , ApiResponse.class, null,null);
+ this.pathResource( "management/users/"+clientSetup.getUsername()+"/revoketokens",clientSetup.getSuperuserToken() )
+ .post( ApiResponse.class );
+
+ // management().users().user( clientSetup.getUsername() ).revokeTokens().post(true , ApiResponse.class, null,null);
refreshIndex();
@@ -275,16 +277,21 @@ public class AccessTokenIT extends AbstractRestIT {
QueryParameters queryParameters = new QueryParameters();
queryParameters.addParam( "token", token1.getAccessToken() );
- management().token().setToken( clientSetup.getSuperuserToken() );
- management().users().user( clientSetup.getUsername() ).revokeToken().post( false, ApiResponse.class,null,queryParameters );
+ this.pathResource( getManagementUsersPath( "revoketoken" ), clientSetup.getSuperuserToken()).post(
+ ApiResponse.class, null, queryParameters );
+
+// management().token().setToken( clientSetup.getSuperuserToken() );
+// management().users().user( clientSetup.getUsername() ).revokeToken().post( false, ApiResponse.class,null,queryParameters );
refreshIndex();
//test that token 1 doesn't work
try {
- management().token().setToken( token1 );
- management().users().user( clientSetup.getUsername() ).get();
+// management().token().setToken( token1 );
+// management().users().user( clientSetup.getUsername() ).get();
+
+ this.pathResource( getManagementUsersPath( null ),token1 ).get( ApiResponse.class,null );
fail( "Token1 should have been revoked" );
}
catch ( UniformInterfaceException uie ) {
@@ -294,8 +301,10 @@ public class AccessTokenIT extends AbstractRestIT {
//test that token 2 still works
try {
- management().token().setToken( token2 );
- management().users().user( clientSetup.getUsername() ).get();
+ this.pathResource( getManagementUsersPath( null ),token2).get( ApiResponse.class,null );
+
+ // management().token().setToken( token2 );
+// management().users().user( clientSetup.getUsername() ).get();
}
catch ( UniformInterfaceException uie ) {
fail( "Token2 shouldn't have been revoked" );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/139b9e66/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 9306f2b..238b279 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
@@ -91,12 +91,10 @@ public class AdminUsersIT extends AbstractRestIT {
this.refreshIndex();
//Get the token using the new password
- Token adminToken = management.token().post( false, Token.class, new Token( username, "testPassword" ) ,null );
- management.token().setToken( adminToken );
//Check that we cannot get the token using the old password
try {
- management.token().post(false, Token.class, new Token( username, password ),null);
+ getAdminToken( username,password );
fail( "We shouldn't be able to get a token using the old password" );
}catch(UniformInterfaceException uie) {
errorParse( 400,"invalid_grant",uie );
@@ -156,17 +154,18 @@ public class AdminUsersIT extends AbstractRestIT {
Map<String, Object> passwordPayload = new HashMap<String, Object>();
passwordPayload.put( "newpassword", "testPassword" );
- management.token().setToken( clientSetup.getSuperuserToken());
- management.users().user( username ).password().post( passwordPayload );
+ this.pathResource( "management/users/"+username+"/password",this.clientSetup.getSuperuserToken() )
+ .post( passwordPayload );
this.refreshIndex();
- assertNotNull(management.token().post( false,Token.class, new Token( username, "testPassword" ) ,null ));
+
+ assertNotNull( getAdminToken( username,"testPassword" ) );
//Check that we cannot get the token using the old password
try {
- management.token().post( false,Token.class, new Token( username, password) ,null);
+ getAdminToken( username,password );
fail( "We shouldn't be able to get a token using the old password" );
}catch(UniformInterfaceException uie) {
errorParse( 400,"invalid_grant",uie );
@@ -615,7 +614,8 @@ public class AdminUsersIT extends AbstractRestIT {
// management().token().setToken( organizationToken );
//Create admin user
- management().orgs().organization( clientSetup.getOrganizationName() ).users().post(ApiResponse.class ,adminUserPayload );
+ // management().orgs().organization( clientSetup.getOrganizationName() ).users().post(ApiResponse.class ,adminUserPayload );
+ this.pathResource( "management/orgs/"+clientSetup.getOrganizationName()+"/users",this.getAdminToken() ).post( adminUserPayload );
refreshIndex();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/139b9e66/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 f361e8b..4fd8445 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
@@ -69,8 +69,11 @@ public class ManagementResourceIT extends AbstractRestIT {
@Test
public void setSelfAdminPasswordAsAdwmin() {
UUID uuid = UUIDUtils.newTimeUUID();
- management.token().setToken(clientSetup.getSuperuserToken());
- management.orgs().organization(clientSetup.getOrganizationName()).users().post(ApiResponse.class, new User("test" + uuid, "test" + uuid, "test" + uuid + "@email.com", "test"));
+
+ this.pathResource( "management/orgs/"+clientSetup.getOrganizationName()+"/users" )
+ .post( new User("test" + uuid, "test" + uuid, "test" + uuid + "@email.com", "test") );
+ //management.token().setToken(clientSetup.getSuperuserToken());
+ //management.orgs().organization(clientSetup.getOrganizationName()).users().post(ApiResponse.class, new User("test" + uuid, "test" + uuid, "test" + uuid + "@email.com", "test"));
Map<String, Object> data = new HashMap<>();
data.put( "newpassword", "foo" );
data.put( "oldpassword", "test" );
@@ -457,7 +460,9 @@ public class ManagementResourceIT extends AbstractRestIT {
assertNotNull(response.get("email").toString());
// now revoke the tokens
- response = management.users().user(clientSetup.getUsername()).revokeTokens().post(true,Entity.class,null, null);
+ response = this.pathResource( "management/users/"+clientSetup.getUsername()+"/revoketokens" ).post( Entity.class );
+
+ //management.users().user(clientSetup.getUsername()).revokeTokens().post(true,Entity.class,null, null);
// the tokens shouldn't work
@@ -480,7 +485,9 @@ public class ManagementResourceIT extends AbstractRestIT {
// now revoke the token3
QueryParameters queryParameters = new QueryParameters();
queryParameters.addParam( "token", token3.getAccessToken() );
- management.users().user(clientSetup.getUsername()).revokeToken().post( false, Entity.class,null,queryParameters );
+ this.pathResource( "management/users/"+clientSetup.getUsername()+"/revoketokens" )
+ .post( Entity.class,null,queryParameters );
+ //management.users().user(clientSetup.getUsername()).revokeToken().post( false, Entity.class,null,queryParameters );
// the token3 shouldn't work
status = null;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/139b9e66/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
index 4385a4c..d12f87e 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/OrganizationsIT.java
@@ -72,9 +72,9 @@ public class OrganizationsIT extends AbstractRestIT {
// this.refreshIndex();
//Creates token
- Token token =
- clientSetup.getRestClient().management().token().post(false,Token.class, new Token( "password",
- organization.getUsername(), organization.getPassword() ) ,null);
+ Token token = getAdminToken( organization.getUsername(),organization.getPassword());
+// clientSetup.getRestClient().management().token().post(false,Token.class, new Token( "password",
+// organization.getUsername(), organization.getPassword() ) ,null);
this.management().token().setToken(token);
assertNotNull( token );
@@ -111,8 +111,8 @@ public class OrganizationsIT extends AbstractRestIT {
assertNotNull( orgCreatedResponse );
//Ensure that the token from the newly created organization works.
- Token tokenPayload = new Token( "password", organization.getUsername(), organization.getPassword() );
- Token tokenReturned = clientSetup.getRestClient().management().token().post(false,Token.class, tokenPayload,null );
+ // Token tokenPayload = new Token( "password", organization.getUsername(), organization.getPassword() );
+ Token tokenReturned = getAdminToken( organization.getUsername(),organization.getPassword()) ;
this.management().token().setToken(tokenReturned);
assertNotNull( tokenReturned );
@@ -131,10 +131,9 @@ public class OrganizationsIT extends AbstractRestIT {
// Post to get token of what should be a non existent user due to the failure of creation above
- tokenPayload = new Token( "password", organization.getName() + "test", organization.getPassword() );
Token tokenError = null;
try {
- tokenError = clientSetup.getRestClient().management().token().post(false,Token.class, tokenPayload,null );
+ tokenError = getAdminToken( organization.getUsername() + "test", organization.getPassword() );
fail( "Should not have created user" );
}
catch ( UniformInterfaceException ex ) {
@@ -186,10 +185,11 @@ public class OrganizationsIT extends AbstractRestIT {
}
//try to get the token from the organization that failed to be created to verify it was not made.
- tokenPayload = new Token( "password", organization.getUsername()+"test", organization.getPassword()+"test" );
+ //tokenPayload = new Token( "password", organization.getUsername()+"test", organization.getPassword()+"test" );
Token tokenError = null;
try {
- tokenError = clientSetup.getRestClient().management().token().post(false,Token.class, tokenPayload,null );
+ tokenError = getAdminToken(organization.getUsername()+"test", organization.getPassword()+"test" );
+ //clientSetup.getRestClient().management().token().post(false,Token.class, tokenPayload,null );
fail( "Should not have created organization" );
}
catch ( UniformInterfaceException ex ) {
@@ -270,8 +270,7 @@ public class OrganizationsIT extends AbstractRestIT {
assertEquals(organization.getOrganization(), organizationReturned.getName());
//get token from organization that was created to verify it exists. also sets the current context.
- Token tokenPayload = new Token( "password", organization.getName(), organization.getPassword() );
- Token tokenReturned = clientSetup.getRestClient().management().token().post(false,Token.class, tokenPayload,null);
+ Token tokenReturned = getAdminToken( organization.getName(), organization.getPassword());
assertNotNull( tokenReturned );
@@ -309,7 +308,6 @@ public class OrganizationsIT extends AbstractRestIT {
*/
@Test
public void testCreateOrgUserAndReturnCorrectUsername() throws Exception {
- RestClient restClient = clientSetup.getRestClient();
//Create adminUser values
Entity adminUserPayload = new Entity();
@@ -320,7 +318,9 @@ public class OrganizationsIT extends AbstractRestIT {
adminUserPayload.put("password", username);
//create adminUser
- ApiResponse adminUserEntityResponse = management().orgs().organization( clientSetup.getOrganizationName() ).users().post(ApiResponse.class, adminUserPayload);
+ ApiResponse adminUserEntityResponse = this.pathResource( "management/orgs/"+clientSetup.getOrganizationName()+"/users",this.getAdminToken() )
+ .post( adminUserPayload);
+ // management().orgs().organization( clientSetup.getOrganizationName() ).users().post(ApiResponse.class, adminUserPayload);
Entity adminUserResponse = new Entity(adminUserEntityResponse);
//verify that the response contains the correct data
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/139b9e66/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
index 2972126..9ec0965 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/RegistrationIT.java
@@ -81,16 +81,19 @@ public class RegistrationIT extends AbstractRestIT {
public Entity postAddAdminToOrg(String organizationName, String email, String password) throws IOException {
- this.management().token().setToken(this.getAdminToken());
-
- ApiResponse user = this
- .management()
- .orgs()
- .organization(organizationName)
- .users()
- .post(new User().chainPut("email", email).chainPut("password", password));
-
- assertNotNull(user);
+ // this.management().token().setToken(this.getAdminToken());
+//
+// ApiResponse user = this
+// .management()
+// .orgs()
+// .organization(organizationName)
+// .users()
+// .post(new User().chainPut("email", email).chainPut("password", password));
+
+ ApiResponse user = this.pathResource( "management/orgs/" + organizationName + "/users", this.getAdminToken() )
+ .post( new User().chainPut( "email", email ).chainPut( "password", password ) );
+
+ assertNotNull( user );
return new Entity(user);
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/139b9e66/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
index a78f4fd..7e0f191 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/management/organizations/AdminEmailEncodingIT.java
@@ -112,8 +112,8 @@ public class AdminEmailEncodingIT extends AbstractRestIT {
assertNotNull(organization);
//Retrieve an authorization token using the credentials created above
- Token tokenReturned = clientSetup.getRestClient().management().token()
- .post(false,Token.class,new Token("password", username, password),null);
+ Token tokenReturned = this.clientSetup.getRestClient().pathResource( "management/token" )
+ .post( Token.class,new Token("password",username, password),null);
assertNotNull(tokenReturned);
//Instruct the test framework to use the new token
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/139b9e66/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
index 29b6414..2cadff0 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/AbstractRestIT.java
@@ -136,10 +136,17 @@ public class AbstractRestIT extends JerseyTest {
protected NamedResource pathResource(String path){ return clientSetup.restClient.pathResource(path);}
+ protected NamedResource pathResource(String path, Token token){ return clientSetup.restClient.pathResource(path,token);}
+
protected String getOrgAppPath(String additionalPath){
return clientSetup.orgName + "/" + clientSetup.appName + "/" + (additionalPath !=null ? additionalPath : "");
}
+ protected String getManagementUsersPath(String additionalPath){
+ return "management/users/"+clientSetup.getUsername()
+ + (additionalPath !=null ? ("/" + additionalPath) : "");
+ }
+
protected ClientContext context(){
return this.clientSetup.getRestClient().getContext();
}
@@ -171,14 +178,21 @@ public class AbstractRestIT extends JerseyTest {
protected Token getAdminToken(String username, String password){
- return this.clientSetup.getRestClient().management().token().post(false,Token.class,
- new Token(username, password),null
- );
+ //needs to be a post with a payload.
+ return this.clientSetup.getRestClient().pathResource( "management/token" ).post( Token.class,new Token(username, password),null);
+// return this.clientSetup.getRestClient().management().token().post(false,Token.class,
+// new Token(username, password),null
+// );
}
+ //TODO: add ability to pass in or use existing tokens
protected Token getAdminToken(){
- return this.clientSetup.getRestClient().management().token().post(false,Token.class,
- new Token(this.clientSetup.getUsername(),this.clientSetup.getUsername()),null
- );
+ return this.clientSetup.getRestClient().pathResource( "management/token" )
+ .post( Token.class,
+ new Token( this.clientSetup.getUsername(), this.clientSetup.getUsername() ), null );
+
+ // return this.clientSetup.getRestClient().management().token().post(false,Token.class,
+// new Token(this.clientSetup.getUsername(),this.clientSetup.getUsername()),null
+// );
}
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/139b9e66/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/RestClient.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/RestClient.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/RestClient.java
index 152e546..906b848 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/RestClient.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/RestClient.java
@@ -18,6 +18,7 @@ package org.apache.usergrid.rest.test.resource2point0;
import org.apache.usergrid.rest.test.resource2point0.endpoints.*;
import org.apache.usergrid.rest.test.resource2point0.endpoints.mgmt.ManagementResource;
+import org.apache.usergrid.rest.test.resource2point0.model.Token;
import org.apache.usergrid.rest.test.resource2point0.state.ClientContext;
import com.fasterxml.jackson.databind.JsonNode;
@@ -106,7 +107,12 @@ public class RestClient implements UrlResource {
}
public NamedResource pathResource(String path){
- return new NamedResource(path,context,this);
+ return new NamedResource(null,path,this,"");
+ }
+
+
+ public NamedResource pathResource(String path, Token token){
+ return new NamedResource(token,path,this,"");
}
public void superuserSetup() {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/139b9e66/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java
index f5083ba..136c400 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource2point0/endpoints/NamedResource.java
@@ -50,14 +50,36 @@ public class NamedResource implements UrlResource {
*/
protected final UrlResource parent;
+ protected final Token token;
+
public NamedResource( final String name, final ClientContext context, final UrlResource parent ) {
this.name = name;
this.context = context;
this.parent = parent;
+ this.token = null;
+
+ }
+
+ public NamedResource (final Token token, final String name, final UrlResource parent,String emptyForSignatureReasons) {
+ this.name = name;
+ this.token=token;
+ this.parent=parent;
+ this.context=null;
+
+ }
+
+
+ public WebResource appendAccessTokenToCall(){
+ WebResource resource = parent.getResource().path( getPath() );
+ if ( token == null )
+ return resource;
+ else
+ return resource.queryParam("access_token",token.getAccessToken());
}
+
@Override
public String getPath() {
return name + getMatrix();
@@ -164,12 +186,12 @@ public class NamedResource implements UrlResource {
*/
//For edge cases like Organizations and Tokens
public ApiResponse post(Map map) {
- return post(true,ApiResponse.class,map,null);
+ return post(ApiResponse.class,map,null);
}
//For edge cases like Organizations and Tokens
public ApiResponse post(boolean useToken, Map map, QueryParameters queryParameters) {
- return post(true,ApiResponse.class,map,queryParameters);
+ return post(ApiResponse.class,map,queryParameters);
}
/**
@@ -181,7 +203,7 @@ public class NamedResource implements UrlResource {
*/
//For edge cases like Organizations and Tokens
public <T> T post(Class<T> type) {
- return post(true,type,null,null);
+ return post(type,null,null);
}
@@ -195,7 +217,7 @@ public class NamedResource implements UrlResource {
*/
//For edge cases like Organizations and Tokens
public <T> T post(Class<T> type, Entity requestEntity) {
- return post(true,type,requestEntity,null);
+ return post(type,requestEntity,null);
}
@@ -209,7 +231,7 @@ public class NamedResource implements UrlResource {
*/
//For edge cases like Organizations and Tokens
public <T> T post(Class<T> type, Map requestEntity) {
- return post(true,type,requestEntity,null);
+ return post(type,requestEntity,null);
}
@@ -231,9 +253,26 @@ public class NamedResource implements UrlResource {
}
- //Used for empty posts
- public <T> T post( boolean useToken, Class<T> type, Map entity, final QueryParameters queryParameters ) {
- WebResource resource = getResource(useToken);
+ //Can be used for both emmpty and non empty posts
+// public <T> T post( boolean useToken, Class<T> type, Map entity, final QueryParameters queryParameters ) {
+// WebResource resource = getResource(useToken);
+// resource = addParametersToResource(resource, queryParameters);
+// WebResource.Builder builder = resource
+// .type(MediaType.APPLICATION_JSON_TYPE)
+// .accept( MediaType.APPLICATION_JSON );
+//
+// if(entity!=null){
+// builder.entity(entity);
+// }
+// GenericType<T> gt = new GenericType<>((Class) type);
+// return builder
+// .post(gt.getRawClass());
+//
+// }
+
+
+ public <T> T post( Class<T> type, Map entity, final QueryParameters queryParameters ) {
+ WebResource resource = appendAccessTokenToCall();
resource = addParametersToResource(resource, queryParameters);
WebResource.Builder builder = resource
.type(MediaType.APPLICATION_JSON_TYPE)
@@ -248,7 +287,6 @@ public class NamedResource implements UrlResource {
}
-
//For edge cases like Organizations and Tokens without any payload
public <T> T get(Class<T> type) {
return get(type,null,true);
@@ -263,7 +301,15 @@ public class NamedResource implements UrlResource {
public <T> T get(Class<T> type,QueryParameters queryParameters) {
- return get(type,queryParameters,true);
+ WebResource resource = appendAccessTokenToCall();
+ if(queryParameters!=null) {
+ resource = addParametersToResource(resource, queryParameters);
+ }
+ GenericType<T> gt = new GenericType<>((Class) type);
+ return resource.type(MediaType.APPLICATION_JSON_TYPE)
+ .accept( MediaType.APPLICATION_JSON )
+ .get( gt.getRawClass() );
+
}
public <T> T get(Class<T> type,QueryParameters queryParameters, boolean useToken) {
@@ -278,6 +324,7 @@ public class NamedResource implements UrlResource {
}
+
public String getMatrix() {
return "";
}