Repository: usergrid Updated Branches: refs/heads/hotfix-20160819 4c0c17638 -> fdb7c2728
allow no password when creating admin users when SSO-enabled Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/fdb7c272 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/fdb7c272 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/fdb7c272 Branch: refs/heads/hotfix-20160819 Commit: fdb7c272824efabe4c025ec5c2798b9792e1d8de Parents: 4c0c176 Author: Mike Dunker <[email protected]> Authored: Wed Sep 14 13:00:34 2016 -0700 Committer: Mike Dunker <[email protected]> Committed: Wed Sep 14 13:00:34 2016 -0700 ---------------------------------------------------------------------- .../usergrid/management/cassandra/ManagementServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/fdb7c272/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java ---------------------------------------------------------------------- diff --git a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java index d1e3edf..03377a3 100644 --- a/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java +++ b/stack/services/src/main/java/org/apache/usergrid/management/cassandra/ManagementServiceImpl.java @@ -553,7 +553,7 @@ public class ManagementServiceImpl implements ManagementService { // associate to the requested organization if((password == null || password.isEmpty()) && SubjectUtils.isServiceAdmin()){ user = getAdminUserByEmail(email); - if(user == null ){ + if(user == null && !tokens.isExternalSSOProviderEnabled() ){ throw new IllegalArgumentException("Password should be sent in the request or should be a valid admin user email."); } }
