usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mru...@apache.org
Subject usergrid git commit: Disable new token generation on get user details.
Date Wed, 06 Jul 2016 21:58:07 GMT
Repository: usergrid
Updated Branches:
  refs/heads/apigee-sso-provider 37642347b -> 8d79d365c
Updated Tags:  refs/tags/0.0.29rc1 [created] ea5204909
  refs/tags/0.0.40.r1 [created] 9e8973c4c
  refs/tags/0.0.40.r2 [created] 52ca54ed5
  refs/tags/0.0.40.r3 [created] b2a48c35f
  refs/tags/0.0.40.r4 [created] 9ef664119
  refs/tags/0.0.40.r5 [created] 44c2b542b
  refs/tags/0.0.43.r4 [created] 13dc203d5
  refs/tags/0.0.44.r1 [created] f4aa33a0f
  refs/tags/0.0.44.r2 [created] ab9fdf2e5
  refs/tags/0.0.46.r3 [created] 21dbad841
  refs/tags/0.0.46.r4 [created] 303f840e4
  refs/tags/0.0.52.r1 [created] e17a567a3
  refs/tags/0.0.52.r2 [created] cbe19f151
  refs/tags/0.0.52.r3 [created] d807166a6
  refs/tags/0.0.52.r4 [created] b11b5fcd3
  refs/tags/0.0.54.r1 [created] a1be03363
  refs/tags/0.0.54.r1-freenethotfix-2 [created] c72e09a3d
  refs/tags/0.0.54.r1-freenethotfix-3 [created] bd8ba9416
  refs/tags/0.0.57.r1 [created] cec9f82db
  refs/tags/0.0.58.r1 [created] bfedb3ecb
  refs/tags/0.0.64.r1 [created] 0693584f7
  refs/tags/0.0.72.r1 [created] e9caeea71
  refs/tags/0.0.72.r2 [created] d5ae52366
  refs/tags/0.0.72.r3 [created] e284b034c
  refs/tags/0.0.72.r4 [created] dbba808ed
  refs/tags/0.0.72.r5 [created] d5e57d7ea
  refs/tags/0.0.80.r1 [created] a82f0fb34
  refs/tags/0.0.9.r0 [created] 1c0f4f14a
  refs/tags/1.0.0-rc3 [created] b1eab2553
  refs/tags/1.0.0-rc4 [created] 90f2d4cfd
  refs/tags/1.0.0-rc6 [created] d78b3a750
  refs/tags/1.0.0rc1 [created] 0b47a1721
  refs/tags/2.1-release [created] 5f70f35fe
  refs/tags/2.1.working [created] d1c146deb
  refs/tags/2015-02-16-r1 [created] 068c3a1bc
  refs/tags/2015-02-19-woolworths-rebuild-hotfix [created] d35a0b12b
  refs/tags/2015-02-19-woolworths-rebuild-hotfix-2 [created] 152816844
  refs/tags/2015-02-27_8_r2 [created] d1d60f11a
  refs/tags/2015-03-04-dandb-fixes [created] 6ee818b79
  refs/tags/2015-03-06-org-app-cache-usergrid-9-r1 [created] df2c07aa5
  refs/tags/2015-03-06-org-app-cache-usergrid-9-r2 [created] b760414ad
  refs/tags/2015-03-09-org-app-cache-usergrid-9-r4 [created] 642c42807
  refs/tags/2015-03-09-org-app-cache-usergrid-9-r5 [created] f279492b5
  refs/tags/2015-03-09-org-app-cache-usergrid-9-r6 [created] d37239bd6
  refs/tags/2015-03-11-org-app-cache-usergrid-10-r1 [created] 54ac3ae8a
  refs/tags/2015-03-11-queue-delete-by-quey-10-r1 [created] e36dd561a
  refs/tags/2015-03-15-uniquefix-cleanup-fix-10-r2 [created] 06ef1b82b
  refs/tags/2015-03-18-repair-fix-11-r1 [created] 43d63586f
  refs/tags/2015-03-25-connection-paging-UG-511-12-r1 [created] d5a9d7936
  refs/tags/2015-04-01-thegapfix [created] 9f031e87e
  refs/tags/2015-04-02-fixes [created] 4b743e2a7
  refs/tags/2015-04-02-fixes2 [created] 1e3f6cb10
  refs/tags/2015-04-16-burberry-fix [created] 96baad4b8
  refs/tags/2015-04-20-ssotest [created] 75ec733e8
  refs/tags/2015-04-21-ssofix [created] 4960eda96
  refs/tags/2015-04-28-ssotest [created] 76d3d0020
  refs/tags/2015-04-29-ssotest [created] b4715c043
  refs/tags/2015-17-04-ssotest [created] de32e7017
  refs/tags/2015.02.23-woolworths-fixes [created] a2411e281
  refs/tags/2015.02.24-dandb-fixes [created] 48ad8ed1c
  refs/tags/20150505-dedicated-sso [created] c1e613f8c
  refs/tags/20150512-sso-conn-pool [created] a663f0761
  refs/tags/20150515-jclouds-fix [created] a40180581
  refs/tags/20150608-sso-fixes [created] 27d235f75
  refs/tags/48.0.stack [created] 28e2c3542
  refs/tags/help [created] d901d38ca
  refs/tags/pre-massive-change-merge [created] 8ec20d12b
  refs/tags/tempbuildtag [created] 5cbfc6112
  refs/tags/usergrid-006 [created] 6855e1731
  refs/tags/v0.9.10 [created] 6bc80d3e0
  refs/tags/v1.0 [created] a30bf50ca
  refs/tags/v1.0-rc1 [created] a30bf50ca


Disable new token generation on get user details.


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/8d79d365
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/8d79d365
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/8d79d365

Branch: refs/heads/apigee-sso-provider
Commit: 8d79d365c8bc2387086bdaa72fff13de205ea94e
Parents: 3764234
Author: Michael Russo <mrusso@apigee.com>
Authored: Wed Jul 6 14:58:00 2016 -0700
Committer: Michael Russo <mrusso@apigee.com>
Committed: Wed Jul 6 14:58:00 2016 -0700

----------------------------------------------------------------------
 .../org/apache/usergrid/rest/management/users/UserResource.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/8d79d365/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UserResource.java
----------------------------------------------------------------------
diff --git 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
index e431579..36dbdde 100644
--- 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
@@ -195,9 +195,9 @@ public class UserResource extends AbstractContextResource {
         ApiResponse response = createApiResponse();
         response.setAction( "get admin user" );
 
-        String token = management.getAccessTokenForAdminUser( user.getUuid(), ttl );
+        //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();
 


Mime
View raw message