SSO central related fixes to user creation and superuser login logic.
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
index bcd6f3d..fcbf49c 100644
--- 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
@@ -604,7 +604,7 @@
// haven't created user yet so do that now
OrganizationOwnerInfo ownerOrgInfo = management.createOwnerAndOrganization(
- orgName, username, name, email, dummyPassword, true, true );
+ orgName, username, name, email, dummyPassword, true, false );
management.activateOrganization( ownerOrgInfo.getOrganization() ); // redundant?
applicationCreator.createSampleFor( ownerOrgInfo.getOrganization() );
@@ -718,11 +718,7 @@
// when external tokens enabled then only superuser can obtain an access token
final String superuserName = properties.getProperty( USERGRID_SYSADMIN_LOGIN_NAME );
- final String superuserAllowedStr = properties.getProperty( USERGRID_SYSADMIN_LOGIN_ALLOWED );
- final boolean superuserAllowed = !StringUtils.isEmpty( superuserAllowedStr )
- && superuserAllowedStr.trim().equalsIgnoreCase( "true" );
-
- if ( superuserAllowed && !superuserName.equalsIgnoreCase( username )) {
+ if ( !username.equalsIgnoreCase( superuserName )) {
// this guy is not the superuser
throw new IllegalArgumentException( "Admin Users must login via " +
