You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/06/06 19:18:30 UTC
usergrid git commit: Handle case where users were created in client
SSO system when central SSO was enabled.
Repository: usergrid
Updated Branches:
refs/heads/1.x 0a918bbcd -> d17c99541
Handle case where users were created in client SSO system when central SSO was enabled.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/d17c9954
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/d17c9954
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/d17c9954
Branch: refs/heads/1.x
Commit: d17c99541b77eacbd2a19080323dad55a607a413
Parents: 0a918bb
Author: Michael Russo <mr...@apigee.com>
Authored: Mon Jun 6 12:18:04 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Mon Jun 6 12:18:04 2016 -0700
----------------------------------------------------------------------
.../management/organizations/users/UsersResource.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/d17c9954/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java
index 716679f..6bdc402 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/organizations/users/UsersResource.java
@@ -37,7 +37,9 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.UriInfo;
+import org.apache.commons.lang.StringUtils;
import org.apache.usergrid.rest.RootResource;
+import org.apache.usergrid.rest.management.ManagementResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;
@@ -129,11 +131,21 @@ public class UsersResource extends AbstractContextResource {
ApiResponse response = createApiResponse();
response.setAction( "create user" );
+ final boolean centralSSOEnabled =
+ !StringUtils.isEmpty( properties.getProperty( ManagementResource.USERGRID_CENTRAL_URL ) );
+
UserInfo user = null;
if ( invite ) {
user = management.getAdminUserByEmail( email );
}
+ if ( centralSSOEnabled && user == null){
+
+ throw new IllegalArgumentException( "Admin User "+ email + " not found and must be " +
+ "created using the central account service.");
+
+ }
+
if ( user == null ) {
user = management.createAdminUser( username, name, email, password, false, false );