Merge branch 'apigee-sso-provider' of https://github.com/apache/usergrid into SSO2-Usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/3ba4e596 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/3ba4e596 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/3ba4e596 Branch: refs/heads/master Commit: 3ba4e596c5bccffea4d7fd481e55c1590886322e Parents: 2c59bd8 8413f21 Author: Ayesha Dastagiri <[email protected]> Authored: Thu Jul 7 17:56:39 2016 -0700 Committer: Ayesha Dastagiri <[email protected]> Committed: Thu Jul 7 17:56:39 2016 -0700 ---------------------------------------------------------------------- .../usergrid/rest/management/users/UserResource.java | 3 ++- .../security/shiro/filters/BasicAuthSecurityFilter.java | 3 +++ .../shiro/filters/ClientCredentialsSecurityFilter.java | 4 ++++ .../shiro/filters/OAuth2AccessTokenSecurityFilter.java | 4 ++++ .../rest/security/shiro/filters/SecurityFilter.java | 12 ++++++++++++ 5 files changed, 25 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/3ba4e596/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java ---------------------------------------------------------------------- diff --cc stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java index 89725b8,36dbdde..b16e85c --- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java +++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java @@@ -199,10 -195,9 +199,11 @@@ public class UserResource extends Abstr ApiResponse response = createApiResponse(); response.setAction( "get admin user" ); - //String token = management.getAccessTokenForAdminUser( user.getUuid(), ttl ); +// commenting out creation of token each time and setting the token value to the one sent in the request. +// String token = management.getAccessTokenForAdminUser( user.getUuid(), ttl ); ++ Map<String, Object> userOrganizationData = management.getAdminUserOrganizationData( user, !shallow ); - userOrganizationData.put( "token", token ); + //userOrganizationData.put( "token", token ); response.setData( userOrganizationData ); response.setSuccess();
