Expose external SSO userid and reduce the management/me response.

apache · Aug 2, 2016 · 69625af · 69625af
1 parent 0b84023
commit 69625af
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
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
@@ -61,8 +61,6 @@
 import static javax.servlet.http.HttpServletResponse.*;
 import static javax.ws.rs.core.MediaType.*;
 import static org.apache.commons.lang.StringUtils.isNotBlank;
-import static org.apache.usergrid.security.tokens.cassandra.TokenServiceImpl.USERGRID_EXTERNAL_SSO_PROVIDER;
-import static org.apache.usergrid.security.tokens.cassandra.TokenServiceImpl.USERGRID_EXTERNAL_SSO_PROVIDER_URL;
 import static org.apache.usergrid.security.tokens.cassandra.TokenServiceImpl.USERGRID_EXTERNAL_SSO_ENABLED;
 import static org.apache.usergrid.utils.JsonUtils.mapToJsonString;
 import static org.apache.usergrid.utils.StringUtils.stringOrSubstringAfterFirst;
@@ -222,7 +220,8 @@ public Response getAccessTokenLight( @Context UriInfo ui, @HeaderParam( "Authori
             access_info.setProperty("external_sso_user_id", ssoUserId);
         }
 
-        access_info.setProperty( "user", management.getAdminUserOrganizationData( user, true ) );
+        access_info.setProperty( "user", management.getAdminUserOrganizationData( user, true, false) );
+
 
         return Response.status( SC_OK ).type( jsonMediaType( callback ) )
             .entity( wrapWithCallback( access_info, callback ) ).build();
@@ -413,7 +412,7 @@ else if ( "client_credentials".equals( grant_type ) ) {
                     new AccessInfo().withExpiresIn( tokens.getMaxTokenAgeInSeconds( token ) ).withAccessToken( token )
                                     .withPasswordChanged( passwordChanged );
 
-            access_info.setProperty( "user", management.getAdminUserOrganizationData( user, me ) );
+            access_info.setProperty( "user", management.getAdminUserOrganizationData( user, true, false) );
 
             // increment counters for admin login
             management.countAdminUserAction( user, "login" );

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
@@ -47,7 +47,6 @@
 import java.util.UUID;
 
 import static org.apache.usergrid.security.shiro.utils.SubjectUtils.isServiceAdmin;
-import static org.apache.usergrid.security.tokens.cassandra.TokenServiceImpl.USERGRID_EXTERNAL_SSO_PROVIDER_URL;
 import static org.apache.usergrid.utils.ConversionUtils.string;
 
 
@@ -209,7 +208,7 @@ public ApiResponse getUserData( @Context UriInfo ui, @QueryParam( "ttl" ) long t
         // 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 );
+        Map<String, Object> userOrganizationData = management.getAdminUserOrganizationData( user, !shallow, !shallow);
         //userOrganizationData.put( "token", token );
         response.setData( userOrganizationData );
         response.setSuccess();

diff --git a/stack/services/src/main/java/org/apache/usergrid/management/ManagementService.java b/stack/services/src/main/java/org/apache/usergrid/management/ManagementService.java
@@ -157,7 +157,7 @@ OrganizationOwnerInfo createOwnerAndOrganization( String organizationName, Strin
 
 	UserInfo getAdminUserInfoFromAccessToken( String token ) throws Exception;
 
-	Map<String, Object> getAdminUserOrganizationData( UserInfo user, boolean deep ) throws Exception;
+	Map<String, Object> getAdminUserOrganizationData(UserInfo user, boolean includeApps, boolean includeOrgUsers) throws Exception;
 
 	Map<String, Object> getAdminUserOrganizationData( UUID userId ) throws Exception;
 

diff --git a/...ervices/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java b/...ervices/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java
@@ -1635,7 +1635,7 @@ public BiMap<UUID, String> getOrganizationsForAdminUser( UUID userId ) throws Ex
     @Override
     public Map<String, Object> getAdminUserOrganizationData( UUID userId ) throws Exception {
         UserInfo user = getAdminUserByUuid( userId );
-        return getAdminUserOrganizationData( user, true );
+        return getAdminUserOrganizationData( user, true, true);
     }
 
 
@@ -1647,7 +1647,7 @@ public Long getLastAdminPasswordChange( UUID userId ) throws Exception {
 
 
     @Override
-    public Map<String, Object> getAdminUserOrganizationData( UserInfo user, boolean deep ) throws Exception {
+    public Map<String, Object> getAdminUserOrganizationData(UserInfo user, boolean includeApps, boolean includeOrgUsers) throws Exception {
 
         Map<String, Object> json = new HashMap<>();
 
@@ -1676,10 +1676,11 @@ public Map<String, Object> getAdminUserOrganizationData( UserInfo user, boolean
             jsonOrganization.put( PROPERTY_UUID, organization.getKey() );
             jsonOrganization.put( "properties", getOrganizationByUuid( organization.getKey() ).getProperties() );
 
-            if ( deep ) {
-                BiMap<UUID, String> applications = getApplicationsForOrganization( organization.getKey() );
-                jsonOrganization.put( "applications", applications.inverse() );
-
+            if ( includeApps ) {
+                BiMap<UUID, String> applications = getApplicationsForOrganization(organization.getKey());
+                jsonOrganization.put("applications", applications.inverse());
+            }
+            if ( includeOrgUsers ){
                 List<UserInfo> users = getAdminUsersForOrganization( organization.getKey() );
                 Map<String, Object> jsonUsers = new HashMap<>();
                 for ( UserInfo u : users ) {

diff --git a/stack/services/src/main/java/org/apache/usergrid/security/sso/ApigeeSSO2Provider.java b/stack/services/src/main/java/org/apache/usergrid/security/sso/ApigeeSSO2Provider.java
@@ -127,6 +127,7 @@ public Map<String, String> getDecodedTokenDetails(String token) throws Exception
         tokenDetails.put("username", (String)claims.get("user_name"));
         tokenDetails.put("email", (String)claims.get("email"));
         tokenDetails.put("expiry", claims.get("exp").toString());
+        tokenDetails.put("user_id", claims.get("user_id").toString());
 
 
         return tokenDetails;