You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2016/08/22 15:00:27 UTC

[23/50] usergrid git commit: Use the interface for creating admin users.

Use the interface for creating admin users.


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

Branch: refs/heads/asf-site
Commit: 2a514d4ca4f5466589a3059aeeb69f68c2ee3da3
Parents: c0dd93e
Author: Michael Russo <mr...@apigee.com>
Authored: Mon Aug 8 15:16:50 2016 -0700
Committer: Michael Russo <mr...@apigee.com>
Committed: Mon Aug 8 15:16:50 2016 -0700

----------------------------------------------------------------------
 .../usergrid/management/cassandra/ManagementServiceImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/2a514d4c/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 903c200..4bd2e4f 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
@@ -562,9 +562,9 @@ public class ManagementServiceImpl implements ManagementService {
             if(user == null) {
                 // if external SSO is enabled and we're adding a user to an org, auto activate the user
                 if (tokens.isExternalSSOProviderEnabled() || areActivationChecksDisabled()) {
-                    user = createAdminUserInternal(null, username, name, email, password, true, false, userProperties);
+                    user = createAdminUser(null, username, name, email, password, true, false, userProperties);
                 } else {
-                    user = createAdminUserInternal(null, username, name, email, password, activated, disabled, userProperties);
+                    user = createAdminUser(null, username, name, email, password, activated, disabled, userProperties);
                 }
             }