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/07/14 20:26:19 UTC
[10/16] usergrid git commit: adding comments.
adding comments.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/897d373e
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/897d373e
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/897d373e
Branch: refs/heads/apigee-sso-provider
Commit: 897d373e1e7916802177f09993712dab65f91bcc
Parents: 930308d
Author: Ayesha Dastagiri <ay...@gmail.com>
Authored: Fri Jul 8 11:32:39 2016 -0700
Committer: Ayesha Dastagiri <ay...@gmail.com>
Committed: Fri Jul 8 11:32:39 2016 -0700
----------------------------------------------------------------------
.../rest/management/organizations/users/UsersResource.java | 3 ++-
.../org/apache/usergrid/rest/management/users/UsersResource.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/897d373e/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 03106c0..dad2c14 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
@@ -131,7 +131,8 @@ public class UsersResource extends AbstractContextResource {
if ( user == null ) {
if ( tokens.isExternalSSOProviderEnabled() ){
- user = management.createAdminUser(organization.getUuid(),username,name,email,password,true,false);
+ //autoactivating user, since the activation is done via the external sso provider.
+ user = management.createAdminUser(organization.getUuid(),username,name,email,password,true,false);
}
else {
user = management.createAdminUser(organization.getUuid(), username, name, email, password, false, false);
http://git-wip-us.apache.org/repos/asf/usergrid/blob/897d373e/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
index 64281b6..828b46a 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/management/users/UsersResource.java
@@ -137,7 +137,7 @@ public class UsersResource extends AbstractContextResource {
UserInfo user = null;
if ( tokens.isExternalSSOProviderEnabled() ){
- //autoactivating user, since the activation
+ //autoactivating user, since the activation is done via the external sso provider.
user = management.createAdminUser(null,username,name,email,password,true,false);
}
else {